* merged from main
authorMichael Vogt <michael.vogt@ubuntu.com>
Wed, 18 Jan 2006 22:28:51 +0000 (22:28 +0000)
committerMichael Vogt <michael.vogt@ubuntu.com>
Wed, 18 Jan 2006 22:28:51 +0000 (22:28 +0000)
Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120
   * added debian-archive-keyring to recommends

1  2 
configure.in
debian/changelog
debian/control

diff --cc configure.in
index b900cc165bfcc296474487208c412480d2d0591e,0d80e5ed9a31eeaaef13a884ee96a26de5172ddb..a21a6285a1f2387425de4c39569569042dc5999c
@@@ -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.43.1ubuntu2")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.43.1ubuntu1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
index c838067279b595f3d479da3416ed9bcb895b9aa1,ee0d656054f10ba6aa2bd45c2c91a091bb86f398..dee768a352785ec2981725ea31434c839a6a2c7b
@@@ -11,13 -11,12 +11,13 @@@ apt (0.6.43.1ubuntu1) dapper; urgency=l
      - *.po: Updated from sources (511 strings)
    * add patch to fix http download corruption problem (thanks to
      Petr Vandrovec, closes: #280844, #290694)
 -  * added debian-archive-keyring to the Recommends (closes: #347970)
 +  * added APT::Periodic::Unattended-Upgrade (requires the package
 +    "unattended-upgrade")
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 17:09:31 +0100
+  -- 
  
  apt (0.6.43.1) unstable; urgency=low
 -
 +  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
      * fr.po: Completed to 510 strings
      * it.po: Completed to 510t
diff --cc debian/control
index 5c76a90ebb63aea4085ac494009788bcd1ad41c4,3b8883f885ba7d0c026fb32e802a598a1d371f29..4f3863d720415836c11c4ec8207fe7631209740c
@@@ -13,6 -13,7 +13,7 @@@ Depends: ${shlibs:Depends
  Priority: important
  Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
  Provides: ${libapt-pkg:provides}
 -Recommends: debian-archive-keyring
++Recommends: ubuntu-keyring
  Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
  Section: admin
  Description: Advanced front-end for dpkg