brought tree up-to-date with matt

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-15
   Merge changes from Hoary (0.5.30,0.5.30ubuntu2]

 * apt@packages.debian.org/apt--main--0--patch-16
   Remove apt-utils->bzip2 dependency

 * apt@packages.debian.org/apt--main--0--patch-17
   Fix apt_preferences(5) example to match text

 * apt@packages.debian.org/apt--main--0--patch-18
   Fix permissions

 * apt@packages.debian.org/apt--main--0--patch-19
   Add APT::Periodic::Autoclean setting

 * apt@packages.debian.org/apt--main--0--patch-20
   Finalize 0.5.31

 * apt@packages.debian.org/apt--main--0--patch-21
   Open 0.5.32

 * apt@packages.debian.org/apt--main--0--patch-22
   Call setlocale and bindtextdomain in the http method

 * apt@packages.debian.org/apt--main--0--patch-23
   Fix error in patch-22

 * apt@packages.debian.org/apt--main--0--patch-24
   Temporarily finalize 0.5.32 to resolve a conflict with apt--authentication--0

 * apt@packages.debian.org/apt--main--0--patch-25
   Un-finalize 0.5.32

 * apt@packages.debian.org/apt--main--0--patch-26
   Update AUTHORS to reflect reality

 * apt@packages.debian.org/apt--main--0--patch-27
   Fix spelling

diff --git a/AUTHORS b/AUTHORS
index d8c341f9e3dac91ba2a74765d575528e3c13b1d9..fa4cf13f415d154607e6945bd711e20496c25eb2 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,6 +3,17 @@ The project hierachy stands at:
 CVS:jgg Jason Gunthorpe <jgg@debian.org>
 - The Mad Cow incarnate
 
+CVS:mdz Matt Zimmerman <mdz@debian.org>
+- Ongoing maintenance and coordination of development
+
+CVS:piefel Michael Piefel <piefel@debian.org>
+- i18n and l10n
+
+Michael Vogt <mvo@debian.org>
+- Development and bug fixes
+
+Past Contributors:
+
 CVS:che Ben Gertzfield <che@debian.org>
 - Packaging and Releases
 
@@ -12,7 +23,8 @@ CVS:bod Brendan O'Dea <bod@debian.org>
 CVS:tausq Randolph Chung <tausq@debian.org>
 - Patches, Fixes, Debugging, GUIs and Releases
 
-Past Contributures:
+Isaac Jones <ijones@syntaxpolice.org> and Colin Walters <walters@debian.org>
+        Initial implementation of authentication support (Release.gpg)
 
 Brian White <bcwhite@verisim.com> - Project originator
 Tom Lees <tom@lpsg.demon.co.uk> - DPKG documentation and ideas

diff --git a/configure.in b/configure.in
index 10feee63b33a144124fd38775e0031b03a9121a1..bdffb2a082f7e3dac9d516887089e25595d46a21 100644 (file)
--- 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.5.30ubuntu2")
+AC_DEFINE_UNQUOTED(VERSION,"0.5.32")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index bb6c0151e71413ab7ddfae1c983781db45e9a9ff..17fe8fb78658c8b3b71036ed7044396d3d1f3268 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -38,8 +38,9 @@ update_stamp()
 
 UpdateInterval=0
 DownloadUpgradeableInterval=0
-RES=`apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages`
-eval $RES
+eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages)
+AutocleanInterval=$DownloadUpgradeableInterval
+eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean)
 
 # laptop check, on_ac_power returns:
 #       0 (true)    System is on mains power
@@ -68,3 +69,9 @@ if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then
     apt-get -qq -d dist-upgrade 2>/dev/null
     update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
 fi
+
+AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
+if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
+    apt-get -qq autoclean
+    update_stamp $AUTOCLEAN_STAMP
+fi

diff --git a/debian/changelog b/debian/changelog
index a971e30b121179d925f46041b09d2b0004c4733c..28279ebf4832930d30a894b496c11fc06e2381c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+apt (0.5.32) unstable; urgency=low
+
+  * Call setlocale and bindtextdomain in the http method, so that the
+    messages are properly localised (Closes: #282700)
+
+ --
+
+apt (0.5.31) unstable; urgency=low
+
+  * New Romanian translation from Sorin Batariuc <sorin@bonbon.net>
+    (Closes: #281458)
+  * Merge changes from Hoary (0.5.30,0.5.30ubuntu2]
+  * Fix the example in apt_preferences(5) to match the text
+    (Closes: #222267)
+  * Add APT::Periodic::Autoclean setting, to allow "apt-get autoclean" to
+    be run periodically.  This is useful with
+    APT::Periodic::Download-Upgradeable-Packages, and defaults to the same
+    value, so that the cache size is bounded
+
+ -- Matt Zimmerman <mdz@debian.org>  Tue, 23 Nov 2004 12:53:04 -0800
+
 apt (0.5.30ubuntu2) hoary; urgency=low
 
   * bzip2 is now "Suggested" and it will detect if bzip2 is installed 

diff --git a/debian/control b/debian/control
index 3ac7099065d8c7b338186440822fd0648130fa97..a1e376b9d212dffa725d950650d5669806cb3844 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Description: Documentation for APT development
 
 Package: apt-utils
 Architecture: any
-Depends: bzip2, ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Priority: optional
 Provides: ${libapt-inst:provides}
 Replaces: apt (<< 0.5.9)

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 2aacc174af288787345d77769640c83a45161e09..3e50bef8c1696c1a07aad1344b196d95b33fbc96 100644 (file)
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -192,8 +192,8 @@ and whose release Version number is "<literal>3.0</literal>".</simpara>
 
 <programlisting>
 Package: *
-Pin: release a=unstable, v=3.0
-Pin-Priority: 50
+Pin: release a=stable, v=3.0
+Pin-Priority: 500
 </programlisting>
 </listitem>
 </itemizedlist>

diff --git a/methods/http.cc b/methods/http.cc
index 3bb29cde07d7c42d1658a01c2fe66d4d28617125..e53667c07c2949c54d621c326b337ecedad7b875 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1183,6 +1183,9 @@ int HttpMethod::Loop()
 
 int main()
 {
+   setlocale(LC_ALL, "");
+   bindtextdomain(APT_DOMAIN, _config->FindDir("Dir::Locale").c_str());
+
    HttpMethod Mth;
    
    return Mth.Loop();