[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.16-13-gb673d15

Antti-Juhani Kaijanaho ajk at debian.org
Sat Dec 4 10:33:54 UTC 2010


The following commit has been merged in the master branch:
commit b673d1561e388f69f8a47d6ba9fd074b807017e0
Merge: 687bf93cfe1168f345616565af79f6fe87fd6b49 2d031e1819899cff32c549cf82468723b0ef66ed
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Dec 4 12:33:22 2010 +0200

    Merge branch 'maint-2.14'
    
    * maint-2.14:
      Open 2.14.6
      Release 2.14.5.
      po/ca.po: Updated by Jordi Mallach (closes: #601122)
      po/es.po: Updated by Javier Fernández-Sanguino Peña (closes: #599858)
      Open 2.14.5.
      Release 2.14.4.
      vi.po: Updated by Clytie Siddall (closes: #598494)
      Open 2.14.4.
      Release 2.14.3
      po/sv.po: Updated by Martin Bagge (closes: #597013)
      Open 2.14.3.
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index b7c4f89,900c1d5..c443ca1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,28 +1,53 @@@
 -dctrl-tools (2.14.6) UNRELEASED; urgency=low
 +dctrl-tools (2.17) UNRELEASED; urgency=low
  
--  * 
++  * Merge 2.14.3, 2.14.4, and 2.14.5.
  
-  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 11 Sep 2010 23:05:02 +0300
 - -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 24 Oct 2010 21:23:27 +0300
++ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 04 Dec 2010 12:32:13 +0200
 +
 +dctrl-tools (2.16) experimental; urgency=low
 +
 +  * Merge 2.14.2
 +  * tbl-dctrl: Figure out the fields from the input if no '-c' is given.
 +    Closes: #596424 reported by myself
 +
 + -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 11 Sep 2010 22:45:04 +0300
 +
 +dctrl-tools (2.15) experimental; urgency=low
 +
 +  [ Antti-Juhani Kaijanaho ]
 +  * tbl-dctrl: Fix field line length detection for multi-line fields
 +    - Reported by Gerfried Fuchs <rhonda at debian.at> out of band.
 +  * tbl-dctrl (linewrap): Force a line break where the field has one.
 +  * Update FSF address in license blurbs all over the source tree.
 +  * debian/copyright: Update copyright years
 +  * Merge 2.14.1
 +  * lib/paragraph.c (para_parse_next): Fix line counting.
 +  * convert to source package format 3.0 (native)
 +  
 +  [ Cyril Brulebois ]
 +  * Add Build-Depends/Build-Depends-Indep search example (closes: #339380)
 +
 + -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 28 Aug 2010 20:52:28 +0300
  
+ dctrl-tools (2.14.5) unstable; urgency=low
+ 
+   * po/es.po: Updated by Javier Fernández-Sanguino Peña (closes: #599858)
+   * po/ca.po: Updated by Jordi Mallach (closes: #601122)
+ 
+  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 24 Oct 2010 20:57:11 +0300
+ 
+ dctrl-tools (2.14.4) unstable; urgency=low
+ 
+   * po/vi.po: Updated by Clytie Siddall (closes: #598494)
+ 
+  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 09 Oct 2010 10:31:59 +0300
+ 
+ dctrl-tools (2.14.3) unstable; urgency=low
+ 
+   * po/sv.po: Updated by Martin Bagge (closes: #597013)
+ 
+  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 26 Sep 2010 14:42:53 +0300
+ 
  dctrl-tools (2.14.2) unstable; urgency=low
  
    * po/pt_BR.po: Updated by Maurício Vieira.

-- 
Debian control file query tools



More information about the Dctrl-tools-devel mailing list