Browse Source

merged lp:~jackyf-devel/apt/debian-sid

debian/1.8.y
Michael Vogt 14 years ago
parent
commit
91ee48ae18
  1. 679
      buildlib/config.guess
  2. 262
      buildlib/config.sub
  3. 2
      debian/apt-transport-https.README
  4. 39
      debian/changelog
  5. 2
      debian/rules
  6. 386
      doc/apt.conf.5.xml

679
buildlib/config.guess

File diff suppressed because it is too large

262
buildlib/config.sub

@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
timestamp='2003-10-07'
timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@ -21,14 +22,15 @@ timestamp='2003-10-07'
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
@ -70,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
Free Software Foundation, Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -83,11 +85,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
echo "$timestamp" ; exit 0 ;;
echo "$timestamp" ; exit ;;
--version | -v )
echo "$version" ; exit 0 ;;
echo "$version" ; exit ;;
--help | --h* | -h )
echo "$usage"; exit 0 ;;
echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@ -99,7 +101,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
echo $1
exit 0;;
exit ;;
* )
break ;;
@ -118,7 +120,9 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@ -144,7 +148,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-apple | -axis)
-apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@ -169,6 +173,10 @@ case $os in
-hiux*)
os=-hiuxwe2
;;
-sco6)
os=-sco5v6
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@ -185,6 +193,10 @@ case $os in
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@ -229,14 +241,16 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32r | m68000 | m68k | m88k | mcore \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@ -245,6 +259,7 @@ case $basic_machine in
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
@ -253,20 +268,24 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| mt \
| msp430 \
| nios | nios2 \
| ns16k | ns32k \
| openrisc | or32 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
| strongarm \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
| x86 | xscale | xstormy16 | xtensa \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@ -277,6 +296,9 @@ case $basic_machine in
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
ms1)
basic_machine=mt-unknown
;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@ -296,20 +318,20 @@ case $basic_machine in
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
| bs2000-* \
| avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | cydra-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
| m32r-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@ -318,6 +340,7 @@ case $basic_machine in
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
@ -325,27 +348,35 @@ case $basic_machine in
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
| xtensa-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
# Recognize the basic CPU types without company name, with glob match.
xtensa*)
basic_machine=$basic_machine-unknown
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@ -362,6 +393,9 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
abacus)
basic_machine=abacus-unknown
;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@ -379,6 +413,9 @@ case $basic_machine in
amd64)
basic_machine=x86_64-pc
;;
amd64-*)
basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@ -410,6 +447,14 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
blackfin)
basic_machine=bfin-unknown
os=-linux
;;
blackfin-*)
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
c90)
basic_machine=c90-cray
os=-unicos
@ -438,12 +483,27 @@ case $basic_machine in
basic_machine=j90-cray
os=-unicos
;;
craynv)
basic_machine=craynv-cray
os=-unicosmp
;;
cr16)
basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
basic_machine=m68k-crds
;;
crisv32 | crisv32-* | etraxfs*)
basic_machine=crisv32-axis
;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
crx)
basic_machine=crx-unknown
os=-elf
;;
da30 | da30-*)
basic_machine=m68k-da30
;;
@ -466,6 +526,10 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@ -616,6 +680,14 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
m88k-omron*)
basic_machine=m88k-omron
;;
@ -631,6 +703,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
mingw32ce)
basic_machine=arm-unknown
os=-mingw32ce
;;
miniframe)
basic_machine=m68000-convergent
;;
@ -644,10 +720,6 @@ case $basic_machine in
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
mmix*)
basic_machine=mmix-knuth
os=-mmixware
;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@ -660,6 +732,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-msdos
;;
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
mvs)
basic_machine=i370-ibm
os=-mvs
@ -728,10 +803,6 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
nv1)
basic_machine=nv1-cray
os=-unicosmp
;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@ -739,9 +810,12 @@ case $basic_machine in
basic_machine=hppa1.1-oki
os=-proelf
;;
or32 | or32-*)
openrisc | openrisc-*)
basic_machine=or32-unknown
os=-coff
;;
os400)
basic_machine=powerpc-ibm
os=-os400
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
@ -759,6 +833,14 @@ case $basic_machine in
basic_machine=i860-intel
os=-osf
;;
parisc)
basic_machine=hppa-unknown
os=-linux
;;
parisc-*)
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
pbd)
basic_machine=sparc-tti
;;
@ -768,6 +850,12 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
pc98)
basic_machine=i386-pc
;;
pc98-*)
basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@ -824,6 +912,10 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
rdos)
basic_machine=i386-pc
os=-rdos
;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@ -850,6 +942,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
sde)
basic_machine=mipsisa32-sde
os=-elf
;;
sei)
basic_machine=mips-sei
os=-seiux
@ -861,6 +957,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
sh5el)
basic_machine=sh5le-unknown
;;
sh64)
basic_machine=sh64-unknown
;;
@ -950,6 +1049,10 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
tile*)
basic_machine=tile-unknown
os=-linux-gnu
;;
tx39)
basic_machine=mipstx39-unknown
;;
@ -963,6 +1066,10 @@ case $basic_machine in
tower | tower-32)
basic_machine=m68k-ncr
;;
tpf)
basic_machine=s390x-ibm
os=-tpf
;;
udi29k)
basic_machine=a29k-amd
os=-udi
@ -1006,6 +1113,10 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
xbox)
basic_machine=i686-pc
os=-mingw32
;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@ -1036,6 +1147,9 @@ case $basic_machine in
romp)
basic_machine=romp-ibm
;;
mmix)
basic_machine=mmix-knuth
;;
rs6000)
basic_machine=rs6000-ibm
;;
@ -1052,13 +1166,10 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sh64)
basic_machine=sh64-unknown
;;
sparc | sparcv9 | sparcv9b)
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@ -1131,19 +1242,23 @@ case $os in
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@ -1161,7 +1276,7 @@ case $os in
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
@ -1182,6 +1297,9 @@ case $os in
-opened*)
os=-openedition
;;
-os400*)
os=-os400
;;
-wince*)
os=-wince
;;
@ -1203,6 +1321,9 @@ case $os in
-atheos*)
os=-atheos
;;
-syllable*)
os=-syllable
;;
-386bsd)
os=-bsd
;;
@ -1225,6 +1346,9 @@ case $os in
-sinix*)
os=-sysv4
;;
-tpf*)
os=-tpf
;;
-triton*)
os=-sysv3
;;
@ -1261,6 +1385,9 @@ case $os in
-kaos*)
os=-kaos
;;
-zvmoe)
os=-zvmoe
;;
-none)
;;
*)
@ -1283,6 +1410,12 @@ else
# system, and we'll never get to this point.
case $basic_machine in
score-*)
os=-elf
;;
spu-*)
os=-elf
;;
*-acorn)
os=-riscix1.2
;;
@ -1292,9 +1425,9 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
c4x-* | tic4x-*)
os=-coff
;;
c4x-* | tic4x-*)
os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@ -1320,6 +1453,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
mep-*)
os=-elf
;;
mips*-cisco)
os=-elf
;;
@ -1338,9 +1474,15 @@ case $basic_machine in
*-be)
os=-beos
;;
*-haiku)
os=-haiku
;;
*-ibm)
os=-aix
;;
*-knuth)
os=-mmixware
;;
*-wec)
os=-proelf
;;
@ -1473,9 +1615,15 @@ case $basic_machine in
-mvs* | -opened*)
vendor=ibm
;;
-os400*)
vendor=ibm
;;
-ptx*)
vendor=sequent
;;
-tpf*)
vendor=ibm
;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
@ -1500,7 +1648,7 @@ case $basic_machine in
esac
echo $basic_machine$os
exit 0
exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)

2
debian/apt-transport-https.README

@ -0,0 +1,2 @@
See APT::https group of options in apt.conf(5) to configure how APT will handle
https:// URIs.

39
debian/changelog

@ -1,3 +1,20 @@
apt (0.7.20) unstable; urgency=low
[ Eugene V. Lyubimkin ]
* debian/changelog:
- Fixed place of 'merged install-recommends and install-task branches'
from 0.6.46.1 to 0.7.0. (Closes: #439866)
* buildlib/config.{sub,guess}:
- Renewed. This fixes lintian errors.
* doc/apt.conf.5.xml, debian/apt-transport-https:
- Documented briefly 'APT::https' group of options. (Closes: #507398)
- Applied patch from Daniel Burrows to document 'Debug' group of options.
(Closes: #457265)
- Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
(Closes: #438559)
-- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sat, 06 Dec 2008 20:57:00 +0200
apt (0.7.20~exp3) unstable; urgency=low
[ Michael Vogt ]
@ -6,6 +23,8 @@ apt (0.7.20~exp3) unstable; urgency=low
APT::Get::Build-Dep-Automatic to false (thanks to Aaron
Haviland, closes: #44874, LP: #248268)
apt (0.7.20~exp2) unstable; urgency=low
[ Eugene V. Lyubimkin ]
* doc/examples/sources.list:
- Removed obsolete commented non-us deb-src entry, replaced it with
@ -873,6 +892,16 @@ apt (0.7.0) experimental; urgency=low
* support for unattended-upgrades (via unattended-upgrades
package)
* added apt-transport-https method
* merged "install-recommends" branch (ABI break):
- new "--install-recommends"
- install new recommends on "upgrade" if --install-recommends is
given
- new "--fix-policy" option to install all packages with unmet
important dependencies (usefull with --install-recommends to
see what not-installed recommends are on the system)
- fix of recommended packages display (only show CandidateVersion
fix or-group handling)
* merged "install-task" branch (use with "apt-get install taskname^")
-- Michael Vogt <mvo@debian.org> Fri, 12 Jan 2007 20:48:07 +0100
@ -963,16 +992,6 @@ apt (0.6.46.2) unstable; urgency=low
apt (0.6.46.1) unstable; urgency=low
* merged "install-recommends" branch (ABI break):
- new "--install-recommends"
- install new recommends on "upgrade" if --install-recommends is
given
- new "--fix-policy" option to install all packages with unmet
important dependencies (usefull with --install-recommends to
see what not-installed recommends are on the system)
- fix of recommended packages display (only show CandidateVersion
fix or-group handling)
* merged "install-task" branch (use with "apt-get install taskname^")
* methods/gzip.cc:
- deal with empty files
* Applied patch from Daniel Schepler to make apt bin-NMU able.

2
debian/rules

@ -307,7 +307,7 @@ apt-transport-https: build debian/shlibs.local libapt-pkg-dev
mkdir -p debian/$@/usr/lib/apt/methods
cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods
dh_installdocs -p$@
dh_installdocs -p$@ debian/apt-transport-https.README
dh_installexamples -p$@
# Install the man pages..

386
doc/apt.conf.5.xml

@ -12,10 +12,16 @@
<refentryinfo>
&apt-author.jgunthorpe;
&apt-author.team;
<author>
<firstname>Daniel</firstname>
<surname>Burrows</surname>
<contrib>Initial documentation of Debug::*.</contrib>
<email>dburrows@debian.org</email>
</author>
&apt-email;
&apt-product;
<!-- The last update date -->
<date>29 February 2004</date>
<date>06 December 2008</date>
</refentryinfo>
<refmeta>
@ -220,6 +226,29 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
require this are in violation of RFC 2068.</para></listitem>
</varlistentry>
<varlistentry><term>https</term>
<listitem><para>HTTPS URIs. Cache-control and proxy options are the same as for
<literal>http</literal> method.
<literal>Pipeline-Depth</literal> option is not supported yet.</para>
<para><literal>CaInfo</literal> suboption specifies place of file that
holds info about trusted certificates.
<literal>&lt;host&gt;::CaInfo</literal> is corresponding per-host option.
<literal>Verify-Peer</literal> boolean suboption determines whether verify
server's host certificate against trusted certificates or not.
<literal>&lt;host&gt;::Verify-Peer</literal> is corresponding per-host option.
<literal>Verify-Host</literal> boolean suboption determines whether verify
server's hostname or not.
<literal>&lt;host&gt;::Verify-Host</literal> is corresponding per-host option.
<literal>SslCert</literal> determines what certificate to use for client
authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding per-host option.
<literal>SslKey</literal> determines what private key to use for client
authentication. <literal>&lt;host&gt;::SslKey</literal> is corresponding per-host option.
<literal>SslForceVersion</literal> overrides default SSL version to use.
Can contain 'TLSv1' or 'SSLv3' string.
<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host option.
</para></listitem></varlistentry>
<varlistentry><term>ftp</term>
<listitem><para>FTP URIs; ftp::Proxy is the default proxy server to use. It is in the
standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and is
@ -400,16 +429,353 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
</variablelist>
</refsect1>
<refsect1><title>Debug options</title>
<para>Most of the options in the <literal>debug</literal> section are not interesting to
the normal user, however <literal>Debug::pkgProblemResolver</literal> shows
interesting output about the decisions dist-upgrade makes.
<literal>Debug::NoLocking</literal> disables file locking so APT can do some
operations as non-root and <literal>Debug::pkgDPkgPM</literal> will print out the
command line for each dpkg invokation. <literal>Debug::IdentCdrom</literal> will
disable the inclusion of statfs data in CDROM IDs.
<literal>Debug::Acquire::gpgv</literal> Debugging of the gpgv method.
<refsect1>
<title>Periodic and Archives options</title>
<para><literal>APT::Periodic</literal> and <literal>APT::Archives</literal>
groups of options configure behavior of apt periodic updates, which is
done by <literal>/etc/cron.daily/apt</literal> script. See header of
this script for the brief documentation of these options.
</para>
</refsect1>
<refsect1>
<title>Debug options</title>
<para>
Enabling options in the <literal>Debug::</literal> section will
cause debugging information to be sent to the standard error
stream of the program utilizing the <literal>apt</literal>
libraries, or enable special program modes that are primarily
useful for debugging the behavior of <literal>apt</literal>.
Most of these options are not interesting to a normal user, but a
few may be:
<itemizedlist>
<listitem>
<para>
<literal>Debug::pkgProblemResolver</literal> enables output
about the decisions made by
<literal>dist-upgrade, upgrade, install, remove, purge</literal>.
</para>
</listitem>
<listitem>
<para>
<literal>Debug::NoLocking</literal> disables all file
locking. This can be used to run some operations (for
instance, <literal>apt-get -s install</literal>) as a
non-root user.
</para>
</listitem>
<listitem>
<para>
<literal>Debug::pkgDPkgPM</literal> prints out the actual
command line each time that <literal>apt</literal> invokes
&dpkg;.
</para>
</listitem>
<listitem>
<para>
<literal>Debug::IdentCdrom</literal> disables the inclusion
of statfs data in CDROM IDs. <!-- TODO: provide a
motivating example, except I haven't a clue why you'd want
to do this. -->
</para>
</listitem>
</itemizedlist>
</para>
<para>
A full list of debugging options to apt follows.
</para>
<variablelist>
<varlistentry>
<term><literal>Debug::Acquire::cdrom</literal></term>
<listitem>
<para>
Print information related to accessing
<literal>cdrom://</literal> sources.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::Acquire::ftp</literal></term>
<listitem>
<para>
Print information related to downloading packages using
FTP.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::Acquire::http</literal></term>
<listitem>
<para>
Print information related to downloading packages using
HTTP.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::Acquire::https</literal></term>
<listitem>
<para>
Print information related to downloading packages using
HTTPS.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::Acquire::gpgv</literal></term>
<listitem>
<para>
Print information related to verifying cryptographic
signatures using <literal>gpg</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::aptcdrom</literal></term>
<listitem>
<para>
Output information about the process of accessing
collections of packages stored on CD-ROMs.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::BuildDeps</literal></term>
<listitem>
<para>
Describes the process of resolving build-dependencies in
&apt-get;.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::Hashes</literal></term>
<listitem>
<para>
Output each cryptographic hash that is generated by the
<literal>apt</literal> libraries.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::IdentCDROM</literal></term>
<listitem>
<para>
Do not include information from <literal>statfs</literal>,
namely the number of used and free blocks on the CD-ROM
filesystem, when generating an ID for a CD-ROM.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::NoLocking</literal></term>
<listitem>
<para>
Disable all file locking. For instance, this will allow
two instances of <quote><literal>apt-get
update</literal></quote> to run at the same time.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgAcquire</literal></term>
<listitem>
<para>
Log when items are added to or removed from the global
download queue.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgAcquire::Auth</literal></term>
<listitem>
<para>
Output status messages and errors related to verifying
checksums and cryptographic signatures of downloaded files.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgAcquire::Diffs</literal></term>
<listitem>
<para>
Output information about downloading and applying package
index list diffs, and errors relating to package index list
diffs.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgAcquire::RRed</literal></term>
<listitem>
<para>
Output information related to patching apt package lists
when downloading index diffs instead of full indices.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgAcquire::Worker</literal></term>
<listitem>
<para>
Log all interactions with the sub-processes that actually
perform downloads.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgAutoRemove</literal></term>
<listitem>
<para>
Log events related to the automatically-installed status of
packages and to the removal of unused packages.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgDepCache::AutoInstall</literal></term>
<listitem>
<para>
Generate debug messages describing which packages are being
automatically installed to resolve dependencies. This
corresponds to the initial auto-install pass performed in,
e.g., <literal>apt-get install</literal>, and not to the
full <literal>apt</literal> dependency resolver; see
<literal>Debug::pkgProblemResolver</literal> for that.
</para>
</listitem>
</varlistentry>
<!-- Question: why doesn't this do anything? The code says it should. -->
<varlistentry>
<term><literal>Debug::pkgInitConfig</literal></term>
<listitem>
<para>
Dump the default configuration to standard output on
startup.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgDPkgPM</literal></term>
<listitem>
<para>
When invoking &dpkg;, output the precise command line with
which it is being invoked, with arguments separated by a
single space character.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgDPkgProgressReporting</literal></term>
<listitem>
<para>
Output all the data received from &dpkg; on the status file
descriptor and any errors encountered while parsing it.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgOrderList</literal></term>
<listitem>
<para>
Generate a trace of the algorithm that decides the order in
which <literal>apt</literal> should pass packages to
&dpkg;.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgPackageManager</literal></term>
<listitem>
<para>
Output status messages tracing the steps performed when
invoking &dpkg;.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgPolicy</literal></term>
<listitem>
<para>
Output the priority of each package list on startup.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::pkgProblemResolver</literal></term>
<listitem>
<para>
Trace the execution of the dependency resolver (this
applies only to what happens when a complex dependency
problem is encountered).
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::sourceList</literal></term>
<listitem>
<para>
Print information about the vendors read from
<filename>/etc/apt/vendors.list</filename>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>Debug::Vendor</literal></term>
<listitem>
<para>
Print information about each vendor.
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1><title>Examples</title>

Loading…
Cancel
Save