* 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

diff --git a/.bzrignore b/.bzrignore
index dab38cf712c8add75bc78d6f19be6d2b5b29417f..6dcdc8eb5a116437be6dc2670e5e8655904d49c3 100644 (file)
--- 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 f699388206ce5304afda6542f08e7cdac7bdbdfa..92981027ed42fc58c0bc57d8e7a9f052b9269ee3 100644 (file)
--- 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 (file)
index 1aa3d68..0000000
--- 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 (file)
index 0000000..745e32c
--- /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 7b49ac26979d0542b094df16dccfe08f4452b12e..220a6160d038c39be014e2f65c761d2d22d1853c 100644 (file)
--- 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)