diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-18 22:28:51 +0000 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-18 22:28:51 +0000 |
commit | a3972f18ff561755a5152b5ee6f65a7eb1bf99b5 (patch) | |
tree | 378ca3f85530c21d66e333deb5881730b1000993 | |
parent | 0e1821f3d826829fb3393c516ea3920eeccf46aa (diff) | |
parent | 5b8c18e9dc30668830d4601f0b796a3a0f0bb1a6 (diff) |
* merged from main
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120
* added debian-archive-keyring to recommends
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/configure.in b/configure.in index b900cc165..a21a6285a 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.43.1ubuntu2") +AC_DEFINE_UNQUOTED(VERSION,"0.6.43.1ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index c83806727..dee768a35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ apt (0.6.43.1ubuntu1) dapper; urgency=low * added APT::Periodic::Unattended-Upgrade (requires the package "unattended-upgrade") - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100 + -- apt (0.6.43.1) unstable; urgency=low diff --git a/debian/control b/debian/control index 5c76a90eb..4f3863d72 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Depends: ${shlibs:Depends} 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, gnupg Section: admin Description: Advanced front-end for dpkg |