summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-24 23:52:55 +0100
committerMichael Vogt <mvo@debian.org>2014-01-24 23:52:55 +0100
commitb52e8ce26ee0ee906f8bad4dbd72eca51fb65ed7 (patch)
tree3b619020a79fd5fa340761b135f3f6565ebb6646
parent81dca2d03ad4095c7aaa8b5f74885bc0e61b3ee3 (diff)
merge ubuntu diff from doko
-rw-r--r--debian/apt.install.in3
-rw-r--r--debian/changelog6
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/apt.install.in b/debian/apt.install.in
index ac12060ce..9c9489572 100644
--- a/debian/apt.install.in
+++ b/debian/apt.install.in
@@ -1,5 +1,6 @@
+bin/apt usr/bin/
bin/apt-* usr/bin/
bin/methods/* usr/lib/apt/methods/
scripts/dselect/* usr/lib/dpkg/methods/apt/
usr/share/locale/*/*/apt.mo
-bin/libapt-private.so.* usr/lib/@DEB_HOST_MULTIARCH@/ \ No newline at end of file
+bin/libapt-private.so.* usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/debian/changelog b/debian/changelog
index 230d5055d..2cb9c2783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (0.9.14.1ubuntu2) trusty; urgency=medium
+
+ * Install the apt binary.
+
+ -- Matthias Klose <doko@ubuntu.com> Thu, 16 Jan 2014 12:53:32 +0100
+
apt (0.9.14.1ubuntu1) trusty; urgency=low
* Merge from debian/sid