Package: winpdb
Version: 1.4.8-2
Severity: normal
Tags: patch
Dear maintainer,
I've uploaded an NMU for winpdb (versioned as 1.4.8-2.1). Attached
is a debdiff showing the changes.
Cheers,
Olly
diff -Nru winpdb-1.4.8/debian/changelog winpdb-1.4.8/debian/changelog
--- winpdb-1.4.8/debian/changelog 2014-09-21 20:24:21.000000000 +1200
+++ winpdb-1.4.8/debian/changelog 2014-09-21 19:37:16.000000000 +1200
@@ -1,3 +1,15 @@
+winpdb (1.4.8-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload at maintainer's request.
+ * Update from dpatch to 3.0 (quilt), fixing lintian error.
+ * Update for wxPython 3.0 (Closes: #759093):
+ - New patch: wxpython3.0.patch
+ * Fix "Failed to find script" error (Closes: #757718):
+ - New patch from Frederik Juul Christiani: no-disable-factory.patch
+ * Drop BD on lsb-release which is no longer used. (Closes: #737535)
+
+ -- Olly Betts <[email protected]> Sun, 21 Sep 2014 07:37:15 +0000
+
winpdb (1.4.8-2) unstable; urgency=low
* Including some ideas from #670968:
diff -Nru winpdb-1.4.8/debian/control winpdb-1.4.8/debian/control
--- winpdb-1.4.8/debian/control 2014-09-21 20:24:21.000000000 +1200
+++ winpdb-1.4.8/debian/control 2014-09-21 18:34:30.000000000 +1200
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Bernd Zeimetz <[email protected]>
Uploaders: Python Applications Packaging Team <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), dpatch
-Build-Depends-Indep: docbook-to-man, lsb-release
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~)
+Build-Depends-Indep: docbook-to-man
Standards-Version: 3.9.3
Homepage: http://www.winpdb.org/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/winpdb/trunk/
@@ -13,7 +13,7 @@
Package: winpdb
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
-Recommends: x-terminal-emulator | screen, python-wxversion, python-wxgtk2.8, python-crypto
+Recommends: x-terminal-emulator | screen, python-wxversion, python-wxgtk3.0, python-crypto
Description: Platform independent Python debugger
Winpdb supports debugging of threads- and curses based applications,
namespace modification and embedded debugging. As a remote debugger,
diff -Nru winpdb-1.4.8/debian/patches/00dpatch.conf winpdb-1.4.8/debian/patches/00dpatch.conf
--- winpdb-1.4.8/debian/patches/00dpatch.conf 2014-09-21 20:24:21.000000000 +1200
+++ winpdb-1.4.8/debian/patches/00dpatch.conf 1970-01-01 12:00:00.000000000 +1200
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs
diff -Nru winpdb-1.4.8/debian/patches/00list winpdb-1.4.8/debian/patches/00list
--- winpdb-1.4.8/debian/patches/00list 2014-09-21 20:24:21.000000000 +1200
+++ winpdb-1.4.8/debian/patches/00list 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
-winpdb-debian-wx-hint
diff -Nru winpdb-1.4.8/debian/patches/no-disable-factory.patch winpdb-1.4.8/debian/patches/no-disable-factory.patch
--- winpdb-1.4.8/debian/patches/no-disable-factory.patch 1970-01-01 12:00:00.000000000 +1200
+++ winpdb-1.4.8/debian/patches/no-disable-factory.patch 2014-09-21 19:13:59.000000000 +1200
@@ -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 <[email protected]>
+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'
diff -Nru winpdb-1.4.8/debian/patches/series winpdb-1.4.8/debian/patches/series
--- winpdb-1.4.8/debian/patches/series 1970-01-01 12:00:00.000000000 +1200
+++ winpdb-1.4.8/debian/patches/series 2014-09-21 18:29:59.000000000 +1200
@@ -0,0 +1,3 @@
+winpdb-debian-wx-hint.patch
+wxpython3.0.patch
+no-disable-factory.patch
diff -Nru winpdb-1.4.8/debian/patches/winpdb-debian-wx-hint.dpatch winpdb-1.4.8/debian/patches/winpdb-debian-wx-hint.dpatch
--- winpdb-1.4.8/debian/patches/winpdb-debian-wx-hint.dpatch 2014-09-21 20:24:21.000000000 +1200
+++ winpdb-1.4.8/debian/patches/winpdb-debian-wx-hint.dpatch 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## winpdb-debian-wx-hint.dpatch by Bernd Zeimetz <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@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.
diff -Nru winpdb-1.4.8/debian/patches/winpdb-debian-wx-hint.patch winpdb-1.4.8/debian/patches/winpdb-debian-wx-hint.patch
--- winpdb-1.4.8/debian/patches/winpdb-debian-wx-hint.patch 1970-01-01 12:00:00.000000000 +1200
+++ winpdb-1.4.8/debian/patches/winpdb-debian-wx-hint.patch 2014-09-21 18:21:43.000000000 +1200
@@ -0,0 +1,18 @@
+## winpdb-debian-wx-hint.patch by Bernd Zeimetz <[email protected]>
+
+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.
diff -Nru winpdb-1.4.8/debian/patches/wxpython3.0.patch winpdb-1.4.8/debian/patches/wxpython3.0.patch
--- winpdb-1.4.8/debian/patches/wxpython3.0.patch 1970-01-01 12:00:00.000000000 +1200
+++ winpdb-1.4.8/debian/patches/wxpython3.0.patch 2014-09-21 19:32:44.000000000 +1200
@@ -0,0 +1,47 @@
+Description: Fixes for wxPython 3.0
+ Retains compatibility with 2.8.
+Author: Olly Betts <[email protected]>
+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)
diff -Nru winpdb-1.4.8/debian/rules winpdb-1.4.8/debian/rules
--- winpdb-1.4.8/debian/rules 2014-09-21 20:24:21.000000000 +1200
+++ winpdb-1.4.8/debian/rules 2014-09-21 18:25:25.000000000 +1200
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
-
PKGNAME := winpdb
MANPAGES = $(PKGNAME).1
@@ -13,7 +11,7 @@
build: build-stamp
-build-stamp: $(DPATCH_STAMPFN) $(MANPAGES)
+build-stamp: $(MANPAGES)
dh --with python2 build
touch $@
@@ -31,9 +29,8 @@
chmod 755 $(CURDIR)/debian/$(PKGNAME)/usr/lib/python*/*-packages/*.py
dh_python2
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh --with python2 clean
rm -f $(MANPAGES) build-stamp
-.PHONY: clean unpatch patch clean-patched
+.PHONY: clean
diff -Nru winpdb-1.4.8/debian/source/format winpdb-1.4.8/debian/source/format
--- winpdb-1.4.8/debian/source/format 2014-09-21 20:24:21.000000000 +1200
+++ winpdb-1.4.8/debian/source/format 2014-09-21 18:22:31.000000000 +1200
@@ -1 +1 @@
-1.0
+3.0 (quilt)
