[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.14-23-g7287a72

[Antti-Juhani Kaijanaho]

The following commit has been merged in the master branch:
commit 7287a729c6c3e490c3e54e5288073360662bbbed
Merge: 9b69ca03454f3e555c5213a530461b4fecebdb7a 6c703e79f33084cbd0783f2c4c2f8364c64f3d2a
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Aug 28 09:39:42 2010 +0300

    Merge commit '2.14.1'
    
    * commit '2.14.1':
      Release 2.14.1
      Standards-Version updated to 3.9.1 with no packaging changes.
      French translation updated by David Prévot (closes: #593990)
      Russian translation update from Yuri Kozlov (closes: #593240)
      ... and also document it in the changelog
      Update the german translation
      po/fi.po: Updated translation.
      Update .po files
      grep-dctrl: Make a help string more comprehensible
      Russian translation updated (closes: #513026)
      Open 2.14.1.
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 35d5dea,6387748..88f0bae
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,17 +1,32 @@@
 +dctrl-tools (2.15) UNRELEASED; 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
-   * grep-dctrl: Make a help string more comprehensible
++  * Merge 2.14.1
 +  
 +  [ Cyril Brulebois ]
 +  * Add Build-Depends/Build-Depends-Indep search example (closes: #339380)
 +
++ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 28 Aug 2010 09:38:24 +0300
++
+ dctrl-tools (2.14.1) unstable; urgency=low
+ 
+   [ Antti-Juhani Kaijanaho ]
+   * grep-dctrl: Make a help string more comprehensible
+   * po/fi.po: Updated translation.
+   * Further Russian translation update from Yuri Kozlov (closes: #593240)
+   * French translation updated by David Prévot (closes: #593990)
+   * Standards-Version updated to 3.9.1 with no packaging changes.
+   
    [ Gerfried Fuchs ]
    * Russian translation updated by Yuri Kozlov (closes: #513026)
+   * German translation updated by myself.
  
-  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 08 Aug 2010 12:28:01 +0300
+  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Mon, 23 Aug 2010 21:08:39 +0300
  
  dctrl-tools (2.14) unstable; urgency=low
  

-- 
Debian control file query tools