[Pkg-opt-media-team] [dvdisaster] 33/61: Fix display of changelog, credits and to-do files.

[Takaki Taniguchi]

This is an automated email from the git hooks/post-receive script.

takaki pushed a commit to branch master
in repository dvdisaster.

commit df6fe7761f99185b6788056b99bbc981da0630e5
Author: Carlos Maddela <e7appew at gmail.com>
Date:   Thu Dec 22 12:38:44 2016 +1100

    Fix display of changelog, credits and to-do files.
    
    Use absolute paths to compensate for the fact that we don't install
    duplicates in /usr/share/doc/dvdisaster-doc or build with source
    path embedded anymore.
---
 debian/dvdisaster.install                          |  1 +
 .../20-display-changelog-credits-and-todo.patch    | 47 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  8 ++++
 4 files changed, 57 insertions(+)

diff --git a/debian/dvdisaster.install b/debian/dvdisaster.install
index 303dfb8..40ab72c 100755
--- a/debian/dvdisaster.install
+++ b/debian/dvdisaster.install
@@ -8,3 +8,4 @@ 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
diff --git a/debian/patches/20-display-changelog-credits-and-todo.patch b/debian/patches/20-display-changelog-credits-and-todo.patch
new file mode 100644
index 0000000..df210e8
--- /dev/null
+++ b/debian/patches/20-display-changelog-credits-and-todo.patch
@@ -0,0 +1,47 @@
+From: Carlos Maddela <e7appew at gmail.com>
+Date: Wed, 21 Dec 2016 09:59:58 +1100
+Subject: Fix display of changelog, credits and to-do files.
+
+Description: Fix display of changelog, credits and to-do files.
+ Use absolute paths to compensate for the fact that we don't install
+ duplicates in /usr/share/doc/dvdisaster-doc or build with source
+ path embedded anymore.
+Author: Carlos Maddela <e7appew at gmail.com>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2016-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ menubar.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/menubar.c b/menubar.c
+index 99ae4fc..40f11d5 100644
+--- a/menubar.c
++++ b/menubar.c
+@@ -116,21 +116,21 @@ static void menu_cb(GtkWidget *widget, gpointer data)
+         ShowTextfile(_("windowtitle|Change log"), 
+ 		     _("<big>Change log</big>\n"
+ 		       "<i>Major differences from earlier program versions.</i>"),
+-		     "CHANGELOG", NULL, NULL);
++		     "/usr/share/doc/dvdisaster/.CHANGELOG", NULL, NULL);
+ 	break;
+ 
+       case MENU_HELP_CREDITS:
+         ShowTextfile(_("windowtitle|Credits"), 
+ 		     _("<big>Credits</big>\n"
+ 		       "<i>Thanks go out to...</i>"),
+-		     "CREDITS", NULL, NULL);
++		     "/usr/share/doc/dvdisaster/CREDITS", NULL, NULL);
+ 	break;
+ 
+       case MENU_HELP_TODO:
+ 	ShowTextfile(_("windowtitle|To do list"), 
+ 		     _("<big>To do list</big>\n"
+ 		       "<i>A sneak preview of coming features ... perhaps ;-)</i>"),
+-		     "TODO", NULL, NULL);
++		     "/usr/share/doc/dvdisaster/TODO", NULL, NULL);
+ 	break;
+ 
+       default:
diff --git a/debian/patches/series b/debian/patches/series
index f0ec98c..147818c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 17-fix-all-but-deprecated-api-warnings.patch
 18-update-copyright-in-about-dialog.patch
 19-show-text-files-with-abs-path.patch
+20-display-changelog-credits-and-todo.patch
diff --git a/debian/rules b/debian/rules
index 6f3b38b..65c21bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,3 +27,11 @@ override_dh_auto_install-arch:
 
 override_dh_auto_install-indep:
 	make install-doc BUILDROOT=$(CURDIR)/debian/tmp
+
+# Ensure that none of the text files that the application
+# tries to display directly are not compressed, as it doesn't
+# automatically decompress text files.
+override_dh_compress:
+	dh_compress -p dvdisaster \
+		-X.CHANGELOG -XCREDITS -XREADME.MODIFYING -XTODO
+	dh_compress --remaining-packages

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opt-media/dvdisaster.git