Bug#772843: unblock: gnash/0.8.11~git20140708.20140419-1 (Was: Re: gnash in Jessie)

Thu Dec 11 16:43:37 UTC 2014

Package: release.debian.org
User: release.debian.org at packages.debian.org
Usertags: unblock
Severity: normal
X-Debbugs-CC: pkg-flash-devel at lists.alioth.debian.org gnash-dev at gnu.org

On Thu, Dec 11, 2014 at 01:59:50PM +0000, Jonathan Wiltshire wrote:
> On 2014-12-09 14:47, Gabriele Giacone wrote:
> >I'd like to know how to proceed to get gnash back in testing/jessie,
> >just to avoid doing rejectable uploads/unblock requests.
> 
> Unblock bugs are fine for pre-approvals - better that than your mail gets
> lost, which nearly happened with this one.

Thanks for answering.
 
> >In April, gnash 0.8.11~git20140419-1 was in testing. 0.8.11~git20140708
> >upstream snapshot was uploaded three months later but it never reached
> >testing because of FTBFS on armel, see #754311.
> >Since nobody seems interested in working either on fixing std::future on
> >armv5 or reverting std::future changes only on gnash, I would upload a
> >0.8.11~git20140708.20140419-1 as below (d/changelog since
> >0.8.11~git20140419-1):
> 
> I'm not enthusiastic about this. The bug was filed in July; gnash was
> removed from testing in September and the deadlines for freezing and
> deepening the freeze were 5th November/5th December. That's a long time to
> fix this RC bug.
> 
> One of the things we consider is how well maintainers will be able to react
> to problems in stable - remember the lifetime there is at least three years.
> gnash is a good candidate for needing security fixes during that time. On
> the other hand, popcon is relatively high for this package.
> 
> I'm genuinely torn. I'd be open to persuasion, but please file an unblock
> request if you're serious about this.

Attached debdiff (only debian/ dir changes).
Tarball would be already known by archive
 bc01996f04f425ec265d6df34e48c757 gnash_0.8.11~git20140708.20140419.orig.tar.xz

Thanks for considering.

unblock gnash/0.8.11~git20140708.20140419-1

-- 
G..e
-------------- next part --------------

diff --git a/debian/changelog b/debian/changelog
index 65a2271..6b20935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnash (0.8.11~git20140708.20140419-1) unstable; urgency=medium
+
+  * Tarball is 0.8.11~git20140419 one, which built successfully on all
+    archs (Closes: #754311).
+  * Revert all debian changes since 0.8.11~git20140419-1 except:
+    + Switch from xulrunner-dev to npapi-sdk-dev B-D (Closes: #752836).
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 07 Dec 2014 02:08:26 +0100
+
 gnash (0.8.11~git20140708-3) unstable; urgency=medium
 
   * Fix libgnashsound.so install, FTBFS on hurd.
diff --git a/debian/control b/debian/control
index 34c733a..9466a8d 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends: autoconf,
                libboost-dev,
                libboost-iostreams-dev,
                libboost-program-options-dev,
+               libboost-thread-dev,
                libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev,
                libgconf2-dev,
                libgif-dev,
diff --git a/debian/gnash-common.doc-base.ref b/debian/gnash-common.doc-base.ref
index 5e9c766..39dbb3b 100644
--- a/debian/gnash-common.doc-base.ref
+++ b/debian/gnash-common.doc-base.ref
@@ -7,7 +7,6 @@ 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 991822a..09a47d4 100644
--- a/debian/gnash-common.docs
+++ b/debian/gnash-common.docs
@@ -1,3 +1,2 @@
-debian/tmp/usr/share/doc/gnash/gnashuser.html
-debian/tmp/usr/share/doc/gnash/gnashref.html
-debian/tmp/usr/share/doc/gnash/images/
+tmp.build/doc/C/gnashuser.html
+tmp.build/doc/C/gnashref.html
diff --git a/debian/gnash-common.info b/debian/gnash-common.info
index 05da02f..e0e3bc7 100644
--- a/debian/gnash-common.info
+++ b/debian/gnash-common.info
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/info/gnash_user.info
-debian/tmp/usr/share/info/gnash_ref.info
+tmp.build/doc/C/gnash_user.info
+tmp.build/doc/C/gnash_ref.info
diff --git a/debian/gnash-common.install b/debian/gnash-common.install
index 488bc58..01452f6 100644
--- a/debian/gnash-common.install
+++ b/debian/gnash-common.install
@@ -7,5 +7,6 @@ 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-dev.install b/debian/gnash-dev.install
index 0f64667..d101f17 100644
--- a/debian/gnash-dev.install
+++ b/debian/gnash-dev.install
@@ -5,4 +5,5 @@ usr/lib/gnash/libgnashcore.so
 usr/lib/gnash/libgnashmedia.so
 usr/lib/gnash/libgnashnet.so
 usr/lib/gnash/libgnashrender.so
+usr/lib/gnash/libgnashsound.so
 usr/lib/pkgconfig/*
diff --git a/debian/rules b/debian/rules
index d7bbda1..71f54fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,10 +18,6 @@ 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 $< $@
 
@@ -53,7 +49,7 @@ CONFIGURE_FLAGS = \
 		--enable-shared=yes
 
 ifneq (,$(filter hurd-%,$(DEB_BUILD_ARCH)))
-	CONFIGURE_FLAGS += --disable-jemalloc --enable-sound=none
+	CONFIGURE_FLAGS += --disable-jemalloc
 endif
 
 override_dh_auto_configure:
@@ -78,7 +74,7 @@ endif
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	-$(MAKE) -C $(OBJDIR) check
-	-$(MAKE) -C $(OBJDIR) anal MODE=verbose
+	-$(MAKE) -C $(OBJDIR) anal
 endif
 
 override_dh_installchangelogs:
@@ -100,17 +96,6 @@ 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
-	install -d debian/gnash-dev/usr/lib/gnash
-	install debian/tmp/usr/lib/gnash/libgnashsound.so debian/gnash-dev/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
 
