Merge lp:~sindhudweep-sarkar/gnash/gnash0.8.7packaging into lp:~gnash/gnash/ubuntu

[Sindhudweep Sarkar]

[Sindhudweep Sarkar (sindhudweep-sarkar)]

  * new upstream release 0.8.7
  * use jemalloc memory allocator
  * enable decoding of speex encoded audio
  * fix LP: #318849 - Deprecated klash kde3 binaries removed and not
    replaced with gnash-kde4.
  * cleanup ./configure option in debian/rules to remove obsolete and unrecognized options.

[lp:~sindhudweep-sarkar/gnash/gnash0.8.7packaging]

192. By Sindhudweep Sarkar on 2010-02-15

Add launchpad bug # for upstream release

193. By Sindhudweep Sarkar on 2010-02-16

fix LP: #322141 - konqueror-plugin-gnash contains no binaries

194. By Sindhudweep Sarkar on 2010-02-17

remove explicitly enabling jemalloc as it is the default.

=== modified file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	2009-10-01 02:35:20 +0000
+++ .bzr-builddeb/default.conf	2010-02-18 12:41:12 +0000
@@ -1,3 +1,3 @@
 [BUILDDEB]
 merge = True
-export-upstream = http://bzr.savannah.gnu.org/r/gnash/release_0_8_6/
+export-upstream = http://bzr.savannah.gnu.org/r/gnash/release_0_8_7/
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-10-06 22:08:05 +0000
+++ debian/changelog	2010-02-18 12:41:12 +0000
@@ -1,3 +1,13 @@
+gnash (0.8.7-0ubuntu1) UNRELEASED; urgency=low
+
+  * new upstream release 0.8.7 (LP: #522254)
+  * enable decoding of speex encoded audio
+  * fix LP: #318849 - Deprecated klash kde3 binaries removed and not 
+    replaced with gnash-kde4.
+  * fix LP: #322141 - konqueror-plugin-gnash contains no binaries
+
+ -- Sindhudweep Narayan Sarkar <[e-mail]>  Wed, 17 Feb 2010 07:14:56 -0500
+
 gnash (0.8.6-0ubuntu1) karmic; urgency=low
 
   * new upstream release 0.8.6 (LP: #435897)
 
=== modified file 'debian/control'
--- debian/control	2008-10-13 13:16:04 +0000
+++ debian/control	2010-02-18 12:41:12 +0000
@@ -36,7 +36,9 @@
 	mtasc,
 	libgstreamer-plugins-base0.10-dev,
 	libboost-serialization-dev,
-	libsdl1.2-dev
+	libsdl1.2-dev,
+	libspeex-dev,
+	kdelibs5-dev
 Standards-Version: 3.7.2
 Section: utils
 Xs-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/gnash/ubuntu
@@ -45,7 +47,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-plugins-base, gstreamer0.10-alsa
-Suggests: gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
+Suggests: gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg, libspeex1
 Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~)
 Replaces: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~)
 Description: free SWF movie player - common files/libraries
 
=== modified file 'debian/gnash-common.install'
--- debian/gnash-common.install	2009-04-03 12:48:27 +0000
+++ debian/gnash-common.install	2010-02-18 12:41:12 +0000
@@ -4,6 +4,7 @@
 usr/lib/gnash/libgnashcore-*.so
 usr/lib/gnash/libgnashmedia-*.so
 usr/lib/gnash/libgnashnet.so.*
+usr/lib/gnash/libgnashagg.so.*
 
 usr/bin/gnash
 usr/share/man/man1/gnash.1
 
=== modified file 'debian/klash.desktop'
--- debian/klash.desktop	2006-09-24 15:33:31 +0000
+++ debian/klash.desktop	2010-02-18 12:41:12 +0000
@@ -5,6 +5,6 @@
 GenericName=
 Comment=
 Icon=/usr/share/pixmaps/klash.xpm
-Exec=/usr/bin/klash
+Exec=/usr/bin/kde4-gnash
 Terminal=false
 Categories=Application;AudioVideo;KDE;
 
=== modified file 'debian/klash.install'
--- debian/klash.install	2008-10-10 18:54:58 +0000
+++ debian/klash.install	2010-02-18 12:41:12 +0000
@@ -0,0 +1,4 @@
+usr/bin/kde4-gnash
+usr/share/pixmaps/klash.xpm
+usr/share/applications/klash.desktop
+
 
=== modified file 'debian/konqueror-plugin-gnash.install'
--- debian/konqueror-plugin-gnash.install	2008-10-10 18:54:58 +0000
+++ debian/konqueror-plugin-gnash.install	2010-02-18 12:41:12 +0000
@@ -0,0 +1,4 @@
+usr/lib/kde4/libklashpart.so
+usr/lib/kde4/libklashpart.la
+usr/share/kde4/apps/klash
+usr/share/kde4/services/[Kk]lash*
 
=== modified file 'debian/rules'
--- debian/rules	2009-04-03 12:50:31 +0000
+++ debian/rules	2010-02-18 12:41:12 +0000
@@ -12,7 +12,7 @@
 
 MAIN_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g')
 
-CFLAGS = -Wall -g -Werror-implicit-function-declaration
+CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -53,12 +53,19 @@
 	# In the future, I want to add LDFLAGS="-Wl,-z,defs"
 	./configure CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-		--enable-plugin --enable-gui='gtk' --enable-cygnal \
-		--enable-gstreamer --enable-media=gst --enable-renderer=agg \
-		--with-npapi-plugindir=\$${prefix}/lib/gnash --with-kde-pluginprefix=\$${prefix} \
-		--enable-shared=yes --enable-sdk-install --without-swfdec-testsuite \
-		--disable-rpath --enable-lotsa-warnings --without-gcc-arch --without-ming
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--enable-gui='gtk,kde4' \
+		--enable-cygnal \
+		--enable-media=gst \
+		--enable-renderer=agg \
+		--with-plugins-install=system \
+		--with-npapi-plugindir=\$${prefix}/lib/gnash \
+		--enable-shared=yes \
+		--disable-testsuite \
+		--disable-rpath \
+		--without-ming
 	@printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
 
 	cp libamf/README README.amf