diff options
| author | Antti-Juhani Kaijanaho <ajk@debian.org> | 2010-08-28 09:39:42 +0300 |
|---|---|---|
| committer | Antti-Juhani Kaijanaho <ajk@debian.org> | 2010-08-28 09:39:42 +0300 |
| commit | 7287a729c6c3e490c3e54e5288073360662bbbed (patch) | |
| tree | e689e2bd76ff65124bba111aa7973ecdd1c985bc | |
| parent | 9b69ca03454f3e555c5213a530461b4fecebdb7a (diff) | |
| parent | 6c703e79f33084cbd0783f2c4c2f8364c64f3d2a (diff) | |
| download | dctrl-tools-7287a729c6c3e490c3e54e5288073360662bbbed.tar.gz | |
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
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 15 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 35d5dea..88f0bae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,15 +6,27 @@ dctrl-tools (2.15) UNRELEASED; urgency=low * 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@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@debian.org> Sun, 08 Aug 2010 12:28:01 +0300 + -- Antti-Juhani Kaijanaho <ajk@debian.org> Mon, 23 Aug 2010 21:08:39 +0300 dctrl-tools (2.14) unstable; urgency=low diff --git a/debian/control b/debian/control index 8ea716c..0d23bd0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: dctrl-tools developers <dctrl-tools-devel@lists.alioth.debian.org> Uploaders: Antti-Juhani Kaijanaho <ajk@debian.org>, Jon Bernard <jbernard@debian.org> -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Build-Depends: gettext (>= 0.11-0), gcc (>= 3.0) Vcs-Git: git://git.debian.org/git/collab-maint/dctrl-tools.git Vcs-Browser: http://git.debian.org/?p=collab-maint/dctrl-tools.git;a=summary |