summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-07-30 10:33:01 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-07-30 10:33:01 +0200
commita6afeca0f09252410b359e78ec305f4b4301ad5e (patch)
tree56be1a2c0cb734c36f046611bde152fa667d606b /debian
parent4ed3806e625a4b5c148e27dba5384f133dd77c1a (diff)
parent5c6a9439ea115ab7b5adb934f4955be893961830 (diff)
- [ABI BREAK] add an ErrorType option to CacheSetHelper
* cmdline/apt-cache.cc: - use Notice instead of Error in the CacheSetHelper messages for compat reasons. Otherwise tools like sbuild blow up * debian/control: - remove libcurl3-gnutls-dev alternative as the package is gone - increase needed version of libcurl4-gnutls-dev to >= 7.19.0 as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog18
-rw-r--r--debian/control2
2 files changed, 14 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index d6bfa76ee..14cc1c352 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,21 @@
apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low
+ [ Michael Vogt ]
* debian/control:
- add dependency on zlib-dev for libapt-pkg-dev
- * apt-pkg/cacheset.cc:
- - make CacheSetHelper::canNotFindAllVer display a notice
- only (for compat reasons). Otherwise tools like sbuild
- blow up
- -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 29 Jul 2010 23:45:42 +0200
+ [ David Kalnischkies ]
+ * apt-pkg/cacheset.cc:
+ - [ABI BREAK] add an ErrorType option to CacheSetHelper
+ * cmdline/apt-cache.cc:
+ - use Notice instead of Error in the CacheSetHelper messages
+ for compat reasons. Otherwise tools like sbuild blow up
+ * debian/control:
+ - remove libcurl3-gnutls-dev alternative as the package is gone
+ - increase needed version of libcurl4-gnutls-dev to >= 7.19.0
+ as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642)
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Fri, 30 Jul 2010 10:08:42 +0200
apt (0.7.26~exp11) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 345b72f55..dba0933b1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ 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>, Julian Andres Klode <jak@debian.org>
Standards-Version: 3.9.0
-Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
Build-Conflicts: autoconf2.13, automake1.4
Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/