* apt-pkg/aptconfiguration.cc:

  - support download of xz-compressed indexes files

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 3cf4d24295bb0e55b4ef01e0ff68c4fc4994364a..9ded431e8c22c01c66628dc83d5c1bef0376b35c 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -38,11 +38,13 @@ const Configuration::getCompressionTypes(bool const &Cached) {
 
        // setup the defaults for the compressiontypes => method mapping
        _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");
+       _config->CndSet("Acquire::CompressionTypes::xz","xz");
        _config->CndSet("Acquire::CompressionTypes::lzma","lzma");
        _config->CndSet("Acquire::CompressionTypes::gz","gzip");
 
        // Set default application paths to check for optional compression types
        _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
+       _config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
        _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
 
        // accept non-list order as override setting for config settings on commandline

diff --git a/debian/changelog b/debian/changelog
index 92ae058c5b5e07224b6d08644e11725505944b78..f0f0d342a9d2dbc327d6ae1ccb75bf59c72bb766 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ apt (0.8.11.6) UNRELEASED; urgency=low
     - ensure that Date and Valid-Until time strings are not localised
     - add options to disable specific checksums for Indexes
     - include xz-compressed Packages and Sources files in Release file
+  * apt-pkg/aptconfiguration.cc:
+    - support download of xz-compressed indexes files
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 22 Feb 2011 14:59:51 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 22 Feb 2011 18:10:30 +0100
 
 apt (0.8.11.5) unstable; urgency=low
 

diff --git a/methods/makefile b/methods/makefile
index 4ee356cec736f9f1e956a50a3ab62e1b9ca410a9..6ba51058ebb3d25ff554af60254781afd6cb041b 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -94,8 +94,8 @@ SOURCE = bzip2.cc
 include $(PROGRAM_H)
 
 # SSH and lzma method symlink
-binary: $(BIN)/ssh $(BIN)/lzma
-veryclean: clean-$(BIN)/ssh clean-$(BIN)/lzma
+binary: $(BIN)/ssh $(BIN)/lzma $(BIN)/xz
+veryclean: clean-$(BIN)/ssh clean-$(BIN)/lzma clean-$(BIN)/xz
 
 $(BIN)/ssh:
        echo "Installing ssh method link"
@@ -108,3 +108,9 @@ $(BIN)/lzma:
        ln -fs bzip2 $(BIN)/lzma
 clean-$(BIN)/lzma:
        -rm $(BIN)/lzma
+
+$(BIN)/xz:
+       echo "Installing xz method link"
+       ln -fs bzip2 $(BIN)/xz
+clean-$(BIN)/xz:
+       -rm $(BIN)/xz