summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-09-03 19:50:43 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-09-03 19:50:43 +0200
commit7a84afe3763988f08ae0beda48e55829a7c9f698 (patch)
treef499f597ad931cf75fa9db37b3420d17300bdc74
parent602790bbaf7ea2599298f4e58e119890b03277cd (diff)
* debian/rules:
- put ubuntu-archive.gpg back into the package (LP: #620576)
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 313c626e8..4ad74b0f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.0ubuntu4) unstable; urgency=low
+
+ * debian/rules:
+ - put ubuntu-archive.gpg back into the package (LP: #620576)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 03 Sep 2010 19:49:54 +0200
+
apt (0.8.0ubuntu3) maverick; urgency=low
* merged fixes from the debian-sid bzr branch:
diff --git a/debian/rules b/debian/rules
index 8bfcaf385..f6ffabd1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -214,7 +214,7 @@ apt: build build-doc debian/shlibs.local
cp debian/bugscript debian/$@/usr/share/bug/apt/script
cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
-
+ cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
# copy lintian override