--- usr_lib_freight_apt.sh.0.3.11.txt	2017-05-18 15:00:00.000000000 +0000
+++ /usr/lib/freight/apt.sh	2018-03-29 21:26:03.225391216 +0000
@@ -116,7 +116,9 @@
             # Source packages.  The *.dsc file is considered the "entrypoint"
             # and will find the associated *.orig.tar.gz, *.diff.gz, and/or
             # *.tar.gz as they are needed.
-            *.dsc) apt_cache_source "$DIST" "$DISTCACHE" "$PATHNAME" "$COMP" "$PACKAGE";;
+            *.dsc) apt_cache_source "$DIST" "$DISTCACHE" "$PATHNAME" "$COMP" "$PACKAGE";
+				 echo "apt_cache_source \"$DIST\" \"$DISTCACHE\" \"$PATHNAME\" \"$COMP\" \"$PACKAGE\""
+				;;
             *.debian.tar.gz|*.debian.tar.bz2|*.debian.tar.xz|*.debian.tar.lzma|*.diff.gz|*.orig.tar.gz|*.orig.tar.bz2|*.orig.tar.xz|*.orig.tar.lzma|*.tar.gz|*.tar.bz2|*.tar.xz|*.tar.lzma|*.deb-control|*.dsc-cached) ;;
 
             *) echo "# [freight] skipping extraneous file $PATHNAME" >&2;;
@@ -380,7 +382,7 @@
     DEBTAR_XZ_FILENAME="${NAME}_${VERSION%*:}.debian.tar.xz"
     DEBTAR_LZMA_FILENAME="${NAME}_${VERSION%*:}.debian.tar.lzma"
     DIFFGZ_FILENAME="${NAME}_${VERSION%*:}.diff.gz"
-    ORIG_FILENAME="${NAME}_${ORIG_VERSION}.orig.tar.gz"
+    ORIG_FILENAME="${NAME}_${ORIG_VERSION}.orig.tar.bz2"
     TAR_FILENAME="${NAME}_${VERSION%*:}.tar.gz"
 
     # Find which style of diff they're using.
@@ -396,7 +398,13 @@
     fi
 
     # Verify this package by ensuring the other necessary files are present.
-    [ -f "$VARLIB/apt/$DIST/$DIRNAME/$ORIG_FILENAME" ] && [ -f "$VARLIB/apt/$DIST/$DIRNAME/$DIFF_FILENAME" ] || [ -f "$VARLIB/apt/$DIST/$DIRNAME/$TAR_FILENAME" ] || {
+	echo ls -l $VARLIB/apt/$DIST/$DIRNAME/$ORIG_FILENAME
+	ls -l $VARLIB/apt/$DIST/$DIRNAME/$ORIG_FILENAME	
+	echo ls -l $VARLIB/apt/$DIST/$DIRNAME/$DIFF_FILENAME
+	ls -l $VARLIB/apt/$DIST/$DIRNAME/$DIFF_FILENAME
+	echo "just next: skipping invalid Debian source package $PATHNAME"
+	read FAKE
+    [ -f "$VARLIB/apt/$DIST/$DIRNAME/$ORIG_FILENAME" ] && [ -f "$VARLIB/apt/$DIST/$DIRNAME/$DIFF_FILENAME" ] || {
         echo "# [freight] skipping invalid Debian source package $PATHNAME" >&2
         return
     }
@@ -409,7 +417,7 @@
     # if it isn't already there (which can happen when two packages derive
     # from the same original tarball).
     mkdir -p "$DISTCACHE/.refs/$COMP"
-    for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME" "$TAR_FILENAME"
+    for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME"
     do
         [ -f "$VARLIB/apt/$DIST/$DIRNAME/$FILENAME" ] || continue
         [ -f "$DISTCACHE/.refs/$COMP/$FILENAME" ] ||
@@ -423,7 +431,7 @@
     # Link this source package into the pool.
     POOL="pool/$DIST/$COMP/$(apt_prefix "$NAME")/$NAME"
     mkdir -p "$VARCACHE/$POOL"
-    for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME" "$TAR_FILENAME"
+    for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME"
     do
         if [ -f "$DISTCACHE/.refs/$COMP/$FILENAME" ] && ! [ -f "$VARCACHE/$POOL/$FILENAME" ]
         then
@@ -447,7 +455,7 @@
             sed "s/^Source:/Package:/"
             echo "Directory: DIRECTORY"
             echo "Files:"
-            for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME" "$TAR_FILENAME"
+            for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME"
             do
                 [ -f "$VARCACHE/$POOL/$FILENAME" ] || continue
                 SIZE="$(apt_filesize "$VARCACHE/$POOL/$FILENAME")"
@@ -455,7 +463,7 @@
                 echo " $MD5 $SIZE $FILENAME"
             done
             echo "Checksums-Sha1:"
-            for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME" "$TAR_FILENAME"
+            for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME"
             do
                 [ -f "$VARCACHE/$POOL/$FILENAME" ] || continue
                 SIZE="$(apt_filesize "$VARCACHE/$POOL/$FILENAME")"
@@ -463,7 +471,7 @@
                 echo " $SHA1 $SIZE $FILENAME"
             done
             echo "Checksums-Sha256:"
-            for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME" "$TAR_FILENAME"
+            for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME"
             do
                 [ -f "$VARCACHE/$POOL/$FILENAME" ] || continue
                 SIZE="$(apt_filesize "$VARCACHE/$POOL/$FILENAME")"
@@ -471,7 +479,7 @@
                 echo " $SHA256 $SIZE $FILENAME"
             done
             echo "Checksums-Sha512:"
-            for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME" "$TAR_FILENAME"
+            for FILENAME in "$DSC_FILENAME" "$ORIG_FILENAME" "$DIFF_FILENAME"
             do
                 [ -f "$VARCACHE/$POOL/$FILENAME" ] || continue
                 SIZE="$(apt_filesize "$VARCACHE/$POOL/$FILENAME")"