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

[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  fd592ae7306ab216e15b5af81287fbeba2b75ec6 (commit)
       via  fc172b2a36895b297da00afc8f627a0295818262 (commit)
       via  d9dc08f4364efcf277fe42e2876b6b0388acd084 (commit)
      from  316f32c999088adb3ebe2c56fc8c8c90ae5256c7 (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 fd592ae7306ab216e15b5af81287fbeba2b75ec6
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Jul 9 11:54:45 2014 +0200

    Install missing rtmp.png.

commit fc172b2a36895b297da00afc8f627a0295818262
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Jul 9 11:23:54 2014 +0200

    Borrow #733890 patch to try to fix build on powerpc* and mips*.

commit d9dc08f4364efcf277fe42e2876b6b0388acd084
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Jul 9 01:29:29 2014 +0200

    Install libgnashsound.so on !hurd-any.

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

Summary of changes:
 debian/changelog                 |  8 ++++++++
 debian/gnash-common.doc-base.ref |  1 +
 debian/gnash-common.docs         |  5 +++--
 debian/gnash-common.info         |  4 ++--
 debian/gnash-common.install      |  1 -
 debian/rules                     | 13 +++++++++++++
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e410ee..24915c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnash (0.8.11~git20140708-2) unstable; urgency=medium
+
+  * Install libgnashsound.so on !hurd-any.
+  * Borrow #733890 patch to try to fix build on powerpc* and mips*.
+  * docs: install missing rtmp.png image.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Wed, 09 Jul 2014 01:27:44 +0200
+
 gnash (0.8.11~git20140708-1) unstable; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/gnash-common.doc-base.ref b/debian/gnash-common.doc-base.ref
index 39dbb3b..5e9c766 100644
--- a/debian/gnash-common.doc-base.ref
+++ b/debian/gnash-common.doc-base.ref
@@ -7,6 +7,7 @@ Section: Video
 Format: HTML
 Index: /usr/share/doc/gnash-common/gnashref.html
 Files: /usr/share/doc/gnash-common/gnashref.html
+ /usr/share/doc/gnash-common/images/rtmp.png
 
 Format: Info
 Index: /usr/share/info/gnash_ref.info.gz
diff --git a/debian/gnash-common.docs b/debian/gnash-common.docs
index 09a47d4..991822a 100644
--- a/debian/gnash-common.docs
+++ b/debian/gnash-common.docs
@@ -1,2 +1,3 @@
-tmp.build/doc/C/gnashuser.html
-tmp.build/doc/C/gnashref.html
+debian/tmp/usr/share/doc/gnash/gnashuser.html
+debian/tmp/usr/share/doc/gnash/gnashref.html
+debian/tmp/usr/share/doc/gnash/images/
diff --git a/debian/gnash-common.info b/debian/gnash-common.info
index e0e3bc7..05da02f 100644
--- a/debian/gnash-common.info
+++ b/debian/gnash-common.info
@@ -1,2 +1,2 @@
-tmp.build/doc/C/gnash_user.info
-tmp.build/doc/C/gnash_ref.info
+debian/tmp/usr/share/info/gnash_user.info
+debian/tmp/usr/share/info/gnash_ref.info
diff --git a/debian/gnash-common.install b/debian/gnash-common.install
index 01452f6..488bc58 100644
--- a/debian/gnash-common.install
+++ b/debian/gnash-common.install
@@ -7,6 +7,5 @@ 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/rules b/debian/rules
index 378ae93..fd6890b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,10 @@ OUTFILES  := $(INFILES:.desktop.in=.desktop)
 MANPTOFIX := $(addprefix debian/tmp/usr/share/man/man1/, $(notdir $(basename $(wildcard doc/C/preformatted/*.1.in))))
 OBJDIR    := $(CURDIR)/tmp.build
 
+ifneq (,$(filter $(DEB_BUILD_ARCH),powerpc powerpcspe mips mipsel))
+export DEB_LDFLAGS_MAINT_APPEND += -latomic
+endif
+
 %.desktop: %.desktop.in
 	intltool-merge -d debian/po $< $@
 
@@ -96,6 +100,15 @@ override_dh_auto_install:
 	cd $(CURDIR)/debian/tmp && find
 	printf "\n -------------------------------------- End of LIST OF FILES ---- \n\n"
 
+ifeq (,$(filter hurd-%,$(DEB_BUILD_ARCH)))
+	install -d debian/gnash-common/usr/lib/gnash
+	install debian/tmp/usr/lib/gnash/libgnashsound-*.so debian/gnash-common/usr/lib/gnash
+endif
+
+	# make info docs load rtmp.png installed under /usr/share/doc/gnash-common
+	sed -i 's/images\/rtmp.png/\/usr\/share\/doc\/gnash-common\/images\/rtmp.png/' \
+		debian/tmp/usr/share/info/gnash_ref.info
+
 override_dh_strip:
 	dh_strip --dbg-package=gnash-dbg
 


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