r99 - in /packages/gnash/branches/0.8.0/debian: changelog libgnash0.install libklash0.install patches/klashg_png.patch rules

baby-guest at users.alioth.debian.org baby-guest at users.alioth.debian.org
Tue Jun 12 10:43:13 UTC 2007


Author: baby-guest
Date: Tue Jun 12 10:43:13 2007
New Revision: 99

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=99
Log:
Removed collision between files common to libgnash0 and libgnash0
Switched to released 0.8.0 instead of CVS version


Added:
    packages/gnash/branches/0.8.0/debian/patches/klashg_png.patch
Modified:
    packages/gnash/branches/0.8.0/debian/changelog
    packages/gnash/branches/0.8.0/debian/libgnash0.install
    packages/gnash/branches/0.8.0/debian/libklash0.install
    packages/gnash/branches/0.8.0/debian/rules

Modified: packages/gnash/branches/0.8.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/changelog?rev=99&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/changelog (original)
+++ packages/gnash/branches/0.8.0/debian/changelog Tue Jun 12 10:43:13 2007
@@ -1,6 +1,6 @@
-gnash (0.8.0~cvs20070610.1900-1) unstable; urgency=low
+gnash (0.8.0-1) unstable; urgency=low
 
-  * New Upstream Release. Downloaded from CVS. Release Branch 0.8.0
+  * Third alpha Release from Upstream.
   * Added ming_headers.patch patch so that the missing definitions in ming
     headers are available for the check. Closes: #425888
   * Removed $(MAKE) check. Does not seem to be able to finish in my computer.
@@ -11,6 +11,7 @@
   * 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
+  * Klash uses now usr/share/gnash/KlashG.png instead of usr/share/gnash/GnashG.png
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Sun, 10 Jun 2007 18:58:57 +0000
 

Modified: packages/gnash/branches/0.8.0/debian/libgnash0.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/libgnash0.install?rev=99&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/libgnash0.install (original)
+++ packages/gnash/branches/0.8.0/debian/libgnash0.install Tue Jun 12 10:43:13 2007
@@ -2,4 +2,3 @@
 tmp-gnash/usr/lib/libgnash*-*.so usr/lib/
 overrides/libgnash0 usr/share/lintian/overrides/
 tmp-gnash/usr/share/gnash/GnashG.png usr/share/gnash
-tmp-gnash/usr/share/gnash/gnash_128_96.ico usr/share/gnash

Modified: packages/gnash/branches/0.8.0/debian/libklash0.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/libklash0.install?rev=99&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/libklash0.install (original)
+++ packages/gnash/branches/0.8.0/debian/libklash0.install Tue Jun 12 10:43:13 2007
@@ -3,5 +3,4 @@
 tmp-klash/usr/lib/libklash*.so.* usr/lib/
 tmp-klash/usr/lib/libklash*-*.so usr/lib/
 overrides/libklash0 usr/share/lintian/overrides/
-tmp-klash/usr/share/gnash/GnashG.png usr/share/gnash
-tmp-klash/usr/share/gnash/gnash_128_96.ico usr/share/gnash
+tmp-klash/usr/share/gnash/KlashG.png usr/share/gnash

Added: packages/gnash/branches/0.8.0/debian/patches/klashg_png.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/patches/klashg_png.patch?rev=99&op=file
==============================================================================
--- packages/gnash/branches/0.8.0/debian/patches/klashg_png.patch (added)
+++ packages/gnash/branches/0.8.0/debian/patches/klashg_png.patch Tue Jun 12 10:43:13 2007
@@ -1,0 +1,20 @@
+--- gnash-0.8.0/gui/gtk.cpp.orig	2007-06-12 10:22:06.000000000 +0200
++++ gnash-0.8.0/gui/gtk.cpp	2007-06-12 12:25:36.000000000 +0200
+@@ -85,7 +85,7 @@
+     // XXXbjacques: why do we need this?
+     gtk_container_set_reallocate_redraws(GTK_CONTAINER (_window), TRUE);
+ 
+-    _window_icon_pixbuf = create_pixbuf ("GnashG.png");
++    _window_icon_pixbuf = create_pixbuf ("KlashG.png");
+     if (_window_icon_pixbuf) {
+         gtk_window_set_icon (GTK_WINDOW (_window), _window_icon_pixbuf);
+ 	gdk_pixbuf_unref (_window_icon_pixbuf);
+@@ -866,7 +866,7 @@
+     comments += ".";
+ 
+     gtk_about_dialog_set_url_hook(NULL, NULL, NULL);
+-    GdkPixbuf *logo_pixbuf = gdk_pixbuf_new_from_file("GnashG.png", NULL);
++    GdkPixbuf *logo_pixbuf = gdk_pixbuf_new_from_file("KlashG.png", NULL);
+     //GtkWidget *about = (GtkWidget*) g_object_new (GTK_TYPE_ABOUT_DIALOG,
+     gtk_show_about_dialog (
+     		   NULL,

Modified: packages/gnash/branches/0.8.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.0/debian/rules?rev=99&op=diff
==============================================================================
--- packages/gnash/branches/0.8.0/debian/rules (original)
+++ packages/gnash/branches/0.8.0/debian/rules Tue Jun 12 10:43:13 2007
@@ -107,6 +107,7 @@
 build-klash: build-klash-stamp
 build-klash-stamp: config-klash
 	dh_testdir
+	patch -p1 < debian/patches/klashg_png.patch
 
 	@printf "\n == MAKE KLASH ================================================== \n\n"
 	test -e $@ || $(MAKE) -C tmp-klash VERSION="0.8.0.gl"
@@ -116,6 +117,7 @@
 	@#-test -e $@ || $(MAKE) -C tmp-klash check
 	@#@printf "\n ---------------------------------------- End of CHECK KLASH ---- \n\n"
 
+	patch -p1 -R < debian/patches/klashg_png.patch
 	touch $@
 
 # CLEAN
@@ -131,18 +133,18 @@
 endif
 
 	rm -f config.{sub,guess,log,status}
-	rm -f libtool
+	#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
-	#-find . -name Makefile.in -exec rm {} \;
-	-rm `find . -name Makefile.in`
-
-	-rm -rf libltdl/autom4te.cache
-	-rm -f libltdl/* ltmain.sh
+	#rm -f configure aclocal.m4 config.h.in
+	#rm -f `find . -name Makefile.in`
+
+	#rm -rf libltdl/autom4te.cache
+	#rm -f libltdl/* ltmain.sh
 
 	#cd debian/h2m; $(MAKE) clean
 
@@ -170,6 +172,7 @@
 	@printf "\n == INSTALL KLASH =============================================== \n\n"
 	$(MAKE) install -C tmp-klash DESTDIR=$(CURDIR)/debian/tmp-klash
 	@printf "\n -------------------------------------- End of INSTALL KLASH ---- \n\n"
+	mv $(CURDIR)/debian/tmp-klash/usr/share/gnash/GnashG.png $(CURDIR)/debian/tmp-klash/usr/share/gnash/KlashG.png
 
 	#cd debian/h2m; $(MAKE)
 




More information about the pkg-flash-devel mailing list