r167 - /packages/gnash/trunk/debian/
baby-guest at users.alioth.debian.org
baby-guest at users.alioth.debian.org
Thu Feb 14 14:42:50 UTC 2008
Author: baby-guest
Date: Thu Feb 14 14:42:50 2008
New Revision: 167
URL: http://svn.debian.org/wsvn/?sc=1&rev=167
Log:
New Upstream Release
Removed:
packages/gnash/trunk/debian/gnash-opengl.install
packages/gnash/trunk/debian/gnash-opengl.manpages
packages/gnash/trunk/debian/gnash.manpages
packages/gnash/trunk/debian/gui.tgz.uu
packages/gnash/trunk/debian/libgnash-dev.install
packages/gnash/trunk/debian/libgnash0-agg.install
packages/gnash/trunk/debian/libgnash0-opengl.install
packages/gnash/trunk/debian/libklash0-agg.install
packages/gnash/trunk/debian/libklash0-opengl.install
Modified:
packages/gnash/trunk/debian/TODO.Debian
packages/gnash/trunk/debian/changelog
packages/gnash/trunk/debian/control
packages/gnash/trunk/debian/copyright
packages/gnash/trunk/debian/gnash-cygnal.install
packages/gnash/trunk/debian/gnash-tools.install
packages/gnash/trunk/debian/gnash.desktop
packages/gnash/trunk/debian/gnash.install
packages/gnash/trunk/debian/klash.desktop
packages/gnash/trunk/debian/klash.install
packages/gnash/trunk/debian/konqueror-plugin-gnash.install
packages/gnash/trunk/debian/mozilla-plugin-gnash.install
packages/gnash/trunk/debian/mozilla-plugin-gnash.links
packages/gnash/trunk/debian/rules
Modified: packages/gnash/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/TODO.Debian?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/TODO.Debian (original)
+++ packages/gnash/trunk/debian/TODO.Debian Thu Feb 14 14:42:50 2008
@@ -1,6 +1,4 @@
* Add a menu file and uncomment dh_installmenu in the debian/rules.
* Create a better icon.
-* Add a debian/watch file.
* Find a way to generate man pages without $DISPLAY.
* Add LDFLAGS="-Wl,-z,defs" to ./configure in rules.
-* Add swfdec testsuite for check.
Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/changelog?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Thu Feb 14 14:42:50 2008
@@ -1,20 +1,127 @@
-gnash (0.8.0+cvs20070707.1946-1) experimental; urgency=low
-
- * New Upstream Release. Downloaded from CVS.
- + New Garbage Collector.
- (See http://lists.gnu.org/archive/html/gnash-dev/2007-07/msg00001.html)
-
- -- Miriam Ruiz <little_miry at yahoo.es> Sat, 07 Jul 2007 19:47:02 +0000
-
-gnash (0.8.0+cvs20070626.1540-1) experimental; urgency=low
-
- * New Upstream Release. Downloaded from CVS.
- * Reestructured the code in debian/rules so that multiple builds can be made.
- * Releasing -agg and -opengl flavours now.
- * debian/control: added sharutils and chrpath to Build-Depends
- * Using chrpath to remove rpath, at least in amd64.
-
- -- Miriam Ruiz <little_miry at yahoo.es> Tue, 26 Jun 2007 15:41:17 +0000
+gnash (0.8.1~rc.070818-1) unstable; urgency=low
+
+ [ Miriam Ruiz ]
+ * debian/control: point Xs-Vcs-Bzr: to Debian release branch
+ http://bzr.debian.org/bzr/pkg-flash/debian.sid
+ * debian/control: break long Build-Depends line into multiple lines
+ for the sake of readability
+ * debian/patches/use_pkglibdir_for_unversioned_libs, debian/patches/series:
+ remove upstream applied patch 'use_pkglibdir_for_unversioned_libs' from bzr
+ and quilt series.
+ * debian/patches/ming_headers.patch, debian/patches/no-kde-ldflags
+ debian/patches/exclude-testsuite-from-built: Removed unneeded patches
+ * debian/rules: make errors in make clean fatal
+ * debian/rules, debian/autogen.sh: Added script to regenerate the autotools
+ building system in case it's not present in the tarball
+ * debian/gnash-common.install: Install libraries whether they're CVS version
+ or not.
+ * debian/rules, debian/gnash-dev.install: Removed references to gnash-dev, as
+ it's not predictable to exist in a near future.
+ * debian/rules, debian/*.install: Modify source so that files to be installed
+ can be referenced from debian/ directory without having to move them.
+ * debian/overrides/* : Added override files for lintian warnings
+ * debian/rules: Comment out dh_makeshlibs, as we're not releasing any public
+ shared library anymore.
+ * debian/rules: Don't copy files from debian/ into debian/tmp: not needed
+ anymore.
+ * debian/*.desktop: Fixed desktop files.
+
+ [ Alexander Sack ]
+ * debian/control: choose sane explicit depends: 'gstreamer0.10-plugins-base,
+ gstreamer0.10-videosink | gstreamer0.10-plugins-good,
+ gstreamer0.10-audiosink | gstreamer0.10-alsa'; promote
+ gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg to recommends as
+ debian has no easy-codec-install backend (yet); fix short
+ description typo.
+ * debian/patches/disable-testsuite: gnash builds now fine without
+ hacking build system to not include testsuite in build
+ * debian/patches/series: drop this patch from quilt series file
+ accordingly.
+
+ -- Alexander Sack <asac at debian.org> Tue, 21 Aug 2007 13:07:53 +0200
+
+gnash (0.8.1~trunk.070802-1) UNRELEASED; urgency=low
+
+ * debian targetted trunk build 070802 aka preview 0.8.1:
+ bzr repo: https://code.launchpad.net/~vcs-imports/gnash/trunk
+ revno: 5534
+
+ -- Alexander Sack <asac at ubuntu.com> Thu, 02 Aug 2007 12:30:58 +0000
+
+gnash (0.8.1~trunk.070802-0ubuntu1) UNRELEASED; urgency=low
+
+ Update source for trunk build 070802 aka preview 0.8.1:
+ bzr repo: https://code.launchpad.net/~vcs-imports/gnash/trunk
+ revno: 5534
+
+ Redo and cleanup packaging in consequence of upstream buildsystem
+ refactoring:
+
+ * debian/rules: dropping obsolete --enable-sound and --enable-mp3 and
+ the bogus --enable-static switch; fixing --enable-gui switch
+ * debian/patches/series: don't apply no-kde-ldflags anymore ... applied
+ upstream
+ * debian/patches/series: don't apply easy-codec-install anymore ... applied
+ upstream
+ * debian/rules: use agg renderer
+ * debian/patches/{disable-testsuite,series}: disable testsuite patch
+ * debian/control: drop firefox-dev from build-depends
+ * debian/patches/*: drop ming headers patch - not used
+ * debian/rules: use enable-gui='gtk,kde'
+ * debian/rules: dropping obsolete --enable-sound and --enable-mp3 and the
+ bogus --enable-static switch; fixing --enable-gui switch
+ * debian/patches/use_pkglibdir_for_unversioned_libs, debian/patches/series:
+ install libs in pkglibdir instead of just libdir - as they are unversioned
+ * reorganize gnash packaging to take upstream changes into account:
+ all common files are now stored in pkglibdir and provided by gnash-common
+ package; in turn no libgnash0 nor libklash0 package exist anymore; gui
+ code is not linked into the binaries, which are provided by gnash and klash
+ package respectively; since no stable lib api is provided anymore
+ libgnash-dev package is now just gnash-dev (though its currently disabled
+ completely).
+ * debian/gnash-common.install: install those libs we need explicitly to
+ prevent libgnashplugin.so from getting pulled into gnash-common package
+ * debian/rules: don't run dh_makeshlibs for libgnash0 libklash0 anymore ...
+ as they don't exist
+ * debian/control: make gnash-common conflicts/replaces on libklash0,
+ libgnash0, gnash << 0.8.1~
+ * debian/gnash.manpages: remove manpages for gnash package as gnash manpage
+ is now shipped in gnash-common
+ * debian/TODO,debian/overrides/libgnash0,debian/overrides/libklash0:
+ dropping these old/unused files from bzr.
+
+ -- Alexander Sack <asac at ubuntu.com> Thu, 02 Aug 2007 09:06:22 +0000
+
+gnash (0.8.0~cvs20070611.1016-1ubuntu3) gutsy; urgency=low
+
+ * Rebuild for the libcurl transition mess.
+
+ -- Steve Kowalik <stevenk at ubuntu.com> Thu, 5 Jul 2007 01:35:59 +1000
+
+gnash (0.8.0~cvs20070611.1016-1ubuntu2~mt1) feisty; urgency=low
+
+ * feisty backport for mozillateam preview archive
+
+ -- Alexander Sack <asac at ubuntu.com> Sun, 17 Jun 2007 17:37:00 +0200
+
+gnash (0.8.0~cvs20070611.1016-1ubuntu2) gutsy; urgency=low
+
+ * debian/control: add libgstreamer-plugins-base0.10-dev to fix ftbfs
+
+ -- Alexander Sack <asac at ubuntu.com> Wed, 13 Jun 2007 09:41:59 +0200
+
+gnash (0.8.0~cvs20070611.1016-1ubuntu1) gutsy; urgency=low
+
+ * debian/patches/gnash_easy_codec_install: initial version of easy codec
+ install patch for gnash
+ * debian/patches/series: adapt quilt series file accordingly
+ * debian/control: adapt Maintainer field for ubuntu upload
+ * debian/control: Depends, Recommends and Suggests for libgnash0 and libklash0
+ changed in preparation of easy-codec-installation:
+ demote gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg from Recommends to Suggests
+ promote gstreamer0.10-plugins-base, gstreamer0.10-alsa from Recommends to Depends
+
+ -- Alexander Sack <asac at ubuntu.com> Tue, 12 Jun 2007 15:50:37 +0200
gnash (0.8.0~cvs20070611.1016-1) unstable; urgency=low
Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/control?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Thu Feb 14 14:42:50 2008
@@ -1,54 +1,42 @@
Source: gnash
Priority: optional
Maintainer: Miriam Ruiz <little_miry at yahoo.es>
-Uploaders: Alexander Sack <asac at debian.org>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, sharutils, chrpath,
- autoconf, automake1.9 | automake (> 1.10), 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,
- libpango1.0-dev | pango-devel, libgtkglext1-dev, libmad0-dev, libxul-dev | mozilla-dev,
- libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev,
- libdirectfb-dev, libkonq4-dev, libcaca-dev, libboost-date-time-dev, libming-dev, libming-util,
- libavcodec-dev, libavformat-dev, mtasc
+Uploaders: Alexander Sack <asac at jwsdot.com>
+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, libkonq4-dev,
+ libpango1.0-dev | pango-devel, libgtkglext1-dev, libmad0-dev, libdirectfb-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, libgstreamer-plugins-base0.10-dev
Standards-Version: 3.7.2
Section: utils
+Xs-Vcs-Bzr: http://bzr.debian.org/bzr/pkg-flash/debian.sid
-Package: libgnash0-agg
+Package: gnash-common
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 - shared libraries
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-plugins-base, gstreamer0.10-videosink | gstreamer0.10-plugins-good, gstreamer0.10-audiosink | gstreamer0.10-alsa
+Recommends: gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
+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 Flash movie player - common files/libraries
Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Iceweasel/Mozilla or Konqueror.
+ plugin for Firefox/Mozilla or Konqueror.
.
- This package includes the shared libraries compiled with gstreamer and AGG
- backends.
+ This package includes the common, gui-independent files/libraries
.
- Homepage: http://www.gnu.org/software/gnash/
-
-Package: libgnash0-opengl
-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 - shared libraries
- Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Iceweasel/Mozilla or Konqueror.
- .
- This package includes the shared libraries compiled with gstreamer and OpenGL
- backends.
- .
- Homepage: http://www.gnu.org/software/gnash/
+ Homepage: http://www.gnu.org/software/gnash/
Package: gnash
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash-common (= ${binary:Version}), ${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/Iceweasel/Mozilla or Konqueror. Currently it is in a
- alpha state. The plugins are under heavy development at this time.
+ 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
@@ -62,18 +50,16 @@
.
This package includes the standalone GTK+-based OpenGL player.
.
- Homepage: http://www.gnu.org/software/gnash/
+ Homepage: http://www.gnu.org/software/gnash/
-Package: gnash-opengl
+Package: klash
Section: utils
Architecture: any
-Provides: gnash
-Conflicts: gnash
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: free Flash movie player
+Depends: gnash-common (= ${binary:Version}), ${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/Iceweasel/Mozilla or Konqueror. Currently it is in a
- alpha state. The plugins are under heavy development at this time.
+ 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
@@ -85,9 +71,9 @@
socket, and parse the incoming XML message. This lets a movie be a remote
control for other devices or applications.
.
- This package includes the standalone GTK+-based OpenGL player.
+ Klash is a free standalone Flash movie player for KDE.
.
- Homepage: http://www.gnu.org/software/gnash/
+ Homepage: http://www.gnu.org/software/gnash/
Package: gnash-tools
Section: utils
@@ -95,8 +81,8 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: free Flash movie player - Command-line Tools
Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Iceweasel/Mozilla or Konqueror. Currently it is in a
- alpha state. The plugins are under heavy development at this time.
+ 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
@@ -110,7 +96,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
@@ -118,8 +104,8 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: free Flash movie player - Media server
Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Iceweasel/Mozilla or Konqueror. Currently it is in a
- alpha state. The plugins are under heavy development at this time.
+ 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
@@ -133,7 +119,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
@@ -141,20 +127,20 @@
Depends: gnash (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: free Flash movie player - Plugin for Mozilla and derivatives
Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Iceweasel/Mozilla or Konqueror.
+ plugin for Firefox/Mozilla or Konqueror.
.
- This package includes the plugin for Firefox/Iceweasel/Mozilla Web Browser.
+ 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: 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/Iceweasel/Mozilla or Konqueror.
+ 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/
Modified: packages/gnash/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/copyright?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/copyright (original)
+++ packages/gnash/trunk/debian/copyright Thu Feb 14 14:42:50 2008
@@ -584,7 +584,3 @@
Software without prior written authorization from the Gnome Foundation
or Bitstream Inc., respectively. For further information, contact:
fonts at gnome dot org.
-
-
-The Debian packaging, man pages and icons in debian/ directory are licensed
-under the GPL, see above.
Modified: packages/gnash/trunk/debian/gnash-cygnal.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/gnash-cygnal.install?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash-cygnal.install (original)
+++ packages/gnash/trunk/debian/gnash-cygnal.install Thu Feb 14 14:42:50 2008
@@ -1,1 +1,2 @@
-tmp-agg/usr/bin/cygnal usr/bin/
+tmp/usr/bin/cygnal usr/bin/
+overrides/gnash-cygnal usr/share/lintian/overrides/
Modified: packages/gnash/trunk/debian/gnash-tools.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/gnash-tools.install?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash-tools.install (original)
+++ packages/gnash/trunk/debian/gnash-tools.install Thu Feb 14 14:42:50 2008
@@ -1,2 +1,3 @@
-tmp-agg/usr/bin/gparser usr/bin/
-tmp-agg/usr/bin/gprocessor usr/bin/
+tmp/usr/bin/gparser usr/bin/
+tmp/usr/bin/gprocessor usr/bin/
+overrides/gnash-tools usr/share/lintian/overrides/
Modified: packages/gnash/trunk/debian/gnash.desktop
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/gnash.desktop?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash.desktop (original)
+++ packages/gnash/trunk/debian/gnash.desktop Thu Feb 14 14:42:50 2008
@@ -7,4 +7,4 @@
Icon=/usr/share/pixmaps/gnash.xpm
Exec=/usr/bin/gnash
Terminal=false
-Categories=Application;AudioVideo;
+Categories=AudioVideo;Player;GTK;
Modified: packages/gnash/trunk/debian/gnash.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/gnash.install?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash.install (original)
+++ packages/gnash/trunk/debian/gnash.install Thu Feb 14 14:42:50 2008
@@ -1,3 +1,3 @@
-tmp-agg/usr/bin/gnash usr/bin/
+tmp/usr/bin/gtk-gnash usr/bin/
gnash.xpm usr/share/pixmaps/
gnash.desktop usr/share/applications/
Modified: packages/gnash/trunk/debian/klash.desktop
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/klash.desktop?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/klash.desktop (original)
+++ packages/gnash/trunk/debian/klash.desktop Thu Feb 14 14:42:50 2008
@@ -7,4 +7,4 @@
Icon=/usr/share/pixmaps/klash.xpm
Exec=/usr/bin/klash
Terminal=false
-Categories=Application;AudioVideo;KDE;
+Categories=AudioVideo;Player;KDE;
Modified: packages/gnash/trunk/debian/klash.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/klash.install?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/klash.install (original)
+++ packages/gnash/trunk/debian/klash.install Thu Feb 14 14:42:50 2008
@@ -1,3 +1,4 @@
-tmp-opengl/usr/bin/klash usr/bin/
+tmp/usr/bin/kde-gnash usr/bin/
klash.xpm usr/share/pixmaps/
klash.desktop usr/share/applications/
+overrides/klash usr/share/lintian/overrides/
Modified: packages/gnash/trunk/debian/konqueror-plugin-gnash.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/konqueror-plugin-gnash.install?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/konqueror-plugin-gnash.install (original)
+++ packages/gnash/trunk/debian/konqueror-plugin-gnash.install Thu Feb 14 14:42:50 2008
@@ -1,4 +1,4 @@
-tmp-agg/usr/lib/kde3/libklashpart.so usr/lib/kde3/
-tmp-agg/usr/lib/kde3/libklashpart.la usr/lib/kde3/
-tmp-agg/usr/share/apps/klash usr/share/apps/
-tmp-agg/usr/share/services/[Kk]lash* usr/share/services/
+tmp/usr/lib/kde3/libklashpart.so usr/lib/kde3/
+tmp/usr/lib/kde3/libklashpart.la usr/lib/kde3/
+tmp/usr/share/apps/klash usr/share/apps/
+tmp/usr/share/services/[Kk]lash* usr/share/services/
Modified: packages/gnash/trunk/debian/mozilla-plugin-gnash.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/mozilla-plugin-gnash.install?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/mozilla-plugin-gnash.install (original)
+++ packages/gnash/trunk/debian/mozilla-plugin-gnash.install Thu Feb 14 14:42:50 2008
@@ -1,5 +1,2 @@
-tmp-agg/usr/lib/gnash/libgnashplugin.so usr/lib/gnash/
-tmp-agg/usr/lib/libmozsdk*.so.* usr/lib/
-tmp-agg/usr/lib/mozilla/* usr/lib/mozilla/
-tmp-agg/usr/lib/firefox/* usr/lib/firefox/
+tmp/usr/lib/gnash/libgnashplugin.so usr/lib/gnash/
overrides/gnash-plugin usr/share/lintian/overrides/
Modified: packages/gnash/trunk/debian/mozilla-plugin-gnash.links
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/mozilla-plugin-gnash.links?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/mozilla-plugin-gnash.links (original)
+++ packages/gnash/trunk/debian/mozilla-plugin-gnash.links Thu Feb 14 14:42:50 2008
@@ -1,3 +1,5 @@
usr/lib/gnash/libgnashplugin.so usr/lib/mozilla/plugins/libgnashplugin.so
usr/lib/gnash/libgnashplugin.so usr/lib/firefox/plugins/libgnashplugin.so
+usr/lib/gnash/libgnashplugin.so usr/lib/seamonkey/plugins/libgnashplugin.so
usr/lib/gnash/libgnashplugin.so usr/lib/iceweasel/plugins/libgnashplugin.so
+usr/lib/gnash/libgnashplugin.so usr/lib/iceape/plugins/libgnashplugin.so
Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/rules?rev=167&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Thu Feb 14 14:42:50 2008
@@ -13,16 +13,12 @@
MAIN_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g')
CFLAGS = -Wall -g -Werror-implicit-function-declaration
-CXXFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-
-CFLAGS_AGG=$(CXXFLAGS) -DGNASHG_PNG=\\\"GnashG.agg.png\\\"
-CFLAGS_OPENGL=$(CXXFLAGS) -DGNASHG_PNG=\\\"GnashG.opengl.png\\\"
# shared library versions, option 1
#version=2.0.5
@@ -35,9 +31,9 @@
# CONFIGURE
-setup: setup-stamp
-setup-stamp:
+config.status: configure.ac
dh_testdir
+
@printf "\n == APPLYING PATCHES ============================================ \n\n"
$(MAKE) -f /usr/share/quilt/quilt.make patch
@printf "\n ----------------------------------- End of APPLYING PATCHES ---- \n\n"
@@ -50,99 +46,50 @@
endif
@printf "\n == AUTOGEN ===================================================== \n\n"
- test -e configure || ./autogen.sh
+ if test -e autogen.sh; then ./autogen.sh; else sh debian/autogen.sh; fi
@printf "\n -------------------------------------------- End of AUTOGEN ---- \n\n"
- uudecode debian/gui.tgz.uu -o debian/gui.tgz
- cd debian && tar xvfz gui.tgz
- rm -f debian/gui.tgz
+ @printf "\n == CONFIGURE =================================================== \n\n"
+ # In the future, I want to add LDFLAGS="-Wl,-z,defs"
+ ./configure CFLAGS="$(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,kde' --enable-cygnal \
+ --enable-gstreamer --enable-media=gst --enable-renderer=agg \
+ --with-plugindir=\$${prefix}/lib/gnash \
+ --enable-shared=yes --enable-sdk-install \
+ --disable-rpath --enable-lotsa-warnings --without-gcc-arch
+ @printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
cp libamf/README README.amf
- touch $@
-
-config-agg: config-agg-stamp
-config-agg-stamp: setup
- dh_testdir
- @printf "\n == CONFIGURE GNASH/AGG ========================================= \n\n"
- # In the future, I want to add LDFLAGS="-Wl,-z,defs"
- test -e $@ || ( mkdir tmp-agg && cd tmp-agg && $(CURDIR)/configure \
- CFLAGS="$(CFLAGS_AGG)" CXXFLAGS="$(CFLAGS_AGG)" \
- --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-gui=GTK \
- --enable-gstreamer --enable-media=gst --enable-renderer=agg \
- --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 GNASH/AGG ---- \n\n"
- touch $@
-
-config-opengl: config-opengl-stamp
-config-opengl-stamp: setup
- dh_testdir
- @printf "\n == CONFIGURE GNASH/OPENGL ======================================= \n\n"
- # In the future, I want to add LDFLAGS="-Wl,-z,defs"
- test -e $@ || ( mkdir tmp-opengl && cd tmp-opengl && $(CURDIR)/configure \
- CFLAGS="$(CFLAGS_OPENGL)" CXXFLAGS="$(CFLAGS_OPENGL)" \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-rpath \
- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --enable-mp3 --enable-plugin --enable-klash --enable-gui=KDE \
- --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 GNASH/OPENGL ---- \n\n"
- touch $@
# BUILD
-BUILD_VERSION = $(shell /bin/date --utc +%0Y%0m%0d)
-
-build: build-agg build-opengl
-
-build-agg: build-agg-stamp
-build-agg-stamp: config-agg
+build: build-stamp
+build-stamp: config.status
dh_testdir
- @printf "\n == MAKE GNASH/AGG ============================================== \n\n"
- test -e $@ || $(MAKE) -C tmp-agg VERSION="$(BUILD_VERSION).agg"
- @printf "\n ------------------------------------- End of MAKE GNASH/AGG ---- \n\n"
+ @printf "\n == MAKE ======================================================== \n\n"
+ $(MAKE)
+ @printf "\n ----------------------------------------------- End of MAKE ---- \n\n"
- @#@printf "\n == CHECK GNASH/AGG ============================================= \n\n"
- @#-test -e $@ || $(MAKE) -C tmp-agg check
- @#@printf "\n ------------------------------------ End of CHECK GNASH/AGG ---- \n\n"
+ @printf "\n == CHECK ======================================================= \n\n"
+ $(MAKE) check
+ @printf "\n ---------------------------------------------- End of CHECK ---- \n\n"
- touch $@
-
-build-opengl: build-opengl-stamp
-build-opengl-stamp: config-opengl
- dh_testdir
- #patch -p1 < debian/patches/klashg_png.patch
-
- @printf "\n == MAKE GNASH/OPENGL =========================================== \n\n"
- test -e $@ || $(MAKE) -C tmp-opengl VERSION="$(BUILD_VERSION).opengl"
- @printf "\n ---------------------------------- End of MAKE GNASH/OPENGL ---- \n\n"
-
- @#@printf "\n == CHECK GNASH/OPENGL ========================================== \n\n"
- @#-test -e $@ || $(MAKE) -C tmp-opengl check
- @#@printf "\n --------------------------------- End of CHECK GNASH/OPENGL ---- \n\n"
-
- #patch -p1 -R < debian/patches/klashg_png.patch
- touch $@
+ touch build-stamp
# CLEAN
clean:
dh_testdir
dh_testroot
- -rm -rf *-stamp tmp-* debian/tmp-*
+ rm -f build-stamp
-#ifeq (Makefile,$(wildcard Makefile))
-# -$(MAKE) maintainer-clean
-# -$(MAKE) distclean
-#endif
+ifeq (Makefile,$(wildcard Makefile))
+ [ ! -f Makefile ] || $(MAKE) maintainer-clean
+ [ ! -f Makefile ] || $(MAKE) distclean
+endif
ifneq ($(wildcard ${AUTO_JUNK}),)
rm $(wildcard ${AUTO_JUNK})
@@ -150,27 +97,26 @@
rm -f config.{sub,guess,log,status}
rm -f libtool
-
rm -f `find . -name "Makefile"| grep -v "debian/"`
rm -f `find . -name "*.o"`
rm -rf `find . -name ".libs"`
rm -rf `find . -name ".deps"`
rm -f configure aclocal.m4 config.h.in
- rm -f `find . -name Makefile.in`
+ #-find . -name Makefile.in -exec rm {} \;
+ -rm `find . -name Makefile.in`
- rm -rf libltdl/autom4te.cache
+ -rm -rf libltdl/autom4te.cache
-rm -f libltdl/* ltmain.sh
#cd debian/h2m; $(MAKE) clean
- rm -f README.amf
+ -rm -f README.amf
@printf "\n == CLEANING PATCHES ============================================ \n\n"
$(MAKE) -f /usr/share/quilt/quilt.make unpatch
@printf "\n ----------------------------------- End of CLEANING PATCHES ---- \n\n"
- rm -rf debian/gui
dh_clean
# INSTALL
@@ -181,40 +127,18 @@
dh_clean -k
dh_installdirs
- @printf "\n == INSTALL GNASH/AGG =========================================== \n\n"
- $(MAKE) install -C tmp-agg DESTDIR=$(CURDIR)/debian/tmp-agg
- @printf "\n ---------------------------------- End of INSTALL GNASH/AGG ---- \n\n"
+ install -d $(CURDIR)/debian/tmp/usr/bin
+ install -d $(CURDIR)/debian/tmp/usr/lib
+ install -d $(CURDIR)/debian/tmp/usr/lib/gnash/
+ install -d $(CURDIR)/debian/tmp/usr/lib/mozilla/plugins/
+ install -d $(CURDIR)/debian/tmp/usr/lib/firefox/plugins/
+ install -d $(CURDIR)/debian/tmp/usr/include/gnash
- @printf "\n == INSTALL GNASH/OPENGL ======================================== \n\n"
- $(MAKE) install -C tmp-opengl DESTDIR=$(CURDIR)/debian/tmp-opengl
- @printf "\n ------------------------------- End of INSTALL GNASH/OPENGL ---- \n\n"
-
- for i in $(CURDIR)/debian/tmp-{agg,opengl}/usr/bin/* ; do \
- echo "Removing rpath from \"$$i\"" ; \
- chrpath --delete "$$i" ; \
- done
-
- for i in $(CURDIR)/debian/tmp-{agg,opengl}/usr/lib/{*.so.*,*-*.so} ; do \
- echo "Removing rpath from \"$$i\"" ; \
- chrpath --delete "$$i" ; \
- done
+ @printf "\n == INSTALL ===================================================== \n\n"
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ @printf "\n -------------------------------------------- End of INSTALL ---- \n\n"
#cd debian/h2m; $(MAKE)
-
-# install -d $(CURDIR)/debian/tmp/usr/include/gnash/
-# cp compatibility_include.h $(CURDIR)/debian/tmp/usr/include/gnash/
-# install -d $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
-# cp libbase/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
-# install -d $(CURDIR)/debian/tmp/usr/include/gnash/libgeometry/
-# cp libgeometry/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libgeometry/
-# install -d $(CURDIR)/debian/tmp/usr/include/gnash/libamf/
-# cp libamf/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libamf/
-# install -d $(CURDIR)/debian/tmp/usr/include/gnash/server/
-# cp server/*.h $(CURDIR)/debian/tmp/usr/include/gnash/server/
-# install -d $(CURDIR)/debian/tmp/usr/include/gnash/backend/
-# cp backend/*.h $(CURDIR)/debian/tmp/usr/include/gnash/backend/
-# install -d $(CURDIR)/debian/tmp/usr/include/gnash/gui/
-# cp gui/*.h $(CURDIR)/debian/tmp/usr/include/gnash/gui/
# CREATE PACKAGES
@@ -228,7 +152,7 @@
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
- #dh_installexamples
+ dh_installexamples
dh_install --sourcedir=$(CURDIR)/debian
# dh_installmenu
# dh_installmime
@@ -237,25 +161,15 @@
dh_strip
dh_compress
dh_fixperms
- #dh_makeshlibs -V 'libgnash0 (=$${binary:Version})'
- dh_makeshlibs -plibgnash0-agg -V 'libgnash0-agg (=$(MAIN_VERSION))'
- dh_makeshlibs -plibgnash0-opengl -V 'libgnash0-opengl (=$(MAIN_VERSION))'
- #dh_makeshlibs -plibklash0 -V 'libklash0 (=$(MAIN_VERSION))'
+ #dh_makeshlibs
dh_installdeb
- dh_shlibdeps -plibgnash0-agg -l $(CURDIR)/debian/tmp-agg/usr/lib
- dh_shlibdeps -plibgnash0-opengl -l $(CURDIR)/debian/tmp-opengl/usr/lib
- dh_shlibdeps -pgnash -L libgnash0-agg -l $(CURDIR)/debian/libgnash0-agg/usr/lib
- dh_shlibdeps -pgnash-opengl -L libgnash0-opengl -l $(CURDIR)/debian/libgnash0-opengl/usr/lib
- dh_shlibdeps -pmozilla-plugin-gnash -L libgnash0-agg -l $(CURDIR)/debian/libgnash0-agg/usr/lib
- dh_shlibdeps -pkonqueror-plugin-gnash -L libgnash0-agg -l $(CURDIR)/debian/libgnash0-agg/usr/lib
- dh_shlibdeps -pgnash-tools -L libgnash0-agg -l $(CURDIR)/debian/libgnash0-agg/usr/lib
- dh_shlibdeps -pgnash-cygnal -L libgnash0-agg -l $(CURDIR)/debian/libgnash0-agg/usr/lib
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
-VERSION_ID = 0.8.0+cvs$(VERSION_DATE)
+VERSION_ID = 0.7.2+cvs$(VERSION_DATE)
get-orig-source:
echo Downloading gnash $(VERSION_ID) from CVS...
#test -e gnashd && exit
More information about the pkg-flash-devel
mailing list