summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2010-03-01 13:47:56 +0100
committerJulian Andres Klode <jak@debian.org>2010-03-01 13:47:56 +0100
commit946b0e068e431df81badf88ab795cbad7cd846dd (patch)
tree4871a7f6c9e4a0d5a29a376a92ea2228098af04f /debian
parentb07740deb6debca95441a90f4bfd89f497ad36f4 (diff)
* cmdline/apt-mark:
- Use the new python-apt API (and conflict with python-apt << 0.7.93.2).
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/control1
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c855c77d5..6003477ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
apt (0.7.26~exp3) UNRELEASED; urgency=low
+ [ Christian Perrier ]
* German translation update. Closes: #571037
+ [ Julian Andres Klode ]
+ * cmdline/apt-mark:
+ - Use the new python-apt API (and conflict with python-apt << 0.7.93.2).
+
-- Christian Perrier <bubulle@debian.org> Wed, 24 Feb 2010 22:13:50 +0100
apt (0.7.26~exp2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index de2bf6544..c2b6c17a5 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Architecture: any
Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends}
Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
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.