[Python-apps-commits] r4100 - in packages/boa-constructor/trunk/debian (4 files)

[dktrkranz at users.alioth.debian.org]

    Date: Tuesday, November 10, 2009 @ 22:23:14
  Author: dktrkranz
Revision: 4100

Do not install embedded pyparsing module (Closes: #555367)

Modified:
  packages/boa-constructor/trunk/debian/changelog
  packages/boa-constructor/trunk/debian/control
  packages/boa-constructor/trunk/debian/patches/no_maxint.patch
  packages/boa-constructor/trunk/debian/rules

Modified: packages/boa-constructor/trunk/debian/changelog
===================================================================
--- packages/boa-constructor/trunk/debian/changelog	2009-11-10 21:57:45 UTC (rev 4099)
+++ packages/boa-constructor/trunk/debian/changelog	2009-11-10 22:23:14 UTC (rev 4100)
@@ -1,3 +1,10 @@
+boa-constructor (0.6.1-8) UNRELEASED; urgency=low
+
+  * Do not install embedded pyparsing module, suggest python-pyparsing
+    instead, wx25upgrade.py needs it (Closes: #555367).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Tue, 10 Nov 2009 23:21:12 +0100
+
 boa-constructor (0.6.1-7) unstable; urgency=low
 
   * Update my e-mail address.

Modified: packages/boa-constructor/trunk/debian/control
===================================================================
--- packages/boa-constructor/trunk/debian/control	2009-11-10 21:57:45 UTC (rev 4099)
+++ packages/boa-constructor/trunk/debian/control	2009-11-10 22:23:14 UTC (rev 4100)
@@ -14,6 +14,7 @@
 Package: boa-constructor
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, pychecker, python-wxgtk2.6
+Suggests: python-pyparsing
 Description: RAD tool for Python and wxWindows application
  Boa-constructor is an IDE oriented towards creating cross-platform
  applications built on top of the Python language and the wxWindows GUI

Modified: packages/boa-constructor/trunk/debian/patches/no_maxint.patch
===================================================================
--- packages/boa-constructor/trunk/debian/patches/no_maxint.patch	2009-11-10 21:57:45 UTC (rev 4099)
+++ packages/boa-constructor/trunk/debian/patches/no_maxint.patch	2009-11-10 22:23:14 UTC (rev 4100)
@@ -16,37 +16,6 @@
      
  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

Modified: packages/boa-constructor/trunk/debian/rules
===================================================================
--- packages/boa-constructor/trunk/debian/rules	2009-11-10 21:57:45 UTC (rev 4099)
+++ packages/boa-constructor/trunk/debian/rules	2009-11-10 22:23:14 UTC (rev 4100)
@@ -14,7 +14,7 @@
 	cd Docs/boa.apphelp; patch -p1 < ../../debian/patches/docs_typo.patch
 	cd Docs/boa.apphelp; zip -q ../boa.apphelp.htb *
 	rm -fr Docs/boa.apphelp
-	dh_install -Xboa.apphelp.htb.orig
+	dh_install -Xboa.apphelp.htb.orig -Xpyparsing.py
 
 override_dh_pysupport:
 	dh_pysupport -X zoa