From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 13 Feb 2006 10:25:04 +0000 (+0000)
Subject: * merged with mainline
X-Git-Tag: 0.7.24ubuntu1~271
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/5e972bffae68a75aafc9f9b639e82e252fde3b8b

* merged with mainline


Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-167
   Resync with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-168
   Vietnamese translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-169
   Update PO files and POT file...again

 * bubulle@debian.org--2005/apt--main--0--patch-170
   Compelted French translation

 * bubulle@debian.org--2005/apt--main--0--patch-171
   Activate Welsh translation

 * bubulle@debian.org--2005/apt--main--0--patch-172
   Completed to 512 strings

 * bubulle@debian.org--2005/apt--main--0--patch-173
   Russian translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-174
   Swedish translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-175
   Merge from Philippe Batailler French manpages tree/Vietnamese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-176
   Galician translation update

 * bubulle@debian.org--2005/apt--main--0--patch-177
   Slovak translation update

 * bubulle@debian.org--2005/apt--main--0--patch-178
   Polish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-179
   Correct permissions

 * bubulle@debian.org--2005/apt--main--0--patch-180
   Japanese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-181
   Basque translation update

 * bubulle@debian.org--2005/apt--main--0--patch-182
   Catalan translation completed

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123
   * fix typo in apt-cache.8 manpage

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124
   * fixed another typo in doc/apt-secure.8.xml

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125
   * merged the debian-sid changes back

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126
   * fixed the changelog yet again

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-127
   * merged with apt--mvo

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-128
   * don't explod if a Provides has DepCompareOp

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-129
   * fix regression about not working --print-uris in "install"

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-130
   * merged with bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-131
   * create sources.list.d as well

 * mvo@debian.org--2005/apt--debian-sid--0--patch-17
   * merged with apt--mvo--0

 * mvo@debian.org--2005/apt--debian-sid--0--patch-18
   * merged with apt--mvo

 * philippe.batailler@free.fr--2005/apt--main--0--patch-9
   manpages
---

5e972bffae68a75aafc9f9b639e82e252fde3b8b
diff --cc configure.in
index a21a6285a,8d4b99904..2e92bd0a9
--- 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.43.1ubuntu1")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.43.3")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.43.3ubuntu1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --cc debian/changelog
index 42056b1b7,f4a8aaca0..544c5b9da
--- a/debian/changelog
+++ b/debian/changelog
@@@ -13,16 -45,16 +45,18 @@@ apt (0.6.43.2) unstable; urgency=lo
      - es.po: Updated to 510t1f Closes: #348158
      - gl.po: Completed to 511 strings Closes: #347729
      - it.po: Yet another update Closes: #347435
-     - *.po: Updated from sources (511 strings)
+   * added debian-archive-keyring to the Recommends (closes: #347970)
+   * fixed message in apt-key to install debian-archive-keyring 
+   * typos fixed in apt-cache.8 (closes: #348348, #347349)
    * add patch to fix http download corruption problem (thanks to
      Petr Vandrovec, closes: #280844, #290694)
 +  * added APT::Periodic::Unattended-Upgrade (requires the package
 +    "unattended-upgrade")
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 17:09:31 +0100
+  -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2006 00:06:33 +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