r315 - in /packages/gnash/trunk/debian: changelog control h2m/ klash-opengl.bk.manpages klash.manpages rules

[miriam at users.alioth.debian.org]

Author: miriam
Date: Sun Mar  1 01:36:39 2009
New Revision: 315

URL: http://svn.debian.org/wsvn/?sc=1&rev=315
Log:
Prepare upload to experimental


Removed:
    packages/gnash/trunk/debian/h2m/
    packages/gnash/trunk/debian/klash-opengl.bk.manpages
    packages/gnash/trunk/debian/klash.manpages
Modified:
    packages/gnash/trunk/debian/changelog
    packages/gnash/trunk/debian/control
    packages/gnash/trunk/debian/rules

Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/changelog?rev=315&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Sun Mar  1 01:36:39 2009
@@ -1,10 +1,11 @@
-gnash (0.8.5~pre20090227-1) UNRELEASED; urgency=low
+gnash (0.8.5~pre20090227-1) experimental; urgency=low
 
   * New Upstream Release
   * Using FFMPEG instead of GStreamer
   * Using KDE4 instead of KDE3
   * Fixed Build Dependencies accordingly
   * Added libspeex-dev, libcsound64-dev to Build Dependencies
+  * Removed dependency from help2man and Debian-specific man pages
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Sat, 28 Feb 2009 05:12:12 +0100
 

Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/control?rev=315&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Sun Mar  1 01:36:39 2009
@@ -3,7 +3,7 @@
 Maintainer: Miriam Ruiz <little_miry at yahoo.es>
 Uploaders: Alexander Sack <asac at jwsdot.com>, Robert Millan <rmh at aybabtu.com>
 Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, sng,
- autoconf, automake | automake1.9, libtool, autotools-dev, help2man, dh-buildinfo,
+ autoconf, automake | automake1.9, libtool, autotools-dev, dh-buildinfo,
  libltdl3-dev, libxmu-dev, dejagnu, libboost-dev, libboost-thread-dev, libgtkglext1-dev,
  libjpeg-dev, libpng12-dev | libpng-dev, libgif-dev, libagg-dev,
  libpango1.0-dev | pango-devel, libsdl1.2-dev, libcsound64-dev,
@@ -110,9 +110,10 @@
 Package: klash-opengl
 Section: utils
 Architecture: any
-Depends: gnash-common-opengl (= ${binary:Version}),
- libqt3-mt (>= 3:3.3.8), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: klash
+Depends: klash (= ${binary:Version})
+#Depends: gnash-common-opengl (= ${binary:Version}),
+# libqt3-mt (>= 3:3.3.8), ${shlibs:Depends}, ${misc:Depends}
+#Conflicts: klash
 Description: free SWF movie player - standalone player for KDE
  Gnash is a free GPL'd SWF movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.
@@ -129,6 +130,9 @@
  .
  Klash is the free standalone SWF movie player for KDE that use OpenGL
  as the rendering backend.
+ .
+ This package is currently a fake. Gnash does not currently support OpenGL
+ on KDE4, so we're falling back on AGG until it's ready.
 
 Package: gnash-tools
 Section: utils

Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/rules?rev=315&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Sun Mar  1 01:36:39 2009
@@ -149,8 +149,6 @@
 	-rm -rf libltdl/autom4te.cache
 	-rm -f libltdl/* ltmain.sh
 
-	cd debian/h2m; $(MAKE) clean
-
 	-rm -f README.amf
 	-rm -f debian/*.png
 
@@ -197,8 +195,6 @@
 #	cd $(CURDIR)/debian/tmp.opengl && find
 #	@printf "\n ----------------------------- End of LIST OF FILES / OPENGL ---- \n\n"
 
-	cd debian/h2m; $(MAKE)
-
 # CREATE PACKAGES
 
 # Build architecture-independent files here.
@@ -208,7 +204,7 @@
 binary-arch: install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 	dh_install --sourcedir=$(CURDIR)/debian