summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-09-29 15:24:11 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-09-29 15:24:11 +0200
commitb0a6debfa93f547ce843732962314743d8282567 (patch)
treee72b515021742cc05e8c6fb6ab45b657ad6fd92c
parentbdce936af01878a0f2ff3056621e3278e17d1ae3 (diff)
parentb255ff1a1161385b7f52454ec8661f058f05d6db (diff)
* merged from apt--auto-mark
-rw-r--r--cmdline/apt-get.cc3
-rw-r--r--configure.in2
-rw-r--r--debian/changelog6
3 files changed, 8 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 9a3140428..765591b14 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1420,7 +1420,7 @@ bool DoUpdate(CommandLine &CmdL)
bool DoAutomaticRemove(CacheFile &Cache)
{
bool Debug = _config->FindI("Debug::pkgAutoRemove",false);
- bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove");
+ bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false);
pkgDepCache::ActionGroup group(*Cache);
@@ -2646,7 +2646,6 @@ void GetInitialize()
_config->Set("APT::Get::Fix-Broken",false);
_config->Set("APT::Get::Force-Yes",false);
_config->Set("APT::Get::List-Cleanup",true);
- _config->Set("APT::Get::AutomaticRemove",false);
}
/*}}}*/
// SigWinch - Window size change signal handler /*{{{*/
diff --git a/configure.in b/configure.in
index 9639cffc5..2ec63d6dd 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.45ubuntu14")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu15")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index cd38465d0..9eebb5516 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (0.6.45ubuntu15) edgy; urgency=low
+
+ *
+
+ --
+
apt (0.6.45ubuntu14) edgy; urgency=low
* cmdline/apt-get.cc: