tags 640310 patch
thanks

Hi,

 This is caused by a change in jdk package, and I made a patch to adjust
 jni path. Please check attached patch, thanks.


-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/org
 http://wiki.debian.org/HidekiYamane
diff -Nru geotranz-3.1/debian/changelog geotranz-3.1/debian/changelog
--- geotranz-3.1/debian/changelog	2011-03-12 13:44:26.000000000 +0900
+++ geotranz-3.1/debian/changelog	2012-01-02 14:53:04.000000000 +0900
@@ -1,3 +1,11 @@
+geotranz (3.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches
+    - fix 001-makefiles.patch to use DEB_BUILD_ARCH (Closes: #640310) 
+
+ -- Hideki Yamane <henr...@debian.org>  Mon, 02 Jan 2012 14:47:45 +0900
+
 geotranz (3.1-2) unstable; urgency=low
 
   * Fix symbols issue again, this time it'll work with g++ 4.4 and 4.5.
diff -Nru geotranz-3.1/debian/patches/001-makefiles.patch geotranz-3.1/debian/patches/001-makefiles.patch
--- geotranz-3.1/debian/patches/001-makefiles.patch	2011-03-07 10:08:37.000000000 +0900
+++ geotranz-3.1/debian/patches/001-makefiles.patch	2012-01-02 14:52:55.000000000 +0900
@@ -4,7 +4,7 @@
 Index: geotranz-3.1/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ geotranz-3.1/Makefile	2011-03-06 12:32:19.279988021 +0100
++++ geotranz-3.1/Makefile	2012-01-02 14:45:21.212625508 +0900
 @@ -0,0 +1,13 @@
 +
 +all:
@@ -21,8 +21,8 @@
 +
 Index: geotranz-3.1/CCS/linux/makefile
 ===================================================================
---- geotranz-3.1.orig/CCS/linux/makefile	2011-03-06 12:32:15.899987090 +0100
-+++ geotranz-3.1/CCS/linux/makefile	2011-03-07 02:07:27.696348909 +0100
+--- geotranz-3.1.orig/CCS/linux/makefile	2012-01-02 14:45:09.084611570 +0900
++++ geotranz-3.1/CCS/linux/makefile	2012-01-02 14:47:25.648782266 +0900
 @@ -10,10 +10,15 @@
  #COMPILER_ISSUES = $(COMPILER_BOOLS) $(COMPILER_CASTS)
  
@@ -42,7 +42,7 @@
  
  ####
  # Support declarations
-@@ -21,8 +26,8 @@
+@@ -21,18 +26,19 @@
  
  DEBUG = -g
  
@@ -53,16 +53,19 @@
  
  ####
  # Directories
-@@ -32,7 +37,7 @@
+ ####
++DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ 
+ DTCCDIR = ../../CCS/src/dtcc/CoordinateSystems#../../dt_cc
  CCSERVICEDIR = ../../CCS/src
  SRCDIR = ../../GEOTRANS3/java_gui/geotrans3/jni
  JNIDIR = ../../GEOTRANS3/java_gui/geotrans3/jni
 -JAVADIR = /usr/jdk1.5.0_18#Note: Change this for your system
-+JAVADIR = /usr/lib/jvm/java-6-openjdk
++JAVADIR = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
  
  ####
  # Libraries
-@@ -41,6 +46,10 @@
+@@ -41,6 +47,10 @@
  LIBMSPDTCC = libMSPdtcc.so
  LIBMSPCCS = libMSPCoordinateConversionService.so
  LIBJNI = libjnimsp_ccs.so
@@ -73,7 +76,7 @@
  
  #LIBS = $(XPCLASSLIBS) $(MOTIFLIBS) $(XLIBS) -lm
  
-@@ -287,21 +296,32 @@
+@@ -287,21 +297,32 @@
  # Targets
  ####
  
@@ -111,7 +114,7 @@
  
  ####
  # Supporting Rules
-@@ -309,28 +329,28 @@
+@@ -309,28 +330,28 @@
  
  #DT&CC Modules - for MSPCCS shared object library
  $(DTCCSRCS):
@@ -147,7 +150,7 @@
  
  posic_sources:
  	make "P=$(posic)" $(SRCS) $(SRCS:.cpp=.o)
-@@ -338,14 +358,15 @@
+@@ -338,14 +359,15 @@
  force_rebuild:
  
  $(SRCS:.cpp=.o):$(@:.o=.cpp) force_rebuild
@@ -169,18 +172,20 @@
 Index: geotranz-3.1/GEOTRANS3/java_gui/MANIFEST.MF
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ geotranz-3.1/GEOTRANS3/java_gui/MANIFEST.MF	2011-03-06 12:32:19.307988140 +0100
++++ geotranz-3.1/GEOTRANS3/java_gui/MANIFEST.MF	2012-01-02 14:45:21.212625508 +0900
 @@ -0,0 +1,2 @@
 +Manifest-Version: 1.0
 +Main-Class: geotrans3.gui.MSP_GEOTRANS3
 Index: geotranz-3.1/GEOTRANS3/java_gui/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ geotranz-3.1/GEOTRANS3/java_gui/Makefile	2011-03-07 02:08:23.867987394 +0100
-@@ -0,0 +1,41 @@
++++ geotranz-3.1/GEOTRANS3/java_gui/Makefile	2012-01-02 14:46:38.248719410 +0900
+@@ -0,0 +1,43 @@
++DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
++
 +SRC = geotrans3
 +ICONS = $(SRC)/gui/icons
-+JAVAC = /usr/lib/jvm/java-6-openjdk/bin/javac
++JAVAC = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)/bin/javac
 +
 +all: MSPCCS.jar
 +

Reply via email to