[med-svn] r4320 - in trunk/packages/gwyddion/trunk/debian: . patches

[Jan Beyer]

Author: beathovn-guest
Date: 2009-11-07 20:14:21 +0000 (Sat, 07 Nov 2009)
New Revision: 4320

Added:
   trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.18-remote-new-x11.patch
Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/patches/fix-shared-mime-info.patch
   trunk/packages/gwyddion/trunk/debian/patches/series
Log:
Adding important upstream patch, fixing gwyddion startup from desktop menu and improving the other new patch.

Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2009-11-06 21:19:29 UTC (rev 4319)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2009-11-07 20:14:21 UTC (rev 4320)
@@ -1,3 +1,12 @@
+gwyddion (2.18-2) unstable; urgency=low
+
+  * Include patch gwyddion-2.18-remote-new-x11.patch from upstream,
+    fixing start failure when started from desktop menu entry
+  * Improving patch fix-shared-mime-info.patch to fix not only gwyddion.xml but
+    also the file which it is created from
+
+ -- Jan Beyer <jan at beathovn.de>  Sat, 07 Nov 2009 21:07:44 +0100
+
 gwyddion (2.18-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/gwyddion/trunk/debian/patches/fix-shared-mime-info.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-shared-mime-info.patch	2009-11-06 21:19:29 UTC (rev 4319)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-shared-mime-info.patch	2009-11-07 20:14:21 UTC (rev 4320)
@@ -1,7 +1,3 @@
-Description: fix a wrong offset notation
-Forwarded: private mail to maintainer 2009-11-06
-Author: Jan Beyer <jan at beathovn.de>
-
 --- gwyddion-2.18.orig/data/gwyddion.xml
 +++ gwyddion-2.18/data/gwyddion.xml
 @@ -350,7 +350,7 @@
@@ -9,7 +5,18 @@
    <magic priority="80">
      <match type="string" offset="0" value="#Channel: ">
 -      <match type="string" offset="12-32" value="#Frame  :"/>
-+    <match type="string" offset="12:32" value="#Frame  :"/>
++    <match type="string" offset="12-32" value="#Frame  :"/>
      </match>
    </magic>
    <glob pattern="*.plt"/>
+--- gwyddion-2.18.orig/modules/file/pltfile.c
++++ gwyddion-2.18/modules/file/pltfile.c
+@@ -23,7 +23,7 @@
+  *   <comment>Nanosurf PLT data</comment>
+  *   <magic priority="80">
+  *     <match type="string" offset="0" value="#Channel: ">
+- *       <match type="string" offset="12-32" value="#Frame  :"/>
++ *     <match type="string" offset="12:32" value="#Frame  :"/>
+  *     </match>
+  *   </magic>
+  *   <glob pattern="*.plt"/>

Added: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.18-remote-new-x11.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.18-remote-new-x11.patch	                        (rev 0)
+++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.18-remote-new-x11.patch	2009-11-07 20:14:21 UTC (rev 4320)
@@ -0,0 +1,20 @@
+From: David Necas (Yeti) <yeti at gwyddion.net>
+Subject: Fixes failure to start with option --remote-new on X11 which is how the
+ default desktop menu entries and launchers run Gwyddion.
+Origin: upstream, http://gwyddion.net/download/2.18/gwyddion-2.18-remote-new-x11.patch
+
+Index: app/remote-x11.c
+===================================================================
+--- app/remote-x11.c	(revision 10360)
++++ app/remote-x11.c	(revision 10361)
+@@ -132,6 +132,10 @@
+     }
+ 
+     XFree(xchildren);
++    if (!remote->winid) {
++        gwy_remote_free(remote);
++        remote = NULL;
++    }
+ 
+     return remote;
+ }

Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series	2009-11-06 21:19:29 UTC (rev 4319)
+++ trunk/packages/gwyddion/trunk/debian/patches/series	2009-11-07 20:14:21 UTC (rev 4320)
@@ -1,3 +1,4 @@
 fix-manpage-section-for-debian.diff
 fix-rpath-issue.patch
 fix-shared-mime-info.patch
+gwyddion-2.18-remote-new-x11.patch