Package: apt Version: 0.9.14.1 Severity: wishlist Tags: patch
While updating the apt package in raspbian I noticed that the keyring related settings that we have to change have now moved into a new vendor system. So I added an entry for raspbian by copying the debian one and changing the keyring and example sources.list settings.
I notice that you include settings for both debian and ubuntu in the debian source package. Please consider also including the settings for raspbian so we don't have to manually alter the source package every time a new version enters debian.
Debdiff of the most recent upload to raspbian is attatched, no intent to nmu.
diff -Nru apt-0.9.14.1/debian/changelog apt-0.9.14.1+rpi1/debian/changelog --- apt-0.9.14.1/debian/changelog 2013-12-12 17:36:44.000000000 +0000 +++ apt-0.9.14.1+rpi1/debian/changelog 2013-12-20 23:02:16.000000000 +0000 @@ -1,3 +1,9 @@ +apt (0.9.14.1+rpi1) jessie-staging; urgency=low + + * Include vendor information for raspbian. + + -- Peter Michael Green <plugw...@p10link.net> Fri, 20 Dec 2013 22:51:48 +0000 + apt (0.9.14.1) unstable; urgency=medium * fix apt-get source -t dist regression (closes: #731853) diff -Nru apt-0.9.14.1/vendor/raspbian/apt-vendor.ent apt-0.9.14.1+rpi1/vendor/raspbian/apt-vendor.ent --- apt-0.9.14.1/vendor/raspbian/apt-vendor.ent 1970-01-01 00:00:00.000000000 +0000 +++ apt-0.9.14.1+rpi1/vendor/raspbian/apt-vendor.ent 2013-12-20 22:59:28.000000000 +0000 @@ -0,0 +1,7 @@ +<!-- details about the keys used by the distribution --> +<!ENTITY keyring-distro "Raspbian"> +<!ENTITY keyring-package "<package>raspbian-archive-keyring</package>"> +<!ENTITY keyring-filename "<filename>/usr/share/keyrings/raspbian-archive-keyring.gpg</filename>"> +<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/raspbian-archive-removed-keys.gpg</filename>"> +<!ENTITY keyring-master-filename ""> +<!ENTITY keyring-uri ""> diff -Nru apt-0.9.14.1/vendor/raspbian/makefile apt-0.9.14.1+rpi1/vendor/raspbian/makefile --- apt-0.9.14.1/vendor/raspbian/makefile 1970-01-01 00:00:00.000000000 +0000 +++ apt-0.9.14.1+rpi1/vendor/raspbian/makefile 2013-12-20 23:35:44.000000000 +0000 @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/raspbian + +# Bring in the default rules +include ../../buildlib/defaults.mak + +doc binary manpages: sources.list + +sources.list: sources.list.in ../../doc/apt-verbatim.ent + sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ diff -Nru apt-0.9.14.1/vendor/raspbian/sources.list.in apt-0.9.14.1+rpi1/vendor/raspbian/sources.list.in --- apt-0.9.14.1/vendor/raspbian/sources.list.in 1970-01-01 00:00:00.000000000 +0000 +++ apt-0.9.14.1+rpi1/vendor/raspbian/sources.list.in 2013-12-20 23:01:09.000000000 +0000 @@ -0,0 +1,6 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://mirrordirector.raspbian.org/raspbian &stable-codename; main contrib non-free + +# Uncomment if you want the apt-get source function to work +#deb-src http://mirrordirector.raspbian.org/raspbian &stable-codename; main contrib non-free