[Gnash-commit] gnash ./ChangeLog packaging/debian/changelog pa...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/26 02:20:08

Modified files:
        .              : ChangeLog 
        packaging/debian: changelog control gnash-klash.install 
        server         : shape.cpp 

Log message:
        * packaging/debian/changelog: Reverse the order of entries so it
        it uses the right GPG key for packages.
        * packaging/debian/control: Fix cut & paste error in Depends
        list.
        * packaging/debian/gnash-klash.install: Add klash executable.
        * server/shape.cpp: Support alternate tag value.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.231&tr2=1.232&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/packaging/debian/changelog.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/packaging/debian/control.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/packaging/debian/gnash-klash.install.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shape.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.231 gnash/ChangeLog:1.232
--- gnash/ChangeLog:1.231       Tue Apr 25 14:43:38 2006
+++ gnash/ChangeLog     Wed Apr 26 02:20:07 2006
@@ -1,5 +1,19 @@
 2006-04-25  Rob Savoye  <address@hidden>
 
+       * packaging/debian/changelog: Reverse the order of entries so it
+       it uses the right GPG key for packages.
+       * packaging/debian/control: Fix cut & paste error in Depends
+       list.
+       * packaging/debian/gnash-klash.install: Add klash executable.
+       * server/shape.cpp: Support alternate tag value
+       
+       * plugin/klash/klash.cpp: Add player control menu for the right
+       mouse button.
+       * plugin/klash/Makefile.am: Build a MOC file for klash.cpp.
+       
+       * packaging/debian/gnash-klash.install: Add the klash executable.
+       * packaging/redhat/gnash.spec: Add the klash executable.
+       
        * libbase/jpeg.cpp: Add support for grayscale jpegs.
        * plugin/klash/Makefile.am: Add klash executable.
        * plugin/klash/klash.cpp: Build a KDE version of the standalone
Index: gnash/packaging/debian/changelog
diff -u gnash/packaging/debian/changelog:1.3 
gnash/packaging/debian/changelog:1.4
--- gnash/packaging/debian/changelog:1.3        Fri Apr 21 22:57:19 2006
+++ gnash/packaging/debian/changelog    Wed Apr 26 02:20:07 2006
@@ -1,15 +1,16 @@
 gnash (0.7-1) unstable; urgency=low
-
+       
   * Initial release Closes: #347352
+       
+ -- Rob Savoye <address@hidden>  Fri, 25 Apr 2006 4:20:00 +0600
+       
+  * Install the info file.
 
- -- Miriam Ruiz <address@hidden>  Fri, 20 Jan 2006 23:07:01 +0100
+ -- Rob Savoye <address@hidden>  Fri, 7 Apr 2006 4:20:00 +0600
 
   * Revised to match how the plugin gets installed, and add klash.
 
- -- Rob Savoye <address@hidden>  Fri, 7 Apr 2006 4:20:00 +0600
+ -- Miriam Ruiz <address@hidden>  Fri, 20 Jan 2006 23:07:01 +0100
 
   * Revised to match how the plugin gets installed, and add klash.
 
- -- Rob Savoye <address@hidden>  Fri, 21 Apr 2006 4:20:00 +0600
-
-  * Install the info file.
Index: gnash/packaging/debian/control
diff -u gnash/packaging/debian/control:1.2 gnash/packaging/debian/control:1.3
--- gnash/packaging/debian/control:1.2  Mon Apr 10 01:18:11 2006
+++ gnash/packaging/debian/control      Wed Apr 26 02:20:07 2006
@@ -60,7 +60,7 @@
 Package: gnash-klash
 Section: utils
 Architecture: any
-Depends: libgnash0 (= ${Source-Version}), gnash (= ${Source-Version}), 
${shlibs:Depends}, ${misc:Depends}
+Depends: libgnash0 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: free Flash movie player - Plugin
  Gnash is a Free Flash movie player, which works either standalone, or as a
  Firefox/Mozilla plugin. This package includes the plugin for the Konqueror
Index: gnash/packaging/debian/gnash-klash.install
diff -u gnash/packaging/debian/gnash-klash.install:1.3 
gnash/packaging/debian/gnash-klash.install:1.4
--- gnash/packaging/debian/gnash-klash.install:1.3      Tue Apr 25 14:54:34 2006
+++ gnash/packaging/debian/gnash-klash.install  Wed Apr 26 02:20:07 2006
@@ -1,4 +1,4 @@
 usr/share/apps/klash/*
 usr/lib/kde3/*
-usr/bin/*
+usr/bin/klash
 usr/share/services/klash_part.desktop
Index: gnash/server/shape.cpp
diff -u gnash/server/shape.cpp:1.13 gnash/server/shape.cpp:1.14
--- gnash/server/shape.cpp:1.13 Wed Apr  5 04:15:34 2006
+++ gnash/server/shape.cpp      Wed Apr 26 02:20:07 2006
@@ -934,6 +934,9 @@
                if (SHAPE_LOG) IF_VERBOSE_PARSE(log_msg("  
shape_character_read: line = %d\n", current_path.m_line));
            }
            if (flags & 0x10) {
+               if (tag_type == 2) {
+                   tag_type+=20;
+               }
                assert(tag_type >= 22);
 
                IF_VERBOSE_PARSE(log_msg("  shape_character read: more fill 
styles\n"));