diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/examples/sources.list | 9 | ||||
| -rw-r--r-- | doc/examples/sources.list.in | 8 | ||||
| -rw-r--r-- | doc/makefile | 3 |
5 files changed, 15 insertions, 9 deletions
diff --git a/.bzrignore b/.bzrignore index dab38cf71..6dcdc8eb5 100644 --- a/.bzrignore +++ b/.bzrignore @@ -26,4 +26,5 @@ abicheck/tests/ # apt man pages and other documentation ./doc/*/ !./doc/examples/ +./doc/examples/sources.list !./doc/po/ diff --git a/debian/changelog b/debian/changelog index f69938820..92981027e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ apt (0.9.5.2) UNRELEASED; urgency=low * doc/apt-verbatim.ent: - APT doesn't belong to the product 'Linux', so use 'APT' instead as after all APT is a big suite of applications + * doc/examples/sources.list: + - use the codename instead of 'stable' in the examples sources.list + as we do in the manpage and as the debian-installer does [ Justin B Rye ] * doc/apt-cdrom.8.xml: diff --git a/doc/examples/sources.list b/doc/examples/sources.list deleted file mode 100644 index 1aa3d6865..000000000 --- a/doc/examples/sources.list +++ /dev/null @@ -1,9 +0,0 @@ -# See sources.list(5) for more information, especialy -# Remember that you can only use http, ftp or file URIs -# CD-ROMs are managed through the apt-cdrom tool. -deb http://http.us.debian.org/debian stable main contrib non-free -deb http://security.debian.org stable/updates main contrib non-free - -# Uncomment if you want the apt-get source function to work -#deb-src http://http.us.debian.org/debian stable main contrib non-free -#deb-src http://security.debian.org stable/updates main contrib non-free diff --git a/doc/examples/sources.list.in b/doc/examples/sources.list.in new file mode 100644 index 000000000..745e32cbe --- /dev/null +++ b/doc/examples/sources.list.in @@ -0,0 +1,8 @@ +# 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 7b49ac269..220a6160d 100644 --- a/doc/makefile +++ b/doc/makefile @@ -56,6 +56,9 @@ endif SOURCE = apt.8 include $(MANPAGE_H) +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 SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf TO = $(DOC) |