From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 3 Jul 2006 20:02:41 +0000 (+0200)
Subject: * merged the debian--auto-mark patch
X-Git-Tag: 0.7.24ubuntu1~254
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e9afbeb9df95b582aac76bb44b5ae2b766ab8fd5

* merged the debian--auto-mark patch
* updated the library soname
---

e9afbeb9df95b582aac76bb44b5ae2b766ab8fd5
diff --cc apt-pkg/init.h
index 8255b406a,6a832bddf..0c6260c2f
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@@ -18,7 -18,7 +18,7 @@@
  
  // See the makefile
  #define APT_PKG_MAJOR 3
- #define APT_PKG_MINOR 11
 -#define APT_PKG_MINOR 13
++#define APT_PKG_MINOR 50
  #define APT_PKG_RELEASE 0
      
  extern const char *pkgVersion;
diff --cc apt-pkg/makefile
index 0e6aecc65,7093d23ce..2f4d8b525
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@@ -13,7 -13,7 +13,7 @@@ include ../buildlib/defaults.ma
  # methods/makefile - FIXME
  LIBRARY=apt-pkg
  LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
- MAJOR=3.11
 -MAJOR=3.13
++MAJOR=3.50
  MINOR=0
  SLIBS=$(PTHREADLIB) $(INTLLIBS)
  APT_DOMAIN:=libapt-pkg$(MAJOR)
diff --cc configure.in
index 644eab90a,6d42f340e..e55c8cebe
--- 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.1-2ubuntu1
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-0.1")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.44.2ubuntu1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --cc debian/changelog
index 83bf9c1d5,8b11ff0da..aa5087f32
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,17 +1,33 @@@
 -apt (0.6.44.2) unstable; urgency=low
 +apt (0.6.44.2ubuntu1) edgy; urgency=low
  
 -  * apt-pkg/depcache.cc:
 -    - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
 -  * merged from 
 -    http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
 -  	* sk.po: Completed to 512t
 -	* eu.po: Completed to 512t
 -	* fr.po: Completed to 512t
 -	* sv.po: Completed to 512t
 -	* Update all PO and the POT. Gives 506t6f for formerly
 -	  complete translations
 +  * merged with debian/unstable
++  * merged the "auto-mark" branch to support aptitude like
++    marking of automatically installed dependencies and added
++    "apt-get remove --auto-remove" to remove unused auto-installed
++    packages again
++  * changed library version from 3.11 to 3.50 to make it clearly 
++    different from the debian version (we are ABI incompatible because
++    of the auto-mark patch)
  
 - --
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  3 Jul 2006 18:30:46 +0200
 +
 +apt  (0.6.44.2) unstable; urgency=low 
 +  
 +   * apt-pkg/depcache.cc:
 +     - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
 +   * apt-pkg/acquire-item.cc:
 +     - fix missing chmod() in the new aquire code
 +       (thanks to Bastian Blank, Closes: #367425)
 +   * merged from
 +     http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
 +     * sk.po: Completed to 512t
 +     * eu.po: Completed to 512t
 +     * fr.po: Completed to 512t
 +     * sv.po: Completed to 512t
 +     * Update all PO and the POT. Gives 506t6f for formerly
 +       complete translations
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200 
  
  apt (0.6.44.1-0.1) unstable; urgency=low
  
diff --cc methods/makefile
index 1e3b1ef85,7af5d38d1..03a424411
--- a/methods/makefile
+++ b/methods/makefile
@@@ -7,7 -7,7 +7,7 @@@ include ../buildlib/defaults.ma
  BIN := $(BIN)/methods
  
  # FIXME..
- LIB_APT_PKG_MAJOR = 3.11
 -LIB_APT_PKG_MAJOR = 3.13
++LIB_APT_PKG_MAJOR = 3.50
  APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
  
  # The file method
diff --cc share/debian-archive.gpg
index ce412117d,000000000..bb5ed5033
mode 100644,000000..100644
Binary files differ