[SCM] GNU Shockwave Flash (SWF) player branch, master, updated. debian/0.8.11_git20120629-1-3-g98e1794

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Shockwave Flash (SWF) player".

The branch, master has been updated
       via  98e1794d557b309e166f63a34f731f2ebbea4bc2 (commit)
       via  ecfb2847a925ee3f19f5a7ef7abe03928846d418 (commit)
       via  15bd42982893cfd5926d2c9419116a8cc1b67b16 (commit)
      from  fb44eff4e3b715fe2610cabc1e1767539b6363f1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 98e1794d557b309e166f63a34f731f2ebbea4bc2
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Jul 1 18:01:22 2012 +0000

    Remove ftbfs patch, not reproducible anymore with dh9, w/o hardening-wrapper.

commit ecfb2847a925ee3f19f5a7ef7abe03928846d418
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Jul 1 17:57:03 2012 +0000

    Switch to dh compat 9.

commit 15bd42982893cfd5926d2c9419116a8cc1b67b16
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Jul 1 00:32:37 2012 +0000

    Add compile to clean target.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog            |    7 +++++++
 debian/compat               |    2 +-
 debian/control              |    3 +--
 debian/patches/01gprocessor |   13 -------------
 debian/patches/series       |    1 -
 debian/rules                |   31 ++++++++++++-------------------
 6 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00075ae..756730b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnash (0.8.11~git20120629-2) UNRELEASED; urgency=low
+
+  * Switch to dh compatibility 9.
+    + Remove hardening-wrapper from B-D.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 01 Jul 2012 17:55:07 +0000
+
 gnash (0.8.11~git20120629-1) unstable; urgency=low
 
   * Git snapshot.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index c335bce..8c1a1e5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Miriam Ruiz <little_miry at yahoo.es>,
 Build-Depends: autoconf,
                automake,
                autotools-dev,
-               debhelper (>= 7.0.50~7),
+               debhelper (>= 9),
                dejagnu,
                dh-buildinfo,
                docbook,
@@ -16,7 +16,6 @@ Build-Depends: autoconf,
                docbook2x,
                doxygen,
                dpkg-dev (>= 1.13.19),
-               hardening-wrapper,
                intltool,
                kdelibs5-dev,
                libagg-dev,
diff --git a/debian/patches/01gprocessor b/debian/patches/01gprocessor
deleted file mode 100644
index d98db0f..0000000
--- a/debian/patches/01gprocessor
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Fix FTBFS due to relocation R_X86_64_32.
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
-
---- a/utilities/Makefile.am
-+++ b/utilities/Makefile.am
-@@ -61,6 +61,7 @@
- 	$(GLIB_CFLAGS) \
- 	$(BOOST_CFLAGS) \
- 	$(PTHREAD_CFLAGS) \
-+	-fPIC \
- 	$(NULL)
- 
- if BUILD_EGL_DEVICE
diff --git a/debian/patches/series b/debian/patches/series
index 38d6060..1eb8018 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 00sensible
-01gprocessor
diff --git a/debian/rules b/debian/rules
index a0d2346..6ba6711 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
-export DEB_BUILD_HARDENING=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+export DEB_CFLAGS_MAINT_APPEND  = -Wall -Werror-implicit-function-declaration
+export DEB_CXXFLAGS_MAINT_APPEND  = -Wall
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-add-needed
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -17,28 +21,13 @@ OBJDIR    := $(CURDIR)/tmp.build
 	intltool-merge -d debian/po $< $@
 
 %:
-	dh --builddirectory=$(OBJDIR) --with python2 $@
-
-CFLAGS = -Wall -g -Werror-implicit-function-declaration
-LDFLAGS = -Wl,--no-add-needed
-CXXFLAGS = -Wall -g
+	dh $@ --builddirectory=$(OBJDIR) --with python2
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-	CXXFLAGS += -O0
-else
-	CFLAGS += -O2
-	CXXFLAGS += -O2
-endif
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
+       export MAKEFLAGS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
 CONFIGURE_FLAGS = \
-		CFLAGS="$(CFLAGS)" \
-		CXXFLAGS="$(CXXFLAGS)" \
-		LDFLAGS="$(LDFLAGS)" \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
@@ -63,6 +52,10 @@ CONFIGURE_FLAGS = \
 override_dh_auto_configure:
 	./autogen.sh
 	mkdir -p $(OBJDIR)
+	@echo CFLAGS=$(CFLAGS)
+	@echo CPPFLAGS=$(CPPFLAGS)
+	@echo CXXFLAGS=$(CXXFLAGS)
+	@echo LDFLAGS=$(LDFLAGS)
 	cd $(OBJDIR) && ../configure $(CONFIGURE_FLAGS)
 	-cp revno.h $(OBJDIR)
 
@@ -113,7 +106,7 @@ override_dh_makeshlibs:
 
 override_dh_auto_clean:
 	rm -f config.guess config.sub configure ltmain.sh gnashconfig.h.in
-	rm -f debian/gnash.png $(OUTFILES)
+	rm -f debian/gnash.png $(OUTFILES) compile
 	rm -rf autom4te.cache libltdl $(OBJDIR) 
 	rm -f aclocal.m4 macros/argz.m4 macros/libtool.m4 macros/lt*.m4
 	find . -name Makefile.in -delete


hooks/post-receive
-- 
GNU Shockwave Flash (SWF) player