Refresh and drop patches.

The following patches have been dropped:
    01-libpng15.patch
    06-remove-encoding-from-desktop-file.patch
    07-fix-spelling-errors-in-binaries.patch
    09-fix-format-security-warnings.patch
    21-fix-privacy-breach-in-doco.patch
This commit is contained in:
Carlos Maddela
2017-01-05 14:21:59 +11:00
parent 16c1f0cc01
commit df576e4510
21 changed files with 439 additions and 1024 deletions

View File

@@ -6,48 +6,54 @@ Description: Do not install cruft.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2016-12-19
Last-Update: 2017-01-05
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
GNUmakefile.template | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
GNUmakefile.template | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/GNUmakefile.template b/GNUmakefile.template
index fe4c504..10e4524 100644
index a3074c7..6fda92b 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -315,11 +315,6 @@ install: dvdisaster images
@@ -228,12 +228,6 @@ install: dvdisaster manual
install -d $(BUILDROOT)$(BINDIR)
install dvdisaster$(EXE_SUFFIX) $(BUILDROOT)$(BINDIR)
install dvdisaster $(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 -d $(BUILDROOT)$(DOCSUBDIR)
(cd documentation/user-manual; install -m 644 manual.pdf $(BUILDROOT)$(DOCSUBDIR))
install -d $(BUILDROOT)$(MANDIR)/man1
install -d $(BUILDROOT)$(MANDIR)/de/man1
@@ -251,26 +245,6 @@ install: dvdisaster manual
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
- @echo "rm -f \"$(BINDIR)/dvdisaster\" \"$(BINDIR)/dvdisaster-uninstall.sh\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/CHANGELOG\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/COPYING\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/CREDITS.de\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/CREDITS.en\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/manual.pdf\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/README.MODIFYING\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/TODO\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rmdir \"$(DOCSUBDIR)\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @for i in $(PO_LOCALES); do \
- echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- echo "rm -f \"$(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- done
- @echo "rm -f \"$(MANDIR)/man1/dvdisaster.1\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @for i in $(MAN_LOCALES); do \
- echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- echo "rm -f \"$(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