Merge remote-tracking branch 'exp/debian/unstable'

This allows dvdisaster to scan and read (ie create ISO
images of) BD-ROM media.

Closes: #849518

debian/changelog

@@ -1,3 +1,18 @@
+dvdisaster (0.72.4-3) unstable; urgency=medium
+
+  [ Carlos Maddela ]
+  * Team upload.
+  * Bump compat level to 10.
+  * debian/watch: Relax upstream version restriction.
+  * Use original name for the duplicate uncompressed upstream CHANGELOG.
+  * Backup and restore mutable files to allow multiple builds.
+  * Fix FTBFS for hurd-i386.
+
+  [ Corey Wright ]
+  * Add support for BD-ROM media-type. (Closes: #849518)
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 07 Jan 2017 00:29:19 +1100
+
 dvdisaster (0.72.4-2) unstable; urgency=medium
 
   * Team upload.

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Optical Media Tools Team <pkg-opt-media-team@lists.alioth.debian.org>
 Uploaders: TANIGUCHI Takaki <takaki@debian.org>,
            Rogério Brito <rbrito@ime.usp.br>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                dh-exec,
                dpkg-dev (>= 1.16.1.1),
                gettext,

debian/dvdisaster.docs

@@ -1,3 +1,4 @@
+CHANGELOG
 CREDITS.*
 README.MODIFYING
 TODO

debian/dvdisaster.install

@@ -8,4 +8,3 @@ contrib/dvdisaster24.png => usr/share/icons/hicolor/24x24/apps/dvdisaster.png
 contrib/dvdisaster32.png => usr/share/icons/hicolor/32x32/apps/dvdisaster.png
 contrib/dvdisaster48.png => usr/share/icons/hicolor/48x48/apps/dvdisaster.png
 contrib/dvdisaster64.png => usr/share/icons/hicolor/64x64/apps/dvdisaster.png
-CHANGELOG => usr/share/doc/dvdisaster/.CHANGELOG

debian/patches/20-display-changelog-credits-and-todo.patch

@@ -9,7 +9,7 @@ Description: Fix display of changelog, credits and to-do files.
 Author: Carlos Maddela <e7appew@gmail.com>
 Origin: vendor
 Forwarded: not-needed
-Last-Update: 2016-12-21
+Last-Update: 2017-01-05
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 ---
@@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/menubar.c b/menubar.c
-index 99ae4fc..40f11d5 100644
+index 99ae4fc..33e6ba4 100644
 --- a/menubar.c
 +++ b/menubar.c
 @@ -116,21 +116,21 @@ static void menu_cb(GtkWidget *widget, gpointer data)
@@ -25,7 +25,7 @@ index 99ae4fc..40f11d5 100644
  		     _("<big>Change log</big>\n"
  		       "<i>Major differences from earlier program versions.</i>"),
 -		     "CHANGELOG", NULL, NULL);
-+		     "/usr/share/doc/dvdisaster/.CHANGELOG", NULL, NULL);
++		     "/usr/share/doc/dvdisaster/CHANGELOG", NULL, NULL);
  	break;
  
        case MENU_HELP_CREDITS:

debian/patches/22-fix-hurd-i386-ftbfs.patch

@@ -0,0 +1,32 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 4 Jan 2017 03:55:58 +1100
+Subject: Fix FTBFS for hurd-i386.
+
+Description: Fix FTBFS for hurd-i386.
+ Hurd does not have path length restrictions, so doesn't define
+ PATH_MAX. Assuming a PATH_MAX of 4096 as a quick workaround.
+Author: Carlos Maddela <e7appew@gmail.com>
+Origin: vendor
+Forwarded: no
+Last-Update: 2017-01-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ menubar.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/menubar.c b/menubar.c
+index 33e6ba4..0a40e1a 100644
+--- a/menubar.c
++++ b/menubar.c
+@@ -23,6 +23,10 @@
+ 
+ #include <limits.h>
+ 
++#ifndef PATH_MAX
++  #define PATH_MAX 4096
++#endif
++
+ /***
+  *** Forward declarations
+  ***/

debian/patches/23-add-bdrom-support.patch

@@ -0,0 +1,32 @@
+From: Corey Wright <undefined@pobox.com>
+Date: Sat, 24 Sep 2016 14:16:10 -0500
+Subject: Add support for BD-ROM media-type.
+
+Description: Add support for BD-ROM media-type.
+ The attached patch adds support to dvdisaster for the BD-ROM
+ media-type.  This allows dvdisaster to scan and read (ie create ISO
+ images of) BD-ROM media.
+Author: Corey Write <undefined@pobox.com>
+Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849518;filename=dvdisaster-add_bdrom_support.patch;msg=5
+Bug-Debian: https://bugs.debian.org/849518
+Forwarded: no
+Last-Update: 2016-12-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ scsi-layer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scsi-layer.c b/scsi-layer.c
+index 0ba0976..8b005ec 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -1035,7 +1035,7 @@ static int query_bd(DeviceHandle *dh, int probe_only)
+ 
+    if(!strncmp((char*)&buf[4+8], "BDO", 3))
+    {  dh->typeDescr = g_strdup("BD-ROM");
+-      dh->subType = UNSUPPORTED;
++      dh->subType = BD;
+    }
+ 
+    if(!strncmp((char*)&buf[4+8], "BDW", 3))

debian/patches/series

@@ -18,3 +18,5 @@
 19-show-text-files-with-abs-path.patch
 20-display-changelog-credits-and-todo.patch
 21-fix-privacy-breach-in-doco.patch
+22-fix-hurd-i386-ftbfs.patch
+23-add-bdrom-support.patch

debian/rules

@@ -6,16 +6,27 @@ include /usr/share/dpkg/buildflags.mk
 export DEB_CFLAGS_MAINT_APPEND = $(CPPFLAGS) -Wall -Wno-deprecated-declarations -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+MUTABLE_FILES := build.h $(wildcard locale/*.po)
+
 %:
 	dh $@
 
 override_dh_auto_configure:
+	for f in $(MUTABLE_FILES); do \
+		cp -an $$f $$f.orig; \
+	done
 	dh_auto_configure -- \
 		--localedir=\$${prefix}/share/locale \
 		--docdir=\$${prefix}share/doc \
 		--docsubdir=dvdisaster-doc/html \
 		--with-embedded-src-path=no
 
+override_dh_clean:
+	dh_clean -X.orig
+	for f in $(MUTABLE_FILES); do \
+		test ! -f $$f.orig || mv -f $$f.orig $$f; \
+	done
+
 override_dh_auto_build-arch:
 	make all
 
@@ -33,5 +44,5 @@ override_dh_auto_install-indep:
 # automatically decompress text files.
 override_dh_compress:
 	dh_compress -p dvdisaster \
-		-X.CHANGELOG -XCREDITS -XREADME.MODIFYING -XTODO
+		-XCHANGELOG -XCREDITS -XREADME.MODIFYING -XTODO
 	dh_compress --remaining-packages

debian/source/options

@@ -0,0 +1 @@
+no-unapply-patches

debian/watch

@@ -3,4 +3,4 @@ opts="pgpsigurlmangle=s/$/.gpg/, \
       compression=xz, \
       repack" \
 http://dvdisaster.net/en/index.html \
-     (?:.*?/)?dvdisaster-(.*)\.tar\.bz2 0.72.6 uupdate
+     (?:.*?/)?dvdisaster-(.*)\.tar\.bz2 debian uupdate