From eaa545b89c98d5f6f352c440727276ae208234ab Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Tue, 8 Aug 2017 03:18:19 +1000 Subject: [PATCH 1/6] Fix another build failure on kFreeBSD. --- debian/changelog | 7 +++++++ .../31-improve-hurd-and-kfreebsd-support.patch | 16 +--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 171c739..58f24cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dvdisaster (0.79.5-3) UNRELEASED; urgency=medium + + * Team upload. + * Fix another build failure on kFreeBSD. + + -- Carlos Maddela Tue, 08 Aug 2017 03:13:26 +1000 + dvdisaster (0.79.5-2) unstable; urgency=medium [ Carlos Maddela ] diff --git a/debian/patches/31-improve-hurd-and-kfreebsd-support.patch b/debian/patches/31-improve-hurd-and-kfreebsd-support.patch index 6b1b24d..a62d867 100644 --- a/debian/patches/31-improve-hurd-and-kfreebsd-support.patch +++ b/debian/patches/31-improve-hurd-and-kfreebsd-support.patch @@ -11,14 +11,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- cacheprobe.c | 16 +++++++++------- closure.c | 6 ++++-- - rs03-create.c | 2 +- scripts/bash-based-configure | 18 ++++++++++++++++++ scsi-freebsd.c | 4 ++-- scsi-layer.c | 10 ++++++---- scsi-layer.h | 17 +++++++++-------- scsi-unknown.c | 4 ++-- show-html.c | 15 ++++++++++----- - 9 files changed, 61 insertions(+), 31 deletions(-) + 8 files changed, 60 insertions(+), 30 deletions(-) diff --git a/cacheprobe.c b/cacheprobe.c index 60c55f9..f30f5d3 100644 @@ -99,19 +98,6 @@ index 632c103..7c8b3bd 100644 #ifdef HAVE_64BIT #define BITNESS_STRING " 64bit" #else -diff --git a/rs03-create.c b/rs03-create.c -index b14e326..7a22bae 100644 ---- a/rs03-create.c -+++ b/rs03-create.c -@@ -43,7 +43,7 @@ - - #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE) - --#elif defined(SYS_FREEBSD) -+#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) - - #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ) - diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure index d62f5d7..9abcf96 100644 --- a/scripts/bash-based-configure From a66cebafd38de294070e3cf82659079835b19489 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Tue, 8 Aug 2017 10:16:21 +1000 Subject: [PATCH 2/6] Bump Standards Version to 4.0.1. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 58f24cc..1be1719 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ dvdisaster (0.79.5-3) UNRELEASED; urgency=medium * Team upload. * Fix another build failure on kFreeBSD. + * Bump Standards Version to 4.0.1. -- Carlos Maddela Tue, 08 Aug 2017 03:13:26 +1000 diff --git a/debian/control b/debian/control index 09b88bb..dc4ebf7 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10), # Build-Depends-Indep: texlive-fonts-recommended, # texlive-latex-base, # texlive-latex-extra -Standards-Version: 4.0.0 +Standards-Version: 4.0.1 Vcs-Browser: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git Vcs-Git: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git Homepage: http://dvdisaster.net/ From 34afe54009ff12624ae45540f18ea490670e6ee3 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Wed, 9 Aug 2017 21:23:31 +1000 Subject: [PATCH 3/6] Regenerate patches with git version 2.14.0. --- debian/changelog | 1 + debian/patches/27-allow-opening-in-browser-again.patch | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1be1719..92643be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ dvdisaster (0.79.5-3) UNRELEASED; urgency=medium * Team upload. * Fix another build failure on kFreeBSD. * Bump Standards Version to 4.0.1. + * Regenerate patches with git version 2.14.0. -- Carlos Maddela Tue, 08 Aug 2017 03:13:26 +1000 diff --git a/debian/patches/27-allow-opening-in-browser-again.patch b/debian/patches/27-allow-opening-in-browser-again.patch index cbb3eea..d61a01b 100644 --- a/debian/patches/27-allow-opening-in-browser-again.patch +++ b/debian/patches/27-allow-opening-in-browser-again.patch @@ -48,19 +48,19 @@ index db2031e..22eab5a 100644 GMutex progressLock; /* A mutex protected the stuff below */ char bs[256]; /* A string of 255 backspace characters */ -@@ -1299,6 +1300,12 @@ int ProbeAltiVec(void); +@@ -1298,6 +1299,12 @@ int ProbeAltiVec(void); + void ShowPDF(char*); - /*** ++/*** + *** show-html.c + ***/ + +void ShowHTML(char*); + -+/*** + /*** *** smart-lec.c ***/ - diff --git a/help-dialogs.c b/help-dialogs.c index 5065e76..3874463 100644 --- a/help-dialogs.c From af00bbb1cbbae5eb1f31e019789ee6cb24616fe6 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Wed, 9 Aug 2017 21:28:41 +1000 Subject: [PATCH 4/6] Do not suppress the display of compilation commands Do not suppress the display of compilation commands, so that build logs may be analysed by blhc. --- debian/changelog | 2 + .../32-display-compilation-commands.patch | 192 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 195 insertions(+) create mode 100644 debian/patches/32-display-compilation-commands.patch diff --git a/debian/changelog b/debian/changelog index 92643be..647885e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ dvdisaster (0.79.5-3) UNRELEASED; urgency=medium * Fix another build failure on kFreeBSD. * Bump Standards Version to 4.0.1. * Regenerate patches with git version 2.14.0. + * Do not suppress the display of compilation commands, + so that build logs may be analysed by blhc. -- Carlos Maddela Tue, 08 Aug 2017 03:13:26 +1000 diff --git a/debian/patches/32-display-compilation-commands.patch b/debian/patches/32-display-compilation-commands.patch new file mode 100644 index 0000000..1fe92b7 --- /dev/null +++ b/debian/patches/32-display-compilation-commands.patch @@ -0,0 +1,192 @@ +From: Carlos Maddela +Date: Wed, 9 Aug 2017 20:49:31 +1000 +Subject: Do not suppress the display of compilation commands + +Description: Do not suppress the display of compilation commands, + so that build logs may be analysed by blhc. +Author: Carlos Maddela +Forwarded: not-needed +Last-Update: 2017-08-9 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + GNUmakefile.template | 93 +++++++++++++++++++++++++--------------------------- + 1 file changed, 45 insertions(+), 48 deletions(-) + +diff --git a/GNUmakefile.template b/GNUmakefile.template +index d80932d..ac1f597 100644 +--- a/GNUmakefile.template ++++ b/GNUmakefile.template +@@ -71,41 +71,41 @@ OFILES = $(CFG_OFILES) + + ${BUILDTMP}/%.o : %.c + @echo "Compiling:" $? +- @$(CC) $(COPTS) -c $? -o $@ ++ $(CC) $(COPTS) -c $? -o $@ + + all: time-stamp dvdisaster + + # Building the dvdisaster binary + + time-stamp: +- @$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h ++ $(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h + + dvdisaster: inlined-icons.h $(OFILES) + @echo "Linking : dvdisaster" +- @$(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster +- @if test -e locale/de/LC_MESSAGES/dvdisaster.mo \ ++ $(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster ++ if test -e locale/de/LC_MESSAGES/dvdisaster.mo \ + || echo $(WITH_OPTIONS) | grep "NLS_NO" >/dev/null; \ + then echo "not touching locale"; \ + else $(MAKE) --no-print-directory -C locale; \ + fi + + inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png +- @gdk-pixbuf-csource --raw --name=dvdisaster_read icons/read.png >inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_create icons/create.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_scan icons/scan.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_fix icons/fix.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_verify icons/verify.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_cd icons/cd.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help icons/gtk-help.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index icons/gtk-index.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_read icons/read.png >inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_create icons/create.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_scan icons/scan.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_fix icons/fix.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_verify icons/verify.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_cd icons/cd.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help icons/gtk-help.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index icons/gtk-index.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >>inlined-icons.h ++ gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >>inlined-icons.h + + $(BUILDTMP)/help-dialogs.o: help-dialogs.c simple-md5sum +- @if test -e fingerprints.md5; \ ++ if test -e fingerprints.md5; \ + then if test -e help-dialogs.h; then rm help-dialogs.h; fi; \ + mv inlined-icons.h inlined-icons.saved; \ + mv build.h build.saved; \ +@@ -121,35 +121,35 @@ $(BUILDTMP)/help-dialogs.o: help-dialogs.c simple-md5sum + else echo "#define MODIFIED_SOURCE 1" >> help-dialogs.h; \ + fi + @echo "Compiling:" help-dialogs.c +- @$(CC) $(COPTS) -c help-dialogs.c -o $(BUILDTMP)/help-dialogs.o ++ $(CC) $(COPTS) -c help-dialogs.c -o $(BUILDTMP)/help-dialogs.o + + $(BUILDTMP)/rs-encoder-sse2.o: rs-encoder-sse2.c + @echo "Compiling:" rs-encoder-sse2.c +- @$(CC) $(SSE2_OPTIONS) $(COPTS) -c rs-encoder-sse2.c -o $(BUILDTMP)/rs-encoder-sse2.o ++ $(CC) $(SSE2_OPTIONS) $(COPTS) -c rs-encoder-sse2.c -o $(BUILDTMP)/rs-encoder-sse2.o + + $(BUILDTMP)/rs-encoder-altivec.o: rs-encoder-altivec.c + @echo "Compiling:" rs-encoder-altivec.c +- @$(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o ++ $(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o + + locale: +- @$(MAKE) --no-print-directory -C locale ++ $(MAKE) --no-print-directory -C locale + + untranslated: +- @$(MAKE) --no-print-directory -C locale check-untranslated ++ $(MAKE) --no-print-directory -C locale check-untranslated + + simple-md5sum: md5.c +- @$(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum ++ $(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum + + version.tex: + @echo "\\newcommand{\\projectversion}{$(VERSION)}" >$(SRCDIR)/documentation/config/version.tex + + manual: version.tex + @echo "Producing user manual... " +- @$(MAKE) --no-print-directory -C documentation/user-manual manual.pdf ++ $(MAKE) --no-print-directory -C documentation/user-manual manual.pdf + + manualclean: + @echo "Removing temporary user manual files... " +- @$(MAKE) --no-print-directory -C documentation/user-manual clean ++ $(MAKE) --no-print-directory -C documentation/user-manual clean + + + # Some usage info +@@ -259,13 +259,13 @@ uninstall: + + archclean: distclean + @echo "Removing rebuildable documentation parts" +- @$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs archclean +- @$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual archclean ++ $(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs archclean ++ $(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual archclean + + distclean: clean + @echo "Removing configuration files" +- @rm -f configure.log Makefile.config GNUmakefile locale/Makefile +- @for i in locale/?? locale/??_??; do rm -rf $$i; done ++ rm -f configure.log Makefile.config GNUmakefile locale/Makefile ++ for i in locale/?? locale/??_??; do rm -rf $$i; done + @echo "all:" >>GNUmakefile + @echo -e "\t@echo" >>GNUmakefile + @echo -e "\t@echo \"Please create a Makefile by entering \\\"bash configure\\\" first\"" >>GNUmakefile +@@ -277,14 +277,14 @@ distclean: clean + + clean: + @echo "Removing rebuildable files" +- @rm -rf *.o $(BUILDTMP)/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core +- @rm -f inlined-icons.h help-dialogs.h +- @find . -name \*\~ -print | xargs rm -f; +- @find . -name \*.mo -print | xargs rm -f; +- @find . -name \#\*\# -print | xargs rm -f; +- @rm -f documentation/config/version.tex +- @if test -e $(PKGNAME); then rm -rf $(PKGNAME); fi +- @if test -e ~/.dvdisaster-original-author; then \ ++ rm -rf *.o $(BUILDTMP)/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core ++ rm -f inlined-icons.h help-dialogs.h ++ find . -name \*\~ -print | xargs rm -f; ++ find . -name \*.mo -print | xargs rm -f; ++ find . -name \#\*\# -print | xargs rm -f; ++ rm -f documentation/config/version.tex ++ if test -e $(PKGNAME); then rm -rf $(PKGNAME); fi ++ if test -e ~/.dvdisaster-original-author; then \ + mv build.h build.saved ;\ + if ! test -x simple-md5sum || ! ./simple-md5sum >/dev/null 2>&1; then \ + rm -f simple-md5sum; \ +@@ -294,20 +294,17 @@ clean: + ./simple-md5sum -b *.h *.c >fingerprints.md5 ;\ + mv build.saved build.h; \ + fi +- @rm -f simple-md5sum +- @$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs clean; +- @$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual clean; ++ rm -f simple-md5sum ++ $(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs clean; ++ $(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual clean; + + BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3` + arch: archclean time-stamp +- @cd .. ; tar -c -z -f $(TAR_PREFIX)/$(PKGNAME)-$(BUILD).tgz $(PKGNAME) ++ cd .. ; tar -c -z -f $(TAR_PREFIX)/$(PKGNAME)-$(BUILD).tgz $(PKGNAME) + + INSTALL: documentation/install.template +- @sed "s/@@PKGNAME/$(PKGNAME)/" INSTALL ++ sed "s/@@PKGNAME/$(PKGNAME)/" INSTALL + + srcdist: INSTALL distclean manual manualclean +- @cd .. ; tar -c -j -X $(PKGNAME)/NODIST -f $(TAR_PREFIX)/$(PKGNAME).tar.bz2 $(PKGNAME) +- @cd .. ; gpg --homedir .gnupg --default-key 758BCC23 --detach-sign --output $(TAR_PREFIX)/$(PKGNAME).tar.bz2.gpg --armor $(TAR_PREFIX)/$(PKGNAME).tar.bz2 +- +- +- ++ cd .. ; tar -c -j -X $(PKGNAME)/NODIST -f $(TAR_PREFIX)/$(PKGNAME).tar.bz2 $(PKGNAME) ++ cd .. ; gpg --homedir .gnupg --default-key 758BCC23 --detach-sign --output $(TAR_PREFIX)/$(PKGNAME).tar.bz2.gpg --armor $(TAR_PREFIX)/$(PKGNAME).tar.bz2 diff --git a/debian/patches/series b/debian/patches/series index f387f93..ebd02f0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -23,3 +23,4 @@ 29-fix-more-typos.patch 30-hurd-kfreebsd-ftbfs.patch 31-improve-hurd-and-kfreebsd-support.patch +32-display-compilation-commands.patch From 520b4cb8c9761bed2ea5b2c6e14790f5365cb38d Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Mon, 14 Aug 2017 14:41:09 +1000 Subject: [PATCH 5/6] Update uploaders list. Add myself to uploaders list. --- debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 647885e..fb16b53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dvdisaster (0.79.5-3) UNRELEASED; urgency=medium * Regenerate patches with git version 2.14.0. * Do not suppress the display of compilation commands, so that build logs may be analysed by blhc. + * Update uploaders list. -- Carlos Maddela Tue, 08 Aug 2017 03:13:26 +1000 diff --git a/debian/control b/debian/control index dc4ebf7..59d4b40 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: otherosfs Priority: optional Maintainer: Optical Media Tools Team Uploaders: TANIGUCHI Takaki , - Rogério Brito + Rogério Brito , + Carlos Maddela Build-Depends: debhelper (>= 10), dh-exec, dpkg-dev (>= 1.16.1.1), From 9f38622429ea14adb52b553131f8c19ca71f518c Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Mon, 14 Aug 2017 14:53:19 +1000 Subject: [PATCH 6/6] Release version 0.79.5-3 to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb16b53..f618a5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dvdisaster (0.79.5-3) UNRELEASED; urgency=medium +dvdisaster (0.79.5-3) unstable; urgency=medium * Team upload. * Fix another build failure on kFreeBSD. @@ -8,7 +8,7 @@ dvdisaster (0.79.5-3) UNRELEASED; urgency=medium so that build logs may be analysed by blhc. * Update uploaders list. - -- Carlos Maddela Tue, 08 Aug 2017 03:13:26 +1000 + -- Carlos Maddela Mon, 14 Aug 2017 14:52:56 +1000 dvdisaster (0.79.5-2) unstable; urgency=medium