From: Michael Vogt <egon@bottom>
Date: Tue, 16 May 2006 19:17:58 +0000 (+0200)
Subject: * merged with mainline
X-Git-Tag: 0.7.21~322
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ae6f2268b49710b5b153d6d28a80268f2f3df3da?hp=--cc

* merged with mainline
---

ae6f2268b49710b5b153d6d28a80268f2f3df3da
diff --cc configure.in
index 2c4bbcb6f,f24400ed7..96adad597
--- 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.44")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --cc debian/changelog
index e151d82f5,04c3f02ee..7862505f5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,14 @@@
  apt (0.6.44.1) unstable; urgency=low
  
 +  * apt-pkg/acquire-item.cc:
-     - fix reversed order of the "Acquire::PDiffs" option
++    - fix reversed logic of the "Acquire::PDiffs" option
+   * merged from 
+     http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+     - po/LINGUAS: added "bg" Closes: #360262
+     - po/gl.po: Galician translation update. Closes: #366849
+     - po/hu.po: Hungarian translation update. Closes: #365448
  
-  -- Michael Vogt <mvo@debian.org>  Thu, 11 May 2006 12:11:26 +0200
+  --
  
  apt (0.6.44) unstable; urgency=low