diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 48 | ||||
| -rw-r--r-- | debian/control | 27 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 61 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog index 732d67cbf..122052888 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,52 @@ -apt (0.8.16~exp10ubuntu1) UNRELEASED; urgency=low +apt (0.8.16~exp12ubuntu1~ppa1) precise; urgency=low * merge from debian/experimental: - new ABI - * DO NOT UPLOAD YET; THERE IS ANOTHER ABI BREAK COMMING SOON - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Jan 2012 09:05:16 +0100 + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 24 Jan 2012 20:07:38 +0100 + +apt (0.8.16~exp12) experimental; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - fix segfault on pkg removal + + [ David Kalnischkies ] + * apt-pkg/cacheiterators.h: + - return the correct version arch for all+foreign, too + * apt-pkg/packagemanager.cc: + - ignore breaks on not-installed versions while searching for + breakage loops as we don't have to avoid them + * debian/control: + - remove APT from the short descriptions as lintian doesn't like it + and it doesn't transport any information for a reader anyway + - apply typofixes by Pascal De Vuyst, thanks! (Closes: #652834, #652835) + * debian/rules: + - apply patch to enable usage of hardning CPPFLAGS and LDFLAGS by + Moritz Muehlenhoff, thanks! (Closes: #653504) + * methods/https.cc: + - use curls list append instead of appending Range and If-Range by hand + which generates malformed requests, thanks Mel Collins for the hint! + (Closes: #646381) + * test/libapt/run-tests: + - hurd doesn't have dmesg yet and we don't really need it either, + so use with $0 a more stable data source for hashsumming + + [ Pino Toscano ] + * test/libapt/globalerror_test.cc: + - errno 0 has a different strerror on hurd, so generate the expected + message dynamically instead of hardcoding 'Success' (Closes: #656530) + + -- Michael Vogt <mvo@debian.org> Tue, 24 Jan 2012 12:24:38 +0100 + +apt (0.8.16~exp11) experimental; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/dpkgpm.cc: + - redirect out/input of dpkg --assert-multi-arch to /dev/null + - if multi-arch is detected ensure that pkg:all is reported as pkg:all + + -- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2012 13:48:18 +0100 apt (0.8.16~exp10) experimental; urgency=low diff --git a/debian/control b/debian/control index d7e295243..2354834ab 100644 --- a/debian/control +++ b/debian/control @@ -8,10 +8,9 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.9.2 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.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, - gcc-4.6 (>= 4.6.0-6ubuntu2) + 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: lp:~ubuntu-core-dev/apt/ubuntu Vcs-Browser: http://code.launchpad.net/apt/ubuntu @@ -22,7 +21,7 @@ Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg Replaces: manpages-pl (<< 20060617-3~) Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt -Description: APT's commandline package manager +Description: 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. @@ -42,7 +41,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: APT's package managment runtime library +Description: 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. @@ -63,8 +62,8 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: APT's deb package format runtime library - This library provides methods to query and extract information +Description: 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. @@ -73,7 +72,7 @@ Architecture: all Priority: optional Depends: ${misc:Depends} Section: doc -Description: Documentation for APT +Description: documentation for APT This package contains the user guide and offline guide for various APT tools which are provided in a html and a text-only version. @@ -84,7 +83,7 @@ Priority: optional Pre-Depends: ${misc:Pre-Depends} 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 +Description: development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for developing with APT's libapt-pkg Debian package manipulation library and the libapt-inst deb/tar/ar library. @@ -94,7 +93,7 @@ Architecture: all Priority: optional Depends: ${misc:Depends} Section: doc -Description: Documentation for APT development +Description: documentation for APT development This package contains documentation for development of the APT Debian package manipulation program and its libraries. . @@ -104,7 +103,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: APT utility programs +Description: package managment related utility programs This package contains some less used commandline utilities related to package managment with APT. . @@ -122,7 +121,7 @@ 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). + accessible over https (Hypertext Transfer Protocol Secure). . - This transport supports server as well as client authenification + This transport supports server as well as client authentication with certificates. diff --git a/debian/rules b/debian/rules index 234114d5d..dcd4fc361 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,8 @@ endif ifneq (,$(shell which dpkg-buildflags)) export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) + export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) + export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) else ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) export CXXFLAGS = -O0 -g -Wall @@ -95,7 +97,7 @@ build/configure-stamp: configure dh_testdir -mkdir build cp COPYING debian/copyright - cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags) + cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags) touch $@ build/build-stamp: build/configure-stamp |