From: Michael Vogt Date: Fri, 26 Nov 2004 09:47:13 +0000 (+0000) Subject: brought tree up-to-date with matt X-Git-Tag: 0.7.24ubuntu1~372^2~2 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/759ef60bae33fd38079d298287c107ec83821634?hp=df96f2e54f977e9c3d7531a97a0b84788ac3f44c 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 d8c341f9e..fa4cf13f4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,6 +3,17 @@ The project hierachy stands at: CVS:jgg Jason Gunthorpe - The Mad Cow incarnate +CVS:mdz Matt Zimmerman +- Ongoing maintenance and coordination of development + +CVS:piefel Michael Piefel +- i18n and l10n + +Michael Vogt +- Development and bug fixes + +Past Contributors: + CVS:che Ben Gertzfield - Packaging and Releases @@ -12,7 +23,8 @@ CVS:bod Brendan O'Dea CVS:tausq Randolph Chung - Patches, Fixes, Debugging, GUIs and Releases -Past Contributures: +Isaac Jones and Colin Walters + Initial implementation of authentication support (Release.gpg) Brian White - Project originator Tom Lees - DPKG documentation and ideas diff --git a/configure.in b/configure.in index 10feee63b..bdffb2a08 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.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 bb6c0151e..17fe8fb78 100644 --- 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 a971e30b1..28279ebf4 100644 --- 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 + (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 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 3ac709906..a1e376b9d 100644 --- 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 2aacc174a..3e50bef8c 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -192,8 +192,8 @@ and whose release Version number is "3.0". Package: * -Pin: release a=unstable, v=3.0 -Pin-Priority: 50 +Pin: release a=stable, v=3.0 +Pin-Priority: 500 diff --git a/methods/http.cc b/methods/http.cc index 3bb29cde0..e53667c07 100644 --- 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();