r92 - in /packages/gnash/branches/0.8.0: ./ debian/ debian/README.Debian debian/changelog debian/control debian/klash.install debian/libklash0.install debian/rules

baby-guest at users.alioth.debian.org baby-guest at users.alioth.debian.org
Sun Jun 10 19:02:30 UTC 2007


Author: baby-guest
Date: Sun Jun 10 19:02:30 2007
New Revision: 92

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=92
Log:
New branch


Added:
    packages/gnash/branches/0.8.0/
    packages/gnash/branches/0.8.0/debian/
      - copied from r91, packages/gnash/trunk/debian/
Modified:
    packages/gnash/branches/0.8.0/debian/README.Debian
    packages/gnash/branches/0.8.0/debian/changelog
    packages/gnash/branches/0.8.0/debian/control
    packages/gnash/branches/0.8.0/debian/klash.install
    packages/gnash/branches/0.8.0/debian/libklash0.install
    packages/gnash/branches/0.8.0/debian/rules

Modified: packages/gnash/branches/0.8.0/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/README.Debian?rev=92&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/README.Debian (original)
+++ packages/gnash/branches/0.8.0/debian/README.Debian Sun Jun 10 19:02:30 2007
@@ -45,4 +45,8 @@
 warning when using -v with gnash or gprocessor. Using gprocessor -v is
 a quick way to see why a movie isn't playing correctly.
 
+If you want to be able to view streams of video, you'll need to install
+the following packages too: gstreamer0.10-plugins-base gstreamer0.10-alsa
+gstreamer0.10-ffmpeg gstreamer0.10-audiosink
+
  -- Miriam Ruiz <little_miry at yahoo.es>  Sat, 18 Nov 2006 11:57:04 +0000

Modified: packages/gnash/branches/0.8.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/changelog?rev=92&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/changelog (original)
+++ packages/gnash/branches/0.8.0/debian/changelog Sun Jun 10 19:02:30 2007
@@ -1,17 +1,17 @@
-gnash (0.8.0+cvs20070609.2200-1) unstable; urgency=low
+gnash (0.8.0~cvs20070608.2100-1) unstable; urgency=low
 
-  * New Upstream Release. Downloaded from CVS.
+  * New Upstream Release. Downloaded from CVS. Release Branch 0.8.0
   * Added ming_headers.patch patch so that the missing definitions in ming
     headers are available for the check. Closes: #425888
   * Removed $(MAKE) check. Does not seem to be able to finish in my computer.
   * Changed build dependency from automake1.9 to automake1.9 | automake
-  * Removed build-dependency: libfltk1.1-dev
+  * Removed build-dependencies: libfltk1.1-dev, libsdl1.2-dev, libsdl-mixer1.2-dev
   * Added binary packages: libklash0 and klash (again)
   * Removed debian/*.dirs files. They're not neccesary.
   * Reestructured the code in debian/rules so that multiple builds can be made.
-  * konqueror-plugin-gnash now depends on klash
+  * Klash won't compile against AGG, only with OpenGL.
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Sat, 09 Jun 2007 22:01:35 +0000
+ -- Miriam Ruiz <little_miry at yahoo.es>  Fri, 08 Jun 2007 18:59:46 +0000
 
 gnash (0.7.2+cvs20070518.1557-1) unstable; urgency=low
 

Modified: packages/gnash/branches/0.8.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/control?rev=92&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/control (original)
+++ packages/gnash/branches/0.8.0/debian/control Sun Jun 10 19:02:30 2007
@@ -1,7 +1,7 @@
 Source: gnash
 Priority: optional
 Maintainer: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, autoconf, automake1.9 | automake, libtool, libltdl3-dev, help2man, libxmu-dev, dejagnu, autotools-dev, libboost-dev, libboost-thread-dev, libxml2-dev, libjpeg-dev, libpng12-dev | libpng-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libagg-dev, libgstreamer0.10-dev | libgstreamer0.8-dev, libpango1.0-dev | pango-devel, libgtkglext1-dev, libmad0-dev, libxul-dev | mozilla-dev, libdirectfb-dev, libkonq4-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev , libcaca-dev, libboost-date-time-dev, libavcodec-dev, libavformat-dev, libming-dev, libming-util, mtasc, swfmill
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, autoconf, automake1.9 | automake, libtool, libltdl3-dev, help2man, libxmu-dev, dejagnu, autotools-dev, libboost-dev, libboost-thread-dev, libxml2-dev, libjpeg-dev, libpng12-dev | libpng-dev, libagg-dev, libgstreamer0.10-dev | libgstreamer0.8-dev, libpango1.0-dev | pango-devel, libgtkglext1-dev, libmad0-dev, libxul-dev | mozilla-dev, libdirectfb-dev, libkonq4-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev , libcaca-dev, libboost-date-time-dev, libavcodec-dev, libavformat-dev, libming-dev, libming-util, mtasc, swfmill
 Standards-Version: 3.7.2
 Section: utils
 
@@ -10,11 +10,26 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: gstreamer0.10-plugins-base, gstreamer0.10-alsa | gstreamer0.10-audiosink, gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
+Conflicts: libklash0
 Description: free Flash movie player - shared libraries
  Gnash is a free Flash movie player, which works either standalone, or as
  plugin for Firefox/Mozilla or Konqueror.
  .
  This package includes the shared libraries.
+ .
+  Homepage: http://www.gnu.org/software/gnash/
+
+Package: libklash0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gstreamer0.10-plugins-base, gstreamer0.10-alsa | gstreamer0.10-audiosink, gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
+Conflicts: libgnash0
+Description: free Flash movie player - shared libraries for KDE
+ Gnash is a free Flash movie player, which works either standalone, or as
+ plugin for Firefox/Mozilla or Konqueror.
+ .
+ This package includes the shared libraries for the KDE environment.
  .
   Homepage: http://www.gnu.org/software/gnash/
 
@@ -38,6 +53,29 @@
  control for other devices or applications.
  .
  This package includes the standalone GTK+-based OpenGL player.
+ .
+  Homepage: http://www.gnu.org/software/gnash/
+
+Package: klash
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: free Flash movie player
+ Gnash is a free Flash movie player, which works either standalone, or as
+ plugin for Firefox/Mozilla or Konqueror. Currently it is in a alpha state.
+ The plugins are under heavy development at this time.
+ .
+ Gnash supports the majority of Flash opcodes up to SWF version 7, and
+ a wide sampling of ActionScript classes for SWF version 8.5. All the
+ core ones are implemented, and many of the newer ones work, but may be
+ missing some of their methods.
+ .
+ Included in the Gnash is an XML based messaging system, as specified in
+ the Flash specification. This lets a flash movie communicate over a TCP/IP
+ socket, and parse the incoming XML message. This lets a movie be a remote
+ control for other devices or applications.
+ .
+ Klash is the standalone KDE-based player.
  .
   Homepage: http://www.gnu.org/software/gnash/
 
@@ -102,7 +140,7 @@
 Package: konqueror-plugin-gnash
 Section: utils
 Architecture: any
-Depends: gnash (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: klash (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: free Flash movie player - Plugin for Konqueror
  Gnash is a free Flash movie player, which works either standalone, or as
  plugin for Firefox/Mozilla or Konqueror.

Modified: packages/gnash/branches/0.8.0/debian/klash.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/klash.install?rev=92&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/klash.install (original)
+++ packages/gnash/branches/0.8.0/debian/klash.install Sun Jun 10 19:02:30 2007
@@ -1,3 +1,3 @@
-tmp-gnash/usr/bin/klash usr/bin/
+tmp-klash/usr/bin/klash usr/bin/
 klash.xpm usr/share/pixmaps/
 klash.desktop usr/share/applications/

Modified: packages/gnash/branches/0.8.0/debian/libklash0.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/libklash0.install?rev=92&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/libklash0.install (original)
+++ packages/gnash/branches/0.8.0/debian/libklash0.install Sun Jun 10 19:02:30 2007
@@ -1,3 +1,7 @@
-tmp-gnash/usr/lib/libklash*.so.* usr/lib/
-tmp-gnash/usr/lib/libklash*-*.so usr/lib/
+tmp-klash/usr/lib/libgnash*.so.* usr/lib/
+tmp-klash/usr/lib/libgnash*-*.so usr/lib/
+tmp-klash/usr/lib/libklash*.so.* usr/lib/
+tmp-klash/usr/lib/libklash*-*.so usr/lib/
 overrides/libklash0 usr/share/lintian/overrides/
+tmp-klash/usr/share/gnash/GnashG.png usr/share/gnash
+tmp-klash/usr/share/gnash/gnash_128_96.ico usr/share/gnash

Modified: packages/gnash/branches/0.8.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/rules?rev=92&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/rules (original)
+++ packages/gnash/branches/0.8.0/debian/rules Sun Jun 10 19:02:30 2007
@@ -60,7 +60,7 @@
 	test -e $@ || ( mkdir tmp-gnash && cd tmp-gnash && $(CURDIR)/configure CFLAGS="$(CFLAGS)" \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-		--enable-mp3 --enable-plugin --enable-klash --enable-sound=sdl \
+		--enable-mp3 --enable-plugin --disable-klash --enable-sound=sdl \
 		--enable-gstreamer --enable-media=gst --enable-renderer=agg \
 		--with-plugindir=\$${prefix}/lib/gnash \
 		--enable-shared=yes --enable-static=yes --enable-sdk-install \
@@ -69,9 +69,26 @@
 	@printf "\n ------------------------------------- End of CONFIGURE GNASH ---- \n\n"
 	touch $@
 
+config-klash: config-klash-stamp
+config-klash-stamp: setup
+	dh_testdir
+	@printf "\n == CONFIGURE KLASH ============================================= \n\n"
+	# In the future, I want to add LDFLAGS="-Wl,-z,defs"
+	test -e $@ || ( mkdir tmp-klash && cd tmp-klash && $(CURDIR)/configure CFLAGS="$(CFLAGS)" \
+		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+		--enable-mp3 --enable-plugin --enable-klash --enable-sound=sdl \
+		--enable-gstreamer --enable-media=gst --enable-renderer=opengl \
+		--with-plugindir=\$${prefix}/lib/gnash \
+		--enable-shared=yes --enable-static=yes --enable-sdk-install \
+		--disable-rpath --enable-lotsa-warnings --without-gcc-arch \
+	)
+	@printf "\n ------------------------------------- End of CONFIGURE KLASH ---- \n\n"
+	touch $@
+
 # BUILD
 
-build: build-gnash
+build: build-gnash build-klash
 
 build-gnash: build-gnash-stamp
 build-gnash-stamp: config-gnash
@@ -87,6 +104,20 @@
 
 	touch $@
 
+build-klash: build-klash-stamp
+build-klash-stamp: config-klash
+	dh_testdir
+
+	@printf "\n == MAKE KLASH ================================================== \n\n"
+	test -e $@ || $(MAKE) -C tmp-klash
+	@printf "\n ----------------------------------------- End of MAKE KLASH ---- \n\n"
+
+	@#@printf "\n == CHECK KLASH ================================================= \n\n"
+	@#-test -e $@ || $(MAKE) -C tmp-klash check
+	@#@printf "\n ---------------------------------------- End of CHECK KLASH ---- \n\n"
+
+	touch $@
+
 # CLEAN
 
 clean:
@@ -94,11 +125,6 @@
 	dh_testroot
 
 	-rm -rf *-stamp tmp-* debian/tmp-*
-
-ifeq (Makefile,$(wildcard Makefile))
-	-$(MAKE) -C tmp-gnash maintainer-clean
-	-$(MAKE) -C tmp-gnash distclean
-endif
 
 ifneq ($(wildcard ${AUTO_JUNK}),)
 	rm $(wildcard ${AUTO_JUNK})
@@ -133,8 +159,8 @@
 install: build
 	dh_testdir
 	dh_testroot
+	-rm -rf debian/tmp-*
 	dh_clean -k 
-	-rm -rf debian/tmp-*
 	dh_installdirs
 
 	@printf "\n == INSTALL ===================================================== \n\n"
@@ -183,7 +209,7 @@
 	dh_fixperms
 	#dh_makeshlibs -V 'libgnash0 (=$${binary:Version})'
 	dh_makeshlibs -plibgnash0 -V 'libgnash0 (=$(MAIN_VERSION))'
-#	dh_makeshlibs -plibklash0 -V 'libklash0 (=$(MAIN_VERSION))'
+	dh_makeshlibs -plibklash0 -V 'libklash0 (=$(MAIN_VERSION))'
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -191,13 +217,13 @@
 	dh_builddeb
 
 VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
-VERSION_ID = 0.8.0+cvs$(VERSION_DATE)
+VERSION_ID = 0.8.0~cvs$(VERSION_DATE)
 
 get-orig-source:
 	echo Downloading gnash $(VERSION_ID) from CVS...
 	#test -e gnashd && exit
-	export CVS_RSH="ssh"; cvs -z3 -d:pserver:anonymous at cvs.sv.gnu.org:/sources/gnash co gnash
-	#export CVS_RSH="ssh"; export CVSROOT=":pserver:anonymous at cvs.sv.gnu.org:/sources/gnash" ; cvs co -r release-0-8-0 gnash
+	#export CVS_RSH="ssh"; cvs -z3 -d:pserver:anonymous at cvs.sv.gnu.org:/sources/gnash co gnash
+	export CVS_RSH="ssh"; export CVSROOT=":pserver:anonymous at cvs.sv.gnu.org:/sources/gnash" ; cvs co -r release-0-8-0 gnash
 	#cd gnash; rm -rf `find . -name CVS`
 	tar cvfz "gnash_$(VERSION_ID).orig.tar.gz" gnash
 	mv gnash "gnash-$(VERSION_ID)"




More information about the pkg-flash-devel mailing list