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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-27 12:29:13 +0000 (Thu, 27 Oct 2011)
New Revision: 8308

Added:
   trunk/packages/micromanager/trunk/debian/patches/fixupgphoto2.patch
Modified:
   trunk/packages/micromanager/trunk/debian/control
   trunk/packages/micromanager/trunk/debian/patches/series
Log:
fix gphoto2.

Modified: trunk/packages/micromanager/trunk/debian/control
===================================================================
--- trunk/packages/micromanager/trunk/debian/control	2011-10-27 10:38:02 UTC (rev 8307)
+++ trunk/packages/micromanager/trunk/debian/control	2011-10-27 12:29:13 UTC (rev 8308)
@@ -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
+ libswing-layout-java, libnb-java4-java, clojure1.2, clojure-contrib
+# clooj
 Standards-Version: 3.9.2
 Homepage: http://www.micro-manager.org
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/micromanager/trunk/

Added: trunk/packages/micromanager/trunk/debian/patches/fixupgphoto2.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixupgphoto2.patch	                        (rev 0)
+++ trunk/packages/micromanager/trunk/debian/patches/fixupgphoto2.patch	2011-10-27 12:29:13 UTC (rev 8308)
@@ -0,0 +1,13 @@
+Index: micromanager-1.4.6/DeviceAdapters/configure.in
+===================================================================
+--- micromanager-1.4.6.orig/DeviceAdapters/configure.in	2011-10-27 14:28:18.000000000 +0200
++++ micromanager-1.4.6/DeviceAdapters/configure.in	2011-10-27 14:28:28.000000000 +0200
+@@ -153,7 +153,7 @@
+    GPHOTO2_VERSION=`$PKG_CONFIG --modversion libgphoto2`
+    GPHOTO2_PORT_VERSION=`$PKG_CONFIG --modversion libgphoto2_port`
+    GPHOTO2_LIBDIR=`$PKG_CONFIG --variable=libdir libgphoto2`
+-   LIBGPHOTO2=`$PKG_CONFIG --variable=libdir libgphoto2`/libgphoto2.la
++   LIBGPHOTO2=`$PKG_CONFIG --variable=libdir libgphoto2`/libgphoto2.so
+ fi
+ 
+ # On mac, install dynamic gphoto2 libraries 

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