From ced53a741a3a11da53920ee0bb86adb4e3a7c931 Mon Sep 17 00:00:00 2001 From: Mahyuddin Ramli Date: Tue, 22 Apr 2014 17:32:37 +0200 Subject: add vendor information for BlankOn Modified by commiter to not publicily export the codename (as the manpages do not use it that way) and removing the included additional derives logic as it was not working (the link always exists at that point) and isn't needed as we do the special casing for debian mainly because it would shallow all distributions otherwise. (similar, but not that strong for ubuntu) Closes: 743595 --- vendor/blankon/apt-vendor.ent | 8 ++++++++ vendor/blankon/sources.list.in | 10 ++++++++++ 2 files changed, 18 insertions(+) create mode 100644 vendor/blankon/apt-vendor.ent create mode 100644 vendor/blankon/sources.list.in (limited to 'vendor') diff --git a/vendor/blankon/apt-vendor.ent b/vendor/blankon/apt-vendor.ent new file mode 100644 index 000000000..2600eb715 --- /dev/null +++ b/vendor/blankon/apt-vendor.ent @@ -0,0 +1,8 @@ + + +blankon-keyring"> +/usr/share/keyrings/blankon-archive-keyring.gpg"> +/usr/share/keyrings/blankon-archive-removed-keys.gpg"> + + + diff --git a/vendor/blankon/sources.list.in b/vendor/blankon/sources.list.in new file mode 100644 index 000000000..2322e974d --- /dev/null +++ b/vendor/blankon/sources.list.in @@ -0,0 +1,10 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://arsip.blankonlinux.or.id/blankon ¤t-codename; main restricted +deb-src http://arsip.blankonlinux.or.id/blankon ¤t-codename; main restricted + +deb http://arsip.blankonlinux.or.id/blankon ¤t-codename;-security main restricted +deb-src http://arsip.blankonlinux.or.id/blankon ¤t-codename;-security main restricted + +deb http://arsip.blankonlinux.or.id/blankon ¤t-codename;-updates main restricted +deb-src http://arsip.blankonlinux.or.id/blankon ¤t-codename;-updates main restricted -- cgit v1.2.3 From feb81787827d973366ae20edcbce4bf5fccdebfd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 22 Apr 2014 18:59:22 +0200 Subject: add a README for vendor information --- vendor/README | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 vendor/README (limited to 'vendor') diff --git a/vendor/README b/vendor/README new file mode 100644 index 000000000..19cda6236 --- /dev/null +++ b/vendor/README @@ -0,0 +1,60 @@ +The vendor system in APT is an experiment to help distributions ship a stock +apt release instead of applying documentation patches to it, increasing +maintenance burden for everyone and hiding 'interesting' patches in the mix. + +The provided information is used in the apt-key script and in documentation +like manpages and example configuration files. If you have patches modifying +additional bits and pieces currently not covered by this system please +contact us so we can change this! + + +== Adding a new vendor + +In the same directory you found this README in you should create a new +directory with the name of your distribution (as defined by dpkg-vendor, + e.g. via "dpkg-vendor --query Vendor"). The name is case-insensitive, +but ensure that the name is otherwise correct and the other fields in +your deb-origin(5) file are correct as well as our buildsystem relies on +this information. + +If no information is found for the current vendor at buildtime, the system +looks for a vendor the current vendor is a derivative of, falling back to +Debian if all else fails. + +The directory should include 2 files at the moment. It is best to look +at the files of other distributions to understand what values are to be +expected. Some additional notes about them can be found below. + +If we happen to include new fields/files in this system, we will opt for +using a sensible default rather than failing the build or similar, so +you are recommend to watch this space. +Ensure also that your information is up-to-date! + +Contributing a new vendor as well as updating a existing one is best done +by opening a bug in the Debian BTS against apt with a patch attached. + + +== apt-vendor.ent + +The format used is the one DocBook XML uses. The file is included as an +entity file in the manpages xml source, so the syntax has to be valid! + +The keyring-* settings are additionally used also in the creation of the +apt-key script and the keyring-package in particular as a dependency for apt. + +The field current-codename is optional and can be used in sources.list.in. + + +== sources.list.in + +An example for a sources.list which will be shipped in /usr/share/doc. +This file will NOT be installed in /etc or otherwise used by apt. + +You can use some placeholders in this file, namely: +* &debian-stable-codename; +* &debian-oldstable-codename; +* &debian-testing-codename; +* &ubuntu-codename; +with the value you would expect based on the name. + +The placeholder ¤t-codename; is yours and can be set in apt-vendor.ent -- cgit v1.2.3 From c1b3d18934ce35f6a82b05207f53bf9b0cbfb961 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Apr 2014 13:31:41 +0200 Subject: allow vendors to install configuration files Vendors like ubuntu need to change some options, so giving them a way to do this less painfully avoids reducing differences. --- vendor/README | 6 ++++++ vendor/ubuntu/apt.conf-01-vendor-ubuntu | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 vendor/ubuntu/apt.conf-01-vendor-ubuntu (limited to 'vendor') diff --git a/vendor/README b/vendor/README index 19cda6236..c2fabbd4c 100644 --- a/vendor/README +++ b/vendor/README @@ -58,3 +58,9 @@ You can use some placeholders in this file, namely: with the value you would expect based on the name. The placeholder ¤t-codename; is yours and can be set in apt-vendor.ent + + +== apt.conf-* + +Files in your vendor directory following this naming scheme will be picked up +by the debian/rules file and installed in /etc/apt/apt.conf.d/ directory. diff --git a/vendor/ubuntu/apt.conf-01-vendor-ubuntu b/vendor/ubuntu/apt.conf-01-vendor-ubuntu new file mode 100644 index 000000000..c4092ff44 --- /dev/null +++ b/vendor/ubuntu/apt.conf-01-vendor-ubuntu @@ -0,0 +1,6 @@ +// Server information for apt-changelog +APT { + Changelogs { + Server "http://changelogs.ubuntu.com/changelogs"; + }; +}; -- cgit v1.2.3