[med-svn] r8922 - trunk/packages/cellprofiler/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-12 14:40:46 +0000 (Mon, 12 Dec 2011)
New Revision: 8922

Added:
   trunk/packages/cellprofiler/trunk/debian/cellprofiler2.py
Removed:
   trunk/packages/cellprofiler/trunk/debian/cellprofiler.py
Modified:
   trunk/packages/cellprofiler/trunk/debian/cellprofiler.install
   trunk/packages/cellprofiler/trunk/debian/cellprofiler.pyinstall
   trunk/packages/cellprofiler/trunk/debian/control
Log:
Trying to fixes issues.

Modified: trunk/packages/cellprofiler/trunk/debian/cellprofiler.install
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/cellprofiler.install	2011-12-12 14:14:19 UTC (rev 8921)
+++ trunk/packages/cellprofiler/trunk/debian/cellprofiler.install	2011-12-12 14:40:46 UTC (rev 8922)
@@ -1 +1 @@
-debian/cellprofiler.py usr/bin
+debian/cellprofiler2.py usr/bin

Deleted: trunk/packages/cellprofiler/trunk/debian/cellprofiler.py
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/cellprofiler.py	2011-12-12 14:14:19 UTC (rev 8921)
+++ trunk/packages/cellprofiler/trunk/debian/cellprofiler.py	2011-12-12 14:40:46 UTC (rev 8922)
@@ -1,7 +0,0 @@
-#!/usr/bin/python
-import sys
-import CellProfiler
-# fix sys.path to allow numpy import
-if '/usr/share/pyshared' in sys.path:
-   sys.path.remove('/usr/share/pyshared')
-CellProfiler.main()

Modified: trunk/packages/cellprofiler/trunk/debian/cellprofiler.pyinstall
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/cellprofiler.pyinstall	2011-12-12 14:14:19 UTC (rev 8921)
+++ trunk/packages/cellprofiler/trunk/debian/cellprofiler.pyinstall	2011-12-12 14:40:46 UTC (rev 8922)
@@ -4,11 +4,18 @@
 cellprofiler/cpmath/*.py
 cellprofiler/utilities/*.py
 contrib/*.py
+bioformats/*.py
 # compiled modules
+cellprofiler/cpmath/_lapjv.so
 cellprofiler/cpmath/_filter.so
 cellprofiler/cpmath/_cpmorphology.so
 cellprofiler/cpmath/_watershed.so
 cellprofiler/cpmath/_cpmorphology2.so
 cellprofiler/cpmath/_propagate.so
+cellprofiler/icons/*.py
+cellprofiler/gui/*.py
+cellprofiler/modules/*.py
+cellprofiler/modules/plugins/*.py
+cellprofiler/matlab/*.py
 # java ?
 cellprofiler/utilities/javabridge.so

Added: trunk/packages/cellprofiler/trunk/debian/cellprofiler2.py
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/cellprofiler2.py	                        (rev 0)
+++ trunk/packages/cellprofiler/trunk/debian/cellprofiler2.py	2011-12-12 14:40:46 UTC (rev 8922)
@@ -0,0 +1,7 @@
+#!/usr/bin/python
+import sys
+import CellProfiler
+# fix sys.path to allow numpy import
+if '/usr/share/pyshared' in sys.path:
+   sys.path.remove('/usr/share/pyshared')
+CellProfiler.main()


Property changes on: trunk/packages/cellprofiler/trunk/debian/cellprofiler2.py
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/packages/cellprofiler/trunk/debian/control
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/control	2011-12-12 14:14:19 UTC (rev 8921)
+++ trunk/packages/cellprofiler/trunk/debian/control	2011-12-12 14:40:46 UTC (rev 8922)
@@ -16,7 +16,7 @@
 
 Package: cellprofiler
 Architecture: any
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-libtiff
+Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-libtiff, python-h5py
 Recommends: tifffile
 Provides: ${python:Provides}
 Description: quantitatively measure phenotypes from images automatically