Author: ivomaintz-guest
Date: 2011-12-09 16:46:48 +0000 (Fri, 09 Dec 2011)
New Revision: 8884
Added:
trunk/packages/cellprofiler/branches/experimental/debian/bin/
trunk/packages/cellprofiler/branches/experimental/debian/bin/cellprofiler
Modified:
trunk/packages/cellprofiler/branches/experimental/debian/patches/Makefile.patch
trunk/packages/cellprofiler/branches/experimental/debian/prerm
Log:
added the cellprofiler startup script
modified the Makefile and the prerm script
Added: trunk/packages/cellprofiler/branches/experimental/debian/bin/cellprofiler
===================================================================
--- trunk/packages/cellprofiler/branches/experimental/debian/bin/cellprofiler
(rev 0)
+++ trunk/packages/cellprofiler/branches/experimental/debian/bin/cellprofiler
2011-12-09 16:46:48 UTC (rev 8884)
@@ -0,0 +1,10 @@
+#!/bin/sh
+DIR=/usr/share/cellprofiler
+export JAVA_HOME=$(readlink -f /usr/bin/java | cut -d/ -f1-5)
+export LD_LIBRARY_PATH=$JAVA_HOME:$LD_LIBRARY_PATH
+ARGS="$@"
+if [ -z "$@" ] ; then
+ARGS="-b"
+fi
+cd $DIR
+python CellProfiler.py $ARGS
Property changes on:
trunk/packages/cellprofiler/branches/experimental/debian/bin/cellprofiler
___________________________________________________________________
Added: svn:executable
+ *
Modified:
trunk/packages/cellprofiler/branches/experimental/debian/patches/Makefile.patch
===================================================================
---
trunk/packages/cellprofiler/branches/experimental/debian/patches/Makefile.patch
2011-12-09 16:43:51 UTC (rev 8883)
+++
trunk/packages/cellprofiler/branches/experimental/debian/patches/Makefile.patch
2011-12-09 16:46:48 UTC (rev 8884)
@@ -5,9 +5,10 @@
information below has been extracted from the changelog. Adjust it or drop
it.
.
- cellprofiler (2.0-1) unstable; urgency=low
+ cellprofiler (2.0~svn11691-1) unstable; urgency=low
.
- * Initial release
+ * merging Mathieus works with mine
+ * update from upstream
Author: Ivo Maintz <[email protected]>
---
@@ -25,9 +26,14 @@
Index: cellprofiler-2.0~svn11691/Makefile
===================================================================
---- cellprofiler-2.0~svn11691.orig/Makefile 2011-12-08 15:16:12.000000000
+0100
-+++ cellprofiler-2.0~svn11691/Makefile 2011-12-09 09:59:58.240001727 +0100
-@@ -8,7 +8,7 @@
+--- cellprofiler-2.0~svn11691.orig/Makefile 2011-12-09 16:24:29.000000000
+0100
++++ cellprofiler-2.0~svn11691/Makefile 2011-12-09 17:33:06.272000498 +0100
+@@ -1,3 +1,4 @@
++TARFILE=cellprofiler_2.0~svn11691.orig.tar.gz
+
+ TEST_MODULES = cellprofiler
+
+@@ -8,7 +9,7 @@
PYTHON_COMPILER=unix
endif
@@ -36,13 +42,15 @@
build:
mkdir build
-@@ -32,3 +32,9 @@
+@@ -32,3 +33,11 @@
tests:
python -m nose.core --exe --with-nosexunit
--core-target=target/xml-report $(TEST_MODULES)
+
+clean:
-+ rm -rf cellprofiler/utilities
-+ rm -rf cellprofiler/cpmath
-+ find . -name "*.pyc" -exec rm -f {} +
-+ tar xzf ../cellprofiler_2.0.orig.tar.gz --exclude=Makefile
++# rm -rf cellprofiler/utilities
++# rm -rf cellprofiler/cpmath
++# find . -name "*.pyc" -exec rm -f {} +
++# tar xzf ../$(TARFILE) --exclude=Makefile
++ find . -name "*.so" -exec rm -f {} +
++ rm -f cellprofiler/cpmath/*.c
Modified: trunk/packages/cellprofiler/branches/experimental/debian/prerm
===================================================================
--- trunk/packages/cellprofiler/branches/experimental/debian/prerm
2011-12-09 16:43:51 UTC (rev 8883)
+++ trunk/packages/cellprofiler/branches/experimental/debian/prerm
2011-12-09 16:46:48 UTC (rev 8884)
@@ -1,5 +1,6 @@
#!/bin/sh
set -e
INSTALL_DIR="/usr/share/cellprofiler"
-UTILITIES="$INSTALL_DIR/cellprofiler/utilities"
-rm -f $UTILITIES/|| true
+rm -rf $INSTALL_DIR/cellprofiler/utilities || true
+rm -rf $INSTALL_DIR/cellprofiler/cpmath || true
+find $INSTALL_DIR/ -name "*.pyc" -exec rm -f {} +
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
