[Python-apps-commits] r13178 - in packages/xdot/trunk/debian (9 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Sun May 8 20:55:02 UTC 2016
Date: Sunday, May 8, 2016 @ 20:55:01
Author: stefanor
Revision: 13178
* New upstream release.
* Drop patches, superseded upstream: launch-without-arguments, support-1.7.
* Update copyright years.
* Update dependencies, now using Python 3.
* Bump Standards-Version to 3.9.8, no changes needed.
* Switch Vcs-Browser URL to https.
* Patch: require-version: Use gi.require_version to silence warnings.
Added:
packages/xdot/trunk/debian/patches/require-version
Modified:
packages/xdot/trunk/debian/changelog
packages/xdot/trunk/debian/control
packages/xdot/trunk/debian/copyright
packages/xdot/trunk/debian/patches/series
packages/xdot/trunk/debian/rules
packages/xdot/trunk/debian/xdot.py
Deleted:
packages/xdot/trunk/debian/patches/launch-without-arguments
packages/xdot/trunk/debian/patches/support-1.7
Modified: packages/xdot/trunk/debian/changelog
===================================================================
--- packages/xdot/trunk/debian/changelog 2016-05-08 12:22:21 UTC (rev 13177)
+++ packages/xdot/trunk/debian/changelog 2016-05-08 20:55:01 UTC (rev 13178)
@@ -1,3 +1,15 @@
+xdot (0.7-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Drop patches, superseded upstream: launch-without-arguments, support-1.7.
+ * Update copyright years.
+ * Update dependencies, now using Python 3.
+ * Bump Standards-Version to 3.9.8, no changes needed.
+ * Switch Vcs-Browser URL to https.
+ * Patch: require-version: Use gi.require_version to silence warnings.
+
+ -- Stefano Rivera <stefanor at debian.org> Tue, 08 Dec 2015 15:46:55 -0800
+
xdot (0.6-3) unstable; urgency=medium
* Update watch file to use pypi.debian.net
Modified: packages/xdot/trunk/debian/control
===================================================================
--- packages/xdot/trunk/debian/control 2016-05-08 12:22:21 UTC (rev 13177)
+++ packages/xdot/trunk/debian/control 2016-05-08 20:55:01 UTC (rev 13178)
@@ -7,26 +7,29 @@
debhelper (>= 9),
dh-exec,
dh-python,
- python (>= 2.6.5-13~),
- python-setuptools
-X-Python-Version: >= 2.4
-Standards-Version: 3.9.6
+ python3,
+ python3-setuptools
+Standards-Version: 3.9.8
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/
+Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/xdot/trunk/
Package: xdot
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
+Depends:
+ gir1.2-gtk-3.0,
graphviz,
- python-cairo,
- python-gtk2
+ python-gtk2,
+ python3-gi,
+ python3-gi-cairo,
+ ${misc:Depends},
+ ${python3:Depends}
Description: interactive viewer for Graphviz dot files
xdot is an interactive viewer for graphs written in Graphviz's dot language.
It uses internally the graphviz's xdot output format as an intermediate
format, and PyGTK and Cairo for rendering. xdot can be used either as a
standalone application from command line, or as a library embedded in your
- Python application.
+ Python 3 application.
.
Features:
* Since it doesn't use bitmaps it is fast and has a small memory footprint.
Modified: packages/xdot/trunk/debian/copyright
===================================================================
--- packages/xdot/trunk/debian/copyright 2016-05-08 12:22:21 UTC (rev 13177)
+++ packages/xdot/trunk/debian/copyright 2016-05-08 20:55:01 UTC (rev 13178)
@@ -4,7 +4,7 @@
Source: https://github.com/jrfonseca/xdot.py
Files: *
-Copyright: 2008-2014 Jose Fonseca, et al <jose.r.fonseca at gmail.com>
+Copyright: 2008-2016 Jose Fonseca, et al <jose.r.fonseca at gmail.com>
License: LGPL-3+
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -20,7 +20,7 @@
version 3 can be found in the /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: 2010-2015, Stefano Rivera <stefanor at debian.org>
+Copyright: 2010-2016, Stefano Rivera <stefanor at debian.org>
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Deleted: packages/xdot/trunk/debian/patches/launch-without-arguments
===================================================================
--- packages/xdot/trunk/debian/patches/launch-without-arguments 2016-05-08 12:22:21 UTC (rev 13177)
+++ packages/xdot/trunk/debian/patches/launch-without-arguments 2016-05-08 20:55:01 UTC (rev 13178)
@@ -1,21 +0,0 @@
-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/require-version
===================================================================
--- packages/xdot/trunk/debian/patches/require-version (rev 0)
+++ packages/xdot/trunk/debian/patches/require-version 2016-05-08 20:55:01 UTC (rev 13178)
@@ -0,0 +1,17 @@
+Description: Assert required versions of gi libraries.
+Author: Steven Allen <steven at stebalien.com>
+Origin: upstream, https://github.com/jrfonseca/xdot.py/commit/4e25d294a103aace857bf42b57c0ec5e9183db56
+
+--- a/xdot.py
++++ b/xdot.py
+@@ -30,6 +30,10 @@
+ import re
+ import optparse
+
++import gi
++gi.require_version('Gtk', '3.0')
++gi.require_version('PangoCairo', '1.0')
++
+ from gi.repository import GLib
+ from gi.repository import GObject
+ from gi.repository import Gtk
Modified: packages/xdot/trunk/debian/patches/series
===================================================================
--- packages/xdot/trunk/debian/patches/series 2016-05-08 12:22:21 UTC (rev 13177)
+++ packages/xdot/trunk/debian/patches/series 2016-05-08 20:55:01 UTC (rev 13178)
@@ -1,2 +1 @@
-support-1.7
-launch-without-arguments
+require-version
Deleted: packages/xdot/trunk/debian/patches/support-1.7
===================================================================
--- packages/xdot/trunk/debian/patches/support-1.7 2016-05-08 12:22:21 UTC (rev 13177)
+++ packages/xdot/trunk/debian/patches/support-1.7 2016-05-08 20:55:01 UTC (rev 13178)
@@ -1,26 +0,0 @@
-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/rules
===================================================================
--- packages/xdot/trunk/debian/rules 2016-05-08 12:22:21 UTC (rev 13177)
+++ packages/xdot/trunk/debian/rules 2016-05-08 20:55:01 UTC (rev 13178)
@@ -1,4 +1,4 @@
#!/usr/bin/make -f
%:
- dh $@ --with python2
+ dh $@ --with python3 --buildsystem pybuild
Modified: packages/xdot/trunk/debian/xdot.py
===================================================================
--- packages/xdot/trunk/debian/xdot.py 2016-05-08 12:22:21 UTC (rev 13177)
+++ packages/xdot/trunk/debian/xdot.py 2016-05-08 20:55:01 UTC (rev 13178)
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import xdot
xdot.main()
More information about the Python-apps-commits
mailing list