From: Michael Vogt Date: Mon, 14 Nov 2005 15:14:06 +0000 (+0000) Subject: * merged with apt--mvo--0 X-Git-Tag: 0.7.24ubuntu1~288 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/818d4818b726bd0e4ff703d71a89c4efaa269cbf * merged with apt--mvo--0 Patches applied: * apt@packages.debian.org/apt--sources-list-d--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-30 * apt@packages.debian.org/apt--sources-list-d--0--patch-1 Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d * bubulle@debian.org--2005/apt--main--0--patch-130 Galician translation completed * bubulle@debian.org--2005/apt--main--0--patch-131 Simplified Chinese translation update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-90 * merged the sources.list.d patch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-91 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-92 * changelog update --- 818d4818b726bd0e4ff703d71a89c4efaa269cbf diff --cc configure.in index b08311e72,6130ab544..fb6441f58 --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3ubuntu1") -AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3ubuntu2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --cc debian/changelog index ccf6b8ead,2a636ae30..8f03f2dc7 --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,12 +1,18 @@@ -apt (0.6.42.4) unstable; urgency=low ++apt (0.6.42.3ubuntu2) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: + * zh_CN.po: Completed to 507 strings(Closes: #338267) + * gl.po: Completed to 510 strings (Closes: #338356) + * added support for "/etc/apt/sources.list.d" directory + (closes: #66325) + - -- ++ -- Michael Vogt Mon, 14 Nov 2005 15:30:12 +0100 ++ +apt (0.6.42.3ubuntu1) dapper; urgency=low + + * synced with debian + + -- Michael Vogt Thu, 10 Nov 2005 05:05:56 +0100 apt (0.6.42.3) unstable; urgency=low