[med-svn] r8296 - in trunk/packages/micromanager/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-26 16:22:24 +0000 (Wed, 26 Oct 2011)
New Revision: 8296

Added:
   trunk/packages/micromanager/trunk/debian/patches/fixupimagej.patch
Modified:
   trunk/packages/micromanager/trunk/debian/control
   trunk/packages/micromanager/trunk/debian/patches/series
   trunk/packages/micromanager/trunk/debian/rules
Log:
first compilation of micromanager

Modified: trunk/packages/micromanager/trunk/debian/control
===================================================================
--- trunk/packages/micromanager/trunk/debian/control	2011-10-26 15:50:34 UTC (rev 8295)
+++ trunk/packages/micromanager/trunk/debian/control	2011-10-26 16:22:24 UTC (rev 8296)
@@ -4,7 +4,8 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 8), javahelper (>=0.25), default-jdk
+Build-Depends: debhelper (>= 8), javahelper (>=0.25), default-jdk, autotools-dev, autoconf, libtool
+Build-Depends-Indep: libcommons-math-java, imagej, bsh, libswingx-java, libswing-layout-java, libnb-java4-java
 Standards-Version: 3.9.2
 Homepage: http://www.micro-manager.org
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/micromanager/trunk/

Added: trunk/packages/micromanager/trunk/debian/patches/fixupimagej.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixupimagej.patch	                        (rev 0)
+++ trunk/packages/micromanager/trunk/debian/patches/fixupimagej.patch	2011-10-26 16:22:24 UTC (rev 8296)
@@ -0,0 +1,34 @@
+For some reason I am getting this:
+
+configure:15315: error: not found, Use the without-imagej directive to build
+without ImageJ or install ImageJ (http://rsb.info.nih.gov/ij/ and rerun
+configure, possibly using the --with-imagej=path directive
+
+Index: micromanager-1.4.6/configure.in
+===================================================================
+--- micromanager-1.4.6.orig/configure.in	2011-10-26 18:00:22.000000000 -0400
++++ micromanager-1.4.6/configure.in	2011-10-26 18:20:34.000000000 -0400
+@@ -34,9 +34,9 @@
+       AC_MSG_RESULT($IJJARPATH)
+    fi
+ 
+-   if test -z "$IJJARPATH"; then
+-     AC_MSG_ERROR([not found, Use the without-imagej directive to build without ImageJ or install ImageJ (http://rsb.info.nih.gov/ij/ and rerun configure, possibly using the --with-imagej=path directive])
+-   fi
++   #if test -z "$IJJARPATH"; then
++   #  AC_MSG_ERROR([not found, Use the without-imagej directive to build without ImageJ or install ImageJ (http://rsb.info.nih.gov/ij/ and rerun configure, possibly using the --with-imagej=path directive])
++   #fi
+ 
+    #----------------------------------------------------------------
+    # Find beanshell.jar in ImageJ plugins directory
+@@ -119,8 +119,8 @@
+       ABSOLUTEJARPATH="$CLASSEXT/AbsoluteLayout.jar"
+       AC_MSG_RESULT($ABSOLUTEJARPATH)
+    fi
+-   if test -r "/usr/share/java/AbsoluteLayout.jar" ; then
+-      ABSOLUTEJARPATH="/usr/share/java/AbsoluteLayout.jar"
++   if test -r "/usr/share/netbeans/java4/modules/ext/AbsoluteLayout.jar" ; then
++      ABSOLUTEJARPATH="/usr/share/netbeans/java4/modules/ext/AbsoluteLayout.jar"
+       AC_MSG_RESULT($ABOSLUTEJARPATH)
+    fi
+    if test -r $CLASSEXT"/AbsoluteLayout.jar" ; then

Modified: trunk/packages/micromanager/trunk/debian/patches/series
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/series	2011-10-26 15:50:34 UTC (rev 8295)
+++ trunk/packages/micromanager/trunk/debian/patches/series	2011-10-26 16:22:24 UTC (rev 8296)
@@ -1 +1,3 @@
 fixupcommonsmath.patch
+debian-changes-1.4.6-1
+fixupimagej.patch

Modified: trunk/packages/micromanager/trunk/debian/rules
===================================================================
--- trunk/packages/micromanager/trunk/debian/rules	2011-10-26 15:50:34 UTC (rev 8295)
+++ trunk/packages/micromanager/trunk/debian/rules	2011-10-26 16:22:24 UTC (rev 8296)
@@ -4,27 +4,27 @@
 JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@ --with javahelper
+	dh $@ --with javahelper --with autotools_dev
 
 override_dh_auto_configure:
 	./mmUnixBuild.sh
-	# ./configure --with-imagej=/usr/share/java
-	dh_auto_configure
+	#dh_auto_configure
+	./configure --with-imagej=/usr/share/java
 
 override_dh_clean:
 	dh_clean
 	# 
-	rm install-sh
-	rm config.sub
-	rm missing
-	rm config.guess
-	rm depcomp
-	rm ltmain.sh
-	rm m4/ltsugar.m4
-	rm m4/lt~obsolete.m4
-	rm m4/ltoptions.m4
-	rm m4/libtool.m4
-	rm m4/ltversion.m4
+	rm -f install-sh
+	rm -f config.sub
+	rm -f missing
+	rm -f config.guess
+	rm -f depcomp
+	rm -f ltmain.sh
+	rm -f m4/ltsugar.m4
+	rm -f m4/lt~obsolete.m4
+	rm -f m4/ltoptions.m4
+	rm -f m4/libtool.m4
+	rm -f m4/ltversion.m4
 
 get-orig-source:
 	./debian/get-orig-source