Browse Source

* 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
debian/1.8.y
David Kalnischkies 10 years ago
parent
commit
04e9cc0814
  1. 1
      .bzrignore
  2. 3
      debian/changelog
  3. 9
      doc/examples/sources.list
  4. 8
      doc/examples/sources.list.in
  5. 3
      doc/makefile

1
.bzrignore

@ -26,4 +26,5 @@ abicheck/tests/
# apt man pages and other documentation
./doc/*/
!./doc/examples/
./doc/examples/sources.list
!./doc/po/

3
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:

9
doc/examples/sources.list

@ -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

8
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

3
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)

Loading…
Cancel
Save