Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Change the default for NORECOMMENDS to 1 for consistency with 

NOSUGGESTS. Closes: #598196
* Documentation patches
This commit is contained in:
Steve McIntyre 2010-09-29 13:13:04 +00:00
parent 9210fca346
commit f3928178e9
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CONF.sh
View File

@ -181,8 +181,8 @@ export ISOLINUX=1
# them too # them too
export MAX_PKG_SIZE=600000000 export MAX_PKG_SIZE=600000000
# uncoment this to make build_all.sh try to build a simple CD image if # Should build_all.sh try to build a simple CD image if the proper official
# the proper official CD run does not work # CD run does not work?
ATTEMPT_FALLBACK=yes ATTEMPT_FALLBACK=yes
# Set your disk type here. Known types are: # Set your disk type here. Known types are:
@ -205,7 +205,7 @@ export DISKTYPE=CD
export TASK_LANGLIST=tasksel_d-i.languages export TASK_LANGLIST=tasksel_d-i.languages
# Extra variants to enable. See docs/README.variants for more information. # Extra variants to enable. See docs/README.variants for more information.
# export VARIANTS= export VARIANTS=
# We don't want certain packages to take up space on CD1... # We don't want certain packages to take up space on CD1...
#export EXCLUDE1=exclude #export EXCLUDE1=exclude
@ -216,12 +216,12 @@ export TASK_LANGLIST=tasksel_d-i.languages
# excluded completely. The same goes for packages listed in EXCLUDE. # excluded completely. The same goes for packages listed in EXCLUDE.
# Set this if the recommended packages should be skipped when adding # Set this if the recommended packages should be skipped when adding
# package on the CD. The default is 'false'. # package on the CD. The default is 'true'.
export NORECOMMENDS=1 # export NORECOMMENDS=1
# Set this if the suggested packages should be skipped when adding # Set this if the suggested packages should be skipped when adding
# package on the CD. The default is 'true'. # package on the CD. The default is 'true'.
#export NOSUGGESTS=1 # export NOSUGGESTS=1
# Set to 1 to generate MD5/SHA1/SHA256/SHA512 sums for generated images # Set to 1 to generate MD5/SHA1/SHA256/SHA512 sums for generated images
export IMAGESUMS=1 export IMAGESUMS=1
@ -357,14 +357,14 @@ done
# If so we will link to them on the web site. # If so we will link to them on the web site.
export OMIT_RELEASE_NOTES=1 export OMIT_RELEASE_NOTES=1
# Set this to override the default location
#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"
# Set to 1 to not include the doc/tools directories on CD1 # Set to 1 to not include the doc/tools directories on CD1
# Useful to save space and avoids failures if you have a mirror # Useful to save space and avoids failures if you have a mirror
# without those directories. # without those directories.
#export OMIT_DOC_TOOLS=1 #export OMIT_DOC_TOOLS=1
# Set this to override the default location
#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"
case "$OFFICIAL" in case "$OFFICIAL" in
"Official") "Official")
export OFFICIAL_VAL=2 export OFFICIAL_VAL=2

16
debian/CONF.sh vendored
View File

@ -181,8 +181,8 @@ export ISOLINUX=1
# them too # them too
export MAX_PKG_SIZE=600000000 export MAX_PKG_SIZE=600000000
# uncoment this to make build_all.sh try to build a simple CD image if # Should build_all.sh try to build a simple CD image if the proper official
# the proper official CD run does not work # CD run does not work?
ATTEMPT_FALLBACK=yes ATTEMPT_FALLBACK=yes
# Set your disk type here. Known types are: # Set your disk type here. Known types are:
@ -216,12 +216,12 @@ export VARIANTS=
# excluded completely. The same goes for packages listed in EXCLUDE. # excluded completely. The same goes for packages listed in EXCLUDE.
# Set this if the recommended packages should be skipped when adding # Set this if the recommended packages should be skipped when adding
# package on the CD. The default is 'false'. # package on the CD. The default is 'true'.
export NORECOMMENDS=1 # export NORECOMMENDS=1
# Set this if the suggested packages should be skipped when adding # Set this if the suggested packages should be skipped when adding
# package on the CD. The default is 'true'. # package on the CD. The default is 'true'.
#export NOSUGGESTS=1 # export NOSUGGESTS=1
# Set to 1 to generate MD5/SHA1/SHA256/SHA512 sums for generated images # Set to 1 to generate MD5/SHA1/SHA256/SHA512 sums for generated images
export IMAGESUMS=1 export IMAGESUMS=1
@ -357,14 +357,14 @@ done
# If so we will link to them on the web site. # If so we will link to them on the web site.
export OMIT_RELEASE_NOTES=1 export OMIT_RELEASE_NOTES=1
# Set this to override the default location
#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"
# Set to 1 to not include the doc/tools directories on CD1 # Set to 1 to not include the doc/tools directories on CD1
# Useful to save space and avoids failures if you have a mirror # Useful to save space and avoids failures if you have a mirror
# without those directories. # without those directories.
#export OMIT_DOC_TOOLS=1 #export OMIT_DOC_TOOLS=1
# Set this to override the default location
#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"
case "$OFFICIAL" in case "$OFFICIAL" in
"Official") "Official")
export OFFICIAL_VAL=2 export OFFICIAL_VAL=2

3
debian/changelog vendored
View File

@ -18,6 +18,9 @@ debian-cd (3.1.4) unstable; urgency=low
* Minor tweaks to Debian packaging to make lintian happy. * Minor tweaks to Debian packaging to make lintian happy.
Closes: #592932 Closes: #592932
* Minor whitespace/wording fixes for the README file. Closes: #592933 * Minor whitespace/wording fixes for the README file. Closes: #592933
* Change the default for NORECOMMENDS to 1 for consistency with
NOSUGGESTS. Closes: #598196
* Documentation patches
[ Steve McIntyre ] [ Steve McIntyre ]
* Rename log.add_packages to add_packages.log * Rename log.add_packages to add_packages.log

2
tools/sort_deps
View File

@ -21,7 +21,7 @@ my $extranonfree = $ENV{'EXTRANONFREE'} || 0;
my $force_firmware = $ENV{'FORCE_FIRMWARE'} || 0; my $force_firmware = $ENV{'FORCE_FIRMWARE'} || 0;
my $local = $ENV{'LOCAL'} || 0; my $local = $ENV{'LOCAL'} || 0;
my $complete = $ENV{'COMPLETE'} || 0; my $complete = $ENV{'COMPLETE'} || 0;
my $norecommends = $ENV{'NORECOMMENDS'} || 0; my $norecommends = $ENV{'NORECOMMENDS'} || 1;
my $nosuggests = $ENV{'NOSUGGESTS'} || 1; my $nosuggests = $ENV{'NOSUGGESTS'} || 1;
my $apt = "$ENV{'BASEDIR'}/tools/apt-selection"; my $apt = "$ENV{'BASEDIR'}/tools/apt-selection";