diff -Nru apt-0.7.25.3ubuntu9.1/configure apt-0.7.25.3ubuntu9.2/configure
--- apt-0.7.25.3ubuntu9.1/configure	2010-07-15 14:45:46.000000000 +0200
+++ apt-0.7.25.3ubuntu9.2/configure	2010-09-09 15:17:47.000000000 +0200
@@ -2449,7 +2449,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define VERSION "0.7.25.3ubuntu9.1"
+#define VERSION "0.7.25.3ubuntu9.2"
 _ACEOF
 
 PACKAGE="apt"
diff -Nru apt-0.7.25.3ubuntu9.1/configure.in apt-0.7.25.3ubuntu9.2/configure.in
--- apt-0.7.25.3ubuntu9.1/configure.in	2010-07-15 14:45:45.000000000 +0200
+++ apt-0.7.25.3ubuntu9.2/configure.in	2010-09-09 15:17:46.000000000 +0200
@@ -18,7 +18,7 @@
 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.7.25.3ubuntu9.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.25.3ubuntu9.2")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
diff -Nru apt-0.7.25.3ubuntu9.1/debian/changelog apt-0.7.25.3ubuntu9.2/debian/changelog
--- apt-0.7.25.3ubuntu9.1/debian/changelog	2010-07-15 14:45:40.000000000 +0200
+++ apt-0.7.25.3ubuntu9.2/debian/changelog	2010-09-09 15:17:45.000000000 +0200
@@ -1,3 +1,11 @@
+apt (0.7.25.3ubuntu9.2) lucid-proposed; urgency=low
+
+  * ftparchive/writer.cc:
+    - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
+      available LP: #633967. Thanks to Colin Watson
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Sep 2010 14:43:41 +0200
+
 apt (0.7.25.3ubuntu9.1) lucid-proposed; urgency=low
 
   * apt-pkg/deb/dpkgpm.cc: 
diff -Nru apt-0.7.25.3ubuntu9.1/ftparchive/writer.cc apt-0.7.25.3ubuntu9.2/ftparchive/writer.cc
--- apt-0.7.25.3ubuntu9.1/ftparchive/writer.cc	2010-05-14 09:42:42.000000000 +0200
+++ apt-0.7.25.3ubuntu9.2/ftparchive/writer.cc	2010-09-09 15:17:45.000000000 +0200
@@ -657,22 +657,25 @@
    // Add the dsc to the files hash list
    string const strippedName = flNotDir(FileName);
    char Files[1000];
-   snprintf(Files,sizeof(Files),"\n %s %lu %s\n %s",
-	    string(MD5.Result()).c_str(),St.st_size,
-	    strippedName.c_str(),
-	    Tags.FindS("Files").c_str());
+   if (Tags.FindS("Files") != string())
+      snprintf(Files,sizeof(Files),"\n %s %lu %s\n %s",
+               string(MD5.Result()).c_str(),St.st_size,
+               strippedName.c_str(),
+               Tags.FindS("Files").c_str());
 
    char ChecksumsSha1[1000];
-   snprintf(ChecksumsSha1,sizeof(ChecksumsSha1),"\n %s %lu %s\n %s",
-	    string(SHA1.Result()).c_str(),St.st_size,
-	    strippedName.c_str(),
-	    Tags.FindS("Checksums-Sha1").c_str());
+   if (Tags.FindS("Checksums-Sha1") != string())
+      snprintf(ChecksumsSha1,sizeof(ChecksumsSha1),"\n %s %lu %s\n %s",
+               string(SHA1.Result()).c_str(),St.st_size,
+               strippedName.c_str(),
+               Tags.FindS("Checksums-Sha1").c_str());
 
    char ChecksumsSha256[1000];
-   snprintf(ChecksumsSha256,sizeof(ChecksumsSha256),"\n %s %lu %s\n %s",
-	    string(SHA256.Result()).c_str(),St.st_size,
-	    strippedName.c_str(),
-	    Tags.FindS("Checksums-Sha256").c_str());
+   if (Tags.FindS("Checksums-Sha256") != string())
+      snprintf(ChecksumsSha256,sizeof(ChecksumsSha256),"\n %s %lu %s\n %s",
+               string(SHA256.Result()).c_str(),St.st_size,
+               strippedName.c_str(),
+               Tags.FindS("Checksums-Sha256").c_str());
 
    // Strip the DirStrip prefix from the FileName and add the PathPrefix
    string NewFileName;