From fd138579c35c8d7024353839c7f4e3aaf1706b35 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Mon, 10 Oct 2011 21:59:19 +0200 Subject: [PATCH] parallel: Makefile for creating .deb package (dependent on --minversion) --- packager/debian/Makefile | 14 ++++++++++++-- packager/debian/README | 6 ++++-- src/parallel | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/packager/debian/Makefile b/packager/debian/Makefile index c9f32953..3b5288e3 100644 --- a/packager/debian/Makefile +++ b/packager/debian/Makefile @@ -1,12 +1,20 @@ -all: clean unpack build +all: clean makedist unpack build unpack: ls ../../parallel-*.tar.bz2| tail -n1 | parallel tar xvf cd parallel-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]; cp -a ../debian-template debian build: - cd parallel-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]; debchange -i + which dpkg-buildpackage >/dev/null || ( \ + echo "Error, could not find 'dpkg-buildpackage'." ; \ + echo "To install, run:" ; \ + echo -e "\tapt-get install dpkg-dev" ; \ + false ) + cd parallel-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]; perl -i -pe "s/201[0-9]{5}-[0-9]+/"`src/parallel --minversion 1`"/" debian/{changelog,parallel/DEBIAN/control} cd parallel-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]; dpkg-buildpackage -us -uc + @echo + @echo "To install the GNU Parallel Debian package, run:" + @echo -e \\t sudo dpkg -i `ls -rt parallel_*_all.deb | tail -n 1` clean: rm -f parallel_* @@ -16,3 +24,5 @@ distclean: rm -f parallel_* rm -rf parallel-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] +makedist: + cd ../..; make dist-bzip2 dist-gzip diff --git a/packager/debian/README b/packager/debian/README index 24941469..e61a3070 100644 --- a/packager/debian/README +++ b/packager/debian/README @@ -1,2 +1,4 @@ -make -Edit 20100906-2 to the version number +To build a .deb package: + + make + diff --git a/src/parallel b/src/parallel index 5ee1d367..c58b9059 100755 --- a/src/parallel +++ b/src/parallel @@ -582,7 +582,7 @@ sub parse_options { if(defined $::opt_bg) { $Global::semaphore = 1; } if(defined $::opt_wait) { $Global::semaphore = 1; } if(defined $::opt_minversion) { - version(); + print $Global::version,"\n"; if($Global::version < $::opt_minversion) { wait_and_exit(255); } else {