diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-03-14 16:47:48 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-03-14 16:47:48 +0100 |
| commit | a7307a8727c85b0166339a54fb14ba3812f7a608 (patch) | |
| tree | e576e87289b2fbf4f3f421c0b5495636eb6992b0 /debian | |
| parent | ea5624c3d04c35f5a269b6f7431c135330c9b9b5 (diff) | |
| parent | b14f32f9b8c406706fd7735ffb13ae5c377baefe (diff) | |
merge with debian-sid, update-po for manpages and fix a few more
typos in doc/po/es.po to generate the manpages properly.
[ Christian Perrier ]
* German translation update. Closes: #571037
* Spanish manpages translation update. Closes: #573293
[ Julian Andres Klode ]
* cmdline/apt-mark:
- Use the new python-apt API (and conflict with python-apt << 0.7.93.2).
* apt-inst/contrib/arfile.h:
- Add public ARArchive::Members() which returns the list of members.
* debian/rules:
- Fix the libraries name to be e.g. libapt-pkg4.9 instead of
libapt-pkg-4.9.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index b0d7cb536..3b564b3a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ apt (0.7.26) UNRELEASED; urgency=low + [ Christian Perrier ] + * German translation update. Closes: #571037 + * Spanish manpages translation update. Closes: #573293 + + [ David Kalnischkies ] * Switch to dpkg-source 3.0 (native) format * cmdline/apt-mark: - don't crash if no arguments are given (Closes: #570962) @@ -23,7 +28,16 @@ apt (0.7.26) UNRELEASED; urgency=low * apt-pkg/deb/debversion.cc: - consider absent of debian revision equivalent to 0 (Closes: #573592) - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 19 Feb 2010 21:21:43 +0100 + [ Julian Andres Klode ] + * cmdline/apt-mark: + - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). + * apt-inst/contrib/arfile.h: + - Add public ARArchive::Members() which returns the list of members. + * debian/rules: + - Fix the libraries name to be e.g. libapt-pkg4.9 instead of + libapt-pkg-4.9. + + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 14 Mar 2010 16:47:07 +0100 apt (0.7.26~exp2) experimental; urgency=low diff --git a/debian/control b/debian/control index daff242f0..0cf092c25 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Package: apt Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} Provides: ${libapt-pkg:provides} +Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. diff --git a/debian/rules b/debian/rules index ab384b123..2fe6ed69c 100755 --- a/debian/rules +++ b/debian/rules @@ -78,8 +78,8 @@ APT_UTILS=ftparchive sortpkgs extracttemplates include buildlib/libversion.mak # Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst-$(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 |