Control: tags 758954 + patch
Dear maintainer,
I've updated drpython to the latest upstream release, and added a patch
to rename some uses of deprecated wx constant names (this isn't vital
for wxPython 3.0, but improves compatibility with future release, while
still working with wxPython 2.8).
The update to a new upstream version was a bit involved, as how they
ship documentation has changed, so I'd be happier to at least have the
maintainer look over these changes.
The BTS seems not to like the full NMU diff (including the upstream
changes) - I guess it's too large. So I've run it through filterdiff
to just include changes from the debian directory.
Cheers,
Olly
--- drpython-3.11.1/debian/changelog 2010-04-19 01:42:34.000000000 +1200
+++ drpython-3.11.4/debian/changelog 2014-09-21 23:46:46.000000000 +1200
@@ -1,3 +1,21 @@
+drpython (1:3.11.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release:
+ - Update and refresh patches.
+ - Drop patch FileDialog, incorporated upstream.
+ - Needs --buildsystem=python_distutils passing to dh because there's now
+ a 'Makefile' in the top level of the source tree.
+ - Needs python-wxgtk3.0 as a build dependency.
+ - Now need to build documentation from source (new BD python-sphinx).
+ * Update for wxPython 3.0 (Closes: #758954):
+ - New patch: wxpython3.0.patch
+ * Update from python-support to dh-python.
+ * debian/watch: Fix to allow for slightly different naming of upstream source
+ code zip files.
+
+ -- Olly Betts <o...@survex.com> Sun, 21 Sep 2014 11:46:02 +0000
+
drpython (1:3.11.1-2) unstable; urgency=low
* New Maintainer (Closes: #575845).
--- drpython-3.11.1/debian/control 2010-04-19 01:45:22.000000000 +1200
+++ drpython-3.11.4/debian/control 2014-09-21 23:06:31.000000000 +1200
@@ -2,15 +2,15 @@
Section: devel
Priority: optional
Maintainer: William Vera <bi...@billy.com.mx>
-Build-Depends: debhelper(>= 7.0.50~)
-Build-Depends-Indep: python-support (>= 0.5.3)
+Build-Depends: debhelper(>= 7.0.50~), python-wxgtk3.0
+Build-Depends-Indep: python-all (>= 2.6.6-3~), dh-python, python-sphinx
Homepage: http://drpython.sourceforge.net
Standards-Version: 3.8.4
Package: drpython
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.8
-Suggests: python-doc, wx2.8-doc, python-tk
+Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk3.0
+Suggests: python-doc, wx3.0-doc, python-tk
Description: simple and customizable editor for the Python language
DrPython is a clean and simple yet powerful and highly customizable
editor/environment for developing programs written in Python.
--- drpython-3.11.1/debian/patches/debian_python 2010-03-30 19:13:06.000000000 +1300
+++ drpython-3.11.4/debian/patches/debian_python 2014-09-21 21:25:04.000000000 +1200
@@ -1,11 +1,11 @@
DEBIAN-SPECIFIC
Adjust modules and paths to match Debian Python implementation.
-Index: drpython-3.11.0/drpython.py
+Index: drpython-3.11.4/drpython.py
===================================================================
---- drpython-3.11.0.orig/drpython.py 2009-04-07 22:32:39.000000000 +0200
-+++ drpython-3.11.0/drpython.py 2009-04-07 22:32:58.000000000 +0200
-@@ -162,7 +162,7 @@
+--- drpython-3.11.4.orig/drpython.py
++++ drpython-3.11.4/drpython.py
+@@ -177,7 +177,7 @@ class DrFrame(wx.Frame):
self.stcshortcutlist = drShortcutsFile.GetSTCShortcutList()
@@ -14,10 +14,10 @@
#Preferences
-Index: drpython-3.11.0/drpython.pyw
+Index: drpython-3.11.4/drpython.pyw
===================================================================
---- drpython-3.11.0.orig/drpython.pyw 2009-04-07 22:32:07.000000000 +0200
-+++ drpython-3.11.0/drpython.pyw 2009-04-07 22:32:21.000000000 +0200
+--- drpython-3.11.4.orig/drpython.pyw
++++ drpython-3.11.4/drpython.pyw
@@ -32,5 +32,5 @@
#
--- drpython-3.11.1/debian/patches/defaultdirectory_home 2010-03-30 19:13:06.000000000 +1300
+++ drpython-3.11.4/debian/patches/defaultdirectory_home 2014-09-21 21:20:36.000000000 +1200
@@ -2,17 +2,16 @@
Set default open and save locations into user's home.
http://bugs.debian.org/429552
-Index: drpython-3.11.0/drPreferences.py
+Index: drpython-3.11.4/drPreferences.py
===================================================================
---- drpython-3.11.0.orig/drPreferences.py 2009-04-07 00:13:58.000000000 +0200
-+++ drpython-3.11.0/drPreferences.py 2009-04-07 00:14:27.000000000 +0200
-@@ -281,7 +281,7 @@
- self.vieweol = 1
- self.checkeol = 1
+--- drpython-3.11.4.orig/drPreferences.py
++++ drpython-3.11.4/drPreferences.py
+@@ -283,7 +283,7 @@ class drPreferences:
+ self.vieweol = 0
+ self.checkeol = 0
self.pythonargs = ""
- self.defaultdirectory = programdirectory
+ self.defaultdirectory = os.path.expanduser('~')
self.enablefeedback = 1
wx.GetApp().debugmodus = self.debugmodus = 1
self.alwayspromptonexit = 0
-
--- drpython-3.11.1/debian/patches/distutils_exclude_files 2010-03-30 19:13:06.000000000 +1300
+++ drpython-3.11.4/debian/patches/distutils_exclude_files 2014-09-21 21:24:58.000000000 +1200
@@ -1,21 +1,21 @@
DEBIAN-SPECIFIC
Do not install unwanted files with distutils.
-Index: drpython-3.11.0/setup.py
+Index: drpython-3.11.4/setup.py
===================================================================
---- drpython-3.11.0.orig/setup.py 2009-04-07 21:25:33.000000000 +0200
-+++ drpython-3.11.0/setup.py 2009-04-07 21:30:47.000000000 +0200
-@@ -73,7 +73,6 @@
- 'bitmaps/*.ico', 'bitmaps/*.png',
- 'bitmaps/16/*.png', 'bitmaps/24/*.png',
+--- drpython-3.11.4.orig/setup.py
++++ drpython-3.11.4/setup.py
+@@ -93,7 +93,6 @@ DATA = [
+ "bitmaps/*.ico", "bitmaps/*.png",
+ "bitmaps/16/*.png", "bitmaps/24/*.png",
# adding runner scripts, TODO: drpython startup should be probably redone
-- 'drpython.pyw', 'drpython.lin'
+- "drpython.pyw", "drpython.lin"
]
from distutils.core import setup
-@@ -92,5 +91,4 @@
+@@ -112,5 +111,4 @@ setup(name=name,
packages=[ MY_NAME ],
package_dir={ MY_NAME : '.' },
package_data={ MY_NAME : DATA },
-- scripts=['postinst.py'],
+- scripts=["postinst.py"],
)
--- drpython-3.11.1/debian/patches/FileDialog 2010-03-30 19:13:06.000000000 +1300
+++ drpython-3.11.4/debian/patches/FileDialog 1970-01-01 12:00:00.000000000 +1200
@@ -1,17 +0,0 @@
-Do not hang for a long time while listing huge directories.
-http://sourceforge.net/support/tracker.php?aid=2025471
-
-Index: drpython-3.11.0/drPreferences.py
-===================================================================
---- drpython-3.11.0.orig/drPreferences.py 2009-04-07 00:25:53.000000000 +0200
-+++ drpython-3.11.0/drPreferences.py 2009-04-07 00:26:11.000000000 +0200
-@@ -289,7 +289,7 @@
- self.save = 0
-
- #File Dialog
-- self.usewxfiledialog = 0
-+ self.usewxfiledialog = 1
- self.defaultextension = 1
- self.constantwildcard = '*.lnk'
- #self.windowsshortcutreplacetable = 'C:,/mnt/win_c#'
-
--- drpython-3.11.1/debian/patches/output_redirection 2010-03-30 19:13:06.000000000 +1300
+++ drpython-3.11.4/debian/patches/output_redirection 2014-09-21 21:23:38.000000000 +1200
@@ -1,18 +1,18 @@
DEBIAN-SPECIFIC
Set standard output and error to valid UNIX locations.
-Index: drpython-3.11.1/drpython.py
+Index: drpython-3.11.4/drpython.py
===================================================================
---- drpython-3.11.1.orig/drpython.py 2009-08-29 20:07:49.068592453 +0200
-+++ drpython-3.11.1/drpython.py 2009-08-29 20:14:21.648581517 +0200
-@@ -80,8 +80,8 @@
- if not logdir.endswith('/'):
- logdir += '/'
+--- drpython-3.11.4.orig/drpython.py
++++ drpython-3.11.4/drpython.py
+@@ -89,8 +89,8 @@ if sys.platform == "win32":
+ if not os.path.exists(logdir):
+ logdir = '/'
+
+-err_file = os.path.join(logdir, "drpython.err")
+-out_file = os.path.join(logdir, "drpython.out")
++err_file = os.path.join(logdir, ".drpython/drpython.err")
++out_file = os.path.join(logdir, ".drpython/drpython.out")
+ firsterr_file = os.path.join(logdir, "drpythonfirst.err")
--err_file = logdir + 'drpython.err'
--out_file = logdir + 'drpython.out'
-+err_file = logdir + '~/.drpython/drpython.err'
-+out_file = logdir + '~/.drpython/drpython.out'
- firsterr_file = logdir + 'drpythonfirst.err'
- #*******************************************************************************************************
--- drpython-3.11.1/debian/patches/program_paths 2010-03-30 19:13:06.000000000 +1300
+++ drpython-3.11.4/debian/patches/program_paths 2014-09-21 21:20:00.000000000 +1200
@@ -3,77 +3,76 @@
http://bugs.debian.org/299959
https://launchpad.net/bugs/339323
-Index: drpython-3.11.0/drAboutDialog.py
+Index: drpython-3.11.4/drAboutDialog.py
===================================================================
---- drpython-3.11.0.orig/drAboutDialog.py 2009-04-06 23:57:01.000000000 +0200
-+++ drpython-3.11.0/drAboutDialog.py 2009-04-07 00:07:42.000000000 +0200
-@@ -95,7 +95,7 @@
+--- drpython-3.11.4.orig/drAboutDialog.py
++++ drpython-3.11.4/drAboutDialog.py
+@@ -95,7 +95,7 @@ class drAboutContentPanel(wx.Panel):
author.SetFont(standardfont)
-- credits = drStaticLink(self, 1, ' Credits ', drframe.programdirectory + "/documentation/credits.html", drframe)
-+ credits = drStaticLink(self, 1, ' Credits ', '/usr/share/doc/drpython/documentation/credits.html', drframe)
+- credits = drStaticLink(self, 1, " Credits ", os.path.join(drframe.programdirectory, "documentation/credits.html"), drframe)
++ credits = drStaticLink(self, 1, " Credits ", "/usr/share/doc/drpython/documentation/credits.html", drframe)
- website = drStaticLink(self, 2, ' http://drpython.sourceforge.net/ ', 'http://drpython.sourceforge.net/', drframe)
+ website = drStaticLink(self, 2, " http://drpython.sourceforge.net/ ", "http://drpython.sourceforge.net/";, drframe)
-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ class drLicensePanel(wx.Panel):
wx.Panel.__init__(self, parent, id)
try:
-- f = file(drframe.programdirectory + "/documentation/gpl.html", 'rb')
-+ f = file('/usr/share/doc/drpython/documentation/gpl.html', 'rb')
+- f = open(os.path.join(drframe.programdirectory, "documentation/gpl.html"), "rb")
++ f = open("/usr/share/doc/drpython/documentation/gpl.html", "rb")
text = f.read()
f.close()
except:
-@@ -207,7 +207,7 @@
-
- self.topSizer.Add(wx.lib.stattext.GenStaticText(self, -1, ' '), 0, wx.SHAPED | wx.ALIGN_CENTER_VERTICAL)
-
-- self.topSizer.Add(wx.StaticBitmap(self, -1, wx.BitmapFromImage(wx.Image(parent.programdirectory + "/documentation/drpython.png", wx.BITMAP_TYPE_PNG))), 0, wx.SHAPED | wx.ALIGN_CENTER_VERTICAL)
-+ self.topSizer.Add(wx.StaticBitmap(self, -1, wx.BitmapFromImage(wx.Image('/usr/share/doc/drpython/documentation/drpython.png', wx.BITMAP_TYPE_PNG))), 0, wx.SHAPED | wx.ALIGN_CENTER_VERTICAL)
-
- self.topSizer.Add(wx.lib.stattext.GenStaticText(self, -1, ' '), 0, wx.SHAPED | wx.ALIGN_CENTER_VERTICAL)
-
-Index: drpython-3.11.0/drScriptMenu.py
-===================================================================
---- drpython-3.11.0.orig/drScriptMenu.py 2009-04-06 23:57:00.000000000 +0200
-+++ drpython-3.11.0/drScriptMenu.py 2009-04-07 00:07:42.000000000 +0200
-@@ -200,7 +200,7 @@
+@@ -225,7 +225,7 @@ class drAboutDialog(wx.Dialog):
+ if rootmode:
+ iconname = "drpython_root.png"
+ self.topSizer.Add(wx.StaticBitmap(self, -1,
+- wx.BitmapFromImage(wx.Image(os.path.join(parent.bitmapdirectory, iconname), wx.BITMAP_TYPE_PNG))),
++ wx.BitmapFromImage(wx.Image("/usr/share/doc/drpython/documentation/drpython.png", wx.BITMAP_TYPE_PNG))),
+ 0, wx.SHAPED | wx.ALIGN_CENTER_VERTICAL)
+
+ self.topSizer.Add(wx.lib.stattext.GenStaticText(self, -1, " "), 0, wx.SHAPED | wx.ALIGN_CENTER_VERTICAL)
+Index: drpython-3.11.4/drScriptMenu.py
+===================================================================
+--- drpython-3.11.4.orig/drScriptMenu.py
++++ drpython-3.11.4/drScriptMenu.py
+@@ -200,7 +200,7 @@ class drScriptMenu(drMenu):
self.scriptcount = 0
if self.parent.prefs.drscriptloadexamples:
self.examplemenu = wx.Menu()
-- self.loadscriptsfromfile(self.programdirectory + "/examples/DrScript/drscript.dat", self.examplemenu, 1)
+- self.loadscriptsfromfile(os.path.join(self.programdirectory, "examples/DrScript/drscript.dat"), self.examplemenu, 1)
+ self.loadscriptsfromfile('/usr/share/doc/drpython/examples/DrScript/drscript.dat', self.examplemenu, 1)
self.AppendMenu(self.ID_EXAMPLE_SCRIPTS, "Examples", self.examplemenu)
self.AppendSeparator()
-Index: drpython-3.11.0/drpython.py
+Index: drpython-3.11.4/drpython.py
===================================================================
---- drpython-3.11.0.orig/drpython.py 2009-04-06 23:57:01.000000000 +0200
-+++ drpython-3.11.0/drpython.py 2009-04-07 00:07:42.000000000 +0200
-@@ -162,7 +162,7 @@
+--- drpython-3.11.4.orig/drpython.py
++++ drpython-3.11.4/drpython.py
+@@ -177,7 +177,7 @@ class DrFrame(wx.Frame):
self.stcshortcutlist = drShortcutsFile.GetSTCShortcutList()
-- self.programdirectory = os.path.dirname(os.path.abspath(sys.argv[0])).replace("\\", "/")
+- self.programdirectory = os.path.dirname(os.path.abspath(__file__)).replace('\\', '/')
+ self.programdirectory = '/usr/share/drpython'
#Preferences
-@@ -2798,8 +2798,7 @@
- drAboutDialog.Show(self)
+@@ -2844,7 +2844,7 @@ class DrFrame(wx.Frame):
+ drAboutDialog.Show(self, DRPY_VER)
def OnViewHelp(self, event):
-- self.ViewURLInBrowser(self.programdirectory + "/documentation/help.html")
--
+- self.ViewURLInBrowser(os.path.join(self.programdirectory, "documentation/help.html"))
+ self.ViewURLInBrowser('/usr/share/doc/drpython/documentation/help.html')
+
def OnViewInLeftPanel(self, event):
- self.viewinpaneltarget = 0
-Index: drpython-3.11.0/examples/DrScript/drscript.dat
+Index: drpython-3.11.4/examples/DrScript/drscript.dat
===================================================================
---- drpython-3.11.0.orig/examples/DrScript/drscript.dat 2009-04-06 23:57:01.000000000 +0200
-+++ drpython-3.11.0/examples/DrScript/drscript.dat 2009-04-07 00:07:42.000000000 +0200
+--- drpython-3.11.4.orig/examples/DrScript/drscript.dat
++++ drpython-3.11.4/examples/DrScript/drscript.dat
@@ -1,8 +1,8 @@
-<path>examples/DrScript/ReverseAssignment.py</path><title>Reverse Assigment</title>
-<path>examples/DrScript/PrintEndOfLineCharactersInPrompt.py</path><title>Print End Of Line Characters In Prompt</title>
@@ -89,12 +88,12 @@
- <path>examples/DrScript/SwitcherooInSelection.py</path><title>Switcheroo In Selection</title>
+ <path>/usr/share/doc/drpython/examples/DrScript/ReplaceAllInSelection.py</path><title>Replace All In Selection</title>
+ <path>/usr/share/doc/drpython/examples/DrScript/SwitcherooInSelection.py</path><title>Switcheroo In Selection</title>
-Index: drpython-3.11.0/drPreferences.py
+Index: drpython-3.11.4/drPreferences.py
===================================================================
---- drpython-3.11.0.orig/drPreferences.py 2009-04-06 23:57:01.000000000 +0200
-+++ drpython-3.11.0/drPreferences.py 2009-04-07 00:07:42.000000000 +0200
-@@ -526,8 +526,15 @@
- self.documentationbrowser = "mozilla"
+--- drpython-3.11.4.orig/drPreferences.py
++++ drpython-3.11.4/drPreferences.py
+@@ -529,8 +529,15 @@ class drPreferences:
+ self.documentationbrowser = "firefox"
if self.platform_is_windows:
self.documentationbrowser = "<os.startfile>"
- self.documentationpythonlocation = "http://www.python.org/doc/current/";
@@ -108,18 +107,18 @@
+ self.documentationwxwidgetslocation = "/usr/share/doc/wx2.6-doc/wx-manual.html/wx2.6-manual_contents.html"
+ else:
+ self.documentationwxwidgetslocation = "http://www.wxwidgets.org/docs.htm";
- self.documentationrehowtolocation = "http://www.amk.ca/python/howto/regex/";
+ self.documentationrehowtolocation = "http://docs.python.org/howto/regex.html";
def __getitem__(self, key):
-Index: drpython-3.11.0/drPrefsDialog.py
+Index: drpython-3.11.4/drPrefsDialog.py
===================================================================
---- drpython-3.11.0.orig/drPrefsDialog.py 2009-04-07 00:08:49.000000000 +0200
-+++ drpython-3.11.0/drPrefsDialog.py 2009-04-07 00:09:12.000000000 +0200
-@@ -1316,7 +1316,7 @@
+--- drpython-3.11.4.orig/drPrefsDialog.py
++++ drpython-3.11.4/drPrefsDialog.py
+@@ -1323,7 +1323,7 @@ class drPrefsDialog(wx.Dialog):
self.EndModal(0)
def OnbtnHelp(self, event):
-- self.parent.ViewURLInBrowser(self.parent.programdirectory + "/documentation/preferences.html")
+- self.parent.ViewURLInBrowser(os.path.join(self.parent.programdirectory, "documentation/preferences.html"))
+ self.parent.ViewURLInBrowser("/usr/share/doc/drpython/documentation/preferences.html")
def OnbtnReset(self, event):
--- drpython-3.11.1/debian/patches/sensible_browser 2010-03-30 19:13:06.000000000 +1300
+++ drpython-3.11.4/debian/patches/sensible_browser 2014-09-21 21:25:20.000000000 +1200
@@ -1,18 +1,17 @@
DEBIAN-SPECIFIC
-Use sensible-browser instead of mozilla in default preferences.
+Use sensible-browser instead of firefox in default preferences.
http://bugs.debian.org/299959
-Index: drpython-3.11.0/drPreferences.py
+Index: drpython-3.11.4/drPreferences.py
===================================================================
---- drpython-3.11.0.orig/drPreferences.py 2009-04-06 23:50:15.000000000 +0200
-+++ drpython-3.11.0/drPreferences.py 2009-04-06 23:50:38.000000000 +0200
-@@ -523,7 +523,7 @@
+--- drpython-3.11.4.orig/drPreferences.py
++++ drpython-3.11.4/drPreferences.py
+@@ -526,7 +526,7 @@ class drPreferences:
self.printtabwidth = 4
#Documentation Settings
-- self.documentationbrowser = "mozilla"
+- self.documentationbrowser = "firefox"
+ self.documentationbrowser = "/usr/bin/sensible-browser"
if self.platform_is_windows:
self.documentationbrowser = "<os.startfile>"
if (os.access("/usr/share/doc/python/html/index.html", os.F_OK)):
-
--- drpython-3.11.1/debian/patches/series 2010-03-30 19:13:06.000000000 +1300
+++ drpython-3.11.4/debian/patches/series 2014-09-21 21:26:40.000000000 +1200
@@ -8,4 +8,4 @@
# UPSTREAM
shift_keys
-FileDialog
+wxpython3.0.patch
--- drpython-3.11.1/debian/patches/shift_keys 2010-03-30 19:13:06.000000000 +1300
+++ drpython-3.11.4/debian/patches/shift_keys 2014-09-21 21:25:07.000000000 +1200
@@ -3,11 +3,11 @@
http://bugs.debian.org/347623
http://sourceforge.net/support/tracker.php?aid=1418091
-Index: drpython-3.11.0/drShortcuts.py
+Index: drpython-3.11.4/drShortcuts.py
===================================================================
---- drpython-3.11.0.orig/drShortcuts.py 2009-04-07 00:15:51.000000000 +0200
-+++ drpython-3.11.0/drShortcuts.py 2009-04-07 00:17:01.000000000 +0200
-@@ -333,6 +333,9 @@
+--- drpython-3.11.4.orig/drShortcuts.py
++++ drpython-3.11.4/drShortcuts.py
+@@ -333,6 +333,9 @@ def SetSTCShortcuts(stc, Shortcuts, useD
stc.CmdKeyAssign(PreDefArray[i], modifiers, cmdlist[x])
x = x + 1
--- drpython-3.11.1/debian/patches/wxpython3.0.patch 1970-01-01 12:00:00.000000000 +1200
+++ drpython-3.11.4/debian/patches/wxpython3.0.patch 2014-09-21 23:13:43.000000000 +1200
@@ -0,0 +1,321 @@
+Description: Update for wxPython 3.0
+ Should retain compatibility with 2.8.
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/758954
+Forwarded: no
+Last-Update: 2014-09-21
+
+Index: drpython-3.11.4/drAboutDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drAboutDialog.py
++++ drpython-3.11.4/drAboutDialog.py
+@@ -193,7 +193,7 @@ Operating System Release: %s''' % (wx.VE
+ class drAboutDialog(wx.Dialog):
+
+ def __init__(self, parent, app_version):
+- wx.Dialog.__init__(self, parent, -1, ("About DrPython"), wx.DefaultPosition, (500, 400), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, -1, ("About DrPython"), wx.DefaultPosition, (500, 400), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.parent = parent
+
+Index: drpython-3.11.4/drBookmarksDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drBookmarksDialog.py
++++ drpython-3.11.4/drBookmarksDialog.py
+@@ -131,7 +131,7 @@ class drBookmarksDialog(drTreeDialog):
+ addentry = d.GetValue().replace('\\', '/')
+ d.Destroy()
+ elif s == "Select Directory":
+- d = wx.DirDialog(self, "Select Directory:", style=wx.DD_DEFAULT_STYLE|wx.DD_NEW_DIR_BUTTON|wx.MAXIMIZE_BOX|wx.THICK_FRAME)
++ d = wx.DirDialog(self, "Select Directory:", style=wx.DD_DEFAULT_STYLE|wx.MAXIMIZE_BOX|wx.RESIZE_BORDER)
+ if self.parent.ddirectory:
+ try:
+ d.SetPath(self.parent.ddirectory)
+Index: drpython-3.11.4/drDynamicDrScriptDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drDynamicDrScriptDialog.py
++++ drpython-3.11.4/drDynamicDrScriptDialog.py
+@@ -30,7 +30,7 @@ from drText import DrText
+ class drDynamicDrScriptDialog(wx.Dialog):
+
+ def __init__(self, parent, text):
+- wx.Dialog.__init__(self, parent, -1, ("Dynamic DrScript"), wx.DefaultPosition, (600, 400), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, -1, ("Dynamic DrScript"), wx.DefaultPosition, (600, 400), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.theSizer = wx.BoxSizer(wx.VERTICAL)
+
+Index: drpython-3.11.4/drFileDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drFileDialog.py
++++ drpython-3.11.4/drFileDialog.py
+@@ -357,7 +357,7 @@ class DirPanel(wx.Dialog):
+
+ class drFileDialog(wx.Dialog):
+ def __init__(self, parent, title, wildcard, point=wx.DefaultPosition, size=wx.DefaultSize, IsASaveDialog=0, MultipleSelection=0, ShowRecentFiles=0):
+- wx.Dialog.__init__(self, parent, -1, title, point, size, wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, -1, title, point, size, wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.parent = parent
+
+@@ -1026,8 +1026,8 @@ class drWxFileDialog(wx.FileDialog):
+ def FileDialog(parent, title, wildcard, point=(0, 0), size=wx.DefaultSize, IsASaveDialog=0, MultipleSelection=0, ShowRecentFiles=0):
+ if parent.prefs.usewxfiledialog:
+ if IsASaveDialog:
+- return drWxFileDialog(parent, title, "", "", wildcard, wx.SAVE|wx.HIDE_READONLY|wx.OVERWRITE_PROMPT)
++ return drWxFileDialog(parent, title, "", "", wildcard, wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ else:
+- return drWxFileDialog(parent, title, "", "", wildcard, wx.OPEN|wx.HIDE_READONLY|wx.MULTIPLE)
++ return drWxFileDialog(parent, title, "", "", wildcard, wx.FD_OPEN|wx.FD_MULTIPLE)
+ else:
+ return drFileDialog(parent, title, wildcard, point, size, IsASaveDialog, MultipleSelection, ShowRecentFiles)
+Index: drpython-3.11.4/drFileDialogPrefs.py
+===================================================================
+--- drpython-3.11.4.orig/drFileDialogPrefs.py
++++ drpython-3.11.4/drFileDialogPrefs.py
+@@ -28,7 +28,7 @@ import drScrolledMessageDialog
+ #*******************************************************************************************************
+ class drEditTwoStringsDialog(wx.Dialog):
+ def __init__(self, parent, label1, label2, title):
+- wx.Dialog.__init__(self, parent, -1, title, wx.Point(50, 50), (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.THICK_FRAME)
++ wx.Dialog.__init__(self, parent, -1, title, wx.Point(50, 50), (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+
+ self.txt1 = wx.TextCtrl(self, -1, "", size=(300, -1))
+ self.txt2 = wx.TextCtrl(self, -1, "", size=(300, -1))
+@@ -59,7 +59,7 @@ class drEditTwoStringsDialog(wx.Dialog):
+
+ class drFilePrefsDialogBase(wx.Dialog):
+ def __init__(self, parent, title):
+- wx.Dialog.__init__(self, parent, -1, title, wx.Point(50, 50), (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.THICK_FRAME)
++ wx.Dialog.__init__(self, parent, -1, title, wx.Point(50, 50), (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+ wx.Yield() # TODO Why!?
+
+ self.parent = parent
+Index: drpython-3.11.4/drFindReplaceDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drFindReplaceDialog.py
++++ drpython-3.11.4/drFindReplaceDialog.py
+@@ -1053,7 +1053,7 @@ class drFindReplaceDialog(wx.Dialog):
+ ID_BTNRW = None
+
+ def __init__(self, parent, id, title, stc, IsReplace = 0):
+- wx.Dialog.__init__(self, parent, id, title, wx.DefaultPosition, (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, id, title, wx.DefaultPosition, (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ # TODO: This hack can be removed when all literal IDs are eliminated.
+ get_new_id = wx.GetApp().GetTopWindow().GetNewId
+Index: drpython-3.11.4/drGetKeyDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drGetKeyDialog.py
++++ drpython-3.11.4/drGetKeyDialog.py
+@@ -80,7 +80,7 @@ class drGetTextCtrl(wx.TextCtrl):
+ class drGetKeyDialog(wx.Dialog):
+
+ def __init__(self, parent, ignorestring, grandparent):
+- wx.Dialog.__init__(self, parent, -1, ("Hit A Key"), wx.DefaultPosition, (200, 200), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, -1, ("Hit A Key"), wx.DefaultPosition, (200, 200), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.theSizer = wx.BoxSizer(wx.VERTICAL)
+
+Index: drpython-3.11.4/drHtmlBrowser.py
+===================================================================
+--- drpython-3.11.4.orig/drHtmlBrowser.py
++++ drpython-3.11.4/drHtmlBrowser.py
+@@ -65,7 +65,7 @@ class HtmlBrowser(wx.Dialog):
+ def __init__(self, parent, file, title):
+ global note, dir
+ dir = os.path.dirname(file)
+- wx.Dialog.__init__(self, parent, -1, title, size=(500, 600), style=wx.DEFAULT_DIALOG_STYLE | wx.THICK_FRAME)
++ wx.Dialog.__init__(self, parent, -1, title, size=(500, 600), style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+ note = wx.Notebook(self, -1)
+ history.clear()
+ _AddPage(file)
+Index: drpython-3.11.4/drPluginDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drPluginDialog.py
++++ drpython-3.11.4/drPluginDialog.py
+@@ -1267,7 +1267,7 @@ class drPluginUnInstallWizard(wx.wizard.
+ class drEditIndexDialog(wx.Dialog):
+
+ def __init__(self, parent):
+- wx.Dialog.__init__(self, parent, -1, "Edit Indexes", wx.DefaultPosition, (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.THICK_FRAME)
++ wx.Dialog.__init__(self, parent, -1, "Edit Indexes", wx.DefaultPosition, (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+
+ wx.Yield() # TODO: Why!?
+
+Index: drpython-3.11.4/drPopUpMenuDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drPopUpMenuDialog.py
++++ drpython-3.11.4/drPopUpMenuDialog.py
+@@ -61,7 +61,7 @@ def GetPopUpMenuLabels(filename, frame):
+ class drPopUpMenuDialog(wx.Dialog):
+
+ def __init__(self, parent):
+- wx.Dialog.__init__(self, parent, -1, ("Customize Pop Up Menu"), wx.DefaultPosition, (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.THICK_FRAME)
++ wx.Dialog.__init__(self, parent, -1, ("Customize Pop Up Menu"), wx.DefaultPosition, (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+
+ wx.Yield()
+
+Index: drpython-3.11.4/drPrefsDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drPrefsDialog.py
++++ drpython-3.11.4/drPrefsDialog.py
+@@ -464,7 +464,7 @@ class DrScriptPanel(PrefsPanel):
+ self.chkloadexamples.SetValue(self.grandparent.prefs.drscriptloadexamples)
+
+ def OnbtnDBrowse(self, event):
+- d = wx.DirDialog(self, "Select Default Directory For DrScript:", style=wx.DD_DEFAULT_STYLE|wx.DD_NEW_DIR_BUTTON|wx.MAXIMIZE_BOX|wx.THICK_FRAME)
++ d = wx.DirDialog(self, "Select Default Directory For DrScript:", style=wx.DD_DEFAULT_STYLE|wx.MAXIMIZE_BOX|wx.RESIZE_BORDER)
+ if d.ShowModal() == wx.ID_OK:
+ self.txtdefaultdirectory.SetValue(d.GetPath())
+ d.Destroy()
+@@ -896,7 +896,7 @@ class PluginsPanel(PrefsPanel):
+ self.txtdefaultdirectory.SetValue(self.grandparent.prefs.pluginsdirectory)
+
+ def OnbtnPBrowse(self, event):
+- d = wx.DirDialog(self, "Select Default Directory For Plugins:", style=wx.DD_DEFAULT_STYLE|wx.DD_NEW_DIR_BUTTON|wx.MAXIMIZE_BOX|wx.THICK_FRAME)
++ d = wx.DirDialog(self, "Select Default Directory For Plugins:", style=wx.DD_DEFAULT_STYLE|wx.MAXIMIZE_BOX|wx.RESIZE_BORDER)
+ if d.ShowModal() == wx.ID_OK:
+ self.txtdefaultdirectory.SetValue(d.GetPath())
+ d.Destroy()
+@@ -1185,7 +1185,7 @@ class drPrefsDialog(wx.Dialog):
+
+ def __init__(self, parent, id, title):
+
+- wx.Dialog.__init__(self, parent, id, title, wx.DefaultPosition, (640, 480), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, id, title, wx.DefaultPosition, (640, 480), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.parent = parent
+
+Index: drpython-3.11.4/drRegularExpressionDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drRegularExpressionDialog.py
++++ drpython-3.11.4/drRegularExpressionDialog.py
+@@ -48,7 +48,7 @@ class drRETextCtrl(wx.TextCtrl):
+ class drRegularExpressionDialog(wx.Frame):
+ def __init__(self, parent, id, title, prompthasfocus = 0, infiles = 0):
+
+- wx.Frame.__init__(self, parent, id, title, wx.DefaultPosition, wx.DefaultSize, wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Frame.__init__(self, parent, id, title, wx.DefaultPosition, wx.DefaultSize, wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.insert = (title == "Insert Regular Expression")
+
+Index: drpython-3.11.4/drScriptMenu.py
+===================================================================
+--- drpython-3.11.4.orig/drScriptMenu.py
++++ drpython-3.11.4/drScriptMenu.py
+@@ -46,7 +46,7 @@ def updatescripts(scriptfile, paths, tit
+ class drNewShellDialog(wx.Dialog):
+
+ def __init__(self, parent, title):
+- wx.Dialog.__init__(self, parent, -1, title, wx.Point(50, 50), (375, 250), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, -1, title, wx.Point(50, 50), (375, 250), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.ID_SAVE = 1005
+
+Index: drpython-3.11.4/drScrolledMessageDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drScrolledMessageDialog.py
++++ drpython-3.11.4/drScrolledMessageDialog.py
+@@ -27,7 +27,7 @@ import sys, traceback
+
+ class ScrolledMessageDialog(wx.Dialog):
+ def __init__(self, parent, message, title, position = wx.DefaultPosition, size = (400, 300)):
+- wx.Dialog.__init__(self, parent, -1, title, position, size, wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, -1, title, position, size, wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.ID_CLOSE = 101
+
+Index: drpython-3.11.4/drSetupPreferences.py
+===================================================================
+--- drpython-3.11.4.orig/drSetupPreferences.py
++++ drpython-3.11.4/drSetupPreferences.py
+@@ -44,7 +44,7 @@ import drFileDialog
+ class drSetupPreferencesDialog(wx.Dialog):
+
+ def __init__(self, parent):
+- wx.Dialog.__init__(self, parent, -1, "Setup Preferences", style=wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, -1, "Setup Preferences", style=wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.parent = parent
+
+Index: drpython-3.11.4/drShortcutsDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drShortcutsDialog.py
++++ drpython-3.11.4/drShortcutsDialog.py
+@@ -207,7 +207,7 @@ class drShortcutPanel(wx.Panel):
+ class drShortcutsDialog(wx.Dialog):
+
+ def __init__(self, parent):
+- wx.Dialog.__init__(self, parent, -1, ("Customize Shortcuts"), wx.DefaultPosition, (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.THICK_FRAME)
++ wx.Dialog.__init__(self, parent, -1, ("Customize Shortcuts"), wx.DefaultPosition, (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+
+ wx.Yield()
+
+Index: drpython-3.11.4/drSingleChoiceDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drSingleChoiceDialog.py
++++ drpython-3.11.4/drSingleChoiceDialog.py
+@@ -29,7 +29,7 @@ import wx
+
+ class drSingleChoiceDialog(wx.Dialog):
+ def __init__(self, parent, title, choices, sort=True, point=wx.DefaultPosition, size=(250, 300), SetSizer=True, header="", editbutton="", sortbutton=""):
+- wx.Dialog.__init__(self, parent, -1, title, point, size, wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, -1, title, point, size, wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.parent = parent
+
+Index: drpython-3.11.4/drToolBarDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drToolBarDialog.py
++++ drpython-3.11.4/drToolBarDialog.py
+@@ -36,7 +36,7 @@ def GetToolBarLabels(filename, frame):
+ text = f.read()
+ f.close()
+ except:
+- drScrolledMessageDialog.ShowMessage(frame, "File error with: '" + filename + "".", "ERROR")
++ drScrolledMessageDialog.ShowMessage(frame, "File error with: '" + filename + "'.", "ERROR")
+ return []
+
+ # modified 22/10/2006 Jean-Pierre MANDON
+@@ -73,7 +73,7 @@ def GetToolBarLabels(filename, frame):
+ class drToolBarDialog(wx.Dialog):
+
+ def __init__(self, parent):
+- wx.Dialog.__init__(self, parent, -1, "Customize ToolBar", wx.DefaultPosition, (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.THICK_FRAME)
++ wx.Dialog.__init__(self, parent, -1, "Customize ToolBar", wx.DefaultPosition, (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+ wx.Yield()
+
+ self.parent = parent
+@@ -513,4 +513,4 @@ class drToolBarDialog(wx.Dialog):
+ self.txt24.SetValue("<Default>")
+ else:
+ self.txt16.SetValue("<Default>")
+- self.txt24.SetValue("<Default>")
+\ No newline at end of file
++ self.txt24.SetValue("<Default>")
+Index: drpython-3.11.4/drTreeDialog.py
+===================================================================
+--- drpython-3.11.4.orig/drTreeDialog.py
++++ drpython-3.11.4/drTreeDialog.py
+@@ -220,7 +220,7 @@ class drTree(wx.TreeCtrl):
+ class drTreeDialog(wx.Dialog):
+
+ def __init__(self, parent, title, rootstring, targetfile, targetstyle, dialogsizefile, bitmapfile, BuildTreeFromString, WriteBranch):
+- wx.Dialog.__init__(self, parent, -1, title, wx.Point(50, 50), (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.THICK_FRAME | wx.RESIZE_BORDER)
++ wx.Dialog.__init__(self, parent, -1, title, wx.Point(50, 50), (-1, -1), wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER)
+
+ self.title = title
+
+Index: drpython-3.11.4/drpython.py
+===================================================================
+--- drpython-3.11.4.orig/drpython.py
++++ drpython-3.11.4/drpython.py
+@@ -4076,7 +4076,7 @@ class DrFrame(wx.Frame):
+
+ def promptDir(self, msg):
+ """ open a directory browser and return the directory chosen """
+- d = wx.DirDialog(self, msg, style=wx.DD_DEFAULT_STYLE|wx.DD_NEW_DIR_BUTTON|wx.MAXIMIZE_BOX|wx.THICK_FRAME)
++ d = wx.DirDialog(self, msg, style=wx.DD_DEFAULT_STYLE|wx.MAXIMIZE_BOX|wx.RESIZE_BORDER)
+ dir = ""
+ if d.ShowModal() == wx.ID_OK:
+ dir = d.GetPath()
--- drpython-3.11.1/debian/rules 2010-04-03 02:57:06.000000000 +1300
+++ drpython-3.11.4/debian/rules 2014-09-21 23:20:57.000000000 +1200
@@ -1,8 +1,17 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --with python2 --buildsystem=python_distutils
+
+override_dh_auto_build:
+ make docs
+ cp docsrc/drpython.png documentation
+ dh_auto_build
override_dh_auto_install:
- dh_auto_install -- --install-lib=/usr/share/drpython
+ dh_auto_install --with python2 --buildsystem=python_distutils -- --install-lib=/usr/share/drpython
install -m 0755 -D drpython.pyw debian/drpython/usr/share/drpython/run
+
+override_dh_auto_clean:
+ make clean
+ dh_auto_clean
--- drpython-3.11.1/debian/watch 2010-03-30 19:13:06.000000000 +1300
+++ drpython-3.11.4/debian/watch 2014-09-21 23:45:33.000000000 +1200
@@ -1,2 +1,2 @@
version=3
-http://sf.net/drpython/drpython-([0-9]+\.[0-9]+\.[0-9]+)\.zip debian uupdate
+http://sf.net/drpython/[Dd]r[Pp]ython[-_]([0-9]+\.[0-9]+\.[0-9]+)\.zip debian uupdate
