r286 - in /packages/gnash/trunk/debian: changelog control gnash-common-opengl.install gnash-common.install gnash-tools.install h2m/Makefile mozilla-plugin-gnash.dirs patches/netstreamgst_free.patch patches/series rules
miriam at users.alioth.debian.org
miriam at users.alioth.debian.org
Wed Oct 15 11:56:28 UTC 2008
Author: miriam
Date: Wed Oct 15 11:56:27 2008
New Revision: 286
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=286
Log:
Sync with package in Debian repositories
Modified:
packages/gnash/trunk/debian/changelog
packages/gnash/trunk/debian/control
packages/gnash/trunk/debian/gnash-common-opengl.install
packages/gnash/trunk/debian/gnash-common.install
packages/gnash/trunk/debian/gnash-tools.install
packages/gnash/trunk/debian/h2m/Makefile
packages/gnash/trunk/debian/mozilla-plugin-gnash.dirs
packages/gnash/trunk/debian/patches/netstreamgst_free.patch
packages/gnash/trunk/debian/patches/series
packages/gnash/trunk/debian/rules
Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/changelog?rev=286&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Wed Oct 15 11:56:27 2008
@@ -1,17 +1,10 @@
-gnash (0.8.3+bzr20080813.0800-1) experimental; urgency=low
-
- * New Upstream Release. Downloaded from Bazaar.
-
- -- Miriam Ruiz <little_miry at yahoo.es> Wed, 13 Aug 2008 10:05:10 +0200
-
-gnash (0.8.3+bzr20080812.1800-1) experimental; urgency=low
-
- * New Upstream Release. Downloaded from Bazaar.
- * Replaced get-cvs-source by get-bzr-source in debian/rules to get latest
- changes from the Bazaar repository.
- * Added build dependency: libungif4-dev
-
- -- Miriam Ruiz <little_miry at yahoo.es> Tue, 12 Aug 2008 20:10:41 +0200
+gnash (0.8.3-6) unstable; urgency=low
+
+ [ Miriam Ruiz ]
+ * Include /usr/lib/mozilla/plugins directory in the package, in case
+ it does not exist. Closes: #495333
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Sat, 16 Aug 2008 18:49:58 +0200
gnash (0.8.3-5) unstable; urgency=low
Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/control?rev=286&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Wed Oct 15 11:56:27 2008
@@ -11,7 +11,7 @@
libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev,
libcaca-dev, libavcodec-dev, libavformat-dev, libming-dev,
libming-util, libgstreamer-plugins-base0.10-dev, libqt3-mt-dev (>=3:3.3.8),
- libboost-serialization-dev, libgif-dev, python
+ libboost-serialization-dev, python
Standards-Version: 3.8.0
Section: utils
Homepage: http://www.gnu.org/software/gnash/
Modified: packages/gnash/trunk/debian/gnash-common-opengl.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/gnash-common-opengl.install?rev=286&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash-common-opengl.install (original)
+++ packages/gnash/trunk/debian/gnash-common-opengl.install Wed Oct 15 11:56:27 2008
@@ -1,11 +1,13 @@
tmp.opengl/usr/lib/gnash/libgnashamf-*.so usr/lib/gnash/
tmp.opengl/usr/lib/gnash/libgnashamf.so usr/lib/gnash/
+tmp.opengl/usr/lib/gnash/libgnashbase-*.so usr/lib/gnash/
+tmp.opengl/usr/lib/gnash/libgnashbase.so usr/lib/gnash/
+tmp.opengl/usr/lib/gnash/libgnashmedia-*.so usr/lib/gnash/
+tmp.opengl/usr/lib/gnash/libgnashmedia.so usr/lib/gnash/
+tmp.opengl/usr/lib/gnash/libgnashserver-*.so usr/lib/gnash/
+tmp.opengl/usr/lib/gnash/libgnashserver.so usr/lib/gnash/
tmp.opengl/usr/lib/gnash/libgnashnet.so.* usr/lib/gnash/
tmp.opengl/usr/lib/gnash/libgnashnet.so usr/lib/gnash/
-tmp.opengl/usr/lib/gnash/libgnashmedia-*.so usr/lib/gnash/
-tmp.opengl/usr/lib/gnash/libgnashmedia.so usr/lib/gnash/
-tmp.opengl/usr/lib/gnash/libgnashcore-*.so usr/lib/gnash/
-tmp.opengl/usr/lib/gnash/libgnashcore.so usr/lib/gnash/
tmp.opengl/usr/bin/gnash usr/bin/
tmp.opengl/usr/share/man/man1/gnash.1 usr/share/man/man1/
Modified: packages/gnash/trunk/debian/gnash-common.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/gnash-common.install?rev=286&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash-common.install (original)
+++ packages/gnash/trunk/debian/gnash-common.install Wed Oct 15 11:56:27 2008
@@ -1,11 +1,13 @@
tmp/usr/lib/gnash/libgnashamf-*.so usr/lib/gnash/
tmp/usr/lib/gnash/libgnashamf.so usr/lib/gnash/
+tmp/usr/lib/gnash/libgnashbase-*.so usr/lib/gnash/
+tmp/usr/lib/gnash/libgnashbase.so usr/lib/gnash/
+tmp/usr/lib/gnash/libgnashmedia-*.so usr/lib/gnash/
+tmp/usr/lib/gnash/libgnashmedia.so usr/lib/gnash/
+tmp/usr/lib/gnash/libgnashserver-*.so usr/lib/gnash/
+tmp/usr/lib/gnash/libgnashserver.so usr/lib/gnash/
tmp/usr/lib/gnash/libgnashnet.so.* usr/lib/gnash/
tmp/usr/lib/gnash/libgnashnet.so usr/lib/gnash/
-tmp/usr/lib/gnash/libgnashmedia-*.so usr/lib/gnash/
-tmp/usr/lib/gnash/libgnashmedia.so usr/lib/gnash/
-tmp/usr/lib/gnash/libgnashcore-*.so usr/lib/gnash/
-tmp/usr/lib/gnash/libgnashcore.so usr/lib/gnash/
tmp/usr/bin/gnash usr/bin/
tmp/usr/share/man/man1/gnash.1 usr/share/man/man1/
Modified: packages/gnash/trunk/debian/gnash-tools.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/gnash-tools.install?rev=286&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash-tools.install (original)
+++ packages/gnash/trunk/debian/gnash-tools.install Wed Oct 15 11:56:27 2008
@@ -1,3 +1,1 @@
tmp/usr/bin/gprocessor usr/bin/
-tmp/usr/bin/soldumper usr/bin/
-tmp/usr/bin/dumpshm usr/bin/
Modified: packages/gnash/trunk/debian/h2m/Makefile
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/h2m/Makefile?rev=286&op=diff
==============================================================================
--- packages/gnash/trunk/debian/h2m/Makefile (original)
+++ packages/gnash/trunk/debian/h2m/Makefile Wed Oct 15 11:56:27 2008
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-MANPAGES= gnash.1 gprocessor.1 cygnal.1 klash.1
+MANPAGES= gnash.1 gprocessor.1 cygnal.1
all: $(MANPAGES)
Modified: packages/gnash/trunk/debian/mozilla-plugin-gnash.dirs
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/mozilla-plugin-gnash.dirs?rev=286&op=diff
==============================================================================
--- packages/gnash/trunk/debian/mozilla-plugin-gnash.dirs (original)
+++ packages/gnash/trunk/debian/mozilla-plugin-gnash.dirs Wed Oct 15 11:56:27 2008
@@ -1,1 +1,2 @@
etc
+usr/lib/mozilla/plugins
Modified: packages/gnash/trunk/debian/patches/netstreamgst_free.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/netstreamgst_free.patch?rev=286&op=diff
==============================================================================
--- packages/gnash/trunk/debian/patches/netstreamgst_free.patch (original)
+++ packages/gnash/trunk/debian/patches/netstreamgst_free.patch Wed Oct 15 11:56:27 2008
@@ -2,16 +2,16 @@
# Removes segfault on amd64 due an invalid free() call
# See http://bugs.debian.org/423865
-Index: gnash-0.8.3+bzr20080811.1234/libcore/asobj/NetStreamGst.cpp
+Index: gnash-0.8.3/server/asobj/NetStreamGst.cpp
===================================================================
---- gnash-0.8.3+bzr20080811.1234.orig/libcore/asobj/NetStreamGst.cpp 2008-08-12 13:32:59.000000000 +0200
-+++ gnash-0.8.3+bzr20080811.1234/libcore/asobj/NetStreamGst.cpp 2008-08-12 13:33:51.000000000 +0200
-@@ -580,7 +580,7 @@
+--- gnash-0.8.3.orig/server/asobj/NetStreamGst.cpp 2008-07-14 15:38:28.000000000 +0200
++++ gnash-0.8.3/server/asobj/NetStreamGst.cpp 2008-07-14 15:38:56.000000000 +0200
+@@ -576,7 +576,7 @@
+
processNotify(funcname, o);
- if(taglist)
-- g_free(taglist);
-+ gst_tag_list_free(taglist);
-
+- g_free(taglist);
++ gst_tag_list_free(taglist);
break;
}
+ case GST_MESSAGE_BUFFERING:
Modified: packages/gnash/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/series?rev=286&op=diff
==============================================================================
--- packages/gnash/trunk/debian/patches/series (original)
+++ packages/gnash/trunk/debian/patches/series Wed Oct 15 11:56:27 2008
@@ -3,4 +3,3 @@
kde_include_types.patch
disable_fvisibility-inlines-hidden
netstreamgst_free.patch
-libgnashserver.patch
Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/rules?rev=286&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Wed Oct 15 11:56:27 2008
@@ -183,14 +183,6 @@
$(MAKE) -C tmp.agg install-plugins VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
@printf "\n ------------------------------------ End of INSTALL PLUGINS ---- \n\n"
-# @printf "\n == LIST OF FILES =============================================== \n\n"
-# cd $(CURDIR)/debian/tmp && find
-# @printf "\n -------------------------------------- End of LIST OF FILES ---- \n\n"
-#
-# @printf "\n == LIST OF FILES / OPENGL ====================================== \n\n"
-# cd $(CURDIR)/debian/tmp.opengl && find
-# @printf "\n ----------------------------- End of LIST OF FILES / OPENGL ---- \n\n"
-
cd debian/h2m; $(MAKE)
# CREATE PACKAGES
@@ -231,16 +223,17 @@
dh_builddeb
VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
-VERSION_ID = 0.8.3+bzr$(VERSION_DATE)
-get-bzr-source:
- echo Downloading gnash $(VERSION_ID) from Bazaar...
+VERSION_ID = 0.8.3~cvs$(VERSION_DATE)
+get-cvs-source:
+ echo Downloading gnash $(VERSION_ID) from CVS...
#test -e gnashd && exit
- #bzr branch http://bzr.savannah.gnu.org/r/gnash/rtmp/ gnash
- bzr branch http://bzr.savannah.gnu.org/r/gnash/trunk/ gnash
+ export CVS_RSH="ssh"; cvs -z3 -d:pserver:anonymous at cvs.sv.gnu.org:/sources/gnash co gnash
+ #cd gnash; rm -rf `find . -name CVS`
tar cvfz "gnash_$(VERSION_ID).orig.tar.gz" gnash
mv gnash "gnash-$(VERSION_ID)"
cp debian "gnash-$(VERSION_ID)" -a
- cd "gnash-$(VERSION_ID)"; dch -v "$(VERSION_ID)-1" "New Upstream Release. Downloaded from Bazaar."
+ cd "gnash-$(VERSION_ID)"; dch -v "$(VERSION_ID)-1" "New Upstream Release. Downloaded from CVS."
+
binary: binary-indep binary-arch
.PHONY: config build clean binary-indep binary-arch binary install get-orig-source
More information about the pkg-flash-devel
mailing list