Author: malat-guest
Date: 2011-12-12 13:18:42 +0000 (Mon, 12 Dec 2011)
New Revision: 8916
Added:
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/get-orig-source
trunk/packages/cellprofiler/trunk/debian/rules
Log:
Another round of fixes.
Modified: trunk/packages/cellprofiler/trunk/debian/cellprofiler.install
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/cellprofiler.install
2011-12-12 13:13:36 UTC (rev 8915)
+++ trunk/packages/cellprofiler/trunk/debian/cellprofiler.install
2011-12-12 13:18:42 UTC (rev 8916)
@@ -1 +1 @@
-#contrib/LAP.so usr/lib
+debian/cellprofiler.py usr/bin
Added: trunk/packages/cellprofiler/trunk/debian/cellprofiler.py
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/cellprofiler.py
(rev 0)
+++ trunk/packages/cellprofiler/trunk/debian/cellprofiler.py 2011-12-12
13:18:42 UTC (rev 8916)
@@ -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/cellprofiler.py
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/packages/cellprofiler/trunk/debian/cellprofiler.pyinstall
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/cellprofiler.pyinstall
2011-12-12 13:13:36 UTC (rev 8915)
+++ trunk/packages/cellprofiler/trunk/debian/cellprofiler.pyinstall
2011-12-12 13:18:42 UTC (rev 8916)
@@ -1,4 +1,5 @@
CellProfiler.py
+external_dependencies.py
cellprofiler/*.py
cellprofiler/cpmath/*.py
cellprofiler/utilities/*.py
Modified: trunk/packages/cellprofiler/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/get-orig-source 2011-12-12
13:13:36 UTC (rev 8915)
+++ trunk/packages/cellprofiler/trunk/debian/get-orig-source 2011-12-12
13:18:42 UTC (rev 8916)
@@ -1,5 +1,5 @@
#!/bin/sh
-set -e
+set -ex
PACKAGE=cellprofiler
@@ -24,7 +24,13 @@
mkdir -p ../tarballs
cd ../tarballs
-svn export --quiet -r ${REVISION}
https://svn.broadinstitute.org/CellProfiler/trunk/CellProfiler ${FOLDER}
+#svn export --quiet -r ${REVISION}
https://svn.broadinstitute.org/CellProfiler/trunk/CellProfiler ${FOLDER}
+git clone git://github.com/thouis/CellProfiler.git ${FOLDER}
+cd ${FOLDER}
+git checkout wrap-cppy-in-main
+rm -rf .git
+cd ..
+
#
find ${FOLDER} -name *.exe -delete -o -name *.pdf -delete
# remove left over java stuff
Modified: trunk/packages/cellprofiler/trunk/debian/rules
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/rules 2011-12-12 13:13:36 UTC
(rev 8915)
+++ trunk/packages/cellprofiler/trunk/debian/rules 2011-12-12 13:18:42 UTC
(rev 8916)
@@ -6,5 +6,20 @@
override_dh_auto_configure:
python CellProfiler.py --build-and-exit
+override_dh_auto_clean:
+ dh_auto_clean
+ find . -name *.pyc -delete
+ find . -name *.jar -delete
+ find . -name *.o -delete
+ find . -name *.so -delete
+ # cython generated:
+ rm -f cellprofiler/cpmath/_cpmorphology2.c
+ rm -f cellprofiler/cpmath/_filter.c
+ rm -f cellprofiler/cpmath/_lapjv.c
+ rm -f cellprofiler/cpmath/_propagate.c
+ rm -f cellprofiler/cpmath/_watershed.c
+ rm -f cellprofiler/utilities/javabridge.c
+
get-orig-source:
- uscan --force-download --rename
+ #uscan --force-download --rename
+ ./debian/get-orig-source
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
