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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-27 12:54:54 +0000 (Thu, 27 Oct 2011)
New Revision: 8309

Added:
   trunk/packages/micromanager/trunk/debian/patches/removeinstallrule.patch
Modified:
   trunk/packages/micromanager/trunk/debian/control
   trunk/packages/micromanager/trunk/debian/patches/series
Log:
fix install rules

Modified: trunk/packages/micromanager/trunk/debian/control
===================================================================
--- trunk/packages/micromanager/trunk/debian/control	2011-10-27 12:29:13 UTC (rev 8308)
+++ trunk/packages/micromanager/trunk/debian/control	2011-10-27 12:54:54 UTC (rev 8309)
@@ -10,7 +10,8 @@
  libdc1394-22-dev, libv4l-dev, libfreeimage-dev, libusb-dev
 #pvcam-dkms, 
 Build-Depends-Indep: libcommons-math-java, imagej, bsh, libswingx-java,
- libswing-layout-java, libnb-java4-java, clojure1.2, clojure-contrib
+ libswing-layout-java, libnb-java4-java, clojure1.2, clojure-contrib,
+ libwerken.xpath-java
 # clooj
 Standards-Version: 3.9.2
 Homepage: http://www.micro-manager.org

Added: trunk/packages/micromanager/trunk/debian/patches/removeinstallrule.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/removeinstallrule.patch	                        (rev 0)
+++ trunk/packages/micromanager/trunk/debian/patches/removeinstallrule.patch	2011-10-27 12:54:54 UTC (rev 8309)
@@ -0,0 +1,17 @@
+Index: micromanager-1.4.6/mmstudio/Makefile.am
+===================================================================
+--- micromanager-1.4.6.orig/mmstudio/Makefile.am	2011-10-27 14:53:58.000000000 +0200
++++ micromanager-1.4.6/mmstudio/Makefile.am	2011-10-27 14:54:22.000000000 +0200
+@@ -154,9 +154,9 @@
+ install: 
+ 	test -d $(DESTDIR)$(IJPATH)/plugins/Micro-Manager || mkdir -p $(DESTDIR)$(IJPATH)/plugins/Micro-Manager
+ 	cp MMJ_.jar $(DESTDIR)$(IJPATH)/plugins/Micro-Manager
+-	cp $(IJJARPATH) $(DESTDIR)$(IJPATH)
+-	cp $(CLASSEXT)/*.jar $(DESTDIR)$(IJPATH)/plugins/
+-	rm $(DESTDIR)$(IJPATH)/plugins/ij.jar
++	#cp $(IJJARPATH) $(DESTDIR)$(IJPATH)
++	#cp $(CLASSEXT)/*.jar $(DESTDIR)$(IJPATH)/plugins/
++	#rm $(DESTDIR)$(IJPATH)/plugins/ij.jar
+ 
+ clean:
+ 	test -e MMJ_.jar && rm MMJ_.jar || echo "MMJ_.jar not found"

Modified: trunk/packages/micromanager/trunk/debian/patches/series
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/series	2011-10-27 12:29:13 UTC (rev 8308)
+++ trunk/packages/micromanager/trunk/debian/patches/series	2011-10-27 12:54:54 UTC (rev 8309)
@@ -3,3 +3,4 @@
 fixext.patch
 fixupfreeimage.patch
 fixupgphoto2.patch
+removeinstallrule.patch