[med-svn] r15128 - in trunk/packages/dicomscope/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2013-11-06 14:14:10 +0000 (Wed, 06 Nov 2013)
New Revision: 15128

Modified:
   trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch
   trunk/packages/dicomscope/trunk/debian/rules
Log:
Fix remaining issues

Modified: trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch	2013-11-06 14:07:55 UTC (rev 15127)
+++ trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch	2013-11-06 14:14:10 UTC (rev 15128)
@@ -11,7 +11,7 @@
          //Load deviceColorModell
          loadDeviceInformation();
 -        codeList = new SRCodeList("codes.dic");
-+        codeList = new SRCodeList("/usr/share/dcmtk/codes.dic");
++        codeList = new SRCodeList("/usr/share/dicomscope/codes.dic");
      }
      
      

Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules	2013-11-06 14:07:55 UTC (rev 15127)
+++ trunk/packages/dicomscope/trunk/debian/rules	2013-11-06 14:14:10 UTC (rev 15128)
@@ -5,7 +5,7 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE:STRING="" \
-	-DDICOMSCOPE_INSTALL_LIB_DIR:STRING=lib/jni/$(DEB_HOST_MULTIARCH)
+	-DDICOMSCOPE_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH)/jni
 
 %:
 	dh $@ --buildsystem=cmake --parallel --with javahelper