summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-05-08 09:18:39 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-05-08 09:18:39 +0200
commitcaa8a9f1e777f351b911dc8c30a858a5f026fca3 (patch)
treea9cb3ce115a832245cd528237cb238c38bca86bc /debian
parentff94be47f5dbdcf99cea23fad8c9b992a8e5a67e (diff)
parentb41713efc8f37d62f078bea850ef0a74e0af0103 (diff)
Merge remote-tracking branch 'upstream/debian/sid' into bugfix/update-progress-reporting
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/changelog31
-rwxr-xr-xdebian/rules2
3 files changed, 31 insertions, 3 deletions
diff --git a/debian/apt.dirs b/debian/apt.dirs
index e4bb2c824..6d492a30f 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -15,4 +15,3 @@ var/lib/apt/mirrors/partial
var/lib/apt/periodic
var/log/apt
usr/share/bug/apt
-usr/share/bash-completion/completions/ \ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 1a27dd07e..57fa52f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+apt (1.0.3) unstable; urgency=medium
+
+ [ Michael Vogt ]
+ * reduce delta to ubuntu
+ * provide support for vendor specific config files
+ * debian/apt-doc.docs: remove README.MultiArch
+ * Fix missing ScreenWidth check in apt.cc
+ * Only do openpty() if both stdin/stdout are terminals (Closes: 746434)
+
+ [ David Kalnischkies ]
+ * add a README for vendor information
+ * remove outdated README.MultiArch
+ * build http request in a stringstream
+ * enforce LFS for partial files in https range requests
+ * handle pkgnames shorter than modifiers (Closes: 744940)
+ * allow vendors to install configuration files
+
+ [ John Ogness ]
+ * properly undo CD-ROM mount in all error cases
+
+ [ Mahyuddin Ramli ]
+ * add vendor information for BlankOn (Closes: 743595)
+
+ [ Adam Conrad ]
+ * fix FileFd::Size bitswap on big-endian architectures (Closes: 745866)
+
+ [ Trần Ngọc Quân ]
+ * l10n: vi.po: Update one new string
+
+ -- Michael Vogt <mvo@debian.org> Mon, 05 May 2014 14:03:15 +0200
+
apt (1.0.2) unstable; urgency=medium
[ Michael Vogt ]
diff --git a/debian/rules b/debian/rules
index fc0e9e8f6..f8b392986 100755
--- a/debian/rules
+++ b/debian/rules
@@ -189,8 +189,6 @@ apt: build-binary build-manpages debian/apt.install
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal
chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal
- # install bash completion
- cp share/bash-completions/* debian/$@/usr/share/bash-completion/completions/
# install vendor specific apt confs
find -L vendor/current -name 'apt.conf-*' | while read conf; do cp "$${conf}" "debian/$@/etc/apt/apt.conf.d/$${conf#*-}"; done