summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog15
2 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index a697597b5..e65814b77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
PACKAGE="apt"
-PACKAGE_VERSION="0.9.15.4"
+PACKAGE_VERSION="0.9.15.4ubuntu4"
PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/changelog b/debian/changelog
index 1f6844ca9..1239cfcef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-apt (0.9.15.4ubuntu3) UNRELEASED; urgency=medium
+apt (0.9.15.4ubuntu4) trusty; urgency=low
+ Cherry pick fixes from the apt 1.0 branch:
+
[ Michael Vogt ]
* add sun-java{5,6}-jdk to breaks/replaces as that provided a "apt"
binary as well
@@ -13,10 +15,15 @@ apt (0.9.15.4ubuntu3) UNRELEASED; urgency=medium
[ Julian Andres Klode ]
* Promote xz-utils from apt Suggests to libapt-pkg Depends
- * apt-inst: Do not try to create a substring of an empty string in error
- reporting
- -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 04 Apr 2014 08:23:15 +0200
+ -- Michael Vogt <mvo@ubuntu.com> Fri, 04 Apr 2014 09:08:51 +0200
+
+apt (0.9.15.4ubuntu3) trusty; urgency=low
+
+ * cherry pick git commit b68ce88357daf36 to fix crash in
+ apt-extracttemplates (LP: #1288718)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 02 Apr 2014 15:00:11 +0200
apt (0.9.15.4ubuntu2) trusty; urgency=medium