[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.18-8-g4e1f1ef

Antti-Juhani Kaijanaho ajk at debian.org
Sat Jul 23 13:37:04 UTC 2011


The following commit has been merged in the master branch:
commit 4e1f1ef25e417e842189ad618c13d456dd029711
Merge: 861dc684241e6ba7779a01ec44bedfe513ad0356 225f7827155d61c26d29365f887588f3b2b3dc9a
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Jul 23 16:36:42 2011 +0300

    Merge branch 'merge_2.18ubuntu1'
    
    * merge_2.18ubuntu1:
      Importing 2.18ubuntu1
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 6e2bc05,fcf3e7f..e8f9ca0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,21 @@@
 +dctrl-tools (2.19) UNRELEASED; urgency=low
 +
 +  [ David Prévot ]
 +  * Stylish fix to grep-dctrl(1) manpage
 +  * Makes manpages translatable (using po4a)
 +  * Fix example in manpage (closes: #589827)
 +
-  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 13 Mar 2011 14:26:29 +0200
++  [ Antti-Juhani Kaijanaho ]
++  * Merge 2.18ubuntu1
++
++ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 23 Jul 2011 16:36:19 +0300
++
+ dctrl-tools (2.18ubuntu1) oneiric; urgency=low
+ 
+   * lib/msg.h, grep-dctrl/rc.c, join-dctrl/join-dctrl.c: Pass the arguments to
+     message() in the right order (fixes FTBFS; lp: #774391, Closes: #624707)
+ 
+  -- Michael Bienia <geser at ubuntu.com>  Mon, 02 May 2011 08:25:34 +0100
  
  dctrl-tools (2.18) unstable; urgency=low
  

-- 
Debian control file query tools



More information about the Dctrl-tools-devel mailing list