r104 - in /packages/gnash/trunk: ./ debian/changelog debian/control debian/libklash0.install debian/patches/exclude-testsuite-from-built debian/patches/no-kde-ldflags debian/patches/series debian/rules
asac at users.alioth.debian.org
asac at users.alioth.debian.org
Tue Jun 12 12:42:09 UTC 2007
Author: asac
Date: Tue Jun 12 12:42:08 2007
New Revision: 104
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=104
Log:
* debian/libklash0.install, debian/control, debian/rules: produce libklash0 package and provide proper s
hlibs version info
* debian/patches/ming_headers.patch: resurrect ming_headers patch that was previously reverted
* debian/patches/exclude-testsuite-from-built: add patch to exclude testsuite from being build
* debian/patches/no-kde-ldflags: take care that gnash binaries don't pull in kde libs/depends
* debian/patches/series: update quilt series accordingly
* debian/rules: use --enable-renderer=opengl for now in order to build klash without doing hackish stuff
* debian/control: omit extra whitespace before Homepage: line *all* package descriptions
* debian/control: drop swfmill from build-depends (since we don't build the testsuite atm)
* debian/control: add Alexander Sack <asac at jwsdot.com> to Uploaders field
* debian/control: new packages for kde: libklash0 and klash; fix depends of konqueror-plugin-gnash packa
ge accordingly
* debian/changelog: adapt changelog accordingly; bump version to first 0.8.0 release
Added:
packages/gnash/trunk/debian/libklash0.install
packages/gnash/trunk/debian/patches/exclude-testsuite-from-built
packages/gnash/trunk/debian/patches/no-kde-ldflags
Modified:
packages/gnash/trunk/ (props changed)
packages/gnash/trunk/debian/changelog
packages/gnash/trunk/debian/control
packages/gnash/trunk/debian/patches/series
packages/gnash/trunk/debian/rules
Propchange: packages/gnash/trunk/
------------------------------------------------------------------------------
--- bzr:merge (original)
+++ bzr:merge Tue Jun 12 12:42:08 2007
@@ -1,1 +1,2 @@
asac at jwsdot.com-20070612122605-jwopbr7mjw0wsdq0
+asac at jwsdot.com-20070612124201-3mfqvfqk0tbf8iqc
Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/changelog?rev=104&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Tue Jun 12 12:42:08 2007
@@ -1,3 +1,26 @@
+gnash (0.8.0~cvs20070611.1016-1) unstable; urgency=low
+
+ * New CVS snapshot 20070611.1016 from release-0-8-0 branch
+ * debian/libklash0.install, debian/control, debian/rules: produce libklash0
+ package and provide proper shlibs version info
+ * debian/patches/ming_headers.patch: resurrect ming_headers patch that was
+ previously reverted
+ * debian/patches/exclude-testsuite-from-built: add patch to exclude
+ testsuite from being build
+ * debian/patches/no-kde-ldflags: take care that gnash binaries don't pull in
+ kde libs/depends
+ * debian/patches/series: update quilt series accordingly
+ * debian/rules: use --enable-renderer=opengl for now in order to build klash
+ without doing hackish stuff> * debian/control: omit extra whitespace before
+ Homepage: line *all* package descriptions
+ * debian/control: drop swfmill from build-depends (since we don't build the
+ testsuite atm)
+ * debian/control: add Alexander Sack <asac at jwsdot.com> to Uploaders field
+ * debian/control: new packages for kde: libklash0 and klash; fix depends of
+ konqueror-plugin-gnash package accordingly
+
+ -- Alexander Sack <asac at jwsdot.com> Tue, 12 Jun 2007 14:10:00 +0200
+
gnash (0.7.2+cvs20070525.0721-1) unstable; urgency=low
* New Upstream Release. Downloaded from CVS.
Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/control?rev=104&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Tue Jun 12 12:42:08 2007
@@ -1,7 +1,8 @@
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, 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 , libfltk1.1-dev, libcaca-dev, libboost-date-time-dev, libavcodec-dev, libavformat-dev, libming-dev, libming-util, mtasc, swfmill
+Uploaders: Alexander Sack <asac at jwsdot.com>
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, autoconf, automake1.9, 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 , libfltk1.1-dev, libcaca-dev, libboost-date-time-dev, libavcodec-dev, libavformat-dev, libming-dev, libming-util, mtasc
Standards-Version: 3.7.2
Section: utils
@@ -16,7 +17,21 @@
.
This package includes the shared libraries.
.
- Homepage: http://www.gnu.org/software/gnash/
+ 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
+Description: free Flash movie player for KDE - 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 for klash - the KDE variant of
+ gnash.
+ .
+ Homepage: http://www.gnu.org/software/gnash/
Package: gnash
Section: utils
@@ -39,7 +54,30 @@
.
This package includes the standalone GTK+-based OpenGL player.
.
- Homepage: http://www.gnu.org/software/gnash/
+ Homepage: http://www.gnu.org/software/gnash/
+
+Package: klash
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: free Flash movie player - standalone player for KDE
+ 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 a free standalone Flash movie player for KDE.
+ .
+ Homepage: http://www.gnu.org/software/gnash/
Package: gnash-tools
Section: utils
@@ -62,7 +100,7 @@
.
This package includes command-line utilities based in gnash.
.
- Homepage: http://www.gnu.org/software/gnash/
+ Homepage: http://www.gnu.org/software/gnash/
Package: gnash-cygnal
Section: utils
@@ -85,7 +123,7 @@
.
Cygnal is Gnash's media server.
.
- Homepage: http://www.gnu.org/software/gnash/
+ Homepage: http://www.gnu.org/software/gnash/
Package: mozilla-plugin-gnash
Section: utils
@@ -97,16 +135,16 @@
.
This package includes the plugin for Firefox/Mozilla Web Browser.
.
- Homepage: http://www.gnu.org/software/gnash/
+ Homepage: http://www.gnu.org/software/gnash/
Package: konqueror-plugin-gnash
Section: utils
Architecture: any
-Depends: libgnash0 (= ${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.
.
This package includes the plugin for Konqueror.
.
- Homepage: http://www.gnu.org/software/gnash/
+ Homepage: http://www.gnu.org/software/gnash/
Added: packages/gnash/trunk/debian/libklash0.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/libklash0.install?rev=104&op=file
==============================================================================
--- packages/gnash/trunk/debian/libklash0.install (added)
+++ packages/gnash/trunk/debian/libklash0.install Tue Jun 12 12:42:08 2007
@@ -1,0 +1,1 @@
+usr/lib/libklashplayer-0.8.0.so
Added: packages/gnash/trunk/debian/patches/exclude-testsuite-from-built
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/exclude-testsuite-from-built?rev=104&op=file
==============================================================================
--- packages/gnash/trunk/debian/patches/exclude-testsuite-from-built (added)
+++ packages/gnash/trunk/debian/patches/exclude-testsuite-from-built Tue Jun 12 12:42:08 2007
@@ -1,0 +1,77 @@
+---
+ Makefile.am | 1 -
+ configure.ac | 13 -------------
+ 2 files changed, 14 deletions(-)
+
+Index: gnash-0.8.0~cvs20070611.1016/Makefile.am
+===================================================================
+--- gnash-0.8.0~cvs20070611.1016.orig/Makefile.am 2007-06-11 11:45:55.000000000 +0000
++++ gnash-0.8.0~cvs20070611.1016/Makefile.am 2007-06-11 11:46:44.000000000 +0000
+@@ -25,17 +25,16 @@
+ STD_DIRS = \
+ libbase \
+ libgeometry \
+ libamf \
+ server \
+ backend \
+ utilities \
+ gui \
+- testsuite \
+ po \
+ $(NULL)
+
+ if PLUGIN
+ if HAVE_GTK2
+ PLUGIN_DIRS = plugin
+ else
+ if KLASH
+Index: gnash-0.8.0~cvs20070611.1016/configure.ac
+===================================================================
+--- gnash-0.8.0~cvs20070611.1016.orig/configure.ac 2007-06-11 11:45:59.000000000 +0000
++++ gnash-0.8.0~cvs20070611.1016/configure.ac 2007-06-11 11:46:39.000000000 +0000
+@@ -1105,45 +1105,32 @@
+ RENDERER_CONFIG=$renderer
+ AC_SUBST(RENDERER_CONFIG)
+ GUI_CONFIG=$gui
+ AC_SUBST(GUI_CONFIG)
+ MEDIA_CONFIG=$media_handler
+ AC_SUBST(MEDIA_CONFIG)
+
+ dnl AC_CONFIG_LINKS(doc/C/images)
+-AC_CONFIG_LINKS(testsuite/libbase/gnashrc:testsuite/libbase/gnashrc.in)
+
+ AC_OUTPUT(Makefile
+ po/Makefile
+ libbase/Makefile
+ libgeometry/Makefile
+ server/Makefile
+ server/asobj/Makefile
+ server/vm/Makefile
+ server/parser/Makefile
+ libamf/Makefile
+ backend/Makefile
+ utilities/Makefile
+ doc/Makefile
+ doc/C/Makefile
+ doc/C/asspec/Makefile
+ doc/Doxyfile
+-testsuite/Makefile
+-testsuite/libbase/Makefile
+-testsuite/libgeometry/Makefile
+-testsuite/actionscript.all/Makefile
+-testsuite/samples/Makefile
+-testsuite/swfdec/Makefile
+-testsuite/misc-ming.all/Makefile
+-testsuite/misc-mtasc.all/Makefile
+-testsuite/misc-swfmill.all/Makefile
+-testsuite/movies.all/Makefile
+-testsuite/server/Makefile
+-testsuite/libamf.all/Makefile
+ gui/Makefile
+ extensions/Makefile
+ extensions/dejagnu/Makefile
+ extensions/mysql/Makefile
+ extensions/fileio/Makefile
+ extensions/gtk2/Makefile
+ plugin/Makefile
+ plugin/klash/Makefile
Added: packages/gnash/trunk/debian/patches/no-kde-ldflags
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/no-kde-ldflags?rev=104&op=file
==============================================================================
--- packages/gnash/trunk/debian/patches/no-kde-ldflags (added)
+++ packages/gnash/trunk/debian/patches/no-kde-ldflags Tue Jun 12 12:42:08 2007
@@ -1,0 +1,75 @@
+---
+ gui/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: gnash-0.8.0~cvs20070611.1016/gui/Makefile.am
+===================================================================
+--- gnash-0.8.0~cvs20070611.1016.orig/gui/Makefile.am 2007-06-12 10:40:06.000000000 +0000
++++ gnash-0.8.0~cvs20070611.1016/gui/Makefile.am 2007-06-12 11:09:18.000000000 +0000
+@@ -79,17 +79,16 @@
+ endif # USE_GUI_AQUA
+ if USE_GUI_SDL
+ SDL_OPENGL_SRCS = sdl_ogl_glue.cpp sdl_ogl_glue.h
+ endif # USE_GUI_SDL
+ #if USE_GUI_KDE
+ if KLASH
+ KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
+ AM_CPPFLAGS += $(KDE_CFLAGS) $(QT_CFLAGS)
+- AM_LDFLAGS += $(KDE_LIBS) $(QT_LIBS)
+ BUILT_SOURCES = klash.moc
+ endif # USE_GUI_KDE
+ else # ! USE_RENDERER_OPENGL
+ GTK_OPENGL_SRCS =
+ KDE_OPENGL_SRCS =
+ SDL_OPENGL_SRCS =
+ AQUA_OPENGL_SRCS =
+ endif # ! USE_RENDERER_OPENGL
+@@ -206,17 +205,16 @@
+ lib_LTLIBRARIES = libgnashgui.la libgnashplayer.la
+ endif
+
+ libgnashgui_la_SOURCES = \
+ $(SDL_SRCS) \
+ $(FLTK_SRCS) \
+ $(GTK_SRCS) \
+ $(GTK3_SRCS) \
+- $(KDE_SRCS) \
+ $(FB_SRCS) \
+ $(AQUA_SRCS) \
+ $(RISCOS_SRCS) \
+ gui.cpp gui.h \
+ NullGui.cpp \
+ NullGui.h
+
+ #libgnashgui_la_LIBADD = \
+@@ -242,28 +240,30 @@
+ $(top_builddir)/backend/libgnashbackend.la \
+ $(top_builddir)/server/libgnashserver.la \
+ $(top_builddir)/libgeometry/libgnashgeo.la \
+ $(top_builddir)/libbase/libgnashbase.la \
+ libgnashgui.la
+
+ if KLASH
+ libklashplayer_la_SOURCES = \
++ $(KDE_SRCS) \
+ Player.cpp Player.h
+
+ libklashplayer_la_LIBADD = \
+ $(top_builddir)/server/libgnashserver.la \
+ $(top_builddir)/backend/libgnashbackend.la \
+ libgnashgui.la
+
+ libklashplayer_la_CPPFLAGS = $(AM_CPPFLAGS) -DBUILD_KLASH
+ libklashplayer_la_LDFLAGS = \
+ -release $(VERSION) \
+ -no-undefined \
+ -export-dynamic \
++ $(KDE_LIBS) $(QT_LIBS) \
+ $(AM_LDFLAGS)
+
+ endif
+ libgnashplayer_la_SOURCES = \
+ Player.cpp Player.h
+
+ libgnashplayer_la_LIBADD = \
+ $(top_builddir)/server/libgnashserver.la \
Modified: packages/gnash/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/series?rev=104&op=diff
==============================================================================
--- packages/gnash/trunk/debian/patches/series (original)
+++ packages/gnash/trunk/debian/patches/series Tue Jun 12 12:42:08 2007
@@ -1,1 +1,3 @@
ming_headers.patch
+exclude-testsuite-from-built
+no-kde-ldflags
Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/rules?rev=104&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Tue Jun 12 12:42:08 2007
@@ -55,7 +55,7 @@
--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=agg \
+ --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
@@ -185,7 +185,8 @@
dh_compress
dh_fixperms
#dh_makeshlibs -V 'libgnash0 (=$${binary:Version})'
- dh_makeshlibs -V 'libgnash0 (=$(MAIN_VERSION))'
+ dh_makeshlibs -plibgnash0 -V 'libgnash0 (=$(MAIN_VERSION))'
+ dh_makeshlibs -plibklash0 -V 'libklash0 (=$(MAIN_VERSION))'
dh_installdeb
dh_shlibdeps
dh_gencontrol
More information about the pkg-flash-devel
mailing list