diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-22 16:21:05 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-22 16:21:05 +0200 |
| commit | a298a1dc595c548e6c10b48b8e69d987e5be1c42 (patch) | |
| tree | 75bbda565cefad82c558605da697ad91c820f165 /debian | |
| parent | 6f34deead51a1c200589994a4cf46b7d79a45e69 (diff) | |
| parent | a268c98635f96a5ebb432c14f3c5ba6bbd605281 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d3beac0ef..ea2aaa8f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +apt (1.0.1) unstable; urgency=medium + + [ Michael Vogt ] + * Fix crash in "apt list" when a sources.list file is unreable + (Closes: 743413) + * make apt search case-insensitive by default + * Fix possible race when stunnel/aptwebserver create their PID files + in the tests + * Fix insecure file permissions when using FileFd with OpenMode::Atomic + (LP: #1304657) + + [ Julian Andres Klode ] + * Version the Breaks/Replaces for sun-java{5,6}-jdk (LP: #1302736) + (Closes: #743616) + * Add versioned openjdk-6-jdk breaks + + [ Josef Vitu ] + * apt: Minor typo in 'apt' man page (closes: #743657) + + -- Michael Vogt <mvo@debian.org> Thu, 10 Apr 2014 09:48:56 +0200 + apt (1.0) unstable; urgency=low The "Happy birthday and 10000b years in the making" release diff --git a/debian/control b/debian/control index c0526d30c..ff984db75 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, liblzma-dev, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), - autotools-dev, autoconf, automake + autotools-dev, autoconf, automake, libgtest-dev Build-Depends-Indep: doxygen, debiandoc-sgml, graphviz Build-Conflicts: autoconf2.13, automake1.4 Vcs-Git: git://anonscm.debian.org/apt/apt.git |