From 1bbf5352f7c17133feeca1401035cc545c7ca6bb Mon Sep 17 00:00:00 2001 From: dolik Date: Mon, 29 Mar 2010 11:13:08 +0000 Subject: [PATCH] .lpbuild: fixed unclean source tree in deb, updated standard version, improved dependancy generation git-svn-id: svn://ultimatepp.org/upp/trunk@2279 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppbox/lpbuild/control | 2 +- uppbox/lpbuild/dopack-stub | 18 ++++++++---------- uppbox/lpbuild/rules | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/uppbox/lpbuild/control b/uppbox/lpbuild/control index 349b699b8..64c0aba37 100644 --- a/uppbox/lpbuild/control +++ b/uppbox/lpbuild/control @@ -2,7 +2,7 @@ Source: upp Section: devel Priority: optional Maintainer: Jan Dolinar -Standards-Version: 3.8.3.0 +Standards-Version: 3.8.4 Build-Depends: rsync, libx11-dev (>= 1.0.0), libxft-dev (>= 2.1.8), libpng12-dev (>= 1.2.8), libgtk2.0-dev (>= 2.8.17), libnotify-dev Package: upp diff --git a/uppbox/lpbuild/dopack-stub b/uppbox/lpbuild/dopack-stub index 265723be7..e1bfe1746 100644 --- a/uppbox/lpbuild/dopack-stub +++ b/uppbox/lpbuild/dopack-stub @@ -39,9 +39,6 @@ then exit 1 fi -# strip symbols from executable -strip --strip-all --remove-section=.comment --remove-section=.note $tmp/usr/bin/theide - # copy source files to tmp folder # (copying is done by rsync, because it allows to exclude svn and also # to change permissions on the files) @@ -209,6 +206,13 @@ cp $SRC_PATH/debian/copyright $tmp/usr/share/doc/$PKG cat $SRC_PATH/debian/theide.1 |gzip -9 > $tmp/usr/share/man/man1/theide.1.gz cat $SRC_PATH/changelog |gzip -9 > $tmp/usr/share/doc/$PKG/changelog.gz +# generate dependencies +cd $SRC_PATH +dpkg-shlibdeps $tmp/usr/bin/theide + +# strip symbols from executable +strip --strip-all --remove-section=.comment --remove-section=.note $tmp/usr/bin/theide + #get the installed size (approx...) size=`du -s $tmp/usr |sed 's/[^0-9].*$//'` @@ -217,11 +221,8 @@ cd $tmp find ./ -type f -exec md5sum {} \; | sed s/.[/]// >> $outtmp/md5sums mv $outtmp/md5sums $tmp/DEBIAN/md5sums -# generate dependencies -cd $SRC_PATH -dpkg-shlibdeps $tmp/usr/bin/theide - # create control file +cd $SRC_PATH dpkg-gencontrol -P$tmp # copy maintainer scripts @@ -236,9 +237,6 @@ chmod 0755 $tmp/DEBIAN/{postinst,prerm} $tmp/usr/bin/theide # creates final .deb package dpkg-deb -b $tmp $DEST_PATH -#~ # create debian/files -#~ echo "upp_"$release"_"$arch".deb devel optional" > $SRC_PATH/debian/files - # delete tmp directory rm -r $outtmp diff --git a/uppbox/lpbuild/rules b/uppbox/lpbuild/rules index d5aa95b1d..0ac77b7d1 100644 --- a/uppbox/lpbuild/rules +++ b/uppbox/lpbuild/rules @@ -10,7 +10,7 @@ build: binary-indep: -binary-arch: clean build +binary-arch: build clean bash -x $(CURDIR)/debian/dopack $(CURDIR) $(CURDIR)/.. binary: binary-indep binary-arch