Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/parallel

This commit is contained in:
Ole Tange 2010-10-31 03:13:27 +01:00
commit 05eae86b69
13 changed files with 120 additions and 84 deletions

View file

@ -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 <rbrito@ime.usp.br> Mon, 25 Oct 2010 03:44:37 -0200
parallel (20100922-3) unstable; urgency=low
* New upstream version - 3rd try
-- Ole Tange <ole@tange.dk> Tue, 21 Sep 2010 22:15:05 +0200
parallel (20100922-2) unstable; urgency=low
* New upstream version
-- Ole Tange <ole@tange.dk> Tue, 21 Sep 2010 22:13:53 +0200
parallel (20100922-1) unstable; urgency=low
* New upstream version
-- Ole Tange <ole@tange.dk> Tue, 21 Sep 2010 22:12:22 +0200
parallel (20100906-1) unstable; urgency=low
* New upstream version

View file

@ -1 +1 @@
5
7

View file

@ -1,9 +1,10 @@
Source: parallel
Section: utils
Priority: extra
Maintainer: Ole Tange <ole@tange.dk>
Build-Depends: debhelper (>= 5)
Standards-Version: 3.8.3
Maintainer: Rogério Brito <rbrito@ime.usp.br>
Uploaders: Ole Tange <ole@tange.dk>
Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf
Standards-Version: 3.9.1
Homepage: https://www.gnu.org/software/parallel/
Package: parallel

View file

@ -31,7 +31,8 @@ License:
The Debian packaging is:
Copyright (C) 2010 Ole Tange <ole@tange.dk>
Copyright © 2010 Ole Tange <ole@tange.dk>
Copyright © 2010 Rogério Theodoro de Brito <rbrito@ime.usp.br>
and is licensed under the GPL version 3,
see `/usr/share/common-licenses/GPL-3'.

View file

@ -1,2 +0,0 @@
usr/bin

View file

@ -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

View file

@ -1 +0,0 @@
parallel_20100906-6_all.deb utils extra

View file

@ -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

View file

@ -1 +0,0 @@
misc:Depends=

View file

@ -0,0 +1,52 @@
Description: Fix spelling errors in some manpages
Author: Rogério Brito <rbrito@ime.usp.br>
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<parallel> 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<parallel -a table_file.tsv --trim n --colsep '\t' cmd -o {2} -i {1}>
-=head1 EXAMPLE: Working as cat | sh. Ressource inexpensive jobs and evaluation
+=head1 EXAMPLE: Working as cat | sh. Resource inexpensive jobs and evaluation
GNU B<parallel> can work similar to B<cat | sh>.
-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<string>
-Field separator. Use I<string> as seperator between columns.
+Field separator. Use I<string> as separator between columns.
=item B<--skip-first-line>

View file

@ -0,0 +1 @@
01-fix-spelling.patch

View file

@ -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.
# 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 $@ --with autoreconf
override_dh_clean:
rm -f src/sem
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

View file

@ -0,0 +1 @@
3.0 (quilt)