[Python-apps-commits] r3358 - in packages/boa-constructor/trunk/debian/patches (8 files)
dktrkranz-guest at users.alioth.debian.org
dktrkranz-guest at users.alioth.debian.org
Thu Jul 30 21:17:46 UTC 2009
Date: Thursday, July 30, 2009 @ 21:17:45
Author: dktrkranz-guest
Revision: 3358
Adhere to DEP3
Added:
packages/boa-constructor/trunk/debian/patches/executable_script_fixup.patch
(from rev 3355, packages/boa-constructor/trunk/debian/patches/executable_script_fixup)
packages/boa-constructor/trunk/debian/patches/no_maxint.patch
(from rev 3355, packages/boa-constructor/trunk/debian/patches/maxint)
packages/boa-constructor/trunk/debian/patches/select_wxpython_2_6.patch
(from rev 3355, packages/boa-constructor/trunk/debian/patches/select_wxpython_2_6)
Modified:
packages/boa-constructor/trunk/debian/patches/docs_typo.patch
packages/boa-constructor/trunk/debian/patches/series
Deleted:
packages/boa-constructor/trunk/debian/patches/executable_script_fixup
packages/boa-constructor/trunk/debian/patches/maxint
packages/boa-constructor/trunk/debian/patches/select_wxpython_2_6
Modified: packages/boa-constructor/trunk/debian/patches/docs_typo.patch
===================================================================
--- packages/boa-constructor/trunk/debian/patches/docs_typo.patch 2009-07-30 21:02:01 UTC (rev 3357)
+++ packages/boa-constructor/trunk/debian/patches/docs_typo.patch 2009-07-30 21:17:45 UTC (rev 3358)
@@ -1,5 +1,7 @@
-Fix typos in documentation.
-http://bugs.debian.org/255975
+Description: Fix typos in documentation.
+Origin: Debian
+Bug-Debian: http://bugs.debian.org/255975
+Forwarded: http://sourceforge.net/tracker/?func=detail&aid=1785140&group_id=1909&atid=101909
diff -Npru boa.apphelp.orig/apphelp.hhc boa.apphelp/apphelp.hhc
--- boa.apphelp.orig/apphelp.hhc 2004-08-16 15:49:36.000000000 +0200
Deleted: packages/boa-constructor/trunk/debian/patches/executable_script_fixup
===================================================================
--- packages/boa-constructor/trunk/debian/patches/executable_script_fixup 2009-07-30 21:02:01 UTC (rev 3357)
+++ packages/boa-constructor/trunk/debian/patches/executable_script_fixup 2009-07-30 21:17:45 UTC (rev 3358)
@@ -1,94 +0,0 @@
-Remove shebang lines from Python modules.
-
-Index: boa-constructor-0.6.1/Boa.py
-===================================================================
---- boa-constructor-0.6.1.orig/Boa.py 2009-04-11 15:57:53.000000000 +0200
-+++ boa-constructor-0.6.1/Boa.py 2009-04-11 15:58:51.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- #----------------------------------------------------------------------
- # Name: Boa.py
- # Purpose: The main file for Boa.
-Index: boa-constructor-0.6.1/Examples/advanced/FramePanels/wxApp1.py
-===================================================================
---- boa-constructor-0.6.1.orig/Examples/advanced/FramePanels/wxApp1.py 2009-04-11 15:57:54.000000000 +0200
-+++ boa-constructor-0.6.1/Examples/advanced/FramePanels/wxApp1.py 2009-04-11 15:58:51.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- #Boa:App:BoaApp
-
- import wx
-Index: boa-constructor-0.6.1/Examples/frames/wxApp1.py
-===================================================================
---- boa-constructor-0.6.1.orig/Examples/frames/wxApp1.py 2009-04-11 15:57:54.000000000 +0200
-+++ boa-constructor-0.6.1/Examples/frames/wxApp1.py 2009-04-11 15:58:51.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- #Boa:App:BoaApp
-
- import wx
-Index: boa-constructor-0.6.1/Examples/guide/App1.py
-===================================================================
---- boa-constructor-0.6.1.orig/Examples/guide/App1.py 2009-04-11 15:57:55.000000000 +0200
-+++ boa-constructor-0.6.1/Examples/guide/App1.py 2009-04-11 15:58:51.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- #Boa:App:BoaApp
-
- import wx
-Index: boa-constructor-0.6.1/Examples/mdi/wxApp1.py
-===================================================================
---- boa-constructor-0.6.1.orig/Examples/mdi/wxApp1.py 2009-04-11 15:57:56.000000000 +0200
-+++ boa-constructor-0.6.1/Examples/mdi/wxApp1.py 2009-04-11 15:58:51.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- #Boa:App:BoaApp
-
- import wx
-Index: boa-constructor-0.6.1/ExternalLib/ndiff.py
-===================================================================
---- boa-constructor-0.6.1.orig/ExternalLib/ndiff.py 2009-04-11 15:57:56.000000000 +0200
-+++ boa-constructor-0.6.1/ExternalLib/ndiff.py 2009-04-11 15:58:51.000000000 +0200
-@@ -1,5 +1,3 @@
--#! /usr/bin/env python
--
- # Module ndiff version 1.4.0
- # Released to the public domain 27-Mar-1999,
- # by Tim Peters (tim_one at email.msn.com).
-Index: boa-constructor-0.6.1/ExternalLib/pylint.py
-===================================================================
---- boa-constructor-0.6.1.orig/ExternalLib/pylint.py 2009-04-11 15:57:57.000000000 +0200
-+++ boa-constructor-0.6.1/ExternalLib/pylint.py 2009-04-11 15:58:51.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/bin/env python
- # Simple-minded Python identifier checker (Ka-Ping Yee, 1 April 1997)
-
- import sys, string, tokenize, pprint
-Index: boa-constructor-0.6.1/ExternalLib/reindent.py
-===================================================================
---- boa-constructor-0.6.1.orig/ExternalLib/reindent.py 2009-04-11 15:57:57.000000000 +0200
-+++ boa-constructor-0.6.1/ExternalLib/reindent.py 2009-04-11 15:58:51.000000000 +0200
-@@ -1,5 +1,3 @@
--#! /usr/bin/env python
--
- # Released to the public domain, by Tim Peters, 03 October 2000.
-
- """reindent [-d][-r][-v] path ...
-Index: boa-constructor-0.6.1/ExternalLib/tarfile.py
-===================================================================
---- boa-constructor-0.6.1.orig/ExternalLib/tarfile.py 2009-04-11 15:57:58.000000000 +0200
-+++ boa-constructor-0.6.1/ExternalLib/tarfile.py 2009-04-11 15:58:51.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- # -*- coding: iso-8859-1 -*-
- #-------------------------------------------------------------------
- # tarfile.py
-Index: boa-constructor-0.6.1/ZopeLib/Client.py
-===================================================================
---- boa-constructor-0.6.1.orig/ZopeLib/Client.py 2009-04-11 15:57:58.000000000 +0200
-+++ boa-constructor-0.6.1/ZopeLib/Client.py 2009-04-11 15:58:51.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/bin/sh
- """:"
- exec python $0 ${1+"$@"}
- """
Copied: packages/boa-constructor/trunk/debian/patches/executable_script_fixup.patch (from rev 3355, packages/boa-constructor/trunk/debian/patches/executable_script_fixup)
===================================================================
--- packages/boa-constructor/trunk/debian/patches/executable_script_fixup.patch (rev 0)
+++ packages/boa-constructor/trunk/debian/patches/executable_script_fixup.patch 2009-07-30 21:17:45 UTC (rev 3358)
@@ -0,0 +1,96 @@
+Description: Remove shebang lines from Python modules.
+Origin: Debian
+Forwarded: not-needed
+
+Index: boa-constructor-0.6.1/Boa.py
+===================================================================
+--- boa-constructor-0.6.1.orig/Boa.py 2009-04-11 15:57:53.000000000 +0200
++++ boa-constructor-0.6.1/Boa.py 2009-04-11 15:58:51.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #----------------------------------------------------------------------
+ # Name: Boa.py
+ # Purpose: The main file for Boa.
+Index: boa-constructor-0.6.1/Examples/advanced/FramePanels/wxApp1.py
+===================================================================
+--- boa-constructor-0.6.1.orig/Examples/advanced/FramePanels/wxApp1.py 2009-04-11 15:57:54.000000000 +0200
++++ boa-constructor-0.6.1/Examples/advanced/FramePanels/wxApp1.py 2009-04-11 15:58:51.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #Boa:App:BoaApp
+
+ import wx
+Index: boa-constructor-0.6.1/Examples/frames/wxApp1.py
+===================================================================
+--- boa-constructor-0.6.1.orig/Examples/frames/wxApp1.py 2009-04-11 15:57:54.000000000 +0200
++++ boa-constructor-0.6.1/Examples/frames/wxApp1.py 2009-04-11 15:58:51.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #Boa:App:BoaApp
+
+ import wx
+Index: boa-constructor-0.6.1/Examples/guide/App1.py
+===================================================================
+--- boa-constructor-0.6.1.orig/Examples/guide/App1.py 2009-04-11 15:57:55.000000000 +0200
++++ boa-constructor-0.6.1/Examples/guide/App1.py 2009-04-11 15:58:51.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #Boa:App:BoaApp
+
+ import wx
+Index: boa-constructor-0.6.1/Examples/mdi/wxApp1.py
+===================================================================
+--- boa-constructor-0.6.1.orig/Examples/mdi/wxApp1.py 2009-04-11 15:57:56.000000000 +0200
++++ boa-constructor-0.6.1/Examples/mdi/wxApp1.py 2009-04-11 15:58:51.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #Boa:App:BoaApp
+
+ import wx
+Index: boa-constructor-0.6.1/ExternalLib/ndiff.py
+===================================================================
+--- boa-constructor-0.6.1.orig/ExternalLib/ndiff.py 2009-04-11 15:57:56.000000000 +0200
++++ boa-constructor-0.6.1/ExternalLib/ndiff.py 2009-04-11 15:58:51.000000000 +0200
+@@ -1,5 +1,3 @@
+-#! /usr/bin/env python
+-
+ # Module ndiff version 1.4.0
+ # Released to the public domain 27-Mar-1999,
+ # by Tim Peters (tim_one at email.msn.com).
+Index: boa-constructor-0.6.1/ExternalLib/pylint.py
+===================================================================
+--- boa-constructor-0.6.1.orig/ExternalLib/pylint.py 2009-04-11 15:57:57.000000000 +0200
++++ boa-constructor-0.6.1/ExternalLib/pylint.py 2009-04-11 15:58:51.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/bin/env python
+ # Simple-minded Python identifier checker (Ka-Ping Yee, 1 April 1997)
+
+ import sys, string, tokenize, pprint
+Index: boa-constructor-0.6.1/ExternalLib/reindent.py
+===================================================================
+--- boa-constructor-0.6.1.orig/ExternalLib/reindent.py 2009-04-11 15:57:57.000000000 +0200
++++ boa-constructor-0.6.1/ExternalLib/reindent.py 2009-04-11 15:58:51.000000000 +0200
+@@ -1,5 +1,3 @@
+-#! /usr/bin/env python
+-
+ # Released to the public domain, by Tim Peters, 03 October 2000.
+
+ """reindent [-d][-r][-v] path ...
+Index: boa-constructor-0.6.1/ExternalLib/tarfile.py
+===================================================================
+--- boa-constructor-0.6.1.orig/ExternalLib/tarfile.py 2009-04-11 15:57:58.000000000 +0200
++++ boa-constructor-0.6.1/ExternalLib/tarfile.py 2009-04-11 15:58:51.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- coding: iso-8859-1 -*-
+ #-------------------------------------------------------------------
+ # tarfile.py
+Index: boa-constructor-0.6.1/ZopeLib/Client.py
+===================================================================
+--- boa-constructor-0.6.1.orig/ZopeLib/Client.py 2009-04-11 15:57:58.000000000 +0200
++++ boa-constructor-0.6.1/ZopeLib/Client.py 2009-04-11 15:58:51.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/bin/sh
+ """:"
+ exec python $0 ${1+"$@"}
+ """
Deleted: packages/boa-constructor/trunk/debian/patches/maxint
===================================================================
--- packages/boa-constructor/trunk/debian/patches/maxint 2009-07-30 21:02:01 UTC (rev 3357)
+++ packages/boa-constructor/trunk/debian/patches/maxint 2009-07-30 21:17:45 UTC (rev 3358)
@@ -1,73 +0,0 @@
-Hardcode sys.maxint value to the one returned by 32-bit platforms.
-https://launchpad.net/bugs/313952
-
-Index: boa-constructor-0.6.1/Companions/SizerCompanions.py
-===================================================================
---- boa-constructor-0.6.1.orig/Companions/SizerCompanions.py 2009-04-11 16:52:51.000000000 +0200
-+++ boa-constructor-0.6.1/Companions/SizerCompanions.py 2009-04-11 16:54:05.000000000 +0200
-@@ -743,7 +743,7 @@
- class PositiveIntPropEdit(IntPropEdit):
- def inspectorEdit(self):
- IntPropEdit.inspectorEdit(self)
-- self.editorCtrl.editorCtrl.SetRange(0, sys.maxint)
-+ self.editorCtrl.editorCtrl.SetRange(0, 2L**31-1)
-
- class RowColDTC(HelperDTC):
- propName = 'Prop'
-Index: boa-constructor-0.6.1/ExternalLib/pyparsing.py
-===================================================================
---- boa-constructor-0.6.1.orig/ExternalLib/pyparsing.py 2009-04-11 16:52:52.000000000 +0200
-+++ boa-constructor-0.6.1/ExternalLib/pyparsing.py 2009-04-11 16:55:04.000000000 +0200
-@@ -770,7 +770,7 @@
- if max > 0:
- self.maxLen = max
- else:
-- self.maxLen = sys.maxint
-+ self.maxLen = 2L**31-1
-
- if exact > 0:
- self.maxLen = exact
-@@ -843,7 +843,7 @@
- if max > 0:
- self.maxLen = max
- else:
-- self.maxLen = sys.maxint
-+ self.maxLen = 2L**31-1
-
- if exact > 0:
- self.maxLen = exact
-@@ -921,7 +921,7 @@
- if max > 0:
- self.maxLen = max
- else:
-- self.maxLen = sys.maxint
-+ self.maxLen = 2L**31-1
-
- if exact > 0:
- self.maxLen = exact
-Index: boa-constructor-0.6.1/ExternalLib/tarfile.py
-===================================================================
---- boa-constructor-0.6.1.orig/ExternalLib/tarfile.py 2009-04-11 16:52:51.000000000 +0200
-+++ boa-constructor-0.6.1/ExternalLib/tarfile.py 2009-04-11 16:54:29.000000000 +0200
-@@ -1684,7 +1684,7 @@
- be mixed up (!).
- """
- if size < 0:
-- size = sys.maxint
-+ size = 2L**31-1
-
- nl = self.linebuffer.find("\n")
- if nl >= 0:
-Index: boa-constructor-0.6.1/PropEdit/InspectorEditorControls.py
-===================================================================
---- boa-constructor-0.6.1.orig/PropEdit/InspectorEditorControls.py 2009-04-11 16:52:52.000000000 +0200
-+++ boa-constructor-0.6.1/PropEdit/InspectorEditorControls.py 2009-04-11 16:55:44.000000000 +0200
-@@ -130,7 +130,7 @@
- self.editorCtrl = wx.SpinCtrl(parent, self.wID, value,
- (-2, idx*Preferences.oiLineHeight -2),
- (sizeX, Preferences.oiLineHeight+3), style=wx.SP_VERTICAL,
-- max=sys.maxint, min=-sys.maxint)
-+ max=2L**31-1, min=-(2L**31-1))
- parent.Bind(wx.EVT_TEXT_ENTER, self.OnSelect, id=self.wID)
- parent.Bind(wx.EVT_SPINCTRL, self.OnSelect, id=self.wID)
- InspectorEditorControl.createControl(self)
Copied: packages/boa-constructor/trunk/debian/patches/no_maxint.patch (from rev 3355, packages/boa-constructor/trunk/debian/patches/maxint)
===================================================================
--- packages/boa-constructor/trunk/debian/patches/no_maxint.patch (rev 0)
+++ packages/boa-constructor/trunk/debian/patches/no_maxint.patch 2009-07-30 21:17:45 UTC (rev 3358)
@@ -0,0 +1,75 @@
+Description: Hardcode sys.maxint value to the one returned by 32-bit platforms.
+Origin: Debian
+Bug-Ubuntu: https://launchpad.net/bugs/313952
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2829909&group_id=1909&atid=301909
+
+Index: boa-constructor-0.6.1/Companions/SizerCompanions.py
+===================================================================
+--- boa-constructor-0.6.1.orig/Companions/SizerCompanions.py 2009-04-11 16:52:51.000000000 +0200
++++ boa-constructor-0.6.1/Companions/SizerCompanions.py 2009-04-11 16:54:05.000000000 +0200
+@@ -743,7 +743,7 @@
+ class PositiveIntPropEdit(IntPropEdit):
+ def inspectorEdit(self):
+ IntPropEdit.inspectorEdit(self)
+- self.editorCtrl.editorCtrl.SetRange(0, sys.maxint)
++ self.editorCtrl.editorCtrl.SetRange(0, 2L**31-1)
+
+ class RowColDTC(HelperDTC):
+ propName = 'Prop'
+Index: boa-constructor-0.6.1/ExternalLib/pyparsing.py
+===================================================================
+--- boa-constructor-0.6.1.orig/ExternalLib/pyparsing.py 2009-04-11 16:52:52.000000000 +0200
++++ boa-constructor-0.6.1/ExternalLib/pyparsing.py 2009-04-11 16:55:04.000000000 +0200
+@@ -770,7 +770,7 @@
+ if max > 0:
+ self.maxLen = max
+ else:
+- self.maxLen = sys.maxint
++ self.maxLen = 2L**31-1
+
+ if exact > 0:
+ self.maxLen = exact
+@@ -843,7 +843,7 @@
+ if max > 0:
+ self.maxLen = max
+ else:
+- self.maxLen = sys.maxint
++ self.maxLen = 2L**31-1
+
+ if exact > 0:
+ self.maxLen = exact
+@@ -921,7 +921,7 @@
+ if max > 0:
+ self.maxLen = max
+ else:
+- self.maxLen = sys.maxint
++ self.maxLen = 2L**31-1
+
+ if exact > 0:
+ self.maxLen = exact
+Index: boa-constructor-0.6.1/ExternalLib/tarfile.py
+===================================================================
+--- boa-constructor-0.6.1.orig/ExternalLib/tarfile.py 2009-04-11 16:52:51.000000000 +0200
++++ boa-constructor-0.6.1/ExternalLib/tarfile.py 2009-04-11 16:54:29.000000000 +0200
+@@ -1684,7 +1684,7 @@
+ be mixed up (!).
+ """
+ if size < 0:
+- size = sys.maxint
++ size = 2L**31-1
+
+ nl = self.linebuffer.find("\n")
+ if nl >= 0:
+Index: boa-constructor-0.6.1/PropEdit/InspectorEditorControls.py
+===================================================================
+--- boa-constructor-0.6.1.orig/PropEdit/InspectorEditorControls.py 2009-04-11 16:52:52.000000000 +0200
++++ boa-constructor-0.6.1/PropEdit/InspectorEditorControls.py 2009-04-11 16:55:44.000000000 +0200
+@@ -130,7 +130,7 @@
+ self.editorCtrl = wx.SpinCtrl(parent, self.wID, value,
+ (-2, idx*Preferences.oiLineHeight -2),
+ (sizeX, Preferences.oiLineHeight+3), style=wx.SP_VERTICAL,
+- max=sys.maxint, min=-sys.maxint)
++ max=2L**31-1, min=-(2L**31-1))
+ parent.Bind(wx.EVT_TEXT_ENTER, self.OnSelect, id=self.wID)
+ parent.Bind(wx.EVT_SPINCTRL, self.OnSelect, id=self.wID)
+ InspectorEditorControl.createControl(self)
Deleted: packages/boa-constructor/trunk/debian/patches/select_wxpython_2_6
===================================================================
--- packages/boa-constructor/trunk/debian/patches/select_wxpython_2_6 2009-07-30 21:02:01 UTC (rev 3357)
+++ packages/boa-constructor/trunk/debian/patches/select_wxpython_2_6 2009-07-30 21:17:45 UTC (rev 3358)
@@ -1,15 +0,0 @@
-Use xwpython 2.6.
-
-Index: boa-constructor-0.6.1/Boa.py
-===================================================================
---- boa-constructor-0.6.1.orig/Boa.py 2009-04-11 15:57:01.000000000 +0200
-+++ boa-constructor-0.6.1/Boa.py 2009-04-11 15:57:09.000000000 +0200
-@@ -230,7 +230,7 @@
- if not hasattr(sys, 'frozen'):
- import wxversion
- if wxVersionSelect is None:
-- wxversion.ensureMinimal('2.5')
-+ wxversion.select('2.6')
- else:
- wxversion.select(wxVersionSelect)
- except ImportError:
Copied: packages/boa-constructor/trunk/debian/patches/select_wxpython_2_6.patch (from rev 3355, packages/boa-constructor/trunk/debian/patches/select_wxpython_2_6)
===================================================================
--- packages/boa-constructor/trunk/debian/patches/select_wxpython_2_6.patch (rev 0)
+++ packages/boa-constructor/trunk/debian/patches/select_wxpython_2_6.patch 2009-07-30 21:17:45 UTC (rev 3358)
@@ -0,0 +1,17 @@
+Description: Use xwpython 2.6.
+Origin: Debian
+Forwarded: not-needed
+
+Index: boa-constructor-0.6.1/Boa.py
+===================================================================
+--- boa-constructor-0.6.1.orig/Boa.py 2009-04-11 15:57:01.000000000 +0200
++++ boa-constructor-0.6.1/Boa.py 2009-04-11 15:57:09.000000000 +0200
+@@ -230,7 +230,7 @@
+ if not hasattr(sys, 'frozen'):
+ import wxversion
+ if wxVersionSelect is None:
+- wxversion.ensureMinimal('2.5')
++ wxversion.select('2.6')
+ else:
+ wxversion.select(wxVersionSelect)
+ except ImportError:
Modified: packages/boa-constructor/trunk/debian/patches/series
===================================================================
--- packages/boa-constructor/trunk/debian/patches/series 2009-07-30 21:02:01 UTC (rev 3357)
+++ packages/boa-constructor/trunk/debian/patches/series 2009-07-30 21:17:45 UTC (rev 3358)
@@ -1,4 +1,4 @@
-select_wxpython_2_6
-executable_script_fixup
-maxint
+select_wxpython_2_6.patch
+executable_script_fixup.patch
+no_maxint.patch
no_double_free.patch
More information about the Python-apps-commits
mailing list