* updated changelog ro reflect last upload

diff --git a/configure.in b/configure.in
index f6208777f15d16447ef35d49ccd8835607911f64..67841b3ef75b71b5c76766f53d7f60475ba0143a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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_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.46.4ubuntu5")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu6")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 45f79f40aba7a982b69842a612c41b46477bdf08..8385671836a01464748835497ab875a5abee7bfa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+apt (0.6.46.4ubuntu6) feisty; urgency=low
+
+  * methods/http.cc:
+    - send apt version in User-Agent
+  * apt-pkg/deb/debrecords.cc:
+    - fix SHA1Hash() return value
+  * apt-pkg/algorithms.cc:
+    - fix resolver bug on removal triggered by weak-dependencies 
+      with or-groups
+    - fix segfault (lp: #76530)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Dec 2006 11:04:36 +0100
+

 apt (0.6.46.4ubuntu5) feisty; urgency=low
 
   * added apt-transport-https package to provide a optional
 apt (0.6.46.4ubuntu5) feisty; urgency=low
 
   * added apt-transport-https package to provide a optional


@@ -10,12 +23,6 @@ apt (0.6.46.4ubuntu4) feisty; urgency=low
   * apt-pkg/algorithms.cc:
     - only increase the score of installed applications if they 
       are not obsolete 
   * apt-pkg/algorithms.cc:
     - only increase the score of installed applications if they 
       are not obsolete 

-    - fix resolver bug on removal triggered by weak-dependencies 
-      with or-groups
-  * methods/http.cc:
-    - send apt version in User-Agent
-  * apt-pkg/deb/debrecords.cc:
-    - fix SHA1Hash() return value

 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100