* apt-pkg/aptconfiguration.cc:

  - show a deprecation notice for APT::Acquire::Translation

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 0c050d9dc1852f9a61779222d35f38b73088be59..44f1f318ad049083c8d1f8c494d8fa8bb79fc9e7 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -10,6 +10,7 @@
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/strutl.h>
@@ -196,6 +197,9 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
        // it was undocumented and so it should be not very widthly used
        string const oldAcquire = _config->Find("APT::Acquire::Translation","");
        if (oldAcquire.empty() == false && oldAcquire != "environment") {
+               // TRANSLATORS: the two %s are APT configuration options
+               _error->Notice("Option '%s' is deprecated. Please use '%s' instead, see 'man 5 apt.conf' for details.",
+                               "APT::Acquire::Translation", "Acquire::Languages");
                if (oldAcquire != "none")
                        codes.push_back(oldAcquire);
                codes.push_back("en");

diff --git a/debian/changelog b/debian/changelog
index 46e371165dfe231612a8feeebb000edee38242fc..06bde48fcf4c0dca4d3fff31ab555e59288cde2f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,10 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low
     - complete rewrite but use the same API
     - add NOTICE and DEBUG as new types of a message
     - add a simple stack handling to be able to delay error handling
+  * apt-pkg/aptconfiguration.cc:
+    - show a deprecation notice for APT::Acquire::Translation
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 25 Jun 2010 19:15:21 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 26 Jun 2010 09:01:40 +0200
 
 apt (0.7.26~exp7) experimental; urgency=low