[SCM] GNU Shockwave Flash (SWF) player branch, master, updated. debian/0.8.10_git20111001-1-11-g4976fc4

[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  4976fc40f44541459d34d93fbbb642ef926287e6 (commit)
       via  91849ed6505439c58729f4241bf87cca40912b0d (commit)
      from  75830a0666c34e2c8451c2107f77c9b8a72d1b8e (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 4976fc40f44541459d34d93fbbb642ef926287e6
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Nov 1 12:30:31 2011 +0100

    Move amf and net to gnash-cygnal.

commit 91849ed6505439c58729f4241bf87cca40912b0d
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Nov 1 05:15:28 2011 +0100

    Add revno.h generation.

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

Summary of changes:
 debian/gnash-common.install   |    7 ++++++-
 debian/gnash-cygnal.install   |    2 ++
 debian/overrides/gnash-cygnal |    1 -
 debian/rules                  |    7 +++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/gnash-common.install b/debian/gnash-common.install
index 5b1fedb..f14d19a 100644
--- a/debian/gnash-common.install
+++ b/debian/gnash-common.install
@@ -1,6 +1,11 @@
 debian/gnash.png usr/share/pixmaps/
 debian/gnash.xpm usr/share/pixmaps/
 usr/bin/gnash
-usr/lib/gnash/libgnash*-*.so
+usr/lib/gnash/libgnashbase-*.so
+usr/lib/gnash/libgnashcore-*.so
+usr/lib/gnash/libgnashdevice-*.so
+usr/lib/gnash/libgnashmedia-*.so
+usr/lib/gnash/libgnashrender-*.so
+usr/lib/gnash/libgnashsound-*.so
 usr/share/gnash
 usr/share/locale
diff --git a/debian/gnash-cygnal.install b/debian/gnash-cygnal.install
index 952be8c..6b3bf1b 100644
--- a/debian/gnash-cygnal.install
+++ b/debian/gnash-cygnal.install
@@ -1,3 +1,5 @@
 etc/cygnalrc
 usr/bin/cygnal
 usr/lib/cygnal/plugins/*.so
+usr/lib/gnash/libgnashnet-*.so
+usr/lib/gnash/libgnashamf-*.so
diff --git a/debian/overrides/gnash-cygnal b/debian/overrides/gnash-cygnal
index d0011d2..d5fa306 100644
--- a/debian/overrides/gnash-cygnal
+++ b/debian/overrides/gnash-cygnal
@@ -1,3 +1,2 @@
-gnash-cygnal binary: binary-or-shlib-defines-rpath
 # see bug #631078
 gnash-cygnal binary: hyphen-used-as-minus-sign
diff --git a/debian/rules b/debian/rules
index 0f839c8..c0c8dfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,7 @@ override_dh_auto_configure:
 	./autogen.sh
 	mkdir -p $(OBJDIR)
 	cd $(OBJDIR) && ../configure $(CONFIGURE_FLAGS)
+	-cp revno.h $(OBJDIR)
 
 override_dh_auto_build: $(OUTFILES)
 	$(MAKE) -C $(OBJDIR) VERSION="$(BUILD_VERSION)"
@@ -125,5 +126,11 @@ TMPDIR = gnash-$(VER)
 get-git-source:
 	@echo Git cloning gnash $(VER)...
 	git clone 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; \
+	@echo "#define BRANCH_NICK \"`git branch|grep '^\*'|cut -d' ' -f 2`\"" >> revno.h; \
+	@echo "#define COMMIT_ID \"`git rev-parse --short HEAD`\"" >> revno.h
+	@echo Generating tarball...
 	cd $(TMPDIR) && tar --exclude .git -zcf ../../gnash_$(VER).orig.tar.gz .
 	rm -rf $(TMPDIR) && dch -v $(VER)-1 "Git snapshot."


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