[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.11-57-g156da09

[Antti-Juhani Kaijanaho]

The following commit has been merged in the master branch:
commit 126c362d821c165a42a5f5860e47ad813f733976
Merge: 2bc3218cf4f70db497b97687b0d4bc3a847ec217 53dd67396f5409fec57935ef6febb7d11fce4320
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Dec 5 12:48:15 2009 +0200

    Merge branch 'maint-2.13'
    
    Conflicts:
    	debian/changelog
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --combined debian/changelog
index d5c5a29,5a4ff02..2e56a6d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,15 +1,52 @@@
 -dctrl-tools (2.13.2) UNRELEASED; urgency=low
 +dctrl-tools (2.14) UNRELEASED; urgency=low
  
 -  * 
 -
 - -- Antti-Juhani Kaijanaho <ajk at debian.org>  Tue, 06 Jan 2009 18:47:28 +0200
 +  [ Antti-Juhani Kaijanaho ]
++  * Merge  2.13.1.
 +  * grep-dctrl/rc.c, lib/msg.c: Recode to UTF-8
 +  * lib/msg.c: Remove (obsolete) snail mail and email addresses for me.
 +  * */*.[ch]: Use the copyright symbol instead of (c) or (C).
 +  * msg.[ch] (and others): allow the message functions to handle format strings
 +  * tbl-dctrl.c [linewrap]: Clarify.
 +  * tbl-dctrl.c [linewrap]: Do not include the breakpoint in the next line.
 +    Closes: #508953 (when greping through source packages, 
 +                     tbl-control can't list Files
 +    Reported by Gerfried Fuchs <rhonda at debian.at>.
 +  * tests/bug506138.{sh,out}: New test case.
 +  * grep-dctrl.c [apptok]: Forbid mixing the predicate and input files.
 +    It never worked, anyway.
 +    Closes: #506138 (Segfault when calling with wrong order of parameters)
 +    Reported by Marco Túlio Gontijo e Silva <marcot at holoscopio.com>.
 +  * join-dctrl/join-dctrl.c: Avoid a compiler warning by initializing
 +    a local variable.
 +  * lib/paragraph.c, grep-dctrl/grep-dctrl.c, sort-dctrl/sort-dctrl.c,
 +    tests/bug511022.{sh.in,out}:
 +    The whole paragraph no longer includes the final newline.
 +    Closes: #511022 (the full paragraph should not include its final newline)
 +    Reported by: Loïc Minier <lool at dooz.org>
 +  * GNUmakefile, debian/rules: clean backup files and .d files in subdirs too
 +    Closes: #511081 (.d files do not belong in the source package)
 +    Reported by: Adeodato Simó
 +  * sort-dctrl/sort-dctrl: Fix -k parsing bug (don't just repeat the first
 +    key...)
 +    Closes: #559543 (doesn't take into account secondary sorting criteria)
 +    Reported by: Ryan Niebur <ryan at debian.org>
 +  * lib/paragraph.c (para_parse_next): parse comment lines that start with
 +    unindented '#'-characters (they are not removed semantically, though)
 +    Closes: #521006 (support #-comments)
 +  
 +  [ Stefano Zacchiroli ]
 +  * grep-dctrl: add new matching mode --whole-pkg/-w: it is an improved -e
 +    matching exact package names, i.e., no sub-string matching on package
 +    names. Closes: #383921
 +
-  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 05 Dec 2009 12:41:52 +0200
++ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 05 Dec 2009 12:47:41 +0200
+ 
+ dctrl-tools (2.13.1) unstable; urgency=low
+ 
+   [ Gerfried Fuchs ]  
+   * Czech translation update received from Miroslav Kure, thanks.
+ 
+  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Tue, 06 Jan 2009 16:19:48 +0200
  
  dctrl-tools (2.13.0) unstable; urgency=low
  

-- 
Debian control file query tools