[Python-apps-commits] r11474 - in packages/xdot/trunk/debian (7 files)

[stefanor at users.alioth.debian.org]

    Date: Thursday, October 23, 2014 @ 22:38:51
  Author: stefanor
Revision: 11474

* Patch support-1.7: Claim support for xdot format 1.7.
* Add a %f to the desktop file, to indicate support for opening a single,
  local file only. (LP: #1359123)
* Patch launch-without-arguments: Don't hang forever, if launched
  graphically. (Closes: #751705)
* Bump Standards-Version to 3.9.6, no changes needed.

Added:
  packages/xdot/trunk/debian/patches/
  packages/xdot/trunk/debian/patches/launch-without-arguments
  packages/xdot/trunk/debian/patches/series
  packages/xdot/trunk/debian/patches/support-1.7
Modified:
  packages/xdot/trunk/debian/changelog
  packages/xdot/trunk/debian/control
  packages/xdot/trunk/debian/xdot.desktop

Modified: packages/xdot/trunk/debian/changelog
===================================================================
--- packages/xdot/trunk/debian/changelog	2014-10-23 21:40:05 UTC (rev 11473)
+++ packages/xdot/trunk/debian/changelog	2014-10-23 22:38:51 UTC (rev 11474)
@@ -1,6 +1,12 @@
 xdot (0.6-2) UNRELEASED; urgency=medium
 
   * Update Homepage to point at GitHub.
+  * Patch support-1.7: Claim support for xdot format 1.7.
+  * Add a %f to the desktop file, to indicate support for opening a single,
+    local file only. (LP: #1359123)
+  * Patch launch-without-arguments: Don't hang forever, if launched
+    graphically. (Closes: #751705)
+  * Bump Standards-Version to 3.9.6, no changes needed.
 
  -- Stefano Rivera <stefanor at debian.org>  Sun, 25 May 2014 18:01:31 +0200
 

Modified: packages/xdot/trunk/debian/control
===================================================================
--- packages/xdot/trunk/debian/control	2014-10-23 21:40:05 UTC (rev 11473)
+++ packages/xdot/trunk/debian/control	2014-10-23 22:38:51 UTC (rev 11474)
@@ -8,7 +8,7 @@
  python (>= 2.6.5-13~),
  python-setuptools
 X-Python-Version: >= 2.4
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://github.com/jrfonseca/xdot.py
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/xdot/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/xdot/trunk/

Added: packages/xdot/trunk/debian/patches/launch-without-arguments
===================================================================
--- packages/xdot/trunk/debian/patches/launch-without-arguments	                        (rev 0)
+++ packages/xdot/trunk/debian/patches/launch-without-arguments	2014-10-23 22:38:51 UTC (rev 11474)
@@ -0,0 +1,21 @@
+Description: Don't hang on startup, when launched graphically
+ Revert upstream commit bd016bc662081afd8ce6b01a5ad2715c8eb780a8.
+Author: Stefano Rivera <stefanor at debian.org>
+Bug-Debain: https://bugs.debian.org/751705
+Bug-Upstream: https://github.com/jrfonseca/xdot.py/issues/14
+Last-Update: 2014-10-23
+
+--- a/xdot.py
++++ b/xdot.py
+@@ -2108,10 +2108,7 @@
+     win = DotWindow()
+     win.connect('destroy', gtk.main_quit)
+     win.set_filter(options.filter)
+-    if len(args) == 0:
+-        if not sys.stdin.isatty():
+-            win.set_dotcode(sys.stdin.read())
+-    else:
++    if len(args) >= 1:
+         if args[0] == '-':
+             win.set_dotcode(sys.stdin.read())
+         else:

Added: packages/xdot/trunk/debian/patches/series
===================================================================
--- packages/xdot/trunk/debian/patches/series	                        (rev 0)
+++ packages/xdot/trunk/debian/patches/series	2014-10-23 22:38:51 UTC (rev 11474)
@@ -0,0 +1,2 @@
+support-1.7
+launch-without-arguments

Added: packages/xdot/trunk/debian/patches/support-1.7
===================================================================
--- packages/xdot/trunk/debian/patches/support-1.7	                        (rev 0)
+++ packages/xdot/trunk/debian/patches/support-1.7	2014-10-23 22:38:51 UTC (rev 11474)
@@ -0,0 +1,26 @@
+Description: Support xdot format 1.7
+ All it adds is the OVERLINE bit for t. We don't currently support t at |
+ all, so we can claim support for 1.7 just much as 1.6.
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: https://github.com/jrfonseca/xdot.py/pull/13
+Last-Update: 2014-10-23
+
+--- a/xdot.py
++++ b/xdot.py
+@@ -510,6 +510,7 @@
+ SUPERSCRIPT = 8
+ SUBSCRIPT = 16
+ STRIKE_THROUGH = 32
++OVERLINE = 64
+ 
+ 
+ class XDotAttrParser:
+@@ -1146,7 +1147,7 @@
+ 
+ class XDotParser(DotParser):
+ 
+-    XDOTVERSION = '1.6'
++    XDOTVERSION = '1.7'
+ 
+     def __init__(self, xdotcode):
+         lexer = DotLexer(buf = xdotcode)

Modified: packages/xdot/trunk/debian/xdot.desktop
===================================================================
--- packages/xdot/trunk/debian/xdot.desktop	2014-10-23 21:40:05 UTC (rev 11473)
+++ packages/xdot/trunk/debian/xdot.desktop	2014-10-23 22:38:51 UTC (rev 11474)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=XDot
 Comment=Interactive viewer for Graphviz dot files
-Exec=xdot
+Exec=xdot %f
 Terminal=false
 Type=Application
 Categories=GTK;DataVisualization;Science;Graphics;