* 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

diff --cc configure.in
index b08311e7234ebee30c3f9f6552920898e3825170,6130ab544bca7d0729b927d141cc9ccb3bc9d718..fb6441f583b80e3fba370407dfe12ee58eda2a36
--- 1/configure.in
--- 2/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 ccf6b8eadb3bc11a543fc25ff4f1ad09eb38e0e6,2a636ae30f36b9aac88339467eaab246435f68e8..8f03f2dc7f50f526076cd940364617eb6a547fac
--- 1/debian/changelog
--- 2/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 <michael.vogt@ubuntu.com>  Mon, 14 Nov 2005 15:30:12 +0100
++
 +apt (0.6.42.3ubuntu1) dapper; urgency=low
 +
 +  * synced with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Nov 2005 05:05:56 +0100
  
  apt (0.6.42.3) unstable; urgency=low