r97 - in /packages/gnash/branches/0.8.0/debian: changelog control rules

[baby-guest at users.alioth.debian.org]

Author: baby-guest
Date: Mon Jun 11 14:58:54 2007
New Revision: 97

URL: http://svn.debian.org/wsvn/?sc=1&rev=97
Log:
removed conflicts


Modified:
    packages/gnash/branches/0.8.0/debian/changelog
    packages/gnash/branches/0.8.0/debian/control
    packages/gnash/branches/0.8.0/debian/rules

Modified: packages/gnash/branches/0.8.0/debian/changelog
URL: http://svn.debian.org/wsvn/packages/gnash/branches/0.8.0/debian/changelog?rev=97&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/changelog (original)
+++ packages/gnash/branches/0.8.0/debian/changelog Mon Jun 11 14:58:54 2007
@@ -10,6 +10,7 @@
   * Removed debian/*.dirs files. They're not neccesary.
   * Reestructured the code in debian/rules so that multiple builds can be made.
   * Klash won't compile against AGG, only with OpenGL.
+  * konqueror-plugin-gnash depends on klash. Closes: #428408
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Sun, 10 Jun 2007 18:58:57 +0000
 

Modified: packages/gnash/branches/0.8.0/debian/control
URL: http://svn.debian.org/wsvn/packages/gnash/branches/0.8.0/debian/control?rev=97&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/control (original)
+++ packages/gnash/branches/0.8.0/debian/control Mon Jun 11 14:58:54 2007
@@ -10,7 +10,6 @@
 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.
@@ -24,7 +23,6 @@
 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.

Modified: packages/gnash/branches/0.8.0/debian/rules
URL: http://svn.debian.org/wsvn/packages/gnash/branches/0.8.0/debian/rules?rev=97&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/rules (original)
+++ packages/gnash/branches/0.8.0/debian/rules Mon Jun 11 14:58:54 2007
@@ -95,7 +95,7 @@
 	dh_testdir
 
 	@printf "\n == MAKE GNASH ================================================== \n\n"
-	test -e $@ || $(MAKE) -C tmp-gnash
+	test -e $@ || $(MAKE) -C tmp-gnash VERSION="0.8.0.agg"
 	@printf "\n ----------------------------------------- End of MAKE GNASH ---- \n\n"
 
 	@#@printf "\n == CHECK GNASH ================================================= \n\n"
@@ -109,7 +109,7 @@
 	dh_testdir
 
 	@printf "\n == MAKE KLASH ================================================== \n\n"
-	test -e $@ || $(MAKE) -C tmp-klash
+	test -e $@ || $(MAKE) -C tmp-klash VERSION="0.8.0.gl"
 	@printf "\n ----------------------------------------- End of MAKE KLASH ---- \n\n"
 
 	@#@printf "\n == CHECK KLASH ================================================= \n\n"