From 1382e19eb56fea435aa7aa16582145fca669eb7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Sun, 3 Oct 2021 17:29:57 +0200 Subject: [PATCH] upstream: 11:9fa5dfdc9718 [strengthened install and uninstall against path names with blanks] strengthened install and uninstall against path names with blanks; small updates in various files and documentation --- CREDITS.de | 3 ++ CREDITS.en | 3 ++ GNUmakefile.template | 76 ++++++++++++++++++-------------- INSTALL | 1 + documentation/user-manual/qa.tex | 12 +++++ scripts/bash-based-configure | 3 +- 6 files changed, 65 insertions(+), 33 deletions(-) diff --git a/CREDITS.de b/CREDITS.de index 6ad4756..4b35b7a 100644 --- a/CREDITS.de +++ b/CREDITS.de @@ -10,6 +10,9 @@ Harald Bögeholz (hwb@heise.de) Anregungen und Ideen zurück; er hatte zuvor schon eine ähnliche Strategie entwickelt und in Ausgabe 16/2005 der c't veröffentlicht. +Jesus Cea + hat das Projekt am Leben erhalten und ermöglicht momentan das Datenhosting + Julian Einwag (julian@einwag.de) erstellt und pflegt die Mac OS X / Darwin - spezifischen Anpassungen. diff --git a/CREDITS.en b/CREDITS.en index dd03682..fb3dc95 100644 --- a/CREDITS.en +++ b/CREDITS.en @@ -10,6 +10,9 @@ Harald Bögeholz (hwb@heise.de) suggestions and ideas; he had implemented a similar strategy before and published in issue 16/2005 of the german periodical "c't". +Jesus Cea + for keeping the project alive and providing hosting for the project + Julian Einwag (julian@einwag.de). provides and maintains the Mac OS X / Darwin port. diff --git a/GNUmakefile.template b/GNUmakefile.template index 4ea037a..de0ddf5 100644 --- a/GNUmakefile.template +++ b/GNUmakefile.template @@ -75,11 +75,11 @@ SYS_OPTIONS = $(CFG_SYS_OPTIONS) SYS_NAME = $(CFG_SYS_NAME) HAVE_OPTIONS = $(CFG_HAVE_OPTIONS) WITH_OPTIONS = $(CFG_WITH_OPTIONS) -OTHER_OPTIONS = $(CFG_OTHER_OPTIONS) -DVERSION=\"$(VERSION)\" +OTHER_OPTIONS = $(CFG_OTHER_OPTIONS) -DVERSION="\"$(VERSION)\"" SSE2_OPTIONS = $(CFG_SSE2_OPTIONS) ALTIVEC_OPTIONS = $(CFG_ALTIVEC_OPTIONS) -LOCATIONS = -DSRCDIR=\"$(SRCDIR)\" -DBINDIR=\"$(BINDIR)\" -DDOCDIR=\"$(DOCSUBDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" +LOCATIONS = -DSRCDIR="\"$(SRCDIR)\"" -DBINDIR="\"$(BINDIR)\"" -DDOCDIR="\"$(DOCSUBDIR)\"" -DLOCALEDIR="\"$(LOCALEDIR)\"" COPTS = $(CFLAGS) $(LOCATIONS) $(SYS_OPTIONS) $(SYS_NAME) $(HAVE_OPTIONS) $(WITH_OPTIONS) $(OTHER_OPTIONS) $(INTL_INCL) $(CAM_INCL) $(GTK_CFLAGS) $(MUDFLAP_CFLAGS) LOPTS = $(LDFLAGS) $(INTL_LFLAGS) $(CAM_LFLAGS) $(EFENCE_LFLAGS) $(MUDFLAP_LFLAGS) @@ -277,55 +277,67 @@ show: install: dvdisaster manual @echo "Installing package..." - install -d $(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 TODO $(BUILDROOT)$(DOCSUBDIR) - 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 + install -d "$(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 TODO "$(BUILDROOT)$(DOCSUBDIR)" + 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" cd documentation; \ ESCAPED_DOCSUBDIR=`echo $(DOCSUBDIR) | sed -e 's/\//\\\\\//g'`; \ sed "s/%docdir%/$$ESCAPED_DOCSUBDIR/" dvdisaster.updated; \ - install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/man1/dvdisaster.1; \ + install -m 644 dvdisaster.updated "$(BUILDROOT)$(MANDIR)/man1/dvdisaster.1"; \ sed "s/%docdir%/$$ESCAPED_DOCSUBDIR/" dvdisaster.updated; \ - install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/de/man1/dvdisaster.1; \ + install -m 644 dvdisaster.updated "$(BUILDROOT)$(MANDIR)/de/man1/dvdisaster.1"; \ rm dvdisaster.updated if echo $(WITH_OPTIONS) | grep "NLS_YES" >/dev/null; then \ cd locale; \ for i in ?? ??_??; do\ - install -d $(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES; \ - install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES; \ + install -d "$(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES"; \ + 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-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh - @echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh + @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-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)/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 \"$(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo\"" >> "$(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh" ; \ done - @echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh + @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 \"$(MANDIR)/$$i/man1/dvdisaster.1\"" >> "$(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh" ; \ done - @echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh + @echo "echo \"dvdisaster has been uninstalled.\"" >> "$(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh" uninstall: @echo "Uninstalling package..." - rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster-uninstall.sh - rm -rf $(DOCSUBDIR) - rm -f $(MANDIR)/man1/dvdisaster.1 + rm -f "$(BINDIR)/dvdisaster" "$(BINDIR)/dvdisaster-uninstall.sh" + rm -f "$(DOCSUBDIR)/CHANGELOG" + rm -f "$(DOCSUBDIR)/COPYING" + rm -f "$(DOCSUBDIR)/CREDITS.de" + rm -f "$(DOCSUBDIR)/CREDITS.en" + rm -f "$(DOCSUBDIR)/manual.pdf" + rm -f "$(DOCSUBDIR)/TODO" + rmdir "$(DOCSUBDIR)" + rm -f "$(MANDIR)/man1/dvdisaster.1" for i in $(PO_LOCALES); do \ - rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo; \ + rm "$(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo"; \ done for i in $(MAN_LOCALES); do \ - rm $(MANDIR)/$$i/man1/dvdisaster.1; \ + rm "$(MANDIR)/$$i/man1/dvdisaster.1"; \ done archclean: distclean @@ -340,7 +352,7 @@ distclean: clean clean: @echo "Removing rebuildable files" - @rm -rf *.o $(BUILDTMP)/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core + @rm -rf *.o "$(BUILDTMP)"/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core @rm -f src/inlined-icons.h src/help-dialogs.h @find . -name \*\~ -print | xargs rm -f; @find . -name \*.mo -print | xargs rm -f; diff --git a/INSTALL b/INSTALL index 02e9737..823bb5c 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,6 @@ # dvdisaster: Additional error correction for optical media. # Copyright (C) 2004-2018 Carsten Gnoerlich. +# Copyright (C) 2019-2021 The dvdisaster development team. # # Email: support@dvdisaster.org # diff --git a/documentation/user-manual/qa.tex b/documentation/user-manual/qa.tex index d79ca4d..cc0e57c 100644 --- a/documentation/user-manual/qa.tex +++ b/documentation/user-manual/qa.tex @@ -359,6 +359,18 @@ Usable media by type: You are welcome, of course, to provide an unoffical translation of the project documentation on your own webspace and at your own discretion. } + \qa{There are problems opening this manual from dvdisaster\label{qa-manual}} +{dvdisaster uses {\tt xdg-open} for bringing up the PDF viewer. {\tt xdg-open} keeps a record of file types and applications capable of displaying them. However on some systems, {\tt xdg-open} is either not configured properly for viewing PDF, or misconfigured to use inappropriate programs like {\em Gimp}. + + \smallskip + + \paragraph{Remedy.} Configure {\tt xdg-open} properly. Usually the configuration is found in the ``settings'' menu of your desktop. As an alternative, use the command line to configure it for {\em xpdf}: + + \smallskip + + {\tt xdg-mime default xpdf.desktop application/pdf}} + + %\newpage \subsection{Error messages} diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure index 1066028..20bb86b 100644 --- a/scripts/bash-based-configure +++ b/scripts/bash-based-configure @@ -1,5 +1,6 @@ # Bash based configure - library of test functions # Copyright (C) 2004-2016 Carsten Gnörlich +# Copyright (C) 2019-2021 The dvdisaster development team. # # Email: support@dvdisaster.org # @@ -68,7 +69,7 @@ # WITH_OPTION name default adds -DWITH_OPTION_VALUE for -with-option=value args # to CFG_WITH_OPTIONS -CONFIGURE_VERSION="0.58" +CONFIGURE_VERSION="0.59" echo "Bash based configure V$CONFIGURE_VERSION" echo