From d128401746db0d511c36456d475713fe77d0c295 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Mon, 7 Dec 2015 12:28:42 +0100
Subject: reproducible: rename debbindiff.(html|txt)(.gz|) files to diffoscope…
 files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/reproducible_build.sh          | 4 ++--
 bin/reproducible_common.sh         | 4 ++--
 bin/reproducible_html_breakages.py | 4 ++--
 bin/reproducible_html_packages.py  | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 5c21ce31..1efd321c 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -515,8 +515,8 @@ get_source_package() {
 	fi
 	VERSION="$(grep '^Version: ' ${SRCPACKAGE}_*.dsc| head -1 | egrep -v '(GnuPG v|GnuPG/MacGPG2)' | cut -d ' ' -f2-)"
 	EVERSION="$(echo $VERSION | cut -d ':' -f2)"  # EPOCH_FREE_VERSION was too long
-	DBDREPORT="${SRCPACKAGE}_${EVERSION}.debbindiff.html"
-	DBDTXT="${SRCPACKAGE}_${EVERSION}.debbindiff.txt"
+	DBDREPORT="${SRCPACKAGE}_${EVERSION}.diffoscope.html"
+	DBDTXT="${SRCPACKAGE}_${EVERSION}.diffoscope.txt"
 	BUILDINFO="${SRCPACKAGE}_${EVERSION}_${ARCH}.buildinfo"
 }
 
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 467a2f40..4d93af9f 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -553,8 +553,8 @@ get_filesize() {
 cleanup_pkg_files() {
 	rm -vf $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_*.rbuild.log{,.gz}
 	rm -vf $BASE/logs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.build?.log{,.gz}
-	rm -vf $BASE/dbd/${SUITE}/${ARCH}/${SRCPACKAGE}_*.debbindiff.html
-	rm -vf $BASE/dbdtxt/${SUITE}/${ARCH}/${SRCPACKAGE}_*.debbindiff.txt{,.gz}
+	rm -vf $BASE/dbd/${SUITE}/${ARCH}/${SRCPACKAGE}_*.diffoscope.html
+	rm -vf $BASE/dbdtxt/${SUITE}/${ARCH}/${SRCPACKAGE}_*.diffoscope.txt{,.gz}
 	rm -vf $BASE/buildinfo/${SUITE}/${ARCH}/${SRCPACKAGE}_*.buildinfo
 	rm -vf $BASE/logdiffs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.diff{,.gz}
 }
diff --git a/bin/reproducible_html_breakages.py b/bin/reproducible_html_breakages.py
index 029d94a4..47be0dbc 100755
--- a/bin/reproducible_html_breakages.py
+++ b/bin/reproducible_html_breakages.py
@@ -24,7 +24,7 @@ def unrep_with_dbd_issues():
     for pkg, version, suite, arch in results:
         eversion = strip_epoch(version)
         dbd = DBD_PATH + '/' + suite + '/' + arch + '/' + pkg + '_' + \
-            eversion + '.debbindiff.html'
+            eversion + '.diffoscope.html'
         if not os.access(dbd, os.R_OK):
             without_dbd.append((pkg, version, suite, arch))
             log.warning(suite + '/' + arch + '/' + pkg + ' (' + version + ') is '
@@ -51,7 +51,7 @@ def not_unrep_with_dbd_file():
     for pkg, version, suite, arch in results:
         eversion = strip_epoch(version)
         dbd = DBD_PATH + '/' + suite + '/' + arch + '/' + pkg + '_' + \
-            eversion + '.debbindiff.html'
+            eversion + '.diffoscope.html'
         if os.access(dbd, os.R_OK):
             bad_pkgs.append((pkg, version, suite, arch))
             log.warning(dbd + ' exists but ' + suite + '/' + arch + '/' + pkg + ' (' + version + ')'
diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index 017a33a9..a178330a 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -106,13 +106,13 @@ def link_buildlogs(package, eversion, suite, arch):
 def link_diffs(package, eversion, suite, arch, status):
     html = ''
     dbd = DBD_PATH + '/' + suite + '/' + arch + '/' + package + '_' + \
-          eversion + '.debbindiff.html'
+          eversion + '.diffoscope.html'
     dbdtxt = DBDTXT_PATH + '/' + suite + '/' + arch + '/' + package + '_' + \
-             eversion + '.debbindiff.txt.gz'
+             eversion + '.diffoscope.txt.gz'
     dbd_url = DBD_URI + '/' + suite + '/' + arch + '/' +  package + '_' + \
-              eversion + '.debbindiff.html'
+              eversion + '.diffoscope.html'
     dbdtxt_url = DBDTXT_URI + '/' + suite + '/' + arch + '/' +  package + '_' + \
-                eversion + '.debbindiff.txt'
+                eversion + '.diffoscope.txt'
     if os.access(dbd, os.R_OK):
         html += '<li><a href="' + dbd_url + '" target="main">differences</a>\n'
         if os.access(dbdtxt, os.R_OK):
-- 
cgit v1.2.3-54-g00ecf