Add CONTRIB flag to debian/CONF.sh.

This commit is contained in:
Petter Reinholdtsen 2002-12-14 13:45:27 +00:00
parent 07fcb55774
commit 74f127219d
2 changed files with 7 additions and 2 deletions

4
debian/CONF.sh vendored
View File

@ -2,6 +2,7 @@
unset NONUS || true unset NONUS || true
unset FORCENONUSONCD1 || true unset FORCENONUSONCD1 || true
unset NONFREE || true unset NONFREE || true
unset CONTRIB || true
unset EXTRANONFREE || true unset EXTRANONFREE || true
unset LOCAL || true unset LOCAL || true
unset LOCALDEBS || true unset LOCALDEBS || true
@ -76,6 +77,9 @@ export APTTMP=/home/ftp/tmp/apt
# Do I want to have NONFREE merged in the CD set # Do I want to have NONFREE merged in the CD set
# export NONFREE=1 # export NONFREE=1
# Do I want to have CONTRIB merged in the CD set
export CONTRIB=1
# Do I want to have NONFREE on a separate CD (the last CD of the CD set) # Do I want to have NONFREE on a separate CD (the last CD of the CD set)
# WARNING: Don't use NONFREE and EXTRANONFREE at the same time ! # WARNING: Don't use NONFREE and EXTRANONFREE at the same time !
# export EXTRANONFREE=1 # export EXTRANONFREE=1

5
debian/changelog vendored
View File

@ -1,6 +1,5 @@
debian-cd (2.2.16) unstable; urgency=low debian-cd (2.2.16) UNRELEASED; urgency=low
* UNRELEASED
* Updated standards-version to 3.5.7. * Updated standards-version to 3.5.7.
* Use debhelper 4 (build-depends on it, updated DH_COMPAT). * Use debhelper 4 (build-depends on it, updated DH_COMPAT).
* WARNING: potato is now mostly unsupported, some cruft has been * WARNING: potato is now mostly unsupported, some cruft has been
@ -13,6 +12,8 @@ debian-cd (2.2.16) unstable; urgency=low
* Updated isolinux.bin from syslinux 1.75-1. * Updated isolinux.bin from syslinux 1.75-1.
* Make it possible to exclude contrib from the CDs. Useful if you only * Make it possible to exclude contrib from the CDs. Useful if you only
have a mirror of main. have a mirror of main.
* Petter Reinholdtsen:
- Add CONTRIB flag to debian/CONF.sh.
-- Tollef Fog Heen <tfheen@debian.org> Sat, 7 Dec 2002 10:58:53 +0100 -- Tollef Fog Heen <tfheen@debian.org> Sat, 7 Dec 2002 10:58:53 +0100