summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog20
-rw-r--r--debian/control1
2 files changed, 20 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 6d77f0fcd..230d5055d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+apt (0.9.14.1ubuntu1) trusty; urgency=low
+
+ * Merge from debian/sid
+ * disable autopkgtest for now until it can test the installed
+ packages and not only the build-tree (thanks to Martin Pitt)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 12 Dec 2013 21:19:49 +0100
+
+apt (0.9.14.1) unstable; urgency=medium
+
+ * fix apt-get source -t dist regression (closes: #731853)
+ and add testcase
+ * clarify error message when apt-get source=ver fails
+ (thans to David Kalnischkies)
+ * Fix conffile prompt regression (LP: #1260297)
+ and add testcase
+ * improve error message for apt-get source pkg:arch{=ver,/release}
+
+ -- Michael Vogt <mvo@debian.org> Thu, 12 Dec 2013 18:34:29 +0100
+
apt (0.9.14ubuntu1) trusty; urgency=low
* Merged from debian/sid
diff --git a/debian/control b/debian/control
index fc8f75c3b..f0d4bab95 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends-Indep: doxygen, debiandoc-sgml
Build-Conflicts: autoconf2.13, automake1.4
Vcs-Git: git://anonscm.debian.org/apt/apt.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git
-XS-Testsuite: autopkgtest
Package: apt
Architecture: any