summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2013-11-30 14:01:28 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2013-11-30 22:15:31 +0100
commiteef71f11a5836eb82df133cb4e24cb4806642188 (patch)
treee58a2b15c0ae4df9f0f23fdf7f8a2ebb15ffc7b3 /doc
parenta40310a5e60d880ce1bd82f0513c5d6658bb48ef (diff)
downloadapt-eef71f11a5836eb82df133cb4e24cb4806642188.tar.gz
introduce a vendor system to change sources.list
Many derivatives make quiet a few simple changes to apt introducing silly diffs just to change examples and co making it harder for them to update apt and harder for us to merge real changes back. First stop: doc/examples/sources.list
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-verbatim.ent4
-rw-r--r--doc/examples/sources.list.in8
-rw-r--r--doc/makefile12
3 files changed, 10 insertions, 14 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 0d0d95c7a..30b0c7fe0 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -221,11 +221,11 @@
<!-- this will be updated by 'prepare-release' -->
<!ENTITY apt-product-version "0.9.7.6ubuntu2">
-<!-- Codenames for debian releases -->
+<!-- (Code)names for various things used all over the place -->
<!ENTITY oldstable-codename "squeeze">
<!ENTITY stable-codename "wheezy">
<!ENTITY testing-codename "jessie">
-<!ENTITY stable-version "7.0">
+<!ENTITY stable-version "7">
<!ENTITY ubuntu-codename "precise">
<!-- good and bad just refers to matching and not matching a pattern…
diff --git a/doc/examples/sources.list.in b/doc/examples/sources.list.in
deleted file mode 100644
index 745e32cbe..000000000
--- a/doc/examples/sources.list.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# See sources.list(5) manpage for more information
-# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
-deb http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
-deb http://security.debian.org &stable-codename;/updates main contrib non-free
-
-# Uncomment if you want the apt-get source function to work
-#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
-#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free
diff --git a/doc/makefile b/doc/makefile
index 274fbc278..ebaca908f 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -12,8 +12,9 @@ include $(DEBIANDOC_H)
doc: manpages debiandoc
-examples/sources.list: examples/sources.list.in apt-verbatim.ent
- sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
+examples/sources.list: ../vendor/current/sources.list
+ ln -sf $(shell readlink -f $^) $@
+
# Examples
SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
@@ -23,8 +24,8 @@ include $(COPY_H)
.PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs debiandoc/subdirs all binary doc stats
-clean: clean/subdirs
-veryclean: veryclean/subdirs
+clean: clean/subdirs clean/examples
+veryclean: veryclean/subdirs clean/examples
manpages: manpages/subdirs
debiandoc: debiandoc/subdirs
@@ -41,6 +42,9 @@ debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs:
$(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \
done
+clean/examples:
+ rm -f examples/sources.list
+
stats:
for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done