summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog38
-rw-r--r--debian/control6
-rwxr-xr-xdebian/rules17
3 files changed, 43 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 2d9109ca4..9c4d46e09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,11 +15,41 @@ apt (0.7.25) UNRELEASED; urgency=low
Closes: #551534
* German translation of manpages by Chris Leick
Closes: #552606
-
- [ Michael Vogt ]
+
+ [ David Kalnischkies ]
* apt-pkg/packagemanager.cc:
- - fix overly aggressive immediate config propergation
- (thanks to David Kalnischkies)
+ - better debug output for ImmediateAdd with depth and why
+ - improve the message shown for failing immediate configuration
+ * doc/guide.it.sgml: moved to doc/it/guide.it.sgml
+ * doc/po4a.conf: activate translation of guide.sgml and offline.sgml
+ * doc/apt.conf.5.xml:
+ - provide a few more details about APT::Immediate-Configure
+ * doc/sources.list.5.xml:
+ - add note about additional apt-transport-methods
+ * doc/apt-mark.8.xml:
+ - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440)
+ * cmdline/apt-get.cc:
+ - source should displays his final pkg pick (Closes: #249383, #550952)
+ - source doesn't need the complete version for match (Closes: #245250)
+ - source ignores versions/releases if not available (Closes: #377424)
+ - only warn if (free) space overflows (Closes: #522238)
+ * methods/connect.cc:
+ - display also strerror of "wicked" getaddrinfo errors
+ * buildlib/configure.mak, buildlib/config.{sub,guess}:
+ - remove (outdated) config.{sub,guess} and use the ones provided
+ by the new added build-dependency autotools-dev instead
+
+ [ Chris Leick ]
+ * doc/ various manpages:
+ - correct various errors, typos and oddities (Closes: #552535)
+ * doc/apt-secure.8.xml:
+ - replace literal with emphasis tags in Archive configuration
+
+ [ Eugene V. Lyubimkin ]
+ * apt-pkg/contib/strutl.h
+ - Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2.
+ * build infrastructure:
+ - Bumped libapt version, excluded eglibc from SONAME. (Closes: #448249)
[ Julian Andres Klode ]
* doc/apt.conf.5.xml:
diff --git a/debian/control b/debian/control
index a9c82f9e8..5db294f2e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,17 +6,15 @@ 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.8.2.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, po4a (>= 0.34-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), xsltproc, docbook-xsl, xmlto, po4a (>= 0.34-2), autotools-dev
Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
Package: apt
Architecture: any
Depends: ${shlibs:Depends}, debian-archive-keyring
-Priority: important
Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
Provides: ${libapt-pkg:provides}
Suggests: aptitude | synaptic | 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.
It provides the apt-get utility and APT dselect method that provides a
@@ -55,10 +53,8 @@ Description: Documentation for APT development
Package: apt-utils
Architecture: any
Depends: ${shlibs:Depends}
-Priority: important
Provides: ${libapt-inst:provides}
Replaces: apt (<< 0.5.9)
-Section: admin
Description: APT utility programs
This package contains some APT utility programs such as apt-ftparchive,
apt-sortpkgs and apt-extracttemplates.
diff --git a/debian/rules b/debian/rules
index d19531dfc..f69c0cffb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,25 +75,24 @@ APT_UTILS=ftparchive sortpkgs extracttemplates
#export DH_VERBOSE=1
# Find the libapt-pkg major version for use in other control files
-export LIBAPTPKG_MAJOR:=$(shell egrep '^MAJOR=' apt-pkg/makefile |cut -d '=' -f 2)
-export LIBAPTINST_MAJOR:=$(shell egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)
+include buildlib/libversion.mak
# Determine which package we should provide in the control files
-LIBAPTPKG_PROVIDE=libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTPKG_MAJOR)
-LIBAPTINST_PROVIDE=libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTINST_MAJOR)
+LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR)
+LIBAPTINST_PROVIDE=libapt-inst-$(LIBAPTINST_MAJOR)
debian/shlibs.local: apt-pkg/makefile
# We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and
# one for the rest of the packages. This ensures that each package gets
# the right overrides..
rm -rf $@ $@.apt $@.apt-utils
- echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR)" > $@.apt
+ echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt
- echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
- echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR)" >> $@.apt-utils
+ echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
+ echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils
- echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
- echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
+ echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
+ echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
build: build/build-stamp
build-doc: build/build-doc-stamp