diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.cron.daily | 2 | ||||
| -rw-r--r-- | debian/apt.dirs | 1 | ||||
| -rw-r--r-- | debian/changelog | 317 | ||||
| -rw-r--r-- | debian/control | 12 | ||||
| -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 | 9 |
12 files changed, 337 insertions, 18 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index a5c646d92..f4eb6117a 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -147,7 +147,7 @@ check_size_constraints() fi } -# sleep for a random intervall of time (default 30min) +# sleep for a random interval of time (default 30min) # (some code taken from cron-apt, thanks) random_sleep() { diff --git a/debian/apt.dirs b/debian/apt.dirs index 2db8dca9a..747a8e3fd 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -11,3 +11,4 @@ var/lib/apt/mirrors/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 042603ae6..acc413bea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,308 @@ +apt (0.7.19ubuntu1) jaunty; urgency=low + + * merge from debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 24 Nov 2008 10:52:20 +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 ] + * apt-pkg/acquire-item.cc: + - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz' + available. (Closes: #409284) + * apt-pkg/algorithm.cc: + - Strip username and password from source URL in error message. + (Closes: #425150) + + [ Michael Vogt ] + * fix various -Wall warnings + + -- Michael Vogt <mvo@debian.org> Tue, 28 Oct 2008 18:06:38 +0100 + +apt (0.7.17~exp1) experimental; urgency=low + + [ Luca Bruno ] + * Fix typos: + - apt-pkg/depcache.cc + * Fix compilation warnings: + - apt-pkg/acquire.cc + - apt-pkg/versionmatch.cc + * Compilation fixes and portability improvement for compiling APT against non-GNU libc + (thanks to Martin Koeppe, closes: #392063): + - buildlib/apti18n.h.in: + + textdomain() and bindtextdomain() must not be visible when --disable-nls + - buildlib/inttypes.h.in: undefine standard int*_t types + - Append INTLLIBS to SLIBS: + + cmdline/makefile + + ftparchive/makefile + + methods/makefile + * doc/apt.conf.5.xml: + - clarify whether configuration items of apt.conf are case-sensitive + (thanks to Vincent McIntyre, closes: #345901) + + -- Luca Bruno <lethalman88@gmail.com> Sat, 11 Oct 2008 09:17:46 +0200 + +apt (0.7.16) unstable; urgency=low + + [ Luca Bruno ] + * doc/apt-cache.8.xml: + - search command uses POSIX regex, and searches for virtual packages too + (closes: #277536) + * doc/offline.sgml: clarify remote and target hosts + (thanks to Nikolaus Schulz, closes: #175940) + * Fix several typos in docs, translations and debian/changelog + (thanks to timeless, Nicolas Bonifas and Josh Triplett, + closes: #368665, #298821, #411532, #431636, #461458) + * Document apt-key finger and adv commands + (thanks to Stefan Schmidt, closes: #350575) + * Better documentation for apt-get --option + (thanks to Tomas Pospisek, closes: #386579) + * Retitle the apt-mark.8 manpage (thanks to Justin Pryzby, closes: #471276) + * Better documentation on using both APT::Default-Release and + /etc/apt/preferences (thanks to Ingo Saitz, closes: #145575) + + [ Michael Vogt ] + * doc/apt-cache.8.xml: + - add missing citerefentry + + -- Michael Vogt <mvo@debian.org> Fri, 10 Oct 2008 23:44:50 +0200 + +apt (0.7.15) unstable; urgency=low + + * Upload to unstable + + -- Michael Vogt <mvo@debian.org> Sun, 05 Oct 2008 13:23:47 +0200 + +apt (0.7.15~exp3) experimental; urgency=low + + [Daniel Burrows] + * apt-pkg/deb/dpkgpm.cc: + - Store the trigger state descriptions in a way that does not break + the ABI. The approach taken makes the search for a string O(n) rather + than O(lg(n)), but since n == 4, I do not consider this a major + concern. If it becomes a concern, we can sort the static array and + use std::equal_range(). (Closes: #499322) + + [ Michael Vogt ] + * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc: + - move the state file writting into the Go() implementation + of dpkgpm (closes: #498799) + * apt-pkg/algorithms.cc: + - fix simulation performance drop (thanks to Ferenc Wagner + for reporting the issue) + + -- Michael Vogt <mvo@debian.org> Wed, 01 Oct 2008 18:09:49 +0200 + +apt (0.7.15~exp2) experimental; urgency=low + + [ Michael Vogt ] + * apt-pkg/pkgcachegen.cc: + - do not add multiple identical descriptions for the same + language (closes: #400768) + + [ Program translations ] + * Catalan updated. Closes: #499462 + + -- Michael Vogt <mvo@debian.org> Tue, 23 Sep 2008 07:29:59 +0200 + +apt (0.7.15~exp1) experimental; urgency=low + + [ Christian Perrier ] + * Fix typo in cron.daily script. Closes: #486179 + + [ Program translations ] + * Traditional Chinese updated. Closes: #488526 + * German corrected and completed. Closes: #490532, #480002, #498018 + * French completed + * Bulgarian updated. Closes: #492473 + * Slovak updated. Closes: #492475 + * Galician updated. Closes: #492794 + * Japanese updated. Closes: #492975 + * Fix missing space in Greek translation. Closes: #493922 + * Greek updated. + * Brazilian Portuguese updated. + * Basque updated. Closes: #496754 + * Romanian updated. Closes: #492773, #488361 + * Portuguese updated. Closes: #491790 + * Simplified Chinese updated. Closes: #489344 + * Norwegian Bokmål updated. Closes: #480022 + * Czech updated. Closes: #479628, #497277 + * Korean updated. Closes: #464515 + * Spanish updated. Closes: #457706 + * Lithuanian added. Closes: #493328 + * Swedish updated. Closes: #497496 + * Vietnamese updated. Closes: #497893 + * Portuguese updated. Closes: #498411 + * Greek updated. Closes: #498687 + * Polish updated. + + [ Michael Vogt ] + * merge patch that enforces stricter https server certificate + checking (thanks to Arnaud Ebalard, closes: #485960) + * allow per-mirror specific https settings + (thanks to Arnaud Ebalard, closes: #485965) + * add doc/examples/apt-https-method-example.cof + (thanks to Arnaud Ebalard, closes: #485964) + * apt-pkg/depcache.cc: + - when checking for new important deps, skip critical ones + (closes: #485943) + * improve apt progress reporting, display trigger actions + * add DPkg::NoTriggers option so that applications that call + apt/aptitude (like the installer) defer trigger processing + (thanks to Joey Hess) + * doc/makefile: + - add examples/apt-https-method-example.conf + + -- Michael Vogt <mvo@debian.org> Tue, 16 Sep 2008 21:27:03 +0200 + apt (0.7.14ubuntu7) jaunty; urgency=low * cmdline/apt-cache.cc: @@ -95,6 +400,8 @@ apt (0.7.14ubuntu1) intrepid; urgency=low - show warning on apt-get source with 'Vcs-' header - proxy detection from gconf in apt.cron +apt (0.7.14) unstable; urgency=low + [ Christian Perrier ] * Mark a message from dselect backend as translatable Thanks to Frédéric Bothamy for the patch @@ -113,7 +420,7 @@ apt (0.7.14ubuntu1) intrepid; urgency=low * Korean updated. Closes: #479426 * Basque updated. Closes: #479452 * Vietnamese updated. Closes: #479748 - * Russian updated. Closes: #479777 + * Russian updated. Closes: #479777, #499029 * Galician updated. Closes: #479792 * Portuguese updated. Closes: #479847 * Swedish updated. Closes: #479871 @@ -970,7 +1277,7 @@ apt (0.7.3) unstable; urgency=low Daniel Burrows, closes: #429378) * fixes in the auto-mark code (thanks to Daniel Burrows) - * fix FTFBFS by changing build-depends to + * fix FTBFS by changing build-depends to libcurl4-gnutls-dev (closes: #428363) * cmdline/apt-get.cc: - fix InstallTask code when a pkgRecord ends @@ -1118,7 +1425,7 @@ apt (0.7.2) unstable; urgency=low apt (0.7.1) experimental; urgency=low - * ABI library name change because its build against + * ABI library name change because it's built against new glibc * implement SourceVer() in pkgRecords (thanks to Daniel Burrows for the patch!) @@ -1259,9 +1566,9 @@ apt (0.6.46.4ubuntu4) feisty; urgency=low apt (0.7.0) experimental; urgency=low - * Package that contains tall the new features + * Package that contains all the new features * Removed all #pragma interface/implementation - * Branch that contains tall the new features: + * Branch that contains all the new features: * translated package descriptions * task install support * automatic dependency removal (thanks to Daniel Burrows) diff --git a/debian/control b/debian/control index 3df6226ff..b74079735 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,11 @@ Section: admin Priority: important Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-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, intltool +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, intltool Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt @@ -15,7 +17,7 @@ Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Recommends: ubuntu-keyring -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, gnupg +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. @@ -37,7 +39,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 4f6d72e06..e4ecfbdd7 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 @@ -219,6 +219,9 @@ apt: build debian/shlibs.local cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu # 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 |