From 04df0c405ae817eb3eedc15253c216c26558a9c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= Date: Wed, 27 Oct 2010 11:44:20 -0200 Subject: [PATCH 1/3] Remove temporary files to keep the packaging clean --- packager/debian/debian-template/files | 1 - .../debian/debian-template/parallel.debhelper.log | 13 ------------- packager/debian/debian-template/parallel.substvars | 1 - 3 files changed, 15 deletions(-) delete mode 100644 packager/debian/debian-template/files delete mode 100644 packager/debian/debian-template/parallel.debhelper.log delete mode 100644 packager/debian/debian-template/parallel.substvars diff --git a/packager/debian/debian-template/files b/packager/debian/debian-template/files deleted file mode 100644 index b362486b..00000000 --- a/packager/debian/debian-template/files +++ /dev/null @@ -1 +0,0 @@ -parallel_20100906-6_all.deb utils extra diff --git a/packager/debian/debian-template/parallel.debhelper.log b/packager/debian/debian-template/parallel.debhelper.log deleted file mode 100644 index 11de83b8..00000000 --- a/packager/debian/debian-template/parallel.debhelper.log +++ /dev/null @@ -1,13 +0,0 @@ -dh_prep -dh_installdirs -dh_installchangelogs -dh_installdocs -dh_installexamples -dh_installman -dh_link -dh_compress -dh_fixperms -dh_installdeb -dh_gencontrol -dh_md5sums -dh_builddeb diff --git a/packager/debian/debian-template/parallel.substvars b/packager/debian/debian-template/parallel.substvars deleted file mode 100644 index abd3ebeb..00000000 --- a/packager/debian/debian-template/parallel.substvars +++ /dev/null @@ -1 +0,0 @@ -misc:Depends= From 7819c65303d6d7e85ff6824f8e8431bb5a3b3974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= Date: Wed, 27 Oct 2010 11:49:39 -0200 Subject: [PATCH 2/3] New Debian packaging --- packager/debian/debian-template/changelog | 43 ++++++++++++ packager/debian/debian-template/compat | 2 +- packager/debian/debian-template/control | 7 +- packager/debian/debian-template/copyright | 3 +- packager/debian/debian-template/dirs | 2 - packager/debian/debian-template/doc-base | 11 +++ packager/debian/debian-template/rules | 67 ++----------------- packager/debian/debian-template/source/format | 1 + 8 files changed, 67 insertions(+), 69 deletions(-) delete mode 100644 packager/debian/debian-template/dirs create mode 100644 packager/debian/debian-template/doc-base create mode 100644 packager/debian/debian-template/source/format diff --git a/packager/debian/debian-template/changelog b/packager/debian/debian-template/changelog index 73f92ac6..f25fb198 100644 --- a/packager/debian/debian-template/changelog +++ b/packager/debian/debian-template/changelog @@ -1,3 +1,46 @@ +parallel (20100922-4) unstable; urgency=low + + * Change package to be non-native. + * Move to format "3.0 (quilt)". + * debian/compat: + + update to 7. + * debian/rules: + + don't configure the package in the clean target. + + create a configure (and configure-stamp) target. + * debian/control: + + update debhelper dependency to >= 7. + + add dh-autoreconf to build-dependency. + + indicate that the package conforms to Policy 3.9.1. + + set myself as maintainer and Ole as uploader. + * debian/rules: + + use dh(7) style file with autoreconf add-on. + * debian/doc-base: + + properly register the documentation with doc-base. + * debian/patches: + + include some patches to fix spelling errors detected by lintian. + * debian/dirs: + + remove, not needed. + + -- Rogério Brito Mon, 25 Oct 2010 03:44:37 -0200 + +parallel (20100922-3) unstable; urgency=low + + * New upstream version - 3rd try + + -- Ole Tange Tue, 21 Sep 2010 22:15:05 +0200 + +parallel (20100922-2) unstable; urgency=low + + * New upstream version + + -- Ole Tange Tue, 21 Sep 2010 22:13:53 +0200 + +parallel (20100922-1) unstable; urgency=low + + * New upstream version + + -- Ole Tange Tue, 21 Sep 2010 22:12:22 +0200 + parallel (20100906-1) unstable; urgency=low * New upstream version diff --git a/packager/debian/debian-template/compat b/packager/debian/debian-template/compat index 7ed6ff82..7f8f011e 100644 --- a/packager/debian/debian-template/compat +++ b/packager/debian/debian-template/compat @@ -1 +1 @@ -5 +7 diff --git a/packager/debian/debian-template/control b/packager/debian/debian-template/control index e7fb4c11..da5abfe3 100644 --- a/packager/debian/debian-template/control +++ b/packager/debian/debian-template/control @@ -1,9 +1,10 @@ Source: parallel Section: utils Priority: extra -Maintainer: Ole Tange -Build-Depends: debhelper (>= 5) -Standards-Version: 3.8.3 +Maintainer: Rogério Brito +Uploaders: Ole Tange +Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf +Standards-Version: 3.9.1 Homepage: https://www.gnu.org/software/parallel/ Package: parallel diff --git a/packager/debian/debian-template/copyright b/packager/debian/debian-template/copyright index 0889d6d9..523908f3 100644 --- a/packager/debian/debian-template/copyright +++ b/packager/debian/debian-template/copyright @@ -31,7 +31,8 @@ License: The Debian packaging is: - Copyright (C) 2010 Ole Tange + Copyright © 2010 Ole Tange + Copyright © 2010 Rogério Theodoro de Brito and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'. diff --git a/packager/debian/debian-template/dirs b/packager/debian/debian-template/dirs deleted file mode 100644 index 74c50691..00000000 --- a/packager/debian/debian-template/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin - diff --git a/packager/debian/debian-template/doc-base b/packager/debian/debian-template/doc-base new file mode 100644 index 00000000..6854cda8 --- /dev/null +++ b/packager/debian/debian-template/doc-base @@ -0,0 +1,11 @@ +Document: parallel +Title: Manual of GNU parallel +Author: Ole Tange +Abstract: This manual describes the use of GNU parallel, + provides an introduction to the subject and also presents + comparisons against similar utilities. +Section: System/Administration + +Format: HTML +Index: /usr/share/doc/parallel/parallel.html +Files: /usr/share/doc/parallel/*.html diff --git a/packager/debian/debian-template/rules b/packager/debian/debian-template/rules index a8d1c225..6b4a3cfc 100755 --- a/packager/debian/debian-template/rules +++ b/packager/debian/debian-template/rules @@ -1,64 +1,7 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. +%: + dh $@ --with autoreconf -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -build: build-stamp - -build-stamp: - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch $@ - -clean: - dh_testdir - dh_testroot - dh_installdirs - rm -f build-stamp - - # Add here commands to clean up after the build process. - ./configure --prefix=/usr - $(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep || dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/parallel. - $(MAKE) DESTDIR=$(CURDIR)/debian/parallel install - - -# Build architecture-independent files here. -binary-indep: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-dependent files here. -binary-arch: install - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_clean: + rm -f src/sem + dh_clean diff --git a/packager/debian/debian-template/source/format b/packager/debian/debian-template/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/packager/debian/debian-template/source/format @@ -0,0 +1 @@ +3.0 (quilt) From 7026c9388387074200fd73f0fd8fc9cd09a37f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= Date: Wed, 27 Oct 2010 11:50:09 -0200 Subject: [PATCH 3/3] Add patches to fix spelling, as a temporary measure --- .../patches/01-fix-spelling.patch | 52 +++++++++++++++++++ .../debian/debian-template/patches/series | 1 + 2 files changed, 53 insertions(+) create mode 100644 packager/debian/debian-template/patches/01-fix-spelling.patch create mode 100644 packager/debian/debian-template/patches/series diff --git a/packager/debian/debian-template/patches/01-fix-spelling.patch b/packager/debian/debian-template/patches/01-fix-spelling.patch new file mode 100644 index 00000000..bfe12f50 --- /dev/null +++ b/packager/debian/debian-template/patches/01-fix-spelling.patch @@ -0,0 +1,52 @@ +Description: Fix spelling errors in some manpages +Author: Rogério Brito +Forwarded: no +Last-Update: 2010-10-24 + +--- a/src/parallel ++++ b/src/parallel +@@ -1095,7 +1095,7 @@ + + =head1 EXAMPLE: Group output lines + +-When runnning jobs that output data, you often do not want the output ++When running jobs that output data, you often do not want the output + of multiple jobs to run together. GNU B defaults to grouping the + output of each job, so the output is printed when the job finishes. If + you want the output to be printed while the job is running you can use +@@ -1311,12 +1311,12 @@ + B + + +-=head1 EXAMPLE: Working as cat | sh. Ressource inexpensive jobs and evaluation ++=head1 EXAMPLE: Working as cat | sh. Resource inexpensive jobs and evaluation + + GNU B can work similar to B. + +-A ressource inexpensive job is a job that takes very little CPU, disk +-I/O and network I/O. Ping is an example of a ressource inexpensive ++A resource inexpensive job is a job that takes very little CPU, disk ++I/O and network I/O. Ping is an example of a resource inexpensive + job. wget is too - if the webpages are small. + + The content of the file jobs_to_run: +@@ -2976,7 +2976,7 @@ + # Number of parallel processes to run + + sub compute_number_of_processes { +- # Number of processes wanted and limited by system ressources ++ # Number of processes wanted and limited by system resources + # Returns: + # Number of processes + my $opt_P = shift; +--- a/src/sql ++++ b/src/sql +@@ -118,7 +118,7 @@ + + =item B<-s> I + +-Field separator. Use I as seperator between columns. ++Field separator. Use I as separator between columns. + + + =item B<--skip-first-line> diff --git a/packager/debian/debian-template/patches/series b/packager/debian/debian-template/patches/series new file mode 100644 index 00000000..adab849f --- /dev/null +++ b/packager/debian/debian-template/patches/series @@ -0,0 +1 @@ +01-fix-spelling.patch