diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt-transport-https.README | 2 | ||||
| -rw-r--r-- | debian/apt.dirs | 1 | ||||
| -rw-r--r-- | debian/changelog | 231 | ||||
| -rw-r--r-- | debian/control | 14 | ||||
| -rw-r--r-- | debian/libapt-pkg-doc.doc-base.cache | 2 | ||||
| -rw-r--r-- | debian/libapt-pkg-doc.doc-base.dpkg-tech | 2 | ||||
| -rw-r--r-- | debian/libapt-pkg-doc.doc-base.files | 2 | ||||
| -rw-r--r-- | debian/libapt-pkg-doc.doc-base.method | 2 | ||||
| -rwxr-xr-x | debian/postrm | 2 | ||||
| -rwxr-xr-x | debian/preinst | 2 | ||||
| -rwxr-xr-x | debian/prerm | 2 | ||||
| -rwxr-xr-x | debian/rules | 11 |
12 files changed, 235 insertions, 38 deletions
diff --git a/debian/apt-transport-https.README b/debian/apt-transport-https.README new file mode 100644 index 000000000..0c470a1a2 --- /dev/null +++ b/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. diff --git a/debian/apt.dirs b/debian/apt.dirs index 8ce9b175a..47f60e7e3 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -10,3 +10,4 @@ var/lib/apt/lists/partial var/lib/apt/periodic var/log/apt usr/share/bug/apt +usr/share/lintian/overrides diff --git a/debian/changelog b/debian/changelog index e2a0365ac..c113a9597 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.17) UNRELEASED; urgency=low +apt (0.7.21) UNRELEASED; urgency=low [ Osamu Aoki ] * Updated cron script to support backups by hardlinks and @@ -10,20 +10,10 @@ apt (0.7.17) UNRELEASED; urgency=low configure-index. [ Michael Vogt ] - * apt-pkg/depcache.cc: - - when checking for new important deps, skip critical ones - (LP: #236360) - * document --install-recommends and --no-install-recommends - (thanks to Dereck Wonnacott, LP: #126180) - * make "apt-get build-dep" installed packages marked automatic - by default. This can be changed by setting the value of - APT::Get::Build-Dep-Automatic to false (thanks to Aaron - Haviland, closes: #44874, LP: #248268) * apt-pkg/indexcopy.cc: - support having CDs with no Packages file (just a Packages.gz) by not forcing a verification on non-existing files (LP: #255545) - * cmdline/apt-cache.cc: - remove the gettext from a string that consists entirely of variables (LP: #56792) * doc/makefile: @@ -32,7 +22,6 @@ apt (0.7.17) UNRELEASED; urgency=low - add missing checks for Owner == 0 in end() * apt-pkg/deb/dpkgpm.cc: - fix potential hang when in a backgroud process group - - fix SIGHUP handling (closes: #463030) * apt-pkg/indexrecords.cc: - fix some i18n issues * apt-pkg/contrib/strutl.h: @@ -51,6 +40,198 @@ apt (0.7.17) UNRELEASED; urgency=low -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 12 Sep 2008 11:34:24 +0200 +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) + + [ Michael Vogt ] + * apt-pkg/depcache.cc: + - when checking for new important deps, skip critical ones + (LP: #236360) + * document --install-recommends and --no-install-recommends + (thanks to Dereck Wonnacott, LP: #126180) + * make "apt-get build-dep" installed packages marked automatic + by default. This can be changed by setting the value of + APT::Get::Build-Dep-Automatic to false (thanks to Aaron + Haviland, closes: #44874, LP: #248268) + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sat, 06 Dec 2008 20:57:00 +0200 + +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 + 'deb-src security.debian.org' one. (Closes: #411298) + * apt-pkg/contrib/mmap.cc: + - Added instruction how to work around MMap error in MMap error message. + (Closes: #385674, 436028) + + [ Christian Perrier ] + * Translations: + - French corrected (remove awful use of first person) + + -- Michael Vogt <mvo@debian.org> Tue, 02 Dec 2008 20:30:14 +0100 + +apt (0.7.19) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * doc/sources.list.5.xml: + - Mentioned allowed characters in file names in /etc/apt/sources.list.d. + Thanks to Matthias Urlichs. (Closes: #426913) + * doc/apt-get.8.xml: + - Explicitly say that 'dist-upgrade' command may remove packages. + - Included '-v'/'--version' as a command to synopsis. + * cmdline/apt-cache.cc: + - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) + - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038) + - Removed asking to file a release-critical bug against a package if there + is a request to install only one package and it is not installable. + (Closes: #419521) + + + [ Michael Vogt ] + - fix SIGHUP handling (closes: #463030) + + [ Christian Perrier ] + * Translations: + - French updated + - Bulgarian updated. Closes: #505476 + - Slovak updated. Closes: #505483 + - Swedish updated. Closes: #505491 + - Japanese updated. Closes: #505495 + - Korean updated. Closes: #505506 + - Catalan updated. Closes: #505513 + - British English updated. Closes: #505539 + - Italian updated. Closes: #505518, #505683 + - Polish updated. Closes: #505569 + - German updated. Closes: #505614 + - Spanish updated. Closes: #505757 + - Romanian updated. Closes: #505762 + - Simplified Chinese updated. Closes: #505727 + - Portuguese updated. Closes: #505902 + - Czech updated. Closes: #505909 + - Norwegian Bokmål updated. Closes: #505934 + - Brazilian Portuguese updated. Closes: #505949 + - Basque updated. Closes: #506085 + - Russian updated. Closes: #506452 + - Marathi updated. + - Ukrainian updated. Closes: #506545 + + -- Michael Vogt <mvo@debian.org> Mon, 24 Nov 2008 10:33:54 +0100 + +apt (0.7.18) unstable; urgency=low + + [ Christian Perrier ] + * Translations: + - French updated + - Thai updated. Closes: #505067 + + [ Eugene V. Lyubimkin ] + * doc/examples/configure-index: + - Removed obsoleted header line. (Closes: #417638) + - Changed 'linux-kernel' to 'linux-image'. + * doc/sources.list.5.xml: + - Fixed typo and grammar in 'sources.list.d' section. Thanks to + Timothy G Abbott <tabbott@MIT.EDU>. (Closes: #478098) + * doc/apt-get.8.xml: + - Advanced descriptions for 'remove' and 'purge' options. + (Closes: #274283) + * debian/rules: + - Target 'apt' need to depend on 'build-doc'. Thanks for Peter Green. + Fixes FTBFS. (Closes: #504181) + + [ Michael Vogt ] + * fix depend on libdb4.4 (closes: #501253) + + -- Michael Vogt <mvo@debian.org> Fri, 07 Nov 2008 22:13:39 +0100 + +apt (0.7.17) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * debian/control: + - 'Vcs-Bzr' field is official, used it. + - Bumped 'Standards-Version' to 3.8.0, no changes needed. + - Actualized 'Uploaders' field. + * doc/: + - Substituded 'apt-archive' with 'apt-ftparchive' in docs. + Patch based on work of Andre Felipe Machado. (Closes: #350865) + - Mentioned '/<release>' and '=<version>' for 'apt-get install' and + '=<version>' for 'apt-get source' in apt-get manpage. Patch based on + work of Andre Felipe Machado. (Closes: #399673) + - Mentioned more short options in the apt-get manpage. Documented 'xvcg' + option in the apt-cache manpage. The part of patch by Andre Felipe + Machado. (Closes: #176106, #355945) + - Documented that 'apt-get install' command should be used for upgrading + some of installed packages. Based on patch by Nori Heikkinen and + Andre Felipe Machado. (Closes: #267087) + - Mentioned 'apt_preferences(5)' in apt manpage. (Closes: #274295) + - Documented 'APT::Default-Release' in apt.conf manpage. (Closes: #430399) + - APT::Install-Recommends is now true by default, mentioned this in + configure-index example. (Closes: #463268) + - Added 'APT::Get::AllowUnauthenticated' to configure-index example. + (Closes: #320225) + - Documented '--no-install-recommends' option in apt-get manpage. + (Closes: #462962) + - Documented 'Acquire::PDiffs' in apt.conf manpage. (Closes: #376029) + - Added 'copy', 'rsh', 'ssh' to the list of recognized URI schemes in + sources.list manpage, as they are already described under in the manpage. + - Removed notice that ssh/rsh access cannot use password authentication + from sources.list manpage. Thanks to Steffen Joeris. (Closes: #434894) + - Added '(x)' to some referrings to manpages in apt-get manpage. Patch by + Andre Felipe Machado. (Closes: #309893) + - Added 'dist-upgrade' apt-get synopsis in apt-get manpage. + (Closes: #323866) + + -- Michael Vogt <mvo@debian.org> Wed, 05 Nov 2008 13:14:56 +0100 + +apt (0.7.17~exp4) experimental; urgency=low + + * debian/rules: + - Fixed lintian warnings "debian/rules ignores make errors". + * debian/control: + - Substituted outdated "Source-Version" fields with "binary:Version". + - Added 'python-apt' to Suggests, as apt-mark need it for work. + - Drop Debian revision from 'doc-base' build dependency, this fixes + appropriate lintian warning. + * debian/libapt-pkg-doc.doc-base.*: + - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate + lintian warnings. + * debian/{postrm,prerm,preinst}: + - Added 'set -e', fixes lintian warnings + 'maintainer-script-ignores-error'. + * dselect/makefile: + - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly. + * share/lintian-overrides: + - Added with override of 'apt must depend on python'. Script 'apt-mark' + needs apt-python for working and checks this on fly. We don't want + python in most cases. + * cmdline/apt-key: + - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' + failure when GREP_OPTIONS contains options that modify grep output. + (Closes: #428752) + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 31 Oct 2008 23:45:17 +0300 + +apt (0.7.17~exp3) experimental; urgency=low + + * apt-pkg/acquire-item.cc: + - fix a merge mistake that prevents the fallback to the + uncompressed 'Packages' to work correctly (closes: #409284) + + -- Michael Vogt <mvo@debian.org> Wed, 29 Oct 2008 09:36:24 +0100 + apt (0.7.17~exp2) experimental; urgency=low [ Eugene V. Lyubimkin ] @@ -60,9 +241,11 @@ apt (0.7.17~exp2) experimental; urgency=low * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) + + [ Michael Vogt ] + * fix various -Wall warnings - -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 24 Oct 2008 23:45:17 +0300 - + -- Michael Vogt <mvo@debian.org> Tue, 28 Oct 2008 18:06:38 +0100 apt (0.7.17~exp1) experimental; urgency=low @@ -754,6 +937,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 @@ -844,16 +1037,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. diff --git a/debian/control b/debian/control index a3c84d72a..ba9e32e4b 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,12 @@ Source: apt Section: admin Priority: important Maintainer: APT Development Team <deity@lists.debian.org> -Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org> -Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12-1), xsltproc, docbook-xsl, xmlto -XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ +Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, + Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, + Luca Bruno <lethalman88@gmail.com>, Eugene V. Lyubimkin <jackyf.devel@gmail.com> +Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto +Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any @@ -13,7 +15,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma +Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. @@ -35,7 +37,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${Source-Version}), apt-utils (= ${Source-Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} +Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for diff --git a/debian/libapt-pkg-doc.doc-base.cache b/debian/libapt-pkg-doc.doc-base.cache index 59558dee8..4b47db810 100644 --- a/debian/libapt-pkg-doc.doc-base.cache +++ b/debian/libapt-pkg-doc.doc-base.cache @@ -8,7 +8,7 @@ Abstract: The APT Cache Specification describes the complete implementation tree very fast by pre-linking important things like dependencies and provides. The specification doubles as documentation for one of the in-memory structures used by the package library and the APT GUI. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/cache.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.dpkg-tech b/debian/libapt-pkg-doc.doc-base.dpkg-tech index 3afc262e9..055e8e674 100644 --- a/debian/libapt-pkg-doc.doc-base.dpkg-tech +++ b/debian/libapt-pkg-doc.doc-base.dpkg-tech @@ -3,7 +3,7 @@ Title: APT's interpetation of DPkg Technical Specification Author: Jason Gunthorpe Abstract: The DPkg Technical Manual gives an overview of dpkg's external functions(as APT sees them) and describes how it views the world. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/dpkg-tech.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.files b/debian/libapt-pkg-doc.doc-base.files index e0b79358c..a9faec027 100644 --- a/debian/libapt-pkg-doc.doc-base.files +++ b/debian/libapt-pkg-doc.doc-base.files @@ -4,7 +4,7 @@ Author: Jason Gunthorpe Abstract: The APT Files document describes the complete implementation and format of the installed APT directory structure. It also serves as guide to how APT views the Debian archive. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/files.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.method b/debian/libapt-pkg-doc.doc-base.method index 61c361251..f40d875bd 100644 --- a/debian/libapt-pkg-doc.doc-base.method +++ b/debian/libapt-pkg-doc.doc-base.method @@ -3,7 +3,7 @@ Title: APT Method Interface Author: Jason Gunthorpe Abstract: The APT Method Interface document describes the interface that APT uses to the archive access methods. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/method.html/index.html diff --git a/debian/postrm b/debian/postrm index 8b921dda1..ae1e18d33 100755 --- a/debian/postrm +++ b/debian/postrm @@ -8,6 +8,8 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. +set -e + #DEBHELPER# case "$1" in diff --git a/debian/preinst b/debian/preinst index 276eae5de..985ad9b84 100755 --- a/debian/preinst +++ b/debian/preinst @@ -1,5 +1,7 @@ #! /bin/sh +set -e + # dpkg does this for us while we are upgrading.. #if [ "$1" = "upgrade" -a -L /var/state/apt -a -e /var/lib/apt -a ! -L /var/state/apt ] && dpkg --compare-versions "$2" ">=" "0.4.10"; then # rm /var/state/apt diff --git a/debian/prerm b/debian/prerm index ac70a0279..4a8d47782 100755 --- a/debian/prerm +++ b/debian/prerm @@ -1,5 +1,7 @@ #! /bin/sh +set -e + #DEBHELPER# if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] && diff --git a/debian/rules b/debian/rules index 006d2de8a..f1eb62b57 100755 --- a/debian/rules +++ b/debian/rules @@ -125,8 +125,8 @@ build/build-doc-stamp: build/configure-stamp clean: dh_testdir # dh_testroot - -$(MAKE) clean - -$(MAKE) distclean + [ -f Makefile ] && $(MAKE) clean + [ -f Makefile ] && $(MAKE) distclean rm -rf build @@ -186,7 +186,7 @@ apt-doc: build-doc # Build architecture-dependent files here. binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https -apt: build debian/shlibs.local +apt: build build-doc debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k @@ -217,6 +217,9 @@ apt: build debian/shlibs.local cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog + # copy lintian override + cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt + # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir rm -f build/po/*.pot @@ -304,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.. |