From: Michael Vogt Date: Tue, 28 Jun 2011 09:52:13 +0000 (+0100) Subject: merge from the experimental branch and prepare new upload X-Git-Tag: 0.9.0~96^2~1 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f6c68830b25f73a4b1af144924eb85c442b0f155?hp=-c merge from the experimental branch and prepare new upload --- f6c68830b25f73a4b1af144924eb85c442b0f155 diff --combined debian/changelog index b6ce716b6,bf1b2d962..f9a824163 --- a/debian/changelog +++ b/debian/changelog @@@ -1,5 -1,28 +1,32 @@@ -apt (0.8.15~exp4) UNRELEASED; urgency=low +apt (0.8.15) UNRELEASED; urgency=low ++ [ Christian Perrier ] ++ * Catalan translation update (Jordi Mallach). Closes: #630657 ++ ++ [ Michael Vogt ] + * debian/control: + - modernize package description (closes: #624618) + - -- Michael Vogt Wed, 22 Jun 2011 10:52:00 +0200 ++ -- Michael Vogt Tue, 28 Jun 2011 10:38:02 +0100 + + apt (0.8.15~exp3) experimental; urgency=low + + * debian/control: + - add Breaks: 0.8.15~exp3) for libapt-pkg4.10 and + libapt-inst1.2 (thanks to Jonathan Nieder, closes: #630214) + - use depends for the ${shlibs:Depends} to make the breaks work + + -- Michael Vogt Fri, 17 Jun 2011 21:51:41 +0200 + + apt (0.8.15~exp2) experimental; urgency=low + + * debian/control: + - fix incorrect Replaces (closes: #630204) for libapt-inst1.2 + + -- Michael Vogt Wed, 15 Jun 2011 16:51:14 +0200 + + apt (0.8.15~exp1) experimental; urgency=low + [ Julian Andres Klode ] * apt-pkg/depcache.cc: - Really release action groups only once (Closes: #622744) @@@ -18,7 -41,6 +45,6 @@@ * Galician translation update (Miguel Anxo Bouzada). Closes: #626505 * Italian translation update (Milo Casagrande). Closes: #627834 * German documentation translation update (Chris Leick). Closes: #629949 - * Catalan translation update (Jordi Mallach). Closes: #630657 [ David Kalnischkies ] * fix a bunch of cppcheck warnings/errors based on a patch by @@@ -76,7 -98,16 +102,16 @@@ - ensure for Multi-Arch:same packages that they are unpacked in lock step even in immediate configuration (Closes: #618288) - -- Michael Vogt Mon, 16 May 2011 14:57:52 +0200 + [ Michael Vogt ] + * methods/mirror.cc: + - ignore lines starting with "#" in the mirror file + - ignore non http urls in the mirrors + - append the dist (e.g. sid, wheezy) as a query string when + asking for a suitable mirror + * debian/control: + - add libapt-pkg4.10 and libapt-inst1.2 library packages + + -- Michael Vogt Fri, 10 Jun 2011 15:32:07 +0200 apt (0.8.14.1) unstable; urgency=low diff --combined debian/control index 6d0f16b70,bd5c110fb..512a132f6 --- a/debian/control +++ b/debian/control @@@ -6,26 -6,65 +6,65 @@@ Uploaders: Michael Vogt , Daniel Burrows , Julian Andres Klode Standards-Version: 3.9.2 - Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen + Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, + gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), + zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, + po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any - Pre-Depends: ${shlibs:Depends} - Depends: debian-archive-keyring, ${misc:Depends}, gnupg + Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg Replaces: manpages-pl (<< 20060617-3~) - Provides: ${libapt-pkg:provides} Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt - Description: Advanced front-end for dpkg - This is Debian's next generation front-end for the dpkg package manager. - It provides the apt-get utility and APT dselect method that provides a - simpler, safer way to install and upgrade packages. + Description: APT's commandline package manager + This package provides commandline tools for searching and + managing as well as querying information about packages + as a low-level access to all features of the libapt-pkg library. . - APT features complete installation ordering, multiple source capability - and several other unique features, see the Users Guide in apt-doc. + These include: - * apt-get for retrieval of packages and information about them - from authenticated sources and for installation, upgrade and - removal of packages together with their dependencies - * apt-cache for querying available information about installed - as well as installable packages - * apt-cdrom to use removable media as a source for packages - * apt-config as an interface to the configuration settings - * apt-key as an interface to manage authentication keys ++ * apt-get for retrieval of packages and information about them ++ from authenticated sources and for installation, upgrade and ++ removal of packages together with their dependencies ++ * apt-cache for querying available information about installed ++ as well as installable packages ++ * apt-cdrom to use removable media as a source for packages ++ * apt-config as an interface to the configuration settings ++ * apt-key as an interface to manage authentication keys + + Package: libapt-pkg4.10 + Architecture: any + Depends: ${shlibs:Depends}, ${misc:Depends} + Replaces: apt (<< 0.8.15) + Breaks: apt (<< 0.8.15) + Description: APT's package managment runtime library + This library provides the common functionality for searching and + managing packages as well as information about packages. + Higher-level package managers can depend upon this library. + . + This includes: - * retrieval of information about packages from multiple sources - * retrieval of packages and all dependent packages - needed to satisfy a request either through an internal - solver or by interfacing with an external one - * authenticating the sources and validating the retrieved data - * installation and removal of packages in the system - * providing different transports to retrieve data over cdrom, ftp, - http, rsh as well as an interface to add more transports like - https (apt-transport-https) and debtorrent (apt-transport-debtorrent). ++ * retrieval of information about packages from multiple sources ++ * retrieval of packages and all dependent packages ++ needed to satisfy a request either through an internal ++ solver or by interfacing with an external one ++ * authenticating the sources and validating the retrieved data ++ * installation and removal of packages in the system ++ * providing different transports to retrieve data over cdrom, ftp, ++ http, rsh as well as an interface to add more transports like ++ https (apt-transport-https) and debtorrent (apt-transport-debtorrent). + + Package: libapt-inst1.2 + Architecture: any + Depends: ${shlibs:Depends}, ${misc:Depends} + Replaces: apt-utils (<< 0.8.15), apt (<< 0.8.15) + Breaks: apt (<< 0.8.15), apt-utils (<< 0.8.15) + Description: APT's deb package format runtime library + This library provides methods to query and extract information + from deb packages. This includes the control data and the package + file content. Package: apt-doc Architecture: all @@@ -33,13 -72,13 +72,13 @@@ Priority: optiona Depends: ${misc:Depends} Section: doc Description: Documentation for APT - This package contains the user guide and offline guide, for APT, an - Advanced Package Tool. + This package contains the user guide and offline guide for various + APT tools which are provided in a html and a text-only version. Package: libapt-pkg-dev Architecture: any Priority: optional - Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev + Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for @@@ -61,19 -100,25 +100,25 @@@ Description: Documentation for APT deve Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} - Provides: ${libapt-inst:provides} Description: APT utility programs - This package contains some APT utility programs such as apt-ftparchive, - apt-sortpkgs and apt-extracttemplates. + This package contains some less used commandline utilities related + to package managment with APT. . - apt-extracttemplates is used by debconf to prompt for configuration - questions before installation. apt-ftparchive is used to create Package - and other index files. apt-sortpkgs is a Package/Source file normalizer. - * apt-extracttemplates is used by debconf to prompt for configuration - questions before installation. - * apt-ftparchive is used to create Packages and other index files - needed to publish an archive of debian packages - * apt-sortpkgs is a Packages/Sources file normalizer. ++ * apt-extracttemplates is used by debconf to prompt for configuration ++ questions before installation. ++ * apt-ftparchive is used to create Packages and other index files ++ needed to publish an archive of debian packages ++ * apt-sortpkgs is a Packages/Sources file normalizer. Package: apt-transport-https Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Priority: optional - Description: APT https transport - This package contains a APT https transport. It makes it possible to - use 'deb https://foo distro main' lines in the sources.list. + Description: https download transport for APT + This package enables the usage of 'deb https://foo distro main' lines + in the /etc/apt/sources.list so that all package managers using the + libapt-pkg library can access metadata and packages available in sources + accessable over https (Hypertext Transfer Protocol Secure). + . - This transports supports server as well as client authenification ++ This transport supports server as well as client authenification + with certificates.