[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.14.2-19-ge5a1997

[Antti-Juhani Kaijanaho]

The following commit has been merged in the master branch:
commit e5a19977f4ec1187b5c358dbd5dfb6869a00f106
Merge: 41c2d0a6ac790157e264d7e42cc1ea70229b0d37 98ac6d260115bdb1516c2e734e8cecfb35530f28
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Sep 11 11:35:37 2010 +0300

    Merge commit '2.14.2'
    
    * commit '2.14.2':
      Release 2.14.2.
      po/cs.po: Updated by Miroslav Kure (closes: #595513).
      po/ca.po: Updated by Agusti Grau
      po/en_GB.po: Updated by Jeff Bailes.
      po/pt_BR.po: Updated by Maurício Vieira.
      Open 2.14.2
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 82d98c2,589dd5e..ad435d8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,12 +1,35 @@@
 +dctrl-tools (2.16) UNRELEASED; urgency=low
 +
-   * 
++  * Merge 2.14.2
 +
-  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 28 Aug 2010 21:58:27 +0300
++ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 11 Sep 2010 11:35:20 +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.2) unstable; urgency=low
+ 
+   * po/pt_BR.po: Updated by Maurício Vieira.
+   * po/en_GB.po: Updated by Jeff Bailes.
+   * po/ca.po: Updated by Agusti Grau.
+   * po/cs.po: Updated by Miroslav Kure (closes: #595513).
+ 
+  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Fri, 10 Sep 2010 19:38:32 +0300
+ 
  dctrl-tools (2.14.1) unstable; urgency=low
  
    [ Antti-Juhani Kaijanaho ]

-- 
Debian control file query tools