r246 - in /packages/gnash/trunk/debian: changelog control copyright gnash-common-opengl.install h2m/cygnal h2m/cygnal.1 h2m/gnash.1 h2m/gprocessor.1 rules

miriam at users.alioth.debian.org miriam at users.alioth.debian.org
Thu Jun 5 17:02:32 UTC 2008


Author: miriam
Date: Thu Jun  5 17:02:32 2008
New Revision: 246

URL: http://svn.debian.org/wsvn/?sc=1&rev=246
Log:
New Upstream Version: 0.8.3-rc2
Added OpenGL as an alternative package


Added:
    packages/gnash/trunk/debian/gnash-common-opengl.install
      - copied, changed from r243, packages/gnash/trunk/debian/gnash-common.install
Modified:
    packages/gnash/trunk/debian/changelog
    packages/gnash/trunk/debian/control
    packages/gnash/trunk/debian/copyright
    packages/gnash/trunk/debian/h2m/cygnal
    packages/gnash/trunk/debian/h2m/cygnal.1
    packages/gnash/trunk/debian/h2m/gnash.1
    packages/gnash/trunk/debian/h2m/gprocessor.1
    packages/gnash/trunk/debian/rules

Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/changelog?rev=246&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Thu Jun  5 17:02:32 2008
@@ -1,20 +1,53 @@
-gnash (0.8.3~cvs20080604.1501-1) UNRELEASED; urgency=low
+gnash (0.8.3~rc2-1) UNRELEASED; urgency=low
 
   [ Miriam Ruiz ]
-  * New Upstream Release. Downloaded from CVS.
+  * New Upstream Release.
+    -  Garbage Collector usage reduced where appropriate.
+    - Mouse.hide and Mouse.show implemented in GTK.
+    - ActionScript inheritance fixes:
+        + super implemented correctly (still not 100% compatible for SWF7)
+        + implements / instanceof works correctly now
+     - FsCommands quit, fullscreen and showMenu implemented.
+    - FsCommand-to-javascript implemented (plugin).
+    - Minor ActionScript compatibility fixes: String, XML, toLocaleString,
+      int, parseInt. fromCharCode, toString (SWF4) etc.
+    - Fixes to arguments class.
+    - Native fullscreen support (from AS) implemented.
+    - Stage.scaleMode implemented (fixes resizing of various movies).
+    - Stage.align implemented.
+    - Long command-line options properly supported.
+    - Fixes to Date class (platform consistent).
+    - Logging uses boost::format.
+    - View detailed movie information from GTK gui.
+    - Widget to start stopped movies (e.g. when starting in stopped mode)
+    - Improved Win32 support: builds using MinGW/MSYS (cross-compile not
+      tested yet), and initial implementation of npgnash.dll exists.
+    - Sprite handling improved, fixing FlowPlayer and other video SWFs.
+    - TextField handling:
+        + Fix in device font handling (DefineFontInfo tag)
+        + Fix support for DefineFont2 tag (sizes)
+        + Improve TextField support for TextFormat use. 
+    - Improved Cairo rendering performance.
+    - Fix parsing of malformed XML files
+    - Fix support for OpenOffice Impress SWF exporter (malformed).
+    - Fix loading of text / XML with Byte Order Marks.
+    - Minor fix to _x and _y translation.
+    - More functions correctly registered as ASnative.
+    - System.capabilities information expanded.
+    - Jemalloc memory allocator from Mozilla added as an option.
+    - Redesigned and implemented AMF0 support, with the beginning of AMF3
+      support.
+    - Added "dump" GUI to dump video streams to disk.
+    - SWF8 line styles support (both from tag and drawing api) 
   * Added new patch to fix minor compilation bug: kde_include_types.patch
+  * Removed "DM-Upload-Allowed: yes" from debian/control
+  * Added alternative packages with OpenGL as rendering backend:
+    gnash-common-opengl
 
   [ Robert Millan ]
   * Removed debian/patches/rename_sysgnashrc_to_gnashrc.diff (merged).
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Wed, 04 Jun 2008 15:03:01 +0000
-
-gnash (0.8.3~cvs20080514.1309-1) UNRELEASED; urgency=low
-
-  * New upstream snapshot.
-    + Remove debian/patches/rename_sysgnashrc_to_gnashrc.diff (merged).
-
- -- Robert Millan <rmh at aybabtu.com>  Wed, 14 May 2008 13:11:10 +0000
+ -- Miriam Ruiz <little_miry at yahoo.es>  Thu, 05 Jun 2008 11:49:19 +0000
 
 gnash (0.8.3~cvs20080510.1114-1) experimental; urgency=low
 

Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/control?rev=246&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Thu Jun  5 17:02:32 2008
@@ -14,13 +14,13 @@
 Standards-Version: 3.7.3
 Section: utils
 Homepage: http://www.gnu.org/software/gnash/
-DM-Upload-Allowed: yes
 
 Package: gnash-common
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, base-files (>= 4.0.1~),
- gstreamer0.10-plugins-base, gstreamer0.10-videosink | gstreamer0.10-plugins-good, gstreamer0.10-audiosink | gstreamer0.10-alsa
+ 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, gstreamer0.10-gnomevfs
 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~)
@@ -28,12 +28,30 @@
  Gnash is a free Flash movie player, which works either standalone, or as
  plugin for Firefox/Mozilla or Konqueror.
  .
- This package includes the common, gui-independent files/libraries
+ This package includes the common files/libraries that use AGG (Antigrain)
+ as the rendering backend.
+
+Package: gnash-common-opengl
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, base-files (>= 4.0.1~),
+ 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, gstreamer0.10-gnomevfs
+Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~), gnash-common
+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/Mozilla or Konqueror.
+ .
+ This package includes the common files/libraries that use OpenGL
+ as the rendering backend.
 
 Package: gnash
 Section: utils
 Architecture: any
-Depends: gnash-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
 Description: free Flash movie player
  Gnash is a free GPL'd Flash movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.
@@ -47,13 +65,13 @@
  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.
+ This package includes the standalone GTK+-based player.
 
 Package: klash
 Section: utils
 Architecture: any
-Depends: gnash-common (= ${binary:Version}), libqt3-mt (>= 3:3.3.8),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version}),
+ libqt3-mt (>= 3:3.3.8), ${shlibs:Depends}, ${misc:Depends}
 Description: free Flash movie player - standalone player for KDE
  Gnash is a free GPL'd Flash movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.

Modified: packages/gnash/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/copyright?rev=246&op=diff
==============================================================================
--- packages/gnash/trunk/debian/copyright (original)
+++ packages/gnash/trunk/debian/copyright Thu Jun  5 17:02:32 2008
@@ -1,9 +1,12 @@
 This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
 Sun,  7 May 2006 00:54:46 +0000.
 
-It was downloaded from ftp://ftp.gnu.org/pub/gnu/gnash/
+Downloaded from:
+        http://www.getgnash.org/packages/releases/0.8.3-rc2/gnash-0.8.3-rc2.tar.gz
 
-Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+Official releases can be downloaded from ftp://ftp.gnu.org/pub/gnu/gnash/
+
+Copyright (C) 2005-2008,  Free Software Foundation, Inc.
 
 Main Author: Rob Savoye <rob at senecass.com>
 

Copied: packages/gnash/trunk/debian/gnash-common-opengl.install (from r243, packages/gnash/trunk/debian/gnash-common.install)
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/gnash-common-opengl.install?rev=246&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash-common.install (original)
+++ packages/gnash/trunk/debian/gnash-common-opengl.install Thu Jun  5 17:02:32 2008
@@ -1,15 +1,15 @@
-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.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/usr/bin/gnash usr/bin/
-tmp/usr/share/man/man1/gnash.1 usr/share/man/man1/
-tmp/usr/share/gnash usr/share/
-tmp/usr/share/locale usr/share/
+tmp.opengl/usr/bin/gnash usr/bin/
+tmp.opengl/usr/share/man/man1/gnash.1 usr/share/man/man1/
+tmp.opengl/usr/share/gnash usr/share/
+tmp.opengl/usr/share/locale usr/share/

Modified: packages/gnash/trunk/debian/h2m/cygnal
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/h2m/cygnal?rev=246&op=diff
==============================================================================
--- packages/gnash/trunk/debian/h2m/cygnal (original)
+++ packages/gnash/trunk/debian/h2m/cygnal Thu Jun  5 17:02:32 2008
@@ -11,7 +11,7 @@
       awk '(p<2){if(NF==0){p++;next;}}{print}'
     ;;
    "--version")
-    LD_LIBRARY_PATH="$LIB" $BIN/cygnal --version 2>&1 | \
+    LD_LIBRARY_PATH="$LIB" $BIN/cygnal --version 2>/dev/null | \
       head -n 1 | awk '{ print $2 }'
     ;;
 esac

Modified: packages/gnash/trunk/debian/h2m/cygnal.1
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/h2m/cygnal.1?rev=246&op=diff
==============================================================================
--- packages/gnash/trunk/debian/h2m/cygnal.1 (original)
+++ packages/gnash/trunk/debian/h2m/cygnal.1 Thu Jun  5 17:02:32 2008
@@ -1,24 +1,22 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH CYGNAL "1" "March 2008" "cygnal 0.8.2" "User Commands"
+.TH CYGNAL "1" "June 2008" "cygnal 0.8.3-rc2" "User Commands"
 .SH NAME
 cygnal \- streaming media server
 .SH SYNOPSIS
 .B cygnal  [options...]
 .SH DESCRIPTION
 Cygnal is a Gnash's streaming media server.
-.PP
-usage: cygnal [options...]
 .TP
-\fB\-\-help\fR(\fB\-h\fR)
-Print this info.
+\fB\-h\fR,  \fB\-\-help\fR
+Print this help and exit
 .TP
-\fB\-\-version\fR
-Print the version numbers.
+\fB\-V\fR,  \fB\-\-version\fR
+Print version information and exit
 .TP
-\fB\-\-verbose\fR (\fB\-v\fR)
-Output verbose debug info.
+\fB\-v\fR,  \fB\-\-verbose\fR
+Output verbose debug info
 .TP
-\fB\-\-port\-offset\fR (\fB\-p\fR)
-RTMPT port offset.
+\fB\-p\fR   \fB\-\-port\-offset\fR
+RTMPT port offset
 .SH "SEE ALSO"
 You can find more information at http://www.gnu.org/software/gnash/

Modified: packages/gnash/trunk/debian/h2m/gnash.1
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/h2m/gnash.1?rev=246&op=diff
==============================================================================
--- packages/gnash/trunk/debian/h2m/gnash.1 (original)
+++ packages/gnash/trunk/debian/h2m/gnash.1 Thu Jun  5 17:02:32 2008
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH GNASH "1" "March 2008" "gnash 0.8.2" "User Commands"
+.TH GNASH "1" "June 2008" "gnash 0.8.3-rc2" "User Commands"
 .SH NAME
 gnash \- free Flash movie player
 .SH SYNOPSIS
@@ -8,87 +8,81 @@
 Gnash is a free Flash movie player, which works either standalone, or as plugin for Firefox/Mozilla or Konqueror.
 
 This program plays a SWF (Shockwave Flash) movie using OpenGL
-.PP
-options:
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-Print this info.
+\fB\-h\fR,  \fB\-\-help\fR
+Print this help and exit
 .TP
-\fB\-s\fR <factor>
-Scale the movie up/down by the specified factor
+\fB\-V\fR,  \fB\-\-version\fR
+Print version information and exit
+.TP
+\fB\-s\fR,  \fB\-\-scale\fR <factor>
+Scale the movie by the specified factor
 .TP
 \fB\-c\fR
 Produce a core file instead of letting SDL trap it
 .TP
-\fB\-d\fR num
+\fB\-d\fR,  \fB\-\-delay\fR num
 Number of milliseconds to delay in main loop
 .TP
-\fB\-v\fR
-Be verbose; i.e. print log messages to stdout
+\fB\-v\fR,  \fB\-\-verbose\fR
+Produce verbose output
 .TP
 \fB\-va\fR
-Be verbose about movie Actions
-.TP
-\fB\-vp\fR
-Be verbose about parsing the movie
-.TP
-\fB\-m\fR <bias>
-Specify the texture LOD bias (float, default is \fB\-1\fR.0)
-.TP
-\fB\-x\fR <ID>
-X11 Window ID for display
-.TP
-\fB\-v\fR
-Produce verbose output
+Be (very) verbose about action execution
 .TP
 \fB\-vp\fR
 Be (very) verbose about parsing
 .TP
-\fB\-va\fR
-Be (very) verbose about action execution
+\fB\-A\fR <file>
+Audio dump file (wave format)
 .TP
-\fB\-w\fR
+\fB\-D\fR <file>
+Video dump file (only valid with dump\-gnash)
+.TP
+\fB\-x\fR,  \fB\-\-xid\fR <ID>
+X11 Window ID for display
+.TP
+\fB\-w\fR,  \fB\-\-writelog\fR
 Produce the disk based debug log
 .TP
-\fB\-j\fR <width >
+\fB\-j\fR,  \fB\-\-width\fR <width>
 Set window width
 .TP
-\fB\-k\fR <height>
+\fB\-k\fR,  \fB\-\-height\fR <height>
 Set window height
 .TP
-\fB\-1\fR
-Play once; exit when/if movie reaches the last frame
+\fB\-1\fR,  \fB\-\-once\fR
+Exit when/if movie reaches the last frame
 .TP
-\fB\-g\fR
+\fB\-g\fR,  \fB\-\-debugger\fR
 Turn on the Flash debugger
-.HP
-\fB\-r\fR <0|1|2|3>
-.IP
-0 disables both rendering & sound (good for batch tests)
-1 enables rendering & disables sound
-2 enables sound & disables rendering
-3 enables both rendering & sound (default)
 .TP
-\fB\-t\fR <sec>
-Timeout and exit after the specified number of seconds
+\fB\-r\fR,  \fB\-\-render\-mode\fR <0|1|2|3>
+0 disable rendering and sound
+1 enable rendering, disable sound
+2 enable sound, disable rendering
+3 enable rendering and sound (default)
 .TP
-\fB\-u\fR <url>
-Set "real" url of the movie
-(useful for downloaded movies)
+\fB\-t\fR,  \fB\-\-timeout\fR <sec>
+Exit after the specified number of seconds
 .TP
-\fB\-U\fR <url>
-Set "base" url for this run
-(used to resolve relative urls, defaults to movie url)
+\fB\-u\fR,  \fB\-\-real\-url\fR <url>
+Set "real" URL of the movie
 .TP
-\fB\-P\fR <param>
-Set parameter (ie. "FlashVars=A=1&b=2")
-.HP
-\fB\-V\fR, \fB\-\-version\fR Print gnash's version number and exit
+\fB\-U\fR,  \fB\-\-base\-url\fR <url>
+Set "base" URL for resolving relative URLs
 .TP
-\fB\-F\fR <fd>
-Set filedescriptor to use for external communications
-.PP
-keys:
+\fB\-P\fR,  \fB\-\-param\fR <param>
+Set parameter (e.g. "FlashVars=A=1&b=2")
+.TP
+\fB\-F\fR,  \fB\-\-fd\fR <fd>
+Filedescriptor to use for external communications
+.TP
+\fB\-\-max\-advances\fR num
+Exit after specified number of advances
+.TP
+\fB\-\-fullscreen\fR
+Start in fullscreen mode
 .TP
 CTRL\-Q, CTRL\-W
 Quit/Exit

Modified: packages/gnash/trunk/debian/h2m/gprocessor.1
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/h2m/gprocessor.1?rev=246&op=diff
==============================================================================
--- packages/gnash/trunk/debian/h2m/gprocessor.1 (original)
+++ packages/gnash/trunk/debian/h2m/gprocessor.1 Thu Jun  5 17:02:32 2008
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH GPROCESSOR "1" "March 2008" "gprocessor 1.0 (gnash 0.8.2)" "User Commands"
+.TH GPROCESSOR "1" "June 2008" "gprocessor 1.0 (gnash 0.8.3-rc2)" "User Commands"
 .SH NAME
 gprocessor \- an SWF preprocessor for Gnash
 .SH SYNOPSIS

Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/rules?rev=246&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Thu Jun  5 17:02:32 2008
@@ -33,6 +33,15 @@
 
 # CONFIGURE
 
+CONFIGURE_FLAGS = VERSION="$(BUILD_VERSION)" CFLAGS="$(CFLAGS)" \
+		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr --mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info --disable-testsuite \
+		--enable-plugin --enable-gui='gtk,kde' --enable-cygnal \
+		--with-plugindir=\$${prefix}/lib/gnash \
+		--enable-shared=yes --enable-sdk-install \
+		--disable-rpath --enable-lotsa-warnings --without-gcc-arch
+
 config.status: configure.ac
 	dh_testdir
 
@@ -51,19 +60,14 @@
 	if test -e autogen.sh; then ./autogen.sh; else sh debian/autogen.sh; fi
 	@printf "\n -------------------------------------------- End of AUTOGEN ---- \n\n"
 
-	@printf "\n == CONFIGURE =================================================== \n\n"
+	@printf "\n == CONFIGURE / AGG ============================================= \n\n"
 	# In the future, I want to add LDFLAGS="-Wl,-z,defs"
-	./configure VERSION="$(BUILD_VERSION)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" \
-		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr --mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info --sysconfdir=/etc \
-		--disable-testsuite \
-		--enable-plugin --enable-gui='gtk,kde' --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 \
-		--disable-rpath --enable-lotsa-warnings --without-gcc-arch
+	mkdir tmp.agg && cd tmp.agg && ../configure $(CONFIGURE_FLAGS)  --enable-gstreamer --enable-media=gst --enable-renderer=agg
+	@printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
+
+	@printf "\n == CONFIGURE / OPENGL ========================================== \n\n"
+	# In the future, I want to add LDFLAGS="-Wl,-z,defs"
+	mkdir tmp.opengl && cd tmp.opengl && ../configure $(CONFIGURE_FLAGS)  --enable-gstreamer --enable-media=gst --enable-renderer=opengl
 	@printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
 
 	cp libamf/README README.amf
@@ -74,12 +78,20 @@
 build-stamp:  config.status
 	dh_testdir
 
-	@printf "\n == MAKE ======================================================== \n\n"
-	$(MAKE) VERSION="$(BUILD_VERSION)"
+	@printf "\n == MAKE / AGG ================================================== \n\n"
+	$(MAKE) -C tmp.agg VERSION="$(BUILD_VERSION)"
 	@printf "\n ----------------------------------------------- End of MAKE ---- \n\n"
 
-	@printf "\n == CHECK ======================================================= \n\n"
-	$(MAKE) check
+	@printf "\n == MAKE / OPENGL =============================================== \n\n"
+	$(MAKE) -C tmp.opengl VERSION="$(BUILD_VERSION)"
+	@printf "\n ----------------------------------------------- End of MAKE ---- \n\n"
+
+	@printf "\n == CHECK  / AGG ======================================================= \n\n"
+	$(MAKE) -C tmp.agg check
+	@printf "\n ---------------------------------------------- End of CHECK ---- \n\n"
+
+	@printf "\n == CHECK  / OPENGL ==================================================== \n\n"
+	$(MAKE) -C tmp.opengl check
 	@printf "\n ---------------------------------------------- End of CHECK ---- \n\n"
 
 	touch build-stamp
@@ -91,10 +103,10 @@
 	dh_testroot
 	rm -f build-stamp 
 
-ifeq (Makefile,$(wildcard Makefile))
-	[ ! -f Makefile ] || $(MAKE) maintainer-clean
-	[ ! -f Makefile ] || $(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})
@@ -120,6 +132,8 @@
 
 	-rm -f README.amf
 
+	rm -rf debian/tmp debian/tmp.opengl tmp.agg tmp.opengl
+
 	@printf "\n == CLEANING PATCHES ============================================ \n\n"
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	@printf "\n ----------------------------------- End of CLEANING PATCHES ---- \n\n"
@@ -139,14 +153,18 @@
 	install -d $(CURDIR)/debian/tmp/usr/lib/gnash/
 
 	@printf "\n == INSTALL ===================================================== \n\n"
-	$(MAKE) install VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C tmp.agg install VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
+	@printf "\n -------------------------------------------- End of INSTALL ---- \n\n"
+
+	@printf "\n == INSTALL / OPENGL ============================================ \n\n"
+	$(MAKE) -C tmp.agg install VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp.opengl
 	@printf "\n -------------------------------------------- End of INSTALL ---- \n\n"
 
 	install -d $(CURDIR)/debian/tmp/usr/share/apps/klash
 	install -d $(CURDIR)/debian/tmp/usr/share/services
 
 	@printf "\n == INSTALL PLUGINS ============================================= \n\n"
-	$(MAKE) install-plugins VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C tmp.agg install-plugins VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
 	@printf "\n ------------------------------------ End of INSTALL PLUGINS ---- \n\n"
 
 	#cd debian/h2m; $(MAKE)
@@ -183,7 +201,7 @@
 	#dh_makeshlibs
 	test -e /usr/bin/dh_buildinfo && dh_buildinfo
 	dh_installdeb
-	dh_shlibdeps -l$(CURDIR)/debian/gnash-common/usr/lib/gnash -- --ignore-missing-info
+	dh_shlibdeps -l$(CURDIR)/debian/gnash-common/usr/lib/gnash
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb




More information about the pkg-flash-devel mailing list