[Pkg-opt-media-team] [dvdisaster] 03/04: Do not suppress the display of compilation commands
Carlos Maddela
maddela-guest at moszumanska.debian.org
Mon Aug 14 05:59:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
maddela-guest pushed a commit to branch experimental/master
in repository dvdisaster.
commit af00bbb1cbbae5eb1f31e019789ee6cb24616fe6
Author: Carlos Maddela <e7appew at gmail.com>
Date: Wed Aug 9 21:28:41 2017 +1000
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 +
.../patches/32-display-compilation-commands.patch | 192 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 195 insertions(+)
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 <e7appew at gmail.com> 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 <e7appew at gmail.com>
+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 <e7appew at gmail.com>
+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 at echo" >>GNUmakefile
+ @echo -e "\t at 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)/" <documentation/install.template >INSTALL
++ sed "s/@@PKGNAME/$(PKGNAME)/" <documentation/install.template >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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opt-media/dvdisaster.git
More information about the Pkg-opt-media-team
mailing list