[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 7f9cd73cb73427215ecf465a60257df6897c2fe5

Antti-Juhani Kaijanaho ajk at debian.org
Wed Nov 7 19:47:52 UTC 2007


The branch, master has been updated
       via  7f9cd73cb73427215ecf465a60257df6897c2fe5 (commit)
       via  43c838b95fd8e42db6fcae2f06534aed07410df3 (commit)
       via  96625cbfe09fae265ea53ae765ddf0ee901c8167 (commit)
       via  af2958c243b1bb6e6775ad18cc27da6e67445e6a (commit)
       via  02f2150d718ee6696a43be0d693a4fd517d6db15 (commit)
       via  79c1537cdebdc7c20b556073e1ce00558b414472 (commit)
       via  846d4de8c1f6081cceec5980564cb4db6421101e (commit)
       via  2668f4327b7129ed4f3fcd0ff6fc8dcb63d9bb55 (commit)
       via  c97f9119c9fb5b2172058e3aacf87d488e9ab44f (commit)
       via  3ddf037aa5d830335b51f3cf95c6893238b61bf6 (commit)
       via  2678055b76ce36d71de7175db1db76aac3e5883d (commit)
       via  dc697da2e3c57b1477b4f4bb1666d935e54da166 (commit)
       via  9c4340fad78eb004b7dd890ec36e2f919f1a2e93 (commit)
      from  d7791572e0deb9dcbf8a19cb23aedbb9be55fec3 (commit)


- Shortlog ------------------------------------------------------------
7f9cd73 Topic branches again
43c838b Add topic branch rules of conduct
96625cb Actually use -O2 when compiling
af2958c debian/control: suggest debtags, note grep-debtags in description
02f2150 Open 2.13
79c1537 2.12
846d4de README.Translators: Miscellaneous fixes
2668f43 Document that Rosetta is not an option for translation
c97f911 #423375: Add a grep-debtags alias for grep-dctrl
3ddf037 French translation update from Debian bug #442330.
2678055 Fix Debian bug #440348
dc697da Add a .gitignore file
9c4340f Switch to Git and define best practices for push access

Summary of changes:
 .gitignore               |   17 ++
 GNUmakefile              |   14 +-
 debian/README            |   63 ++++++-
 debian/changelog         |   22 ++-
 debian/control           |    6 +-
 debian/rules             |    4 +-
 grep-dctrl/grep-dctrl.rc |    3 +
 man/grep-dctrl.1.cp      |   19 +-
 po/README.Translators    |    8 +-
 po/fr.po                 |  498 +++++++++++++++++++++++++++-------------------
 sort-dctrl/sort-dctrl.c  |    7 +
 tests/bug440348.out      |    5 +
 tests/bug440348.sh       |    5 +
 13 files changed, 438 insertions(+), 233 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 7f9cd73cb73427215ecf465a60257df6897c2fe5
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Thu Nov 1 00:14:48 2007 +0200

    Topic branches again
    
    The old rules were a bad idea :(
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/README b/debian/README
index d181bd0..c900169 100644
--- a/debian/README
+++ b/debian/README
@@ -51,19 +51,9 @@ Rules of conduct for people with push access to the repository:
     least on the committer or merger's development machine; use topic
     branches for instable development.
 
-  - Topic branches in the collab-maint repository should be named
-    USERNAME/DESCRIPTIVE-NAME, where USERNAME is the Alioth username
-    of the user creating the topic branch, and DESCRIPTIVE-NAME is a
-    something descriptive to distinguish the branch from the user's
-    other topic branches.  A topic branch is owned by the user whose
-    username is encoded in the branch name.
-
-  - Topic branches may (and should) be rebased at will by the branch
-    owner while it hasn't been merged to any other public branch.  New
-    public branches should never be forked off a topic branch, and
-    only the owner of the branch should merge the branch to master
-    (after review, if possible).  A topic branch that is no longer
-    needed should be deleted.
+  - Topic branches should not be made public on the collab-maint
+    repository.  Instead, send patch sets to the list when you
+    want to publish.
 
   - Include an update of debian/changelog in your commits.  One-line
     summary of the commit is sufficient, as you can elaborate in the

commit 43c838b95fd8e42db6fcae2f06534aed07410df3
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Wed Oct 31 22:25:25 2007 +0200

    Add topic branch rules of conduct
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/README b/debian/README
index 7e1aaf7..d181bd0 100644
--- a/debian/README
+++ b/debian/README
@@ -51,6 +51,20 @@ Rules of conduct for people with push access to the repository:
     least on the committer or merger's development machine; use topic
     branches for instable development.
 
+  - Topic branches in the collab-maint repository should be named
+    USERNAME/DESCRIPTIVE-NAME, where USERNAME is the Alioth username
+    of the user creating the topic branch, and DESCRIPTIVE-NAME is a
+    something descriptive to distinguish the branch from the user's
+    other topic branches.  A topic branch is owned by the user whose
+    username is encoded in the branch name.
+
+  - Topic branches may (and should) be rebased at will by the branch
+    owner while it hasn't been merged to any other public branch.  New
+    public branches should never be forked off a topic branch, and
+    only the owner of the branch should merge the branch to master
+    (after review, if possible).  A topic branch that is no longer
+    needed should be deleted.
+
   - Include an update of debian/changelog in your commits.  One-line
     summary of the commit is sufficient, as you can elaborate in the
     commit log and in comments you might add to the source.

commit 96625cbfe09fae265ea53ae765ddf0ee901c8167
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Wed Oct 31 21:01:41 2007 +0200

    Actually use -O2 when compiling
    
    We separate out the mandatory options from CFLAGS into
    ALL_CFLAGS in GNUmakefile, and then pass -O2 from debian/rules
    (so that development-time builds don't get -O2 unnecessarily).
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/GNUmakefile b/GNUmakefile
index bc76ec7..d6959b3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,13 +3,14 @@ sysconfdir = /etc
 localedir = /usr/share/locale
 version := $(shell dpkg-parsechangelog | grep '^Version' | cut -b10-)
 
-CC = gcc -std=gnu99
-CFLAGS = -g -Wall -Werror -Ilib \
+CC = gcc 
+CFLAGS = -g -Wall -Werror
+ALL_CFLAGS = $(CFLAGS) -std=gnu99 -Ilib \
 	 -DENABLE_L_DEBUG -D_GNU_SOURCE -DSYSCONF=\"$(sysconfdir)\" \
          -DHAVE_GETTEXT -DPACKAGE=\"dctrl-tools\" -DLOCALEDIR=\"$(localedir)\" 
 
-CFLAGS += -DVERSION=\"$(version)\"
-CFLAGS += -DMAINTAINER='"$(shell grep ^Maintainer: debian/control | cut -b13-)"'
+ALL_CFLAGS += -DVERSION=\"$(version)\"
+ALL_CFLAGS += -DMAINTAINER='"$(shell grep ^Maintainer: debian/control | cut -b13-)"'
 
 #CFLAGS += -DNDEBUG
 
@@ -60,8 +61,11 @@ join-dctrl/join-dctrl : join-dctrl/join-dctrl.o libdctrl.a
 % : %.o
 	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
+%.o : %.c
+	$(CC) $(ALL_CFLAGS) -c -o $@ $<
+
 %.d: %.c
-	$(CC) -M $(CFLAGS) $< > $@.$$$$; \
+	$(CC) -M $(ALL_CFLAGS) $< > $@.$$$$; \
 	   sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 	   rm -f $@.$$$$
 
diff --git a/debian/rules b/debian/rules
index e915dff..1825a77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include debian/librules.mk
 include langs.mk
 
 debian/stamp/build: #debian/stamp/build-configure
-	$(MAKE)
+	$(MAKE) CC=gcc CFLAGS="-O2 -g -Wall"
 	-$(MAKE) test
 	touch $@
 

commit af2958c243b1bb6e6775ad18cc27da6e67445e6a
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sun Oct 28 14:08:21 2007 +0200

    debian/control: suggest debtags, note grep-debtags in description
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/changelog b/debian/changelog
index fc77311..ef72f98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 dctrl-tools (2.13) UNRELEASED; urgency=low
 
-  * 
+  * debian/control: suggest debtags, note grep-debtags in description
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 28 Oct 2007 00:21:15 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 28 Oct 2007 14:07:05 +0200
 
 dctrl-tools (2.12) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 14ad064..ae19276 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ XS-Vcs-Browser: http://git.debian.org/?p=collab-maint/dctrl-tools.git;a=summary
 Package: dctrl-tools
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: apt
+Suggests: apt, debtags
 Conflicts: grep-dctrl
 Replaces: grep-dctrl
 Provides: grep-dctrl
@@ -27,6 +27,7 @@ Description: Command-line tools to process Debian package information
    grep-available - Grep the DPKG available database
    grep-status    - Grep the DPKG status database
    grep-aptavail  - Grep the APT available database
+   grep-debtags   - Grep the Debtags package database
  .
    sort-dctrl     - Sort dctrl-format files
  .

commit 02f2150d718ee6696a43be0d693a4fd517d6db15
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sun Oct 28 00:21:35 2007 +0300

    Open 2.13
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 26dc9ab..fc77311 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dctrl-tools (2.13) UNRELEASED; urgency=low
+
+  * 
+
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 28 Oct 2007 00:21:15 +0300
+
 dctrl-tools (2.12) unstable; urgency=low
 
   * Switched to git for source control.

commit 79c1537cdebdc7c20b556073e1ce00558b414472
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sun Oct 28 00:18:22 2007 +0300

    2.12
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/changelog b/debian/changelog
index ef422b4..26dc9ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dctrl-tools (2.12) UNRELEASED; urgency=low
+dctrl-tools (2.12) unstable; urgency=low
 
   * Switched to git for source control.
   * make sort-dctrl read stdin if no file arguments are given
@@ -12,7 +12,7 @@ dctrl-tools (2.12) UNRELEASED; urgency=low
   * po/README.Translators: Rosetta is not an option
   * po/README.Translators: misc fixes
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 28 Oct 2007 00:07:09 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 28 Oct 2007 00:17:47 +0300
 
 dctrl-tools (2.11) unstable; urgency=low
 

commit 846d4de8c1f6081cceec5980564cb4db6421101e
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sun Oct 28 00:07:46 2007 +0300

    README.Translators: Miscellaneous fixes
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/changelog b/debian/changelog
index f07cb89..ef422b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ dctrl-tools (2.12) UNRELEASED; urgency=low
     (Add a grep-tags or grep-debtags that gets data from debtags dumpavail)
     Reported by Enrico Zini <enrico at debian.org>
   * po/README.Translators: Rosetta is not an option
+  * po/README.Translators: misc fixes
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 28 Oct 2007 00:06:12 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 28 Oct 2007 00:07:09 +0300
 
 dctrl-tools (2.11) unstable; urgency=low
 
diff --git a/po/README.Translators b/po/README.Translators
index 3cd239f..fd3c64f 100644
--- a/po/README.Translators
+++ b/po/README.Translators
@@ -34,12 +34,11 @@ Technical stuff
 You can get an up-to-date .pot file by saying "make pot" in the
 distribution root directory (the parent directory of this file).
 Running "make po" merges the new pot with the known po files (bringing
-the msgids up to date).  Do NOT commit the pot to CVS (it is a
+the msgids up to date).  Do NOT commit the pot to Git (it is a
 generated file and thus does not belong under version control).
 
 You need to add your language to ../langs.mk for the makefile magic to
 work.
 
-Please, do not touch the C sources without consulting AJK first.
 
 

commit 2668f4327b7129ed4f3fcd0ff6fc8dcb63d9bb55
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sun Oct 28 00:06:29 2007 +0300

    Document that Rosetta is not an option for translation
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 90c9d55..f07cb89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ dctrl-tools (2.12) UNRELEASED; urgency=low
     Closes: #423375
     (Add a grep-tags or grep-debtags that gets data from debtags dumpavail)
     Reported by Enrico Zini <enrico at debian.org>
+  * po/README.Translators: Rosetta is not an option
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 22:03:40 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 28 Oct 2007 00:06:12 +0300
 
 dctrl-tools (2.11) unstable; urgency=low
 
diff --git a/po/README.Translators b/po/README.Translators
index 7f10848..3cd239f 100644
--- a/po/README.Translators
+++ b/po/README.Translators
@@ -23,8 +23,9 @@ Translators should subscribe to dctrl-tools-i18n
 It will contain requests for updates of the translations, and perhaps
 occasionally discussion related to internationalization.
 
-Alternatively, translators can use Canonical's Rosetta for translation; the
-translations are synched between Rosetta and darcs occasionally.
+Rosetta can no longer be used.  It has the fundamental problem that
+there is no audit trail of who translated what, and it is important to
+know exactly who contributed what for copyright reasons.
 
 
 Technical stuff

commit c97f9119c9fb5b2172058e3aacf87d488e9ab44f
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Oct 27 22:41:39 2007 +0300

    #423375: Add a grep-debtags alias for grep-dctrl
    
    We'll need some sort of mechanism for @exec to affect option
    parsing before we can discharge the other part of the report,
    cloned as #448277.
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 1d6cb4b..90c9d55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ dctrl-tools (2.12) UNRELEASED; urgency=low
     Closes: #440348 (sort-dctrl outputs nothing if input is a pipe)
     Reported by Antti-Juhani Kaijanaho <ajk at debian.org>.
   * French translation update, closes: #442330
+  * Provide a grep-debtags alias that sources debtags dumpavail.
+    Closes: #423375
+    (Add a grep-tags or grep-debtags that gets data from debtags dumpavail)
+    Reported by Enrico Zini <enrico at debian.org>
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 21:12:46 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 22:03:40 +0300
 
 dctrl-tools (2.11) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index dce5604..e915dff
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ clean-build:
 
 debian/stamp/binary/arch: debian/stamp/binary/dctrl-tools
 
-aliases = grep-status grep-available grep-aptavail
+aliases = grep-status grep-available grep-aptavail grep-debtags
 
 debian/stamp/binary/dctrl-tools: package=dctrl-tools
 debian/stamp/binary/dctrl-tools: debian/stamp/build
diff --git a/grep-dctrl/grep-dctrl.rc b/grep-dctrl/grep-dctrl.rc
index 31e03b5..bc93e31 100644
--- a/grep-dctrl/grep-dctrl.rc
+++ b/grep-dctrl/grep-dctrl.rc
@@ -24,3 +24,6 @@ grep-available  /var/lib/dpkg/available
 
 # A new feature: grepping apt's available information
 grep-aptavail	@exec apt-cache dumpavail
+
+# A new feature: grepping debtags' information
+grep-debtags    @exec debtags dumpavail
diff --git a/man/grep-dctrl.1.cp b/man/grep-dctrl.1.cp
index c4f66fb..36741e7 100644
--- a/man/grep-dctrl.1.cp
+++ b/man/grep-dctrl.1.cp
@@ -1,5 +1,5 @@
-.TH GREP-DCTRL 1 2006-04-02 "Debian Project" "Debian user's manual"
-\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+.TH GREP-DCTRL 1 2007-10-27 "Debian Project" "Debian user's manual"
+\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 \"               Antti-Juhani Kaijanaho <gaia at iki.fi>
 \"      This program is free software; you can redistribute it and/or modify
 \"      it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 \"      the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 \"      Boston, MA 02111-1307, USA.
 .SH NAME
-grep\-dctrl, grep\-status, grep\-available, grep\-aptavail \- grep Debian control files
+grep\-dctrl, grep\-status, grep\-available, grep\-aptavail, grep\-debtags \- grep Debian control files
 .SH SYNOPSIS
 .I command
 --copying|-C | --help|-h | --version|-V 
@@ -31,9 +31,10 @@ where
 is one of
 .BR grep\-dctrl ,
 .BR grep\-status ,
-.B grep\-available
+.BR grep\-available ,
+.B grep\-aptavail 
 and
-.BR grep\-aptavail .
+.BR grep\-debtags .
 .SH DESCRIPTION
 The grep\-dctrl program can answer such questions as 
 .IR "What is the Debian package foo?" , 
@@ -47,15 +48,17 @@ given a useful input file.
 .PP
 The programs
 .BR grep\-available,
-.B grep\-status
+.BR grep\-status ,
+.B grep\-aptavail 
 and
-.B grep\-aptavail
+.B grep\-debtags
 are aliases of (actually, symbolic links to)
 .BR grep\-dctrl .
 In the shipped configuration, these aliases use as their default input
 the
 .BR dpkg (8)
-available and status files and the apt\-cache dumpavail output,
+available and status files, the apt\-cache dumpavail output
+and the debtags dumpavail output,
 respectively.
 .PP
 .B grep\-dctrl

commit 3ddf037aa5d830335b51f3cf95c6893238b61bf6
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Oct 27 21:13:45 2007 +0300

    French translation update from Debian bug #442330.

diff --git a/debian/changelog b/debian/changelog
index 685beb8..1d6cb4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ dctrl-tools (2.12) UNRELEASED; urgency=low
   * make sort-dctrl read stdin if no file arguments are given
     Closes: #440348 (sort-dctrl outputs nothing if input is a pipe)
     Reported by Antti-Juhani Kaijanaho <ajk at debian.org>.
+  * French translation update, closes: #442330
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 20:45:12 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 21:12:46 +0300
 
 dctrl-tools (2.11) unstable; urgency=low
 
diff --git a/po/fr.po b/po/fr.po
index 81d2e77..c32ef5e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,392 +2,478 @@
 # Copyright (C) YEAR Antti-Juhani Kaijanaho
 # This file is distributed under the same license as the dctrl-tools package.
 # Nicolas Bertolissio <nico.bertol at free.fr>, 2004, 2005.
-# Frédéric Bothamy <frederic.bothamy at free.fr>, 2006.
+# Frédéric Bothamy <frederic.bothamy at free.fr>, 2006, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dctrl-tools 2.9.0\n"
+"Project-Id-Version: dctrl-tools 2.11\n"
 "Report-Msgid-Bugs-To: ajk at debian.org\n"
-"POT-Creation-Date: 2006-04-11 11:14+0200\n"
-"PO-Revision-Date: 2006-04-11 11:28+0200\n"
-"Last-Translator: Frédéric Bothamy <frederic.bothamy at free.fr>\n"
+"POT-Creation-Date: 2007-08-05 21:20+0300\n"
+"PO-Revision-Date: 2007-08-06 15:42+0200\n"
+"Last-Translator: Frédéric Bothamy <frederic.bothamy at free.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: misc.c:37
-#, c-format
-msgid "%s: using `%s' as pager\n"
-msgstr "%s: utilisation de « %s » comme paginateur\n"
-
-#: misc.c:47
-#, c-format
-msgid "%s: popen failed for %s: %s\n"
-msgstr "%s: échec de popen pour %s : %s\n"
-
-#: predicate.c:40 grep-dctrl.c:221 grep-dctrl.c:330
-msgid "predicate is too complex"
-msgstr "le prédicat est trop complexe"
-
-#: paragraph.c:116
-msgid "warning: expected a colon"
-msgstr "avertissement : deux-points (« : ») attendus"
-
-#: paragraph.c:122
-msgid "expected a colon"
-msgstr "deux-points (« : ») attendus"
-
-#: rc.c:66
-msgid "Malformed default input file name"
-msgstr "nom de fichier d'entrée par défaut mal formé"
-
-#: rc.c:79
-msgid "not owned by you or root, ignoring"
-msgstr "détenu ni par vous ni par le superutilisateur, ignoré"
-
-#: rc.c:84
-msgid "write permissions for group or others, ignoring"
-msgstr "droits d'écriture pour le groupe ou le reste du monde, ignoré"
-
-#: rc.c:124
-msgid "reading config file"
-msgstr "lecture du fichier de configuration"
-
-#: rc.c:151
-msgid "read failure or out of memory"
-msgstr "erreur de lecture ou manque de mémoire"
-
-#: rc.c:173
-msgid "syntax error: need a executable name"
-msgstr "erreur de syntaxe : nécessite un nom d'exécutable"
-
-#: rc.c:181
-msgid "syntax error: need an input file name"
-msgstr "erreur de syntaxe : nécessite un nom de fichier d'entrée"
-
-#: rc.c:186
-msgid "considering executable name"
-msgstr "étude de l'exécutable nommé"
-
-#: rc.c:188
-msgid "yes, will use executable name"
-msgstr "utilise l'exécutable nommé"
-
-#: rc.c:190
-msgid "default input file"
-msgstr "fichier d'entrée par défaut"
-
-#: rc.c:201
-msgid "executable name not found; reading from standard input"
-msgstr "nom d'exécutable non trouvé ; lecture depuis l'entrée standard"
-
-#: ifile.c:54
+#: lib/ifile.c:54
 #, c-format
 msgid "%s (child): failed to exec /bin/sh: %s\n"
-msgstr "%s (enfant) : échec d'exécution de /bin/sh : %s\n"
+msgstr "%s (enfant) : échec d'exécution de /bin/sh : %s\n"
 
-#: ifile.c:100
+#: lib/ifile.c:100
 #, c-format
 msgid "%s: command (%s) failed (exit status %d)\n"
-msgstr "%s : la commande (%s) a échoué (état de sortie %d)\n"
+msgstr "%s : la commande (%s) a échoué (état de sortie %d)\n"
 
-#: ifile.c:109
+#: lib/ifile.c:109
 #, c-format
 msgid "%s: command (%s) was killed by signal %d\n"
-msgstr "%s : la commande (%s) a été tuée par le signal %d\n"
+msgstr "%s : la commande (%s) a été tuée par le signal %d\n"
 
-#: ifile.c:127
+#: lib/ifile.c:127
 #, c-format
 msgid "%s: %s: cannot stat: %s\n"
-msgstr "%s : impossible d'analyser « %s » : %s\n"
+msgstr "%s : impossible d'analyser « %s » : %s\n"
 
-#: ifile.c:138
+#: lib/ifile.c:138
 msgid "is a directory, skipping"
-msgstr "est un répertoire, ignoré"
+msgstr "est un répertoire, ignoré"
 
-#: ifile.c:139
+#: lib/ifile.c:139
 msgid "is a block device, skipping"
-msgstr "est un périphérique bloc, ignoré"
+msgstr "est un périphérique bloc, ignoré"
 
-#: ifile.c:140
+#: lib/ifile.c:140
 msgid "internal error"
 msgstr "erreur interne"
 
-#: ifile.c:141
+#: lib/ifile.c:141
 msgid "is a socket, skipping"
-msgstr "est une socket, ignorée"
+msgstr "est une socket, ignorée"
 
-#: ifile.c:142
+#: lib/ifile.c:142
 msgid "unknown file type, skipping"
-msgstr "type de fichier inconnu, ignoré"
+msgstr "type de fichier inconnu, ignoré"
+
+#: lib/misc.c:37
+#, c-format
+msgid "%s: using `%s' as pager\n"
+msgstr "%s: utilisation de « %s » comme paginateur\n"
+
+#: lib/misc.c:47
+#, c-format
+msgid "%s: popen failed for %s: %s\n"
+msgstr "%s: échec de popen pour %s : %s\n"
+
+#: lib/paragraph.c:133
+msgid "warning: expected a colon"
+msgstr "avertissement : deux-points (« : ») attendus"
+
+#: lib/paragraph.c:140
+msgid "expected a colon"
+msgstr "deux-points (« : ») attendus"
 
-#: sorter.c:54
+#: lib/predicate.c:40 grep-dctrl/grep-dctrl.c:227 grep-dctrl/grep-dctrl.c:336
+msgid "predicate is too complex"
+msgstr "le prédicat est trop complexe"
+
+#: lib/sorter.c:49
 msgid "Parse error in field."
-msgstr "Échec d'analyse syntaxique dans le champ."
+msgstr "Échec d'analyse syntaxique dans le champ."
 
-#: grep-dctrl.c:47
+#: grep-dctrl/grep-dctrl.c:47
 msgid "grep-dctrl -- grep Debian control files"
-msgstr "grep-dctrl -- sélectionner dans des fichiers de contrôle Debian"
+msgstr "grep-dctrl -- sélectionner dans des fichiers de contrôle Debian"
 
-#: grep-dctrl.c:110
+#: grep-dctrl/grep-dctrl.c:110
 msgid "Show the testing banner."
-msgstr "Afficher la bannière de test."
+msgstr "Afficher la bannière de test."
 
-#: grep-dctrl.c:112 sort-dctrl.c:39 tbl-dctrl.c:41
+#: grep-dctrl/grep-dctrl.c:112 sort-dctrl/sort-dctrl.c:39
+#: tbl-dctrl/tbl-dctrl.c:42 join-dctrl/join-dctrl.c:45
 msgid "LEVEL"
 msgstr "NIVEAU"
 
-#: grep-dctrl.c:112 sort-dctrl.c:39 tbl-dctrl.c:41
+#: grep-dctrl/grep-dctrl.c:112 sort-dctrl/sort-dctrl.c:39
+#: tbl-dctrl/tbl-dctrl.c:42 join-dctrl/join-dctrl.c:45
 msgid "Set debugging level to LEVEL."
-msgstr "Sélectionner le niveau de débogage NIVEAU."
+msgstr "Sélectionner le niveau de débogage NIVEAU."
 
-#: grep-dctrl.c:113 grep-dctrl.c:116
+#: grep-dctrl/grep-dctrl.c:113 grep-dctrl/grep-dctrl.c:116
 msgid "FIELD,FIELD,..."
 msgstr "CHAMP,CHAMP,..."
 
-#: grep-dctrl.c:113
+#: grep-dctrl/grep-dctrl.c:113
 msgid "Restrict pattern matching to the FIELDs given."
 msgstr "Restreindre le motif de correspondance aux CHAMPS fournis."
 
-#: grep-dctrl.c:114
+#: grep-dctrl/grep-dctrl.c:114
 msgid "This is a shorthand for -FPackage."
 msgstr "Il s'agit d'un raccourci pour -FPackage."
 
-#: grep-dctrl.c:115
+#: grep-dctrl/grep-dctrl.c:115
 msgid "This is a shorthand for -FSource:Package."
 msgstr "Il s'agit d'un raccourci pour -FSource:Package."
 
-#: grep-dctrl.c:116
+#: grep-dctrl/grep-dctrl.c:116
 msgid "Show only the body of these fields from the matching paragraphs."
 msgstr "N'afficher que le corps des champs des paragraphes qui correspondent."
 
-#: grep-dctrl.c:117
+#: grep-dctrl/grep-dctrl.c:117
 msgid ""
 "Show only the first line of the \"Description\" field from the matching "
 "paragraphs."
 msgstr ""
-"N'afficher que la première ligne du champ « Description » des paragraphes "
+"N'afficher que la première ligne du champ « Description » des paragraphes "
 "qui correspondent."
 
-#: grep-dctrl.c:118
+#: grep-dctrl/grep-dctrl.c:118
 msgid "Suppress field names when showing specified fields."
-msgstr "Supprimer les noms de champs lors de l'affichage des champs spécifiés."
+msgstr "Supprimer les noms de champs lors de l'affichage des champs spécifiés."
 
-#: grep-dctrl.c:119
+#: grep-dctrl/grep-dctrl.c:119
 msgid "Regard the pattern as an extended POSIX regular expression."
-msgstr "Considérer le motif comme une expression rationnelle POSIX étendue."
+msgstr "Considérer le motif comme une expression rationnelle POSIX étendue."
 
-#: grep-dctrl.c:120
+#: grep-dctrl/grep-dctrl.c:120
 msgid "The pattern is a standard POSIX regular expression."
 msgstr "Le motif est une expression rationnelle POSIX standard."
 
-#: grep-dctrl.c:121
+#: grep-dctrl/grep-dctrl.c:121
 msgid "Ignore case when looking for a match."
 msgstr "Ignorer la casse lors de la recherche d'un motif."
 
-#: grep-dctrl.c:122
+#: grep-dctrl/grep-dctrl.c:122
 msgid "Show only paragraphs that do not match."
 msgstr "N'afficher que les paragraphes qui ne correspondent pas."
 
-#: grep-dctrl.c:123
+#: grep-dctrl/grep-dctrl.c:123
+msgid "Show those fields that have NOT been selected with -s"
+msgstr "Afficher les champs qui n'ont PAS été sélectionnés avec -s."
+
+#: grep-dctrl/grep-dctrl.c:124
 msgid "Show only the count of matching paragraphs."
 msgstr "N'afficher que le nombre de paragraphes qui correspondent."
 
-#: grep-dctrl.c:124
+#: grep-dctrl/grep-dctrl.c:125
 msgid "FNAME"
 msgstr "FICHIER"
 
-#: grep-dctrl.c:124
+#: grep-dctrl/grep-dctrl.c:125
 msgid "Use FNAME as the config file."
 msgstr "Utiliser FICHIER comme fichier de configuration."
 
-#: grep-dctrl.c:125
+#: grep-dctrl/grep-dctrl.c:126
 msgid "Do an exact match."
 msgstr "Rechercher une correspondance exacte."
 
-#: grep-dctrl.c:126 sort-dctrl.c:38 tbl-dctrl.c:40
+#: grep-dctrl/grep-dctrl.c:127 sort-dctrl/sort-dctrl.c:38
+#: tbl-dctrl/tbl-dctrl.c:41 join-dctrl/join-dctrl.c:44
 msgid "Print out the copyright license."
 msgstr "Afficher la licence."
 
-#: grep-dctrl.c:127
+#: grep-dctrl/grep-dctrl.c:128
 msgid "Conjunct predicates."
-msgstr "Associer les prédicats."
+msgstr "Associer les prédicats."
 
-#: grep-dctrl.c:128
+#: grep-dctrl/grep-dctrl.c:129
 msgid "Disjunct predicates."
-msgstr "Dissocier les prédicats."
+msgstr "Dissocier les prédicats."
 
-#: grep-dctrl.c:129
+#: grep-dctrl/grep-dctrl.c:130
 msgid "Negate the following predicate."
-msgstr "Inverser le prédicat suivant."
+msgstr "Inverser le prédicat suivant."
 
-#: grep-dctrl.c:130
+#: grep-dctrl/grep-dctrl.c:131
 msgid "Test for version number equality."
-msgstr "Test d'égalité de numéro de version."
+msgstr "Test d'égalité de numéro de version."
 
-#: grep-dctrl.c:131
+#: grep-dctrl/grep-dctrl.c:132
 msgid "Version number comparison: <."
-msgstr "Comparaison de numéro de version : <."
+msgstr "Comparaison de numéro de version : <."
 
-#: grep-dctrl.c:132
+#: grep-dctrl/grep-dctrl.c:133
 msgid "Version number comparison: <=."
-msgstr "Comparaison de numéro de version : <=."
+msgstr "Comparaison de numéro de version : <=."
 
-#: grep-dctrl.c:133
+#: grep-dctrl/grep-dctrl.c:134
 msgid "Version number comparison: >."
-msgstr "Comparaison de numéro de version : >."
+msgstr "Comparaison de numéro de version : >."
 
-#: grep-dctrl.c:134
+#: grep-dctrl/grep-dctrl.c:135
 msgid "Version number comparison: >=."
-msgstr "Comparaison de numéro de version : >=."
+msgstr "Comparaison de numéro de version : >=."
 
-#: grep-dctrl.c:135
+#: grep-dctrl/grep-dctrl.c:136
 msgid "Debug option parsing."
-msgstr "Déboguer l'analyse des options"
+msgstr "Déboguer l'analyse des options"
 
-#: grep-dctrl.c:136 grep-dctrl.c:137
+#: grep-dctrl/grep-dctrl.c:137 grep-dctrl/grep-dctrl.c:138
 msgid "Do no output to stdout."
-msgstr "Pas de sortie sur la sortie standard"
+msgstr "Pas d'affichage sur la sortie standard"
 
-#: grep-dctrl.c:138 sort-dctrl.c:41 tbl-dctrl.c:42
+#: grep-dctrl/grep-dctrl.c:139 sort-dctrl/sort-dctrl.c:41
+#: tbl-dctrl/tbl-dctrl.c:43 join-dctrl/join-dctrl.c:46
 msgid "Attempt mmapping input files"
-msgstr "Tentative de mmap des fichiers d'entrées"
+msgstr "Tentative de mmap des fichiers d'entrées"
 
-#: grep-dctrl.c:139
+#: grep-dctrl/grep-dctrl.c:140
 msgid "Ignore parse errors"
 msgstr "Ne pas tenir compte des erreurs d'analyse syntaxique"
 
-#: grep-dctrl.c:140
+#: grep-dctrl/grep-dctrl.c:141
 msgid "PATTERN"
 msgstr "MOTIF"
 
-#: grep-dctrl.c:140
+#: grep-dctrl/grep-dctrl.c:141
 msgid "Specify the pattern to search for"
-msgstr "Spécifier le motif de recherche"
+msgstr "Spécifier le motif de recherche"
 
-#: grep-dctrl.c:298
+#: grep-dctrl/grep-dctrl.c:304
 msgid "predicate is too long"
-msgstr "le prédicat est trop long"
+msgstr "le prédicat est trop long"
 
-#: grep-dctrl.c:357
+#: grep-dctrl/grep-dctrl.c:363
 msgid "inconsistent atom modifiers"
-msgstr "modificateurs d'atome incohérents"
+msgstr "modificateurs d'atome incohérents"
 
-#: grep-dctrl.c:431 sort-dctrl.c:101 tbl-dctrl.c:280
+#: grep-dctrl/grep-dctrl.c:422 grep-dctrl/grep-dctrl.c:813
+#: join-dctrl/join-dctrl.c:112
+msgid "too many output fields"
+msgstr "trop de champs de sortie"
+
+#: grep-dctrl/grep-dctrl.c:446 sort-dctrl/sort-dctrl.c:101
+#: tbl-dctrl/tbl-dctrl.c:289 join-dctrl/join-dctrl.c:167
 msgid "no such log level"
 msgstr "niveau de journalisation inexistant"
 
-#: grep-dctrl.c:525
+#: grep-dctrl/grep-dctrl.c:540
 msgid "Multiple patterns for the same atom are not allowed"
-msgstr "Des motifs multiples pour le même atome ne sont pas autorisés"
+msgstr "Des motifs multiples pour le même atome ne sont pas autorisés"
 
-#: grep-dctrl.c:557 sort-dctrl.c:117 tbl-dctrl.c:292
+#: grep-dctrl/grep-dctrl.c:572 sort-dctrl/sort-dctrl.c:117
+#: tbl-dctrl/tbl-dctrl.c:301 join-dctrl/join-dctrl.c:179
 msgid "too many file names"
 msgstr "trop de noms de fichiers"
 
-#: grep-dctrl.c:646
+#: grep-dctrl/grep-dctrl.c:661
 msgid "unexpected end of predicate"
-msgstr "fin de prédicat inattendue"
+msgstr "fin de prédicat inattendue"
 
-#: grep-dctrl.c:649
+#: grep-dctrl/grep-dctrl.c:664
 msgid "unexpected '!' in command line"
-msgstr "« ! » inattendu sur la ligne de commande"
+msgstr "« ! » inattendu sur la ligne de commande"
 
-#: grep-dctrl.c:652
+#: grep-dctrl/grep-dctrl.c:667
 msgid "unexpected '-a' in command line"
-msgstr "« -a » inattendu sur la ligne de commande"
+msgstr "« -a » inattendu sur la ligne de commande"
 
-#: grep-dctrl.c:655
+#: grep-dctrl/grep-dctrl.c:670
 msgid "unexpected '-o' in command line"
-msgstr "« -o » inattendu sur la ligne de commande"
+msgstr "« -o » inattendu sur la ligne de commande"
 
-#: grep-dctrl.c:658
+#: grep-dctrl/grep-dctrl.c:673
 msgid "unexpected '(' in command line"
-msgstr "« ( » inattendu sur la ligne de commande"
+msgstr "« ( » inattendu sur la ligne de commande"
 
-#: grep-dctrl.c:661
+#: grep-dctrl/grep-dctrl.c:676
 msgid "unexpected ')' in command line"
-msgstr "« ) » inattendu sur la ligne de commande"
+msgstr "« ) » inattendu sur la ligne de commande"
 
-#: grep-dctrl.c:665
+#: grep-dctrl/grep-dctrl.c:680
 msgid "unexpected atom in command line"
 msgstr "atome inattendu sur la ligne de commande"
 
-#: grep-dctrl.c:678
+#: grep-dctrl/grep-dctrl.c:693
 msgid "missing ')' in command line"
-msgstr "« ) » manquante sur la ligne de commande"
+msgstr "« ) » manquante sur la ligne de commande"
 
-#: grep-dctrl.c:759
+#: grep-dctrl/grep-dctrl.c:795
 msgid "A pattern is mandatory"
-msgstr "Un motif est nécessaire"
+msgstr "Un motif est nécessaire"
 
-#: grep-dctrl.c:766
+#: grep-dctrl/grep-dctrl.c:802
 msgid "a predicate is required"
-msgstr "un prédicat est nécessaire"
+msgstr "un prédicat est nécessaire"
 
-#: grep-dctrl.c:771
+#: grep-dctrl/grep-dctrl.c:807
 msgid "malformed predicate"
-msgstr "prédicat mal formé"
-
-#: grep-dctrl.c:777
-msgid "too many output fields"
-msgstr "trop de champs de sortie"
+msgstr "prédicat mal formé"
 
-#: grep-dctrl.c:781
+#: grep-dctrl/grep-dctrl.c:817
 msgid "Adding \"Description\" to selected output fields because of -d"
 msgstr ""
-"Ajout de « Description » aux champs de sortie sélectionnés à cause de -d"
+"Ajout de « Description » aux champs de sortie sélectionnés à cause de -d"
 
-#: grep-dctrl.c:790
+#: grep-dctrl/grep-dctrl.c:826
+msgid "-I requires at least one instance of -s"
+msgstr "-I nécessite au moins une instance de -s"
+
+#: grep-dctrl/grep-dctrl.c:832
 msgid "cannot suppress field names when showing whole paragraphs"
 msgstr ""
 "impossible de supprimer les noms de champs lors de l'affichage des "
 "paragraphes complets"
 
-#: sort-dctrl.c:40
+#: grep-dctrl/rc.c:55
+msgid "Malformed default input file name"
+msgstr "nom de fichier d'entrée par défaut mal formé"
+
+#: grep-dctrl/rc.c:68
+msgid "not owned by you or root, ignoring"
+msgstr "détenu ni par vous ni par le superutilisateur, ignoré"
+
+#: grep-dctrl/rc.c:73
+msgid "write permissions for group or others, ignoring"
+msgstr "droits d'écriture pour le groupe ou les autres utilisateurs, ignoré"
+
+#: grep-dctrl/rc.c:113
+msgid "reading config file"
+msgstr "lecture du fichier de configuration"
+
+#: grep-dctrl/rc.c:140
+msgid "read failure or out of memory"
+msgstr "erreur de lecture ou manque de mémoire"
+
+#: grep-dctrl/rc.c:162
+msgid "syntax error: need a executable name"
+msgstr "erreur de syntaxe : nécessite un nom d'exécutable"
+
+#: grep-dctrl/rc.c:170
+msgid "syntax error: need an input file name"
+msgstr "erreur de syntaxe : nécessite un nom de fichier d'entrée"
+
+#: grep-dctrl/rc.c:175
+msgid "considering executable name"
+msgstr "étude de l'exécutable nommé"
+
+#: grep-dctrl/rc.c:177
+msgid "yes, will use executable name"
+msgstr "utilise l'exécutable nommé"
+
+#: grep-dctrl/rc.c:179
+msgid "default input file"
+msgstr "fichier d'entrée par défaut"
+
+#: grep-dctrl/rc.c:190
+msgid "executable name not found; reading from standard input"
+msgstr "nom d'exécutable non trouvé ; lecture depuis l'entrée standard"
+
+#: sort-dctrl/sort-dctrl.c:40
 msgid "KEYSPEC"
 msgstr "KEYSPEC"
 
-#: sort-dctrl.c:40
+#: sort-dctrl/sort-dctrl.c:40
 msgid "Specify sort keys."
-msgstr "Spécifier les clés de tri."
+msgstr "Spécifier les clés de tri."
 
-#: sort-dctrl.c:87
+#: sort-dctrl/sort-dctrl.c:87
 msgid "invalid key flag"
-msgstr "drapeau de clé invalide"
+msgstr "drapeau de clé non valable"
 
-#: sort-dctrl.c:137
+#: sort-dctrl/sort-dctrl.c:137
 msgid "sort-dctrl -- sort Debian control files"
-msgstr "sort-dctrl -- trier des fichiers de contrôle Debian"
+msgstr "sort-dctrl -- trier des fichiers de contrôle Debian"
 
-#: tbl-dctrl.c:38
+#: tbl-dctrl/tbl-dctrl.c:38
 msgid "DELIM"
 msgstr "DELIM"
 
-#: tbl-dctrl.c:38
+#: tbl-dctrl/tbl-dctrl.c:38
 msgid "Specify a delimiter."
-msgstr "Spécifier un délimiteur."
+msgstr "Spécifier un délimiteur."
 
-#: tbl-dctrl.c:39
+#: tbl-dctrl/tbl-dctrl.c:39
+msgid "Do not print a table heading"
+msgstr "Ne pas afficher d'entête de table"
+
+#: tbl-dctrl/tbl-dctrl.c:40
 msgid "SPEC"
 msgstr "SPEC"
 
-#: tbl-dctrl.c:39
+#: tbl-dctrl/tbl-dctrl.c:40
 msgid "Append the specified column."
-msgstr "Ajouter la colonne spécifiée."
+msgstr "Ajouter la colonne spécifiée."
 
-#: tbl-dctrl.c:266
+#: tbl-dctrl/tbl-dctrl.c:272
 msgid "invalid column length"
 msgstr "taille de colonne invalide"
 
-#: tbl-dctrl.c:317
+#: tbl-dctrl/tbl-dctrl.c:326
 msgid "tbl-dctrl -- tabularize Debian control files"
-msgstr "tbl-dctrl -- tabuler des fichiers de contrôle Debian"
+msgstr "tbl-dctrl -- tabuler des fichiers de contrôle Debian"
 
-#: tbl-dctrl.c:331
+#: tbl-dctrl/tbl-dctrl.c:340
 msgid "bad multibyte character"
-msgstr "caractère multioctets erroné"
+msgstr "caractère multioctets erroné"
+
+#: join-dctrl/join-dctrl.c:39 join-dctrl/join-dctrl.c:40
+#: join-dctrl/join-dctrl.c:41
+msgid "FIELD"
+msgstr "CHAMP"
+
+#: join-dctrl/join-dctrl.c:39
+msgid "Specify the join field to use for the first file"
+msgstr "Spécifier le champ de jointure à utiliser pour le premier fichier"
+
+#: join-dctrl/join-dctrl.c:40
+msgid "Specify the join field to use for the second file"
+msgstr "Spécifier le champ de jointure à utiliser pour le second fichier"
+
+#: join-dctrl/join-dctrl.c:41
+msgid "Specify the common join field"
+msgstr "Spécifier le champ de jointure commun"
+
+#: join-dctrl/join-dctrl.c:42
+msgid "FIELDNO"
+msgstr "NUM_CHAMP"
+
+#: join-dctrl/join-dctrl.c:42
+msgid "Print unpairable records from the indicated file (either 1 or 2)"
+msgstr ""
+"Afficher les enregistrements ne pouvant être appariés à partir du fichier "
+"indiqué (soit 1, soit 2)"
+
+#: join-dctrl/join-dctrl.c:43
+msgid "FIELDSPEC"
+msgstr "SPEC_CHAMP"
+
+#: join-dctrl/join-dctrl.c:43
+msgid "Specify the format of the output file"
+msgstr "Spécifier le format du fichier de sortie"
+
+#: join-dctrl/join-dctrl.c:81
+msgid "malformed argument to '-a'"
+msgstr "paramètre mal formé pour « -a »"
+
+#: join-dctrl/join-dctrl.c:88
+msgid "the join field of the first file has already been specified"
+msgstr "le champ de jointure du premier fichier a déjà été spécifié"
+
+#: join-dctrl/join-dctrl.c:89
+msgid "the join field of the second file has already been specified"
+msgstr "le champ de jointure pour le second fichier a déjà été spécifié"
+
+#: join-dctrl/join-dctrl.c:127
+msgid "missing '.' in output field specification"
+msgstr "« . » absent dans la spécification du champ de sortie"
+
+#: join-dctrl/join-dctrl.c:144
+msgid "expected either '1.' or '2.' at the start of the field specification"
+msgstr "« 1. » ou « 2. » attendu au début de la spécification du champ"
+
+#: join-dctrl/join-dctrl.c:250
+msgid "join-dctrl -- join two Debian control files"
+msgstr "join-dctrl -- fusionner deux fichiers de contrôle Debian"
+
+#: join-dctrl/join-dctrl.c:269
+msgid "need exactly two input files"
+msgstr "nécessite d'exactement deux fichiers d'entrée"
+
+#: join-dctrl/join-dctrl.c:294
+msgid "cannot join a stream with itself"
+msgstr "impossible de fusionner un flux avec lui-même"
 
 #, fuzzy
 #~ msgid "unexpected end of file (expected a colon)"
@@ -402,31 +488,31 @@ msgstr "caractère multioctets erroné"
 
 #, fuzzy
 #~ msgid "pretty-dctrl -- pretty-print Debian control files"
-#~ msgstr "grep-dctrl -- sélection dans des fichiers de contrôle Debian"
+#~ msgstr "grep-dctrl -- sélection dans des fichiers de contrôle Debian"
 
 #~ msgid "invalid numeric pattern"
-#~ msgstr "motif numérique invalide"
+#~ msgstr "motif numérique invalide"
 
 #, fuzzy
 #~ msgid "parse of a field failed"
-#~ msgstr "l'analyse d'un champ numérique a échoué"
+#~ msgstr "l'analyse d'un champ numérique a échoué"
 
 #~ msgid "Numerical test: <."
-#~ msgstr "Test numérique : <"
+#~ msgstr "Test numérique : <"
 
 #~ msgid "Numerical test: <=."
-#~ msgstr "Test numérique : <="
+#~ msgstr "Test numérique : <="
 
 #~ msgid "Numerical test: >."
-#~ msgstr "Test numérique : >"
+#~ msgstr "Test numérique : >"
 
 #~ msgid "Numerical test: >=."
-#~ msgstr "Test numérique : >="
+#~ msgstr "Test numérique : >="
 
 #~ msgid "syntax error in command line"
 #~ msgstr "erreur de syntaxe sur la ligne de commande"
 
 #~ msgid "Unexpected atom in command line. Did you forget to use a connective?"
 #~ msgstr ""
-#~ "Atome inattendu sur la ligne de commande. Auriez-vous oublié d'utiliser "
-#~ "un connecteur ?"
+#~ "Atome inattendu sur la ligne de commande. Auriez-vous oublié d'utiliser "
+#~ "un connecteur ?"

commit 2678055b76ce36d71de7175db1db76aac3e5883d
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Oct 27 20:54:28 2007 +0300

    Fix Debian bug #440348
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/changelog b/debian/changelog
index edb043f..685beb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 dctrl-tools (2.12) UNRELEASED; urgency=low
 
   * Switched to git for source control.
+  * make sort-dctrl read stdin if no file arguments are given
+    Closes: #440348 (sort-dctrl outputs nothing if input is a pipe)
+    Reported by Antti-Juhani Kaijanaho <ajk at debian.org>.
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 16:53:22 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 20:45:12 +0300
 
 dctrl-tools (2.11) unstable; urgency=low
 
diff --git a/sort-dctrl/sort-dctrl.c b/sort-dctrl/sort-dctrl.c
index e4a6f21..95876e4 100644
--- a/sort-dctrl/sort-dctrl.c
+++ b/sort-dctrl/sort-dctrl.c
@@ -158,6 +158,13 @@ int main(int argc, char * argv[])
 						      .reverse = false });
 	}
 
+        if (args.num_fnames == 0) {
+                args.fname[args.num_fnames++] = (struct ifile){
+                        .mode = m_read,
+                        .s = "-" 
+                };
+        }
+
 	struct para_bundle pb;
 	bundle_init(&pb);
 
diff --git a/tests/0006.in b/tests/bug440348.out
similarity index 100%
copy from tests/0006.in
copy to tests/bug440348.out
diff --git a/tests/bug440348.sh b/tests/bug440348.sh
new file mode 100644
index 0000000..474538a
--- /dev/null
+++ b/tests/bug440348.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+$SORT_DCTRL < 0006.in

commit dc697da2e3c57b1477b4f4bb1666d935e54da166
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Oct 27 17:45:16 2007 +0300

    Add a .gitignore file
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..162cb68
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+*~
+*.bak
+*.d
+*.o
+*.mo
+*.a
+man/grep-dctrl.1
+po/dctrl-tools.pot
+grep-dctrl
+join-dctrl
+tbl-dctrl
+sort-dctrl
+sync-available
+debian/files
+debian/stamp
+debian/substvars
+debian/tmp

commit 9c4340fad78eb004b7dd890ec36e2f919f1a2e93
Author: Antti-Juhani Kaijanaho <antti-juhani at kaijanaho.fi>
Date:   Sat Oct 27 17:06:39 2007 +0300

    Switch to Git and define best practices for push access
    
    The best practices include the new recommendation of doing Linux-style
    signoffs that assert the Developer's Cerificate of Origin by implied
    reference.
    
    The DCO is committed separately on its own (detached) branch so that
    we don't contaminate the package with its CC-by-sa/2.5 license.  I believe
    that the DCO is merely aggregated with dctrl-tools in Git, and that this
    does not make dctrl-tools derivative of the DCO.
    
    Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani at kaijanaho.fi>

diff --git a/debian/README b/debian/README
index be32b67..7e1aaf7 100644
--- a/debian/README
+++ b/debian/README
@@ -1,3 +1,4 @@
+                             Mailing list
 
 Developers and users interested in the future of dctrl-tools
 (grep-dctrl and friends) are encouraged to subscribe to the
@@ -6,7 +7,59 @@ dctrl-tools-devel mailing list at
 Early versions are available in the experimental distribution of
 Debian.
 
-Source is managed under darcs; if you want to contribute, please read
-  http://people.debian.org/~ajk/dctrl-tools-darcs.html
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 17 Jul 2004 04:31:34 +0300
+                          Source management
+
+Source is managed with git under collab-maint/dctrl-tools.git.  If you
+are a Debian developer or have collab-maint guest privileges, you can
+do
+  git clone ssh://USERNAME@git.debian.org/git/collab-maint/dctrl-tools.git
+For anonymous checkouts, use
+  git clone http://git.debian.org/git/collab-maint/dctrl-tools.git
+
+Anybody may submit proposed changes as git-format-patch(1) mails to
+the mailing list.
+
+Rules of conduct for people with push access to the repository:
+
+  - Commits should be signed off by the submitter and anybody who
+    contributed copyrightable stuff to that commit; a line of the form
+
+      Signed-off-by: Contributor's Name <contributors at email.example>
+
+    in the commit message signifies that the contributor identified on
+    that line asserts the Developer's Certificate of Origin 1.1 for
+    that particular contribution.
+
+    The authoritative version of the Developer's Certificate of Origin
+    for this project is in the Git blob
+    c930ac94c745efafe5a6fb4bbe12def76b3af994; Antti-Juhani Kaijanaho
+    believes that it is identical to the document of the same name
+    used in Linux and other projects.  That blob can be accessed in a
+    Git repository that contains it by the command git-cat-file blob
+    c930ac94c745efafe5a6fb4bbe12def76b3af994
+
+  - The maintainer reserves the right to veto changes; it is good form
+    to discuss nontrivial changes on the mailing list (see above) before
+    pushing so no reverts have to be made.
+
+  - Simple bugfixes and translation updates may be pushed by anybody
+    at any time.
+
+  - Anything committed or merged to master (and any release
+    maintenance branches) must compile and pass the test suite at
+    least on the committer or merger's development machine; use topic
+    branches for instable development.
+
+  - Include an update of debian/changelog in your commits.  One-line
+    summary of the commit is sufficient, as you can elaborate in the
+    commit log and in comments you might add to the source.
+    
+  - Make sure that the distribution in debian/changelog is UNRELEASED
+    unless the commit is about preparing a release; the top line in
+    debian/changelog should look like
+
+      dctrl-tools (2.12) UNRELEASED; urgency=low
+
+    (where 2.12 is the expected version number of the next release,
+    and "low" may be replaced by any other valid urgency value).
diff --git a/debian/changelog b/debian/changelog
index f09195c..edb043f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 dctrl-tools (2.12) UNRELEASED; urgency=low
 
-  * 
+  * Switched to git for source control.
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 05 Aug 2007 21:30:57 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 16:53:22 +0300
 
 dctrl-tools (2.11) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b88479b..14ad064 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Antti-Juhani Kaijanaho <ajk at debian.org>
 Standards-Version: 3.7.2
 Build-Depends: gettext (>= 0.11-0), gcc (>= 3.0)
-XS-Vcs-Darcs: http://antti-juhani.kaijanaho.fi/darcs/dctrl-tools/
+XS-Vcs-Git: http://git.debian.org/git/collab-maint/dctrl-tools.git
+XS-Vcs-Browser: http://git.debian.org/?p=collab-maint/dctrl-tools.git;a=summary
 
 Package: dctrl-tools
 Architecture: any

-- 
Debian control file query tools



More information about the Dctrl-tools-devel mailing list