From f8dc3ae4a9e241573d1ba3fd56043a071fc9c05f Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 5 Jan 2017 03:09:06 +1100 Subject: [PATCH] Use original name for the duplicate uncompressed upstream CHANGELOG. --- debian/dvdisaster.docs | 1 + debian/dvdisaster.install | 1 - debian/patches/20-display-changelog-credits-and-todo.patch | 6 +++--- debian/rules | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/dvdisaster.docs b/debian/dvdisaster.docs index 3505337..0be57d0 100644 --- a/debian/dvdisaster.docs +++ b/debian/dvdisaster.docs @@ -1,3 +1,4 @@ +CHANGELOG CREDITS.* README.MODIFYING TODO diff --git a/debian/dvdisaster.install b/debian/dvdisaster.install index 40ab72c..303dfb8 100755 --- a/debian/dvdisaster.install +++ b/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 diff --git a/debian/patches/20-display-changelog-credits-and-todo.patch b/debian/patches/20-display-changelog-credits-and-todo.patch index df210e8..19598d0 100644 --- a/debian/patches/20-display-changelog-credits-and-todo.patch +++ b/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 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 _("Change log\n" "Major differences from earlier program versions."), - "CHANGELOG", NULL, NULL); -+ "/usr/share/doc/dvdisaster/.CHANGELOG", NULL, NULL); ++ "/usr/share/doc/dvdisaster/CHANGELOG", NULL, NULL); break; case MENU_HELP_CREDITS: diff --git a/debian/rules b/debian/rules index 65c21bc..ac84ef9 100755 --- a/debian/rules +++ b/debian/rules @@ -33,5 +33,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