* changelog updated, version is now 0.6.27ubuntu4; added DEB_BUILD_PROG_OPTS to debia...

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index fcd655f2aaee4b311958bac79dcab2d8f97875f4..d1bed417be17448280f40dfe150a866195336c77 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -352,7 +352,7 @@ string pkgAcqMetaSig::Custom600Headers()
    struct stat Buf;
    if (stat(Final.c_str(),&Buf) != 0)
       return "\nIndex-File: true";
-   
+
    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
 
@@ -392,8 +392,14 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
    // mistakenly trusted
    string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
    unlink(Final.c_str());
-   Final = _config->FindDir("Dir::State::lists") + "partial/"+ URItoFileName(RealURI);
-   unlink(Final.c_str());
+
+   // if we debug leave the sig-file in partial/ to see what went wrong
+   // else delete it
+   if (!_config->FindB("Debug::pkgAcquire::Auth", false)) {
+      
+      Final = _config->FindDir("Dir::State::lists") + "partial/"+ URItoFileName(RealURI);
+      unlink(Final.c_str());
+   }
 
 
    // queue a pkgAcqMetaIndex with no sigfile

diff --git a/configure.in b/configure.in
index 55062a2b82fc7d15699ba69d5b48102c55703cad..b46decc11821f4b227ac6c5f4b38249a642c3241 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.6.27ubuntu3")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.27ubuntu4")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index f32aa5a948c1e30a41e302360c5e51bf4ce265f1..7825c85a9613dc57b17c6227c31f3784b9fd8aeb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apt (0.6.27ubuntu4) hoary; urgency=low
+
+  * if a sign-file download fails, delete the the partial downloaded 
+    file in "partial/"
+  * added apt-key update method (uses ubuntu-keyring)
+  * documented the "--allow-unauthenticated" switch
+  * added DEB_BUILD_PROG_OPTS to debian/rules (additonal options can be 
+    passed to DEB_BUILD_PROG like "-S")
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 23 Dec 2004 11:12:51 +0100
+
 apt (0.6.27ubuntu3) hoary; urgency=low
 
   * added a exact dependency from libapt-pkg-dev to the apt version it was

diff --git a/debian/rules b/debian/rules
index 1fbbb61d1ef2dea105b50c1c1523d53b39662d96..b756b3b323c93ae39d9d3ffec3003c1a59975a3a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ endif
 # Default rule
 build:
 
-DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc
+DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
 APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
 APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
 APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')

diff --git a/po/apt-all.pot b/po/apt-all.pot
index c57945afa9dd495cfb8e846781a0cd609b0b3d3d..8b0b9eb7dfbd6c2fa958abb8d6ae3418bf3aeb28 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-20 10:20+0100\n"
+"POT-Creation-Date: 2004-12-23 11:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2259,31 +2259,31 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:896
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:718
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:763
+#: apt-pkg/acquire-item.cc:771
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:799
+#: apt-pkg/acquire-item.cc:807
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:886
+#: apt-pkg/acquire-item.cc:894
 msgid "Size mismatch"
 msgstr ""