[Python-modules-commits] r16272 - in packages/gamera/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Wednesday, March 30, 2011 @ 16:30:27
  Author: jwilk
Revision: 16272

Remove io.py, stats.py and pstat.py from the binary package. (Build-)depend on python-stats instead.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/control
  packages/gamera/trunk/debian/patches/use-system-python-modules.diff
  packages/gamera/trunk/debian/rules

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2011-03-30 12:50:10 UTC (rev 16271)
+++ packages/gamera/trunk/debian/changelog	2011-03-30 16:30:27 UTC (rev 16272)
@@ -1,3 +1,10 @@
+gamera (3.2.7-2) UNRELEASED; urgency=low
+
+  * Remove io.py, stats.py and pstat.py from the binary package.
+    (Build-)depend on python-stats instead.
+
+ -- Jakub Wilk <jwilk at debian.org>  Wed, 30 Mar 2011 18:07:29 +0200
+
 gamera (3.2.7-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control	2011-03-30 12:50:10 UTC (rev 16271)
+++ packages/gamera/trunk/debian/control	2011-03-30 16:30:27 UTC (rev 16272)
@@ -12,7 +12,7 @@
  libvigraimpex-dev (>= 1.6.0-1~),
  libga-dev
 Build-Depends-Indep:
- python-numpy, python-wxgtk2.8,
+ python-numpy, python-wxgtk2.8, python-stats,
  help2man, netpbm
 XS-Python-Version: >= 2.4
 Standards-Version: 3.9.1
@@ -20,7 +20,7 @@
 
 Package: python-gamera
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-stats
 Replaces: gamera-gui (<< 3.2.3-2~)
 Recommends: python-wxgtk2.8, python-numpy, python-imaging
 Suggests: gamera-doc

Modified: packages/gamera/trunk/debian/patches/use-system-python-modules.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2011-03-30 12:50:10 UTC (rev 16271)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2011-03-30 16:30:27 UTC (rev 16272)
@@ -158,20 +158,6 @@
     all_extensions = ";".join(["*.%s" % x for x in extensions])
     types.insert(0, "All images (%s)|%s" % (all_extensions, all_extensions))
     types.append("All files (*.*)|*.*")
---- a/gamera/stats.py
-+++ b/gamera/stats.py
-@@ -3063,9 +3063,8 @@
- 
- Usage:  dices(x,y)
- """
--    import sets
--    x = sets.Set(x)
--    y = sets.Set(y)
-+    x = set(x)
-+    y = set(y)
-     common = len(x.intersection(y))
-     total = float(len(x) + len(y))
-     return 2*common/total
 --- a/gamera/classify.py
 +++ b/gamera/classify.py
 @@ -758,7 +758,7 @@
@@ -221,3 +207,26 @@
        if classifier:
           glyphs.update(self._classifier.get_glyphs())
        if page:
+--- a/gamera/confidence.py
++++ b/gamera/confidence.py
+@@ -19,7 +19,8 @@
+ #
+ 
+ from gamera.core import *
+-from gamera import knn, gamera_xml, cluster, stats
++from gamera import knn, gamera_xml, cluster
++import stats
+ import math
+ init_gamera()
+ 
+--- a/gamera/roman_text.py
++++ b/gamera/roman_text.py
+@@ -277,7 +277,7 @@
+         self.agv_line_width = 0
+ 
+     def find_tall_glyphs(self, stdev=20):
+-        from gamera import stats
++        import stats
+         tall = []
+         for i in range(len(self.glyphs)):
+             g = self.glyphs[i]

Modified: packages/gamera/trunk/debian/rules
===================================================================
--- packages/gamera/trunk/debian/rules	2011-03-30 12:50:10 UTC (rev 16271)
+++ packages/gamera/trunk/debian/rules	2011-03-30 16:30:27 UTC (rev 16272)
@@ -32,6 +32,7 @@
 	rm -Rf include/zlib*/ src/zlib*/ src/libpng*/ src/libtiff*/
 	rm -Rf include/vigra/
 	rm -Rf src/ga/
+	rm -f gamera/stats.py gamera/pstat.py gamera/io.py
 	$(MAKE) -f debian/rules $(makeflags) build/stamp
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	set -x -e; \