[Pkg-opt-media-team] [dvdisaster] 15/61: Tidy up installation of doc 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 52734ab081ecd2703e2ac51cdc7e3793a8d166b6
Author: Carlos Maddela <e7appew at gmail.com>
Date:   Mon Dec 19 05:18:19 2016 +1100

    Tidy up installation of doc files.
---
 debian/dvdisaster-doc.install    |  2 +-
 debian/patches/11-no-cruft.patch | 53 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     |  6 -----
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/debian/dvdisaster-doc.install b/debian/dvdisaster-doc.install
index b950696..fa9cd94 100644
--- a/debian/dvdisaster-doc.install
+++ b/debian/dvdisaster-doc.install
@@ -1 +1 @@
-/usr/share/doc/dvdisaster-doc
+usr/share/doc/dvdisaster-doc
diff --git a/debian/patches/11-no-cruft.patch b/debian/patches/11-no-cruft.patch
new file mode 100644
index 0000000..fd2f013
--- /dev/null
+++ b/debian/patches/11-no-cruft.patch
@@ -0,0 +1,53 @@
+From: Carlos Maddela <e7appew at gmail.com>
+Date: Mon, 19 Dec 2016 05:06:30 +1100
+Subject: Do not install cruft.
+
+Description: Do not install cruft.
+Author: Carlos Maddela <e7appew at gmail.com>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2016-12-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template | 20 +-------------------
+ 1 file changed, 1 insertion(+), 19 deletions(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index fe4c504..10e4524 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -315,11 +315,6 @@ install: dvdisaster images
+ 	install -d $(BUILDROOT)$(BINDIR)
+ 	install dvdisaster$(EXE_SUFFIX) $(BUILDROOT)$(BINDIR)
+ 	install -d $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 CHANGELOG $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 COPYING $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 CREDITS* $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 README.MODIFYING $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 TODO $(BUILDROOT)$(DOCSUBDIR)
+ 	for i in $(DOC_LOCALES); do \
+ 	  install -d $(BUILDROOT)$(DOCSUBDIR)/$$i; \
+ 	  (cd documentation; install -m 644 $$i/*.html $(BUILDROOT)$(DOCSUBDIR)/$$i); \
+@@ -355,20 +350,7 @@ install: dvdisaster images
+ 	    install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES; \
+ 	  done \
+ 	fi
+-	@echo "# dvdisaster uninstaller script" > $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@echo >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@for i in $(PO_LOCALES); do \
+-	  echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
+-	done
+-	@for i in $(MAN_LOCALES); do \
+-	  echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
+-	done
+-	@echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	
++
+ uninstall:
+ 	@echo "Uninstalling package..."
+ 	rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh
diff --git a/debian/patches/series b/debian/patches/series
index 831bf0d..374b4fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 08-fix-gnu-make-detection.patch
 09-fix-format-security-warnings.patch
 10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch
+11-no-cruft.patch
diff --git a/debian/rules b/debian/rules
index 84c82d6..01f5772 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,3 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	dh_auto_install -- BUILDROOT=$(CURDIR)/debian/tmp
-
-	# Removing double files
-	rm -f debian/tmp/usr/bin/dvdisaster-uninstall.sh
-	rm -f debian/tmp/usr/share/doc/dvdisaster-doc/html/CHANGELOG
-	rm -f debian/tmp/usr/share/doc/dvdisaster-doc/html/COPYING
-

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