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

[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  6321ab4f1780c8869de768270886aac3c01b1e9f (commit)
       via  0b12f1fbdb69d0ee93688a4ebe931cc6ce7bc3e1 (commit)
       via  33cc0490c38e1bcbc35f333971975dd3dbf21a48 (commit)
      from  98e1794d557b309e166f63a34f731f2ebbea4bc2 (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 6321ab4f1780c8869de768270886aac3c01b1e9f
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Aug 9 17:46:55 2013 +0200

    Disable jemalloc on hurd and kfreebsd-*.

commit 0b12f1fbdb69d0ee93688a4ebe931cc6ce7bc3e1
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Aug 9 12:15:00 2013 +0200

    get-git-source does shallow clones.

commit 33cc0490c38e1bcbc35f333971975dd3dbf21a48
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Aug 9 12:14:18 2013 +0200

    Add libjemalloc-dev to B-D.

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

Summary of changes:
 debian/changelog |    4 ++++
 debian/control   |    1 +
 debian/rules     |    8 ++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 756730b..c88c063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 gnash (0.8.11~git20120629-2) UNRELEASED; urgency=low
 
+  * Git snapshot.
+    + Embedded jemalloc copy has been replaced by system one.
+      - Add libjemalloc-dev to B-D.
+      - Disable jemalloc on hurd and kfreebsd-*. No longer disabled upstream.
   * Switch to dh compatibility 9.
     + Remove hardening-wrapper from B-D.
 
diff --git a/debian/control b/debian/control
index 8c1a1e5..4a4261f 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Build-Depends: autoconf,
                libgstreamer0.10-dev | gstreamer0.10-dev,
                libgtk2.0-dev,
                libjpeg-dev,
+               libjemalloc-dev,
                libltdl-dev,
                libmysqlclient-dev,
                libpango1.0-dev | pango-dev,
diff --git a/debian/rules b/debian/rules
index 6ba6711..b17a433 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ 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)
+DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 MAIN_VERSION = $(shell dpkg-parsechangelog|sed -n '/^Version/{s/Version: \(.*\)/\1/p}')
 BUILD_VERSION = $(shell echo $(MAIN_VERSION)|sed -n 's/\([0-9.]*\)[-+~].*/\1/p')
@@ -39,7 +40,6 @@ CONFIGURE_FLAGS = \
 		--disable-rpath \
 		--enable-cygnal \
 		--enable-python \
-		--enable-jemalloc \
 		--enable-media=gst,ffmpeg \
 		--enable-gui=gtk,qt4,dump \
 		--enable-renderer=agg,cairo \
@@ -49,6 +49,10 @@ CONFIGURE_FLAGS = \
 		--with-plugins-install=system \
 		--enable-shared=yes
 
+ifneq (,$(filter kfreebsd-% hurd-%,$(DEB_BUILD_ARCH)))
+	CONFIGURE_FLAGS += --disable-jemalloc
+endif
+
 override_dh_auto_configure:
 	./autogen.sh
 	mkdir -p $(OBJDIR)
@@ -122,7 +126,7 @@ VER = $(BUILD_VERSION)~git$(shell date -u '+%Y%m%d')
 TMPDIR = gnash-$(VER)
 get-git-source:
 	@echo Git cloning gnash $(VER)...
-	git clone git://git.savannah.gnu.org/gnash.git $(TMPDIR)
+	git clone --depth 1 git://git.savannah.gnu.org/gnash.git $(TMPDIR)
 	@echo Generating revno.h...
 	@cd $(TMPDIR); \
 	echo "#define BRANCH_REVNO \"`git rev-list HEAD|wc -l`\"" > revno.h; \


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