[SCM] GNU Shockwave Flash (SWF) player branch, master, updated. debian/0.8.10_git20110618-1-4-g2b74842

Gabriele Giacone gg0-guest at alioth.debian.org
Tue Jun 21 20:50:47 UTC 2011


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  2b748429e3e21c737200d97a3c2e41c61052d051 (commit)
       via  10d1bcf2c7010107809e55da9963b9db98d20bec (commit)
       via  2a96814e6e743b95262754ba6dbae766d3d56d5f (commit)
       via  bde83139b663e91152eaa3a2225c2fe6b4c11b79 (commit)
      from  e683bb61a0e655c34a41867c483aa5a2a5c4026d (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 2b748429e3e21c737200d97a3c2e41c61052d051
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Jun 21 21:53:19 2011 +0200

    Add multiarch support.

commit 10d1bcf2c7010107809e55da9963b9db98d20bec
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Jun 21 21:50:02 2011 +0200

    Fix python-debug-in-wrong-location tag.

commit 2a96814e6e743b95262754ba6dbae766d3d56d5f
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Jun 21 21:00:35 2011 +0200

    Another hyphen-used-as-minus-sign fix.

commit bde83139b663e91152eaa3a2225c2fe6b4c11b79
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Jun 21 20:58:27 2011 +0200

    Fix cygnal manpage.

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

Summary of changes:
 debian/changelog           |   10 ++++++++++
 debian/patches/01cygnalman |   35 +++++++++++++++++++++++++++++++++++
 debian/patches/02multiarch |   22 ++++++++++++++++++++++
 debian/patches/series      |    2 ++
 debian/rules               |    8 +++++++-
 5 files changed, 76 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2466bf0..880c29f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gnash (0.8.10~git20110618-2) unstable; urgency=low
+
+  * Add multiarch support (02multiarch).
+  * Fix cygnal manpage (01cygnalman).
+  * lintian:
+    + Another hyphen-used-as-minus-sign fix.
+    + Fix python-debug-in-wrong-location tag.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Tue, 21 Jun 2011 21:51:19 +0200
+
 gnash (0.8.10~git20110618-1) unstable; urgency=low
 
   * Git snapshot.
diff --git a/debian/patches/01cygnalman b/debian/patches/01cygnalman
new file mode 100644
index 0000000..c3a1c45
--- /dev/null
+++ b/debian/patches/01cygnalman
@@ -0,0 +1,35 @@
+Description: Fix cygnal manpage.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- a/doc/C/cygnal.man-xml
++++ b/doc/C/cygnal.man-xml
+@@ -40,7 +40,8 @@ cygnal (options)...
+ 
+ <variablelist>
+   <varlistentry>
+-    <term>(-h) --help</term>
++    <term>-h</term>
++    <term>--help</term>
+     <listitem>
+       <para>
+ 	Print usage info.
+@@ -58,7 +59,8 @@ cygnal (options)...
+   </varlistentry>
+   
+   <varlistentry>
+-    <term>(-v) --verbose</term>
++    <term>-v</term>
++    <term>--verbose</term>
+     <listitem>
+       <para>
+ 	Verbose output.
+@@ -67,7 +69,8 @@ cygnal (options)...
+   </varlistentry>
+   
+   <varlistentry>
+-    <term>(-p) --port-offset</term>
++    <term>-p</term>
++    <term>--port-offset</term>
+     <listitem>
+       <para>
+ 	Port offset. This number gets added to the default
diff --git a/debian/patches/02multiarch b/debian/patches/02multiarch
new file mode 100644
index 0000000..afa698f
--- /dev/null
+++ b/debian/patches/02multiarch
@@ -0,0 +1,22 @@
+Description: Add multiarch support.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -504,8 +504,10 @@ if test x$cross_compiling = xyes; then
+   npapi=no
+ else
+   AC_MSG_NOTICE([Configuring Gnash for native compilation])
++  export DEB_HOST_MULTIARCH="`eval dpkg-architecture -qDEB_HOST_MULTIARCH`"
+   export incllist="`eval cat ${srcdir}/macros/incllist`"
+-  export libslist="`eval cat ${srcdir}/macros/libslist`"
++  libslist="`cat ${srcdir}/macros/libslist`"
++  export libslist+=" /lib/${DEB_HOST_MULTIARCH} /usr/lib/${DEB_HOST_MULTIARCH}"
+   export pathlist=$PATH
+ fi
+ 
+--- a/macros/libslist
++++ b/macros/libslist
+@@ -1 +1 @@
+-${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/lib /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 /boot/common/lib /boot/system/lib/gcc4 /boot/system/lib /lib/x86_64-linux-gnu /lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu .. ../..
++${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/lib /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 /boot/common/lib /boot/system/lib/gcc4 /boot/system/lib .. ../..
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..6d15f31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01cygnalman
+02multiarch
diff --git a/debian/rules b/debian/rules
index a3c3b6d..aa36481 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,7 +81,10 @@ override_dh_auto_install:
 
 	# lintian: hyphen-used-as-minus-sign
 	for manfile in $(MANPTOFIX); do \
-			sed -i '2,$$s/\([:alnum:\\]\?\)\-/\1\\\-/g' $$manfile; \
+		sed -i -e '2,$$s/^\-\([^\-]\)/\\\-\1/g' \
+		-e '2,$$s/\-\-/\\\-\\\-/g' \
+		-e '2,$$s/\([\ [:punct:]]\)\-\([[:alnum:]][[:punct:]]\)/\1\\\-\2/g' \
+		$$manfile; \
 	done
 
 	cd $(CURDIR)/debian/overrides/ && for i in *; do \
@@ -96,6 +99,9 @@ override_dh_auto_install:
 
 override_dh_strip:
 	dh_strip --dbg-package=gnash-dbg
+	# lintian: python-debug-in-wrong-location
+	mv debian/gnash-dbg/usr/lib/debug/usr/lib/pyshared \
+		debian/gnash-dbg/usr/lib/debug/usr/lib/pymodules
 
 override_dh_gencontrol:
 	dh_gencontrol -Nswfdec-gnome


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



More information about the pkg-flash-devel mailing list