summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/NEWS2
-rw-r--r--debian/apt-utils.manpages6
-rw-r--r--debian/apt.manpages33
-rw-r--r--debian/changelog139
-rw-r--r--debian/control4
-rwxr-xr-xdebian/prerm15
-rwxr-xr-xdebian/rules6
7 files changed, 134 insertions, 71 deletions
diff --git a/debian/NEWS b/debian/NEWS
index 19f06793e..88f2c564e 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-apt (0.7.22.3) unstable; urgency=low
+apt (0.7.23) unstable; urgency=low
* Code that determines which proxy to use was changed. Now
'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority,
diff --git a/debian/apt-utils.manpages b/debian/apt-utils.manpages
deleted file mode 100644
index a68e909fc..000000000
--- a/debian/apt-utils.manpages
+++ /dev/null
@@ -1,6 +0,0 @@
-doc/apt-extracttemplates.1
-doc/apt-ftparchive.1
-doc/apt-sortpkgs.1
-doc/fr/apt-extracttemplates.fr.1
-doc/fr/apt-ftparchive.fr.1
-doc/fr/apt-sortpkgs.fr.1
diff --git a/debian/apt.manpages b/debian/apt.manpages
deleted file mode 100644
index 3c9c8a460..000000000
--- a/debian/apt.manpages
+++ /dev/null
@@ -1,33 +0,0 @@
-doc/apt-cache.8
-doc/apt-cdrom.8
-doc/apt-config.8
-doc/apt-get.8
-doc/apt-key.8
-doc/apt-mark.8
-doc/apt-secure.8
-doc/apt.8
-doc/apt.conf.5
-doc/apt_preferences.5
-doc/fr/apt-cache.fr.8
-doc/fr/apt-cdrom.fr.8
-doc/fr/apt-config.fr.8
-doc/fr/apt-get.fr.8
-doc/fr/apt-key.fr.8
-doc/fr/apt.conf.fr.5
-doc/fr/apt_preferences.fr.5
-doc/fr/sources.list.fr.5
-doc/es/apt-cache.es.8
-doc/es/apt-cdrom.es.8
-doc/es/apt-config.es.8
-doc/es/apt-get.es.8
-doc/es/apt.conf.es.5
-doc/es/apt_preferences.es.5
-doc/es/sources.list.es.5
-doc/es/apt.es.8
-doc/pt_BR/apt_preferences.pt_BR.5
-doc/ja/apt-cache.ja.8
-doc/ja/apt-cdrom.ja.8
-doc/ja/apt-get.ja.8
-doc/ja/apt.conf.ja.5
-doc/sources.list.5
-doc/de/apt.de.8
diff --git a/debian/changelog b/debian/changelog
index 160210dac..9b2004b57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,5 @@
-apt (0.7.22.3) UNRELEASED; urgency=low
+apt (0.7.24ubuntu1) UNRELEASED; urgency=low
- [ Eugene V. Lyubimkin ]
- * methods/{http,https,ftp}, doc/apt.conf.5.xml:
- - Changed and unified the code that determines which proxy to use. Now
- 'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority,
- and '{http,ftp}_proxy' environment variables are used only if options
- mentioned above are not specified.
- (Closes: #445985, #157759, #320184, #365880, #479617)
-
[ Michael Vogt ]
* apt-pkg/pkgcache.cc:
- do not set internel "needs-configure" state for packages in
@@ -29,7 +21,130 @@ apt (0.7.22.3) UNRELEASED; urgency=low
- Emit a warning if removed keys keyring is missing and skip associated
checks (LP: #218971)
- -- Michael Vogt <mvo@debian.org> Wed, 19 Aug 2009 11:14:15 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Sep 2009 17:24:20 +0200
+
+apt (0.7.24) UNRELEASED; urgency=low
+
+ [ Nicolas François ]
+ * Cleaned up the first patch draft from KURASAWA Nozomu to finally
+ get po4a support for translating the man pages.
+ Many thanks to both for this excellent work! (Closes: #441608)
+ * doc/ja/*, doc/po/ja.po:
+ - remove the old ja man page translation and replace it with
+ the new po4a-powered translation by KURASAWA Nozomu.
+ * doc/*.?.xml (manpages):
+ - add contrib to author tags and also add refmiscinfo to fix warnings
+ * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak:
+ - fix a few typos in the comments of this files
+
+ [ David Kalnischkies ]
+ * doc/Doxyfile.in:
+ - update file with doxygen 1.6.1 (current unstable)
+ - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9
+ * buildlib/po4a_manpage.mak, doc/makefile, configure:
+ - simplify the makefiles needed for po4a manpages
+ * apt-pkg/contrib/configuration.cc:
+ - add a helper to easily get a vector of strings from the config
+ * apt-pkg/contrib/strutl.cc:
+ - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208)
+ * doc/apt-get.8.xml:
+ - fix two little typos in the --simulate description.
+ * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml:
+ - add an order subgroup to the compression types to simplify reordering
+ a bit and improve the documentation for this option group.
+ * doc/apt.ent, all man pages:
+ - move the description of files to globally usable entities
+ * doc/apt_preferences.5.xml:
+ - document the new preferences.d folder (Closes: #544017)
+ * methods/rred.cc:
+ - add at the top without failing (by Bernhard R. Link, Closes: #545694)
+ * buildlib/sizetable:
+ - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058)
+ * debian/prerm:
+ - remove file as nobody will upgrade from 0.4.10 anymore
+ * debian/control:
+ - remove gnome-apt suggestion as it was removed from debian
+ * apt-pkg/deb/dpkgpm.cc, apt-pkg/packagemanager.cc, apt-pkg/orderlist.cc:
+ - add and document _experimental_ options to make (aggressive)
+ use of dpkg's trigger and configuration handling (Closes: #473461)
+
+ [ Christian Perrier ]
+ * doc/fr/*, doc/po/fr.po:
+ - remove the old fr man page translation and replace it with
+ the new po4a-powered translation
+ * doc/pl, doc/de: dropped (pl translation is useless as the translated
+ document is not provideed anymore and the de translation is too
+ incomplete to be used)
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200
+
+apt (0.7.23.1) unstable; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/pkgcache.cc:
+ - do not set internel "needs-configure" state for packages in
+ triggers-pending state. dpkg will deal with the trigger and
+ it if does it before we trigger it, dpkg will error out
+ (LP: #414631)
+ * apt-pkg/acquire-item.cc:
+ - do not segfault on invalid items (closes: #544080)
+
+ -- Michael Vogt <mvo@debian.org> Fri, 28 Aug 2009 21:53:20 +0200
+
+apt (0.7.23) unstable; urgency=low
+
+ [ Eugene V. Lyubimkin ]
+ * methods/{http,https,ftp}, doc/apt.conf.5.xml:
+ - Changed and unified the code that determines which proxy to use. Now
+ 'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority,
+ and '{http,ftp}_proxy' environment variables are used only if options
+ mentioned above are not specified.
+ (Closes: #445985, #157759, #320184, #365880, #479617)
+
+ [ David Kalnischkies ]
+ * cmdline/apt-get.cc:
+ - add APT::Get::HideAutoRemove=small to display only a short line
+ instead of the full package list. (Closes: #537450)
+ - ShowBroken() in build-dep (by Mike O'Connor, Closes: #145916)
+ - check for statfs.f_type (by Robert Millan, Closes: #509313)
+ - correct the order of picked package binary vs source in source
+ - use SourceVersion instead of the BinaryVersion to get the source
+ Patch by Matt Kraai, thanks! (Closes: #382826)
+ - add pkg/archive and codename in source (Closes: #414105, #441178)
+ * apt-pkg/contrib/strutl.cc:
+ - enable thousand separator according to the current locale
+ (by Luca Bruno, Closes: #223712)
+ * doc/apt.conf.5.xml:
+ - mention the apt.conf.d dir (by Vincent McIntyre, Closes: #520831)
+ * apt-inst/contrib/arfile.cc:
+ - use sizeof instead strlen (by Marius Vollmer, Closes: #504325)
+ * doc/apt-mark.8.xml:
+ - improve manpage based on patch by Carl Chenet (Closes: #510286)
+ * apt-pkg/acquire-item.cc:
+ - use configsettings for dynamic compression type use and order.
+ Based on a patch by Jyrki Muukkonen, thanks! (LP: #71746)
+ * apt-pkg/aptconfiguration.cc:
+ - add default configuration for compression types and add lzma
+ support. Order is now bzip2, lzma, gzip, none (Closes: #510526)
+ * ftparchive/writer.cc:
+ - add lzma support also here, patch for this (and inspiration for
+ the one above) by Robert Millan, thanks!
+ * apt-pkg/depcache.cc:
+ - restore the --ignore-hold effect in the Is{Delete,Install}Ok hooks
+ * doc/apt-get.8.xml:
+ - update the source description to reflect what it actually does
+ and how it can be used. (Closes: #413021)
+ * methods/http.cc:
+ - allow empty Reason-Phase in Status-Line to please squid,
+ thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435)
+
+ [ George Danchev ]
+ * cmdline/apt-cache.cc:
+ - fix a memory leak in the xvcg method (Closes: #511557)
+ * apt-pkg/indexcopy.cc:
+ - fix a memory leak then the Release file not exists (Closes: #511556)
+
+ -- Michael Vogt <mvo@debian.org> Thu, 27 Aug 2009 14:44:39 +0200
apt (0.7.22.2) unstable; urgency=low
@@ -119,7 +234,7 @@ apt (0.7.22) unstable; urgency=low
(off by default)
- send "dpkg-exec" message on the status fd when dpkg is run
- provide DPkg::Chroot-Directory config option (useful for testing)
- - fix potential hang when in a backgroud process group
+ - fix potential hang when in a background process group
* apt-pkg/algorithms.cc:
- consider recommends when making the scores for the problem
resolver
@@ -148,7 +263,7 @@ apt (0.7.22) unstable; urgency=low
* apt-pkg/deb/debsystem.cc:
- make strings i18n able
* fix problematic use of tolower() when calculating the version
- hash by using locale independant tolower_ascii() function.
+ hash by using locale independent tolower_ascii() function.
Thanks to M. Vefa Bicakci (LP: #80248)
* build fixes for g++-4.4
* cmdline/apt-mark:
diff --git a/debian/control b/debian/control
index 6587c2eb6..9ffa732e2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,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.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, intltool
+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), intltool
Package: apt
Architecture: any
@@ -16,7 +16,7 @@ Priority: important
Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
Provides: ${libapt-pkg:provides}
Recommends: ubuntu-keyring
-Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
+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.
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100755
index 4a8d47782..000000000
--- a/debian/prerm
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] &&
- dpkg --compare-versions "$2" "<<" 0.4.10
-then
- if [ ! -d /var/state/apt/ ]; then
- ln -s /var/lib/apt /var/state/apt
- touch /var/lib/apt/lists/partial/.delete-me-later
- fi
-fi
-
diff --git a/debian/rules b/debian/rules
index 8e2b18f67..2a18f4f47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -186,6 +186,7 @@ apt-doc: build-doc
# Build architecture-dependent files here.
binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
+apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
apt: build build-doc debian/shlibs.local
dh_testdir -p$@
dh_testroot -p$@
@@ -232,7 +233,7 @@ apt: build build-doc debian/shlibs.local
debian/$@/usr/lib/apt/apt-report-mirror-failure \
dh_installexamples -p$@ $(BLD)/docs/examples/*
- dh_installman -p$@
+ dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
dh_installcron -p$@
dh_installdocs -p$@
dh_installchangelogs -p$@
@@ -275,6 +276,7 @@ libapt-pkg-dev: build debian/shlibs.local
dh_md5sums -p$@
dh_builddeb -p$@
+apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates
apt-utils: build debian/shlibs.local
dh_testdir -p$@
dh_testroot -p$@
@@ -290,7 +292,7 @@ apt-utils: build debian/shlibs.local
dh_installexamples -p$@
# Install the man pages..
- dh_installman -p$@
+ dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES)))
dh_installchangelogs -p$@
dh_strip -p$@