[Python-apps-commits] r13609 - in packages/winpdb/tags (8 files)
bzed at users.alioth.debian.org
bzed at users.alioth.debian.org
Sat Sep 24 21:14:00 UTC 2016
Date: Saturday, September 24, 2016 @ 21:13:59
Author: bzed
Revision: 13609
[svn-buildpackage] Tagging winpdb 1.4.8-3
Added:
packages/winpdb/tags/1.4.8-3/
packages/winpdb/tags/1.4.8-3/debian/patches/no-disable-factory.patch
(from rev 13608, packages/winpdb/trunk/debian/patches/no-disable-factory.patch)
packages/winpdb/tags/1.4.8-3/debian/patches/series
(from rev 13608, packages/winpdb/trunk/debian/patches/series)
packages/winpdb/tags/1.4.8-3/debian/patches/winpdb-debian-wx-hint.patch
(from rev 13608, packages/winpdb/trunk/debian/patches/winpdb-debian-wx-hint.patch)
packages/winpdb/tags/1.4.8-3/debian/patches/wxpython3.0.patch
(from rev 13608, packages/winpdb/trunk/debian/patches/wxpython3.0.patch)
Deleted:
packages/winpdb/tags/1.4.8-3/debian/patches/00dpatch.conf
packages/winpdb/tags/1.4.8-3/debian/patches/00list
packages/winpdb/tags/1.4.8-3/debian/patches/winpdb-debian-wx-hint.dpatch
Deleted: packages/winpdb/tags/1.4.8-3/debian/patches/00dpatch.conf
===================================================================
--- packages/winpdb/trunk/debian/patches/00dpatch.conf 2016-09-24 15:47:37 UTC (rev 13606)
+++ packages/winpdb/tags/1.4.8-3/debian/patches/00dpatch.conf 2016-09-24 21:13:59 UTC (rev 13609)
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs
Deleted: packages/winpdb/tags/1.4.8-3/debian/patches/00list
===================================================================
--- packages/winpdb/trunk/debian/patches/00list 2016-09-24 15:47:37 UTC (rev 13606)
+++ packages/winpdb/tags/1.4.8-3/debian/patches/00list 2016-09-24 21:13:59 UTC (rev 13609)
@@ -1 +0,0 @@
-winpdb-debian-wx-hint
Copied: packages/winpdb/tags/1.4.8-3/debian/patches/no-disable-factory.patch (from rev 13608, packages/winpdb/trunk/debian/patches/no-disable-factory.patch)
===================================================================
--- packages/winpdb/tags/1.4.8-3/debian/patches/no-disable-factory.patch (rev 0)
+++ packages/winpdb/tags/1.4.8-3/debian/patches/no-disable-factory.patch 2016-09-24 21:13:59 UTC (rev 13609)
@@ -0,0 +1,20 @@
+Description: Don't pass obsolete --disable-factory option to gnome-terminal
+ This option is no longer accepted, leading to "Failed to find script" error.
+Author: Frederik Juul Christiani <frederik at christiani.dk>
+Bug-Debian: https://bugs.debian.org/757718
+Forwarded: no
+Last-Update: 2014-09-21
+
+Index: winpdb-1.4.8/rpdb2.py
+===================================================================
+--- winpdb-1.4.8.orig/rpdb2.py
++++ winpdb-1.4.8/rpdb2.py
+@@ -1780,7 +1780,7 @@ osSpawn = {
+ NT_DEBUG: 'start "rpdb2 - Version ' + get_version() + ' - Debuggee Console" cmd.exe /K ""%(exec)s" %(options)s"',
+ POSIX: "%(term)s -e %(shell)s -c '%(exec)s %(options)s; %(shell)s' &",
+ 'Terminal': "Terminal --disable-server -x %(shell)s -c '%(exec)s %(options)s; %(shell)s' &",
+- GNOME_DEFAULT_TERM: "gnome-terminal --disable-factory -x %(shell)s -c '%(exec)s %(options)s; %(shell)s' &",
++ GNOME_DEFAULT_TERM: "gnome-terminal -x %(shell)s -c '%(exec)s %(options)s; %(shell)s' &",
+ MAC: '%(exec)s %(options)s',
+ DARWIN: '%(exec)s %(options)s',
+ SCREEN: 'screen -t debuggee_console %(exec)s %(options)s'
Copied: packages/winpdb/tags/1.4.8-3/debian/patches/series (from rev 13608, packages/winpdb/trunk/debian/patches/series)
===================================================================
--- packages/winpdb/tags/1.4.8-3/debian/patches/series (rev 0)
+++ packages/winpdb/tags/1.4.8-3/debian/patches/series 2016-09-24 21:13:59 UTC (rev 13609)
@@ -0,0 +1,3 @@
+winpdb-debian-wx-hint.patch
+wxpython3.0.patch
+no-disable-factory.patch
Deleted: packages/winpdb/tags/1.4.8-3/debian/patches/winpdb-debian-wx-hint.dpatch
===================================================================
--- packages/winpdb/trunk/debian/patches/winpdb-debian-wx-hint.dpatch 2016-09-24 15:47:37 UTC (rev 13606)
+++ packages/winpdb/tags/1.4.8-3/debian/patches/winpdb-debian-wx-hint.dpatch 2016-09-24 21:13:59 UTC (rev 13609)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## winpdb-debian-wx-hint.dpatch by Bernd Zeimetz <bernd at bzed.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad winpdb~/winpdb.py winpdb/winpdb.py
---- winpdb~/winpdb.py 2009-03-29 07:52:37.000000000 +0200
-+++ winpdb/winpdb.py 2009-04-19 14:43:16.000000000 +0200
-@@ -282,10 +282,8 @@
-
- STR_WXPYTHON_ERROR_TITLE = 'Winpdb Error'
- STR_WXPYTHON_ERROR_MSG = """wxPython was not found.
--wxPython 2.6 or higher is required to run the winpdb GUI.
--wxPython is the graphical user interface toolkit used by Winpdb.
--You can find more information on wxPython at http://www.wxpython.org/
--The Unicode version of wxPython is recommended for Winpdb.
-+wxPython is the graphical user interface toolkit used by Winpdb
-+On Debian this is provided by the package 'python-wxgtk2.6'.
- To use the debugger without a GUI, run rpdb2."""
-
- STR_X_ERROR_MSG = """It was not possible to start Winpdb.
Copied: packages/winpdb/tags/1.4.8-3/debian/patches/winpdb-debian-wx-hint.patch (from rev 13608, packages/winpdb/trunk/debian/patches/winpdb-debian-wx-hint.patch)
===================================================================
--- packages/winpdb/tags/1.4.8-3/debian/patches/winpdb-debian-wx-hint.patch (rev 0)
+++ packages/winpdb/tags/1.4.8-3/debian/patches/winpdb-debian-wx-hint.patch 2016-09-24 21:13:59 UTC (rev 13609)
@@ -0,0 +1,18 @@
+## winpdb-debian-wx-hint.patch by Bernd Zeimetz <bernd at bzed.de>
+
+diff -urNad winpdb~/winpdb.py winpdb/winpdb.py
+--- winpdb~/winpdb.py 2009-03-29 07:52:37.000000000 +0200
++++ winpdb/winpdb.py 2009-04-19 14:43:16.000000000 +0200
+@@ -282,10 +282,8 @@
+
+ STR_WXPYTHON_ERROR_TITLE = 'Winpdb Error'
+ STR_WXPYTHON_ERROR_MSG = """wxPython was not found.
+-wxPython 2.6 or higher is required to run the winpdb GUI.
+-wxPython is the graphical user interface toolkit used by Winpdb.
+-You can find more information on wxPython at http://www.wxpython.org/
+-The Unicode version of wxPython is recommended for Winpdb.
++wxPython is the graphical user interface toolkit used by Winpdb
++On Debian this is provided by the package 'python-wxgtk3.0'.
+ To use the debugger without a GUI, run rpdb2."""
+
+ STR_X_ERROR_MSG = """It was not possible to start Winpdb.
Copied: packages/winpdb/tags/1.4.8-3/debian/patches/wxpython3.0.patch (from rev 13608, packages/winpdb/trunk/debian/patches/wxpython3.0.patch)
===================================================================
--- packages/winpdb/tags/1.4.8-3/debian/patches/wxpython3.0.patch (rev 0)
+++ packages/winpdb/tags/1.4.8-3/debian/patches/wxpython3.0.patch 2016-09-24 21:13:59 UTC (rev 13609)
@@ -0,0 +1,47 @@
+Description: Fixes for wxPython 3.0
+ Retains compatibility with 2.8.
+Author: Olly Betts <olly at survex.com>
+Bug-Debian: https://bugs.debian.org/759093
+Forwarded: no
+Last-Update: 2014-09-20
+
+Index: winpdb-1.4.8/winpdb.py
+===================================================================
+--- winpdb-1.4.8.orig/winpdb.py
++++ winpdb-1.4.8/winpdb.py
+@@ -278,7 +278,7 @@ import sys
+
+
+
+-WXVER = "2.6"
++WXVER = "2.8"
+
+ STR_WXPYTHON_ERROR_TITLE = 'Winpdb Error'
+ STR_WXPYTHON_ERROR_MSG = """wxPython was not found.
+@@ -3870,7 +3870,7 @@ class CHTMLDialog(wx.Dialog):
+ self.m_html.SetPage(self.get_html_text(text))
+
+ ir = self.m_html.GetInternalRepresentation()
+- self.m_html.SetSize((ir.GetWidth() + 25, min(500, ir.GetHeight() + 25)))
++ self.m_html.SetMinSize((ir.GetWidth() + 25, min(500, ir.GetHeight() + 25)))
+
+ btnsizer = wx.StdDialogButtonSizer()
+ sizerv.Add(btnsizer, 0, wx.ALIGN_CENTRE | wx.ALL, 5)
+@@ -4465,7 +4465,7 @@ class COpenDialog(wx.Dialog):
+ (_path, filename, args) = rpdb2.split_command_line_path_filename_args(command_line)
+ _abs_path = os.path.abspath(_path)
+
+- dlg = wx.FileDialog(self, defaultDir = _abs_path, defaultFile = filename, wildcard = WINPDB_WILDCARD, style = wx.OPEN | wx.CHANGE_DIR)
++ dlg = wx.FileDialog(self, defaultDir = _abs_path, defaultFile = filename, wildcard = WINPDB_WILDCARD, style = wx.FD_OPEN | wx.FD_CHANGE_DIR)
+ r = dlg.ShowModal()
+ if r == wx.ID_OK:
+ path = dlg.GetPaths()[0]
+@@ -4563,7 +4563,7 @@ class CLaunchDialog(wx.Dialog):
+
+ cwd = rpdb2.getcwdu()
+
+- dlg = wx.FileDialog(self, defaultDir = _abs_path, defaultFile = filename, wildcard = WINPDB_WILDCARD, style = wx.OPEN | wx.CHANGE_DIR)
++ dlg = wx.FileDialog(self, defaultDir = _abs_path, defaultFile = filename, wildcard = WINPDB_WILDCARD, style = wx.FD_OPEN | wx.FD_CHANGE_DIR)
+ r = dlg.ShowModal()
+
+ os.chdir(cwd)
More information about the Python-apps-commits
mailing list