diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2004-11-23 17:11:45 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2004-11-23 17:11:45 +0000 |
| commit | 206b553334f83cc14087abc15ea5a4fd5376e583 (patch) | |
| tree | 57b18474256aa982f1b2890e08a28666485bfd6a | |
| parent | 5f94945b7ad11431f2d1bca3fd2fd240e9e94a3c (diff) | |
| parent | df96f2e54f977e9c3d7531a97a0b84788ac3f44c (diff) | |
Merge changes from Hoary (0.5.30,0.5.30ubuntu2]
Patches applied:
* michael.vogt@canonical.com--2004/apt--mvo--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-14
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-1
* imported the changes from 0.5.30 to 0.5.30ubuntu2
| -rw-r--r-- | apt-pkg/acquire-item.cc | 5 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/control | 4 |
4 files changed, 21 insertions, 4 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index bf19290c6..6227888b6 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -144,7 +144,10 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, DestFile += URItoFileName(URI); // Create the item - Desc.URI = URI + ".bz2"; + if(FileExists("/usr/bin/bzip2")) + Desc.URI = URI + ".bz2"; + else + Desc.URI = URI + ".gz"; Desc.Description = URIDesc; Desc.Owner = this; Desc.ShortDesc = ShortDesc; diff --git a/configure.in b/configure.in index f02ccd135..10feee63b 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.30") +AC_DEFINE_UNQUOTED(VERSION,"0.5.30ubuntu2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 606c119e4..f9c615373 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,23 @@ 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] -- +apt (0.5.30ubuntu2) hoary; urgency=low + + * bzip2 is now "Suggested" and it will detect if bzip2 is installed + and only then trying to get Packages.bz2 + + -- Michael Vogt <mvo@debian.org> Fri, 19 Nov 2004 12:00:39 +0100 + +apt (0.5.30ubuntu1) hoary; urgency=low + + * Need to Depend: bzip2 or Packages.bz2 fail. + + -- LaMont Jones <lamont@canonical.com> Thu, 18 Nov 2004 12:51:05 -0700 + apt (0.5.30) hoary; urgency=low * Patch from Michael Vogt to enable Packages.bz2 use, with a fallback to diff --git a/debian/control b/debian/control index 7bd0c368a..3ac709906 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Depends: ${shlibs:Depends} Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc +Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2 Section: base Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. @@ -52,7 +52,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any -Depends: ${shlibs:Depends} +Depends: bzip2, ${shlibs:Depends} Priority: optional Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) |