From: LaMont Jones Date: Wed, 23 Apr 2008 04:50:53 +0000 (-0600) Subject: Merge branch 'stable/v2.13' X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fd7be25f33060e20d965997475b1ec2f2cf3f21;p=util-linux Merge branch 'stable/v2.13' Conflicts: NEWS configure.ac debian/changelog po/ca.po po/cs.po po/da.po po/de.po po/es.po po/et.po po/eu.po po/fi.po po/fr.po po/hu.po po/id.po po/it.po po/ja.po po/nl.po po/pl.po po/pt_BR.po po/ru.po po/sl.po po/sv.po po/tr.po po/uk.po po/util-linux-ng.pot po/vi.po --- 6fd7be25f33060e20d965997475b1ec2f2cf3f21 diff --cc NEWS index 4865dccf,bed93a3f..4579cbd5 --- a/NEWS +++ b/NEWS @@@ -1,8 -1,24 +1,16 @@@ +util-linux-ng 2.14-rc1 ++ +* see docs/v2.14-ReleaseNotes or complete changelog at + ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc1-ChangeLog + + util-linux-ng 2.13.1.1 [22-Apr-2008] + + * see docs/v2.13.1.1-ReleaseNotes or complete changelog at + ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1.1-ChangeLog + + util-linux-ng 2.13.1 [16-Jan-2008] + -* see docs/v2.13.1-ReleaseNotes or complete changelog at - ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1-ChangeLog - -util-linux-ng 2.13.1-rc2 - -* see docs/v2.13.1-ReleaseNotes or complete changelog at - ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1-rc2-ChangeLog - -util-linux-ng 2.13.1-rc1 - -* see docs/v2.13.1-ReleaseNotes or complete changelog at - ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1-rc1-ChangeLog - -util-linux-ng 2.13 [28-Aug-2007] +util-linux-ng 2.13 * see docs/v2.13-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-ChangeLog diff --cc debian/changelog index 5f877bd9,40c6b905..7d204f25 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,24 +1,32 @@@ +util-linux (2.14~rc1-1) experimental; urgency=low + + * New upstream version + * control: drop -1 version from libslang2-dev build-dep + * control: standards-version 3.7.3.0 + + -- LaMont Jones Thu, 17 Apr 2008 18:19:27 -0600 + + util-linux (2.13.1.1-0) unstable; urgency=low + + [Steve Grubb] + + * login: audit log injection attack via login + + [Karel Zak] + + * po: merge changes + - po: update it.po (from translationproject.org) (Marco Colombo) + - po: update nl.po (from translationproject.org) (Benno Schulenberg) + * docs: add v2.13.1.1 ReleaseNotes + * build-sys: release++ (2.13.1.1) + + [LaMont Jones] + + * control: drop -1 version from libslang2-dev build-dep + * control: standards-version 3.7.3.0 + + -- LaMont Jones Tue, 22 Apr 2008 22:44:08 -0600 + util-linux (2.13.1-5) unstable; urgency=low * Switch to upstream's more-correct fix for LP#206113