[Pkg-phototools-commits] [openjpeg] 01/01: Import change from 1.5.0-3
Mathieu Malaterre
malat at moszumanska.debian.org
Mon Mar 17 08:22:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
malat pushed a commit to branch master
in repository openjpeg.
commit 549dac61db2cd511e95db3a6b0cc9ed811e61cf8
Author: Mathieu Malaterre <malat at debian.org>
Date: Mon Mar 17 09:19:19 2014 +0100
Import change from 1.5.0-3
---
debian/changelog | 17 +++
debian/control | 2 -
debian/patches/addmathlib.patch | 17 ---
debian/patches/addxml2.patch | 24 ----
debian/patches/fixjniinstall.patch | 39 ++++++
debian/patches/fixjnisoname.patch | 46 +++++++
debian/patches/fixsoname.patch | 104 ---------------
debian/patches/installjava.patch | 213 -------------------------------
debian/patches/relativeincludepath.patch | 65 ----------
debian/patches/series | 7 +-
debian/rules | 5 +-
11 files changed, 105 insertions(+), 434 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6d6efe6..c7ed8aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+openjpeg (1.5.1-1) experimental; urgency=low
+
+ * New upstream. Closes: #687528, #681458, #691156
+ * Fix java binding installation
+ - fixjniinstall.patch
+ * Fix SONAME hack in d/rules, prefer cmake solution
+ - fixjnisoname.patch
+ * Remove patch applied upstream:
+ - addmathlib.patch
+ - fixsoname.patch
+ - relativeincludepath.patch
+ - installjava.patch
+ - addxml2.patch
+ - manpagetypo.patch
+
+ -- Mathieu Malaterre <malat at debian.org> Mon, 22 Oct 2012 12:51:26 +0200
+
openjpeg (1.5.0-3) experimental; urgency=low
* Add missing jp2-thumbnailer
diff --git a/debian/control b/debian/control
index dfd1d28..7f17708 100644
--- a/debian/control
+++ b/debian/control
@@ -87,7 +87,6 @@ Description: tool to allow caching of JPEG 2000 files using JPIP protocol
Package: openjpip-viewer-xerces
Section: graphics
Architecture: all
-Multi-Arch: same
Depends: ${misc:Depends}, ${java:Depends}, openjpip-dec-server
Description: JPEG 2000 java based viewer for advanced remote JPIP access
Java based client to view remote JPEG 2000 using JPIP protocol.
@@ -104,7 +103,6 @@ Description: JPEG 2000 java based viewer for advanced remote JPIP access
Package: openjpip-viewer
Section: graphics
Architecture: all
-Multi-Arch: same
Depends: ${misc:Depends}, ${java:Depends}, openjpip-dec-server
Description: JPEG 2000 java based viewer for basic remote JPIP access
Java based client to view remote JPEG 2000 using JPIP protocol.
diff --git a/debian/patches/addmathlib.patch b/debian/patches/addmathlib.patch
deleted file mode 100644
index 7f163d3..0000000
--- a/debian/patches/addmathlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: missing link to math lib
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: http://code.google.com/p/openjpeg/source/detail?r=1628
-Last-Update: 2012-04-16
-
-Index: openjpeg/libopenjpeg/jpwl/CMakeLists.txt
-===================================================================
---- openjpeg.orig/libopenjpeg/jpwl/CMakeLists.txt 2012-04-16 14:48:39.000000000 +0200
-+++ openjpeg/libopenjpeg/jpwl/CMakeLists.txt 2012-04-16 14:49:01.000000000 +0200
-@@ -23,6 +23,7 @@
- ENDIF(BUILD_SHARED_LIBS)
- ENDIF(WIN32)
- ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPENJPEG_SRCS})
-+target_link_libraries(${OPENJPEG_LIBRARY_NAME}_JPWL m)
- SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL
- PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-
diff --git a/debian/patches/addxml2.patch b/debian/patches/addxml2.patch
deleted file mode 100644
index 82947d2..0000000
--- a/debian/patches/addxml2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: missing rules for addXMLinJP2
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: http://code.google.com/p/openjpeg/source/detail?r=1637
-Last-Update: 2012-04-20
-
-Index: openjpeg/applications/jpip/util/CMakeLists.txt
-===================================================================
---- openjpeg.orig/applications/jpip/util/CMakeLists.txt 2012-04-20 13:13:26.905937928 +0200
-+++ openjpeg/applications/jpip/util/CMakeLists.txt 2012-04-20 13:14:18.869452228 +0200
-@@ -4,6 +4,14 @@
- ${FCGI_INCLUDE_DIRS}
- )
-
-+# Tool to embed metadata into JP2 file
-+ADD_EXECUTABLE(addXMLinJP2 addXMLinJP2.c)
-+# Install exe
-+INSTALL(TARGETS addXMLinJP2
-+ EXPORT OpenJPEGTargets
-+ DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+ )
-+
- IF(BUILD_JPIP_SERVER)
-
- SET(OPJ_SERVER_SRCS
diff --git a/debian/patches/fixjniinstall.patch b/debian/patches/fixjniinstall.patch
new file mode 100644
index 0000000..35bf91f
--- /dev/null
+++ b/debian/patches/fixjniinstall.patch
@@ -0,0 +1,39 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpeg (1.5.1-1) UNRELEASED; urgency=low
+ .
+ * New upstream. Closes: #687528, #681458, #691156
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/681458
+Bug-Debian: http://bugs.debian.org/687528
+Bug-Debian: http://bugs.debian.org/691156
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpeg-1.5.1.orig/applications/JavaOpenJPEG/CMakeLists.txt
++++ openjpeg-1.5.1/applications/JavaOpenJPEG/CMakeLists.txt
+@@ -29,7 +29,7 @@ TARGET_LINK_LIBRARIES(openjpegjni ${OPEN
+ IF(WIN32)
+ SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
+ ELSE()
+- SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
++ SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR}/jni)
+ ENDIF()
+
+ INSTALL(TARGETS openjpegjni
diff --git a/debian/patches/fixjnisoname.patch b/debian/patches/fixjnisoname.patch
new file mode 100644
index 0000000..69e70e0
--- /dev/null
+++ b/debian/patches/fixjnisoname.patch
@@ -0,0 +1,46 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpeg (1.5.1-1) UNRELEASED; urgency=low
+ .
+ * New upstream. Closes: #687528, #681458, #691156
+ * Fix SONAME hack in d/rules, prefer cmake solution
+ * Remove patch applied upstream:
+ - addmathlib.patch
+ - fixsoname.patch
+ - relativeincludepath.patch
+ - installjava.patch
+ - addxml2.patch
+ - manpagetypo.patch
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/681458
+Bug-Debian: http://bugs.debian.org/687528
+Bug-Debian: http://bugs.debian.org/691156
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpeg-1.5.1.orig/applications/JavaOpenJPEG/CMakeLists.txt
++++ openjpeg-1.5.1/applications/JavaOpenJPEG/CMakeLists.txt
+@@ -25,6 +25,7 @@ add_library(openjpegjni MODULE
+ ${openjpegjni_SRCS}
+ )
+ TARGET_LINK_LIBRARIES(openjpegjni ${OPENJPEG_LIBRARY_NAME})
++set_property(TARGET openjpegjni PROPERTY NO_SONAME 1)
+
+ IF(WIN32)
+ SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
diff --git a/debian/patches/fixsoname.patch b/debian/patches/fixsoname.patch
deleted file mode 100644
index 8b46440..0000000
--- a/debian/patches/fixsoname.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Description: SONAME convention was broken upstream
- upstream quickly fix the behavior in the 1.5 branch. Import patch
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: http://code.google.com/p/openjpeg/source/detail?r=1625
- http://code.google.com/p/openjpeg/source/detail?r=1464
-Last-Update: 2012-04-16
-
-Index: openjpeg/CMakeLists.txt
-===================================================================
---- openjpeg.orig/CMakeLists.txt 2012-04-16 16:28:07.000000000 +0200
-+++ openjpeg/CMakeLists.txt 2012-04-16 16:28:09.000000000 +0200
-@@ -34,9 +34,26 @@
- "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
- SET(PACKAGE_VERSION
- "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
-+
-+# Because autotools does not support X.Y notation for SOVERSION, we have to use
-+# two numerorations, one for the openjpeg version and one for openjpeg soversion
-+# version | soversion
-+# 1.0 | 0
-+# 1.1 | 1
-+# 1.2 | 2
-+# 1.3 | 3
-+# 1.4 | 4
-+# 1.5 | 5
-+# 2.0 | 6
-+# above is the recommendation by the OPJ team. If you really need to override this default,
-+# you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
-+# cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
-+if(NOT OPENJPEG_SOVERSION)
-+ SET(OPENJPEG_SOVERSION 5)
-+endif(NOT OPENJPEG_SOVERSION)
- SET(OPENJPEG_LIBRARY_PROPERTIES
- VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
-- SOVERSION "${OPENJPEG_VERSION_MAJOR}"
-+ SOVERSION "${OPENJPEG_SOVERSION}"
- )
-
- # --------------------------------------------------------------------------
-@@ -95,7 +112,7 @@
- ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
-
- IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
-- SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/")
-+ SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
- ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
-
- IF(NOT OPENJPEG_INSTALL_MAN_DIR)
-@@ -107,7 +124,10 @@
- ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
-
- IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
-- SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-+ # We could install *.cmake files in share/ however those files contains
-+ # hardcoded path to libraries on a multi-arch system (fedora/debian) those
-+ # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
-+ SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
- ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
-
- #-----------------------------------------------------------------------------
-@@ -143,13 +163,14 @@
- #-----------------------------------------------------------------------------
- # pkgconfig support
- IF(UNIX)
-+ # install in lib and not share (see multi-arch note above)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
- INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
-- ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig )
-+ ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
- INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
- \"libopenjpeg1.pc\"
-- \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
-+ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")")
- ENDIF(UNIX)
-
- #-----------------------------------------------------------------------------
-@@ -254,9 +275,9 @@
-
- #-----------------------------------------------------------------------------
- # install CHANGES and LICENSE
--INSTALL(
-- FILES CHANGES
-- LICENSE
-- DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
-+IF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
-+ INSTALL(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
-+ENDIF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
-+INSTALL(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
-
- INCLUDE (CMake/OpenJPEGCPack.cmake)
-Index: openjpeg/libopenjpeg/CMakeLists.txt
-===================================================================
---- openjpeg.orig/libopenjpeg/CMakeLists.txt 2012-04-16 16:30:40.000000000 +0200
-+++ openjpeg/libopenjpeg/CMakeLists.txt 2012-04-16 16:30:48.000000000 +0200
-@@ -55,7 +55,7 @@
-
- # Install includes files
- INSTALL(FILES openjpeg.h
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
-+ DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
- )
-
- # install man page of the library
diff --git a/debian/patches/installjava.patch b/debian/patches/installjava.patch
deleted file mode 100644
index 3268a5a..0000000
--- a/debian/patches/installjava.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Description: missing java installation rules
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: http://code.google.com/p/openjpeg/source/detail?r=1636
-Last-Update: 2012-04-20
-
-Index: openjpeg-1.5.0/applications/JavaOpenJPEG/CMakeLists.txt
-===================================================================
---- openjpeg-1.5.0.orig/applications/JavaOpenJPEG/CMakeLists.txt 2012-04-19 14:27:17.013900193 +0200
-+++ openjpeg-1.5.0/applications/JavaOpenJPEG/CMakeLists.txt 2012-04-19 14:27:26.569937384 +0200
-@@ -4,6 +4,9 @@
- SET(openjpegjni_SRCS
- JavaOpenJPEGDecoder.c
- JavaOpenJPEG.c
-+ ../codec/index.c
-+ ../codec/convert.c
-+${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c
- )
-
- # JNI binding:
-@@ -20,6 +23,18 @@
- add_library(openjpegjni MODULE
- ${openjpegjni_SRCS}
- )
-+TARGET_LINK_LIBRARIES(openjpegjni ${OPENJPEG_LIBRARY_NAME})
-+
-+IF(WIN32)
-+ SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
-+ELSE()
-+ SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
-+ENDIF()
-+
-+INSTALL(TARGETS openjpegjni
-+ EXPORT OpenJPEGTargets
-+ LIBRARY DESTINATION ${OPENJPEG_INSTALL_JNI_DIR}/jni COMPONENT Libraries
-+)
-
- # build jar:
- FIND_PACKAGE(Java 1.5 REQUIRED) # javac, jar
-@@ -45,3 +60,7 @@
- DEPENDS ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
- COMMENT "building openjpeg.jar"
- )
-+
-+INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
-+ DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+)
-Index: openjpeg-1.5.0/applications/jpip/util/CMakeLists.txt
-===================================================================
---- openjpeg-1.5.0.orig/applications/jpip/util/CMakeLists.txt 2012-04-19 14:29:10.737939774 +0200
-+++ openjpeg-1.5.0/applications/jpip/util/CMakeLists.txt 2012-04-19 14:29:14.089441659 +0200
-@@ -47,81 +47,95 @@
- ENDFOREACH(exe)
-
- # Build the two java clients:
--FIND_PACKAGE(Java 1.5 REQUIRED) # javac, jar
-+FIND_PACKAGE(Java 1.5 COMPONENTS Development) # javac, jar
-
--# 1. opj_viewer
--# build dep list:
--file(GLOB java1_srcs "opj_viewer/src/*.java")
--
--# make sure target javac dir exists:
--file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes1)
--# Build java
--ADD_CUSTOM_COMMAND(
-- OUTPUT ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
-- COMMAND ${Java_JAVAC_EXECUTABLE}
-- ${java1_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes1
-- COMMAND ${Java_JAR_EXECUTABLE} cfm ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/dist/manifest.txt -C
-- ${CMAKE_CURRENT_BINARY_DIR}/classes1 .
-- DEPENDS ${java1_srcs}
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/dist/manifest.txt
-- COMMENT "javac *.java; jar cvf -> opj_viewer.jar"
--)
--
--# name the target
--ADD_CUSTOM_TARGET(OPJViewerJar ALL
-- DEPENDS ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
-- COMMENT "building opj_viewer.jar"
--)
--
--# 2. opj_viewer_xerces
--# search for package org.apache.xerces.parsers
--find_file(APACHE_XERCES_JAR
-- NAMES xerces-j2.jar xercesImpl.jar
-- PATHS /usr/share/java/
-- NO_DEFAULT_PATH
-- )
--mark_as_advanced(APACHE_XERCES_JAR)
--
--if(EXISTS ${APACHE_XERCES_JAR})
-- configure_file(
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer_xerces/dist/manifest.txt.in
-- ${CMAKE_CURRENT_BINARY_DIR}/opj_viewer_xerces/dist/manifest.txt
-- @ONLY
-- )
-+# Only build the java viewer if dev is found:
-+if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
-+ set(jflags $ENV{JFLAGS})
-+ # 1. opj_viewer
- # build dep list:
-- file(GLOB java2_srcs "opj_viewer_xerces/src/*.java")
--
-- # Need some common files:
-- list(APPEND java2_srcs
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ImageManager.java
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ImgdecClient.java
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/JPIPHttpClient.java
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/MML.java
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/PnmImage.java
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/RegimViewer.java
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ResizeListener.java
-- )
-+ file(GLOB java1_srcs "opj_viewer/src/*.java")
-
- # make sure target javac dir exists:
-- file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes2)
-+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes1)
- # Build java
- ADD_CUSTOM_COMMAND(
-- OUTPUT ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
-- COMMAND ${Java_JAVAC_EXECUTABLE}
-- -classpath ${APACHE_XERCES_JAR}
-- ${java2_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes2
-- COMMAND ${Java_JAR_EXECUTABLE} cfm ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
-- ${CMAKE_CURRENT_BINARY_DIR}/opj_viewer_xerces/dist/manifest.txt
-- -C ${CMAKE_CURRENT_BINARY_DIR}/classes2 .
-- DEPENDS ${java2_srcs}
-- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer_xerces/dist/manifest.txt.in
-- COMMENT "javac *.java; jar cvf -> opj_viewer_xerces.jar"
-+ OUTPUT ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
-+ COMMAND ${Java_JAVAC_EXECUTABLE} ${jflags}
-+ ${java1_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes1
-+ COMMAND ${Java_JAR_EXECUTABLE} cfm ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/dist/manifest.txt -C
-+ ${CMAKE_CURRENT_BINARY_DIR}/classes1 .
-+ DEPENDS ${java1_srcs}
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/dist/manifest.txt
-+ COMMENT "javac *.java; jar cvf -> opj_viewer.jar"
- )
-
- # name the target
-- ADD_CUSTOM_TARGET(OPJViewerXercesJar ALL
-- DEPENDS ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
-- COMMENT "building opj_viewer_xerces.jar"
-+ ADD_CUSTOM_TARGET(OPJViewerJar ALL
-+ DEPENDS ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
-+ COMMENT "building opj_viewer.jar"
-+ )
-+
-+ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
-+ DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+ )
-+
-+ # 2. opj_viewer_xerces
-+ # search for package org.apache.xerces.parsers
-+ find_file(APACHE_XERCES_JAR
-+ NAMES xerces-j2.jar xercesImpl.jar
-+ PATHS /usr/share/java/
-+ NO_DEFAULT_PATH
- )
-+ mark_as_advanced(APACHE_XERCES_JAR)
-+
-+ if(EXISTS ${APACHE_XERCES_JAR})
-+ configure_file(
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer_xerces/dist/manifest.txt.in
-+ ${CMAKE_CURRENT_BINARY_DIR}/opj_viewer_xerces/dist/manifest.txt
-+ @ONLY
-+ )
-+ # build dep list:
-+ file(GLOB java2_srcs "opj_viewer_xerces/src/*.java")
-+
-+ # Need some common files:
-+ list(APPEND java2_srcs
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ImageManager.java
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ImgdecClient.java
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/JPIPHttpClient.java
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/MML.java
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/PnmImage.java
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/RegimViewer.java
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ResizeListener.java
-+ )
-+
-+ # make sure target javac dir exists:
-+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes2)
-+ # Build java
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
-+ COMMAND ${Java_JAVAC_EXECUTABLE} ${jflags}
-+ -classpath ${APACHE_XERCES_JAR}
-+ ${java2_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes2
-+ COMMAND ${Java_JAR_EXECUTABLE} cfm ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
-+ ${CMAKE_CURRENT_BINARY_DIR}/opj_viewer_xerces/dist/manifest.txt
-+ -C ${CMAKE_CURRENT_BINARY_DIR}/classes2 .
-+ DEPENDS ${java2_srcs}
-+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer_xerces/dist/manifest.txt.in
-+ COMMENT "javac *.java; jar cvf -> opj_viewer_xerces.jar"
-+ )
-+
-+ # name the target
-+ ADD_CUSTOM_TARGET(OPJViewerXercesJar ALL
-+ DEPENDS ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
-+ COMMENT "building opj_viewer_xerces.jar"
-+ )
-+
-+ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
-+ DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+ )
-+ endif()
-+else(Java_Development_FOUND)
-+ message(WARNING "No java compiler found. Wont be able to build java viewer")
- endif()
diff --git a/debian/patches/relativeincludepath.patch b/debian/patches/relativeincludepath.patch
deleted file mode 100644
index 2ebe4b4..0000000
--- a/debian/patches/relativeincludepath.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: fix relative installation in multiarch system
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: http://code.google.com/p/openjpeg/source/detail?r=1630
-Last-Update: 2012-04-20
-
-Index: openjpeg-1.5.0/CMake/OpenJPEGConfig.cmake.in
-===================================================================
---- openjpeg-1.5.0.orig/CMake/OpenJPEGConfig.cmake.in 2012-04-19 12:38:27.933915198 +0200
-+++ openjpeg-1.5.0/CMake/OpenJPEGConfig.cmake.in 2012-04-19 12:39:13.641453115 +0200
-@@ -11,22 +11,28 @@
- SET(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@")
-
- # The libraries.
--SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARIES@")
-+SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARY_NAME@")
-
- # The CMake macros dir.
--SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_CMAKE_DIR_CONFIG@")
-+SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_INSTALL_PACKAGE_DIR@")
-
- # The configuration options.
--SET(OPENJPEG_BUILD_SHARED_LIBS "@OPENJPEG_BUILD_SHARED_LIBS@")
-+SET(OPENJPEG_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
-
- # The "use" file.
- SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
-
- get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-+# The following is inspired from:
-+# http://www.cmake.org/Wiki/CMake/Tutorials/Packaging#Packaging_and_Exporting
-+# However the following is difficult to handle:
-+# get_filename_component(myproj_INCLUDE_DIRS "${SELF_DIR}/../../include/myproj" ABSOLUTE)
-+# it asssumes a non multi-arch system, where 'include' is located '../include' from lib
-+# therefore we need to take into account the number of subdirs in OPENJPEG_INSTALL_LIB_DIR
- if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
- # This is an install tree
- include(${SELF_DIR}/OpenJPEGTargets.cmake)
-- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
-+ get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/@relative_parent@/@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
- set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
-
- else(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-Index: openjpeg-1.5.0/CMakeLists.txt
-===================================================================
---- openjpeg-1.5.0.orig/CMakeLists.txt 2012-04-19 12:39:27.165942506 +0200
-+++ openjpeg-1.5.0/CMakeLists.txt 2012-04-19 12:39:41.069394025 +0200
-@@ -103,6 +103,18 @@
- SET(OPENJPEG_INSTALL_LIB_DIR "lib")
- ENDIF(NOT OPENJPEG_INSTALL_LIB_DIR)
-
-+# The following will compute the amount of parent dir to go
-+# from include to lib. it works nicely with
-+# OPENJPEG_INSTALL_LIB_DIR=lib
-+# OPENJPEG_INSTALL_LIB_DIR=lib/
-+# OPENJPEG_INSTALL_LIB_DIR=/lib
-+# OPENJPEG_INSTALL_LIB_DIR=lib/gnu-linux-x64
-+STRING(REPLACE "/" ";" relative_to_lib ${OPENJPEG_INSTALL_LIB_DIR})
-+set(relative_parent "..")
-+foreach( elem ${relative_to_lib})
-+ set( relative_parent "${relative_parent}/.." )
-+endforeach()
-+
- IF(NOT OPENJPEG_INSTALL_SHARE_DIR)
- SET(OPENJPEG_INSTALL_SHARE_DIR "share")
- ENDIF(NOT OPENJPEG_INSTALL_SHARE_DIR)
diff --git a/debian/patches/series b/debian/patches/series
index b1640cd..22cf2bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-addmathlib.patch
-fixsoname.patch
-relativeincludepath.patch
-installjava.patch
defaulttmpfile.patch
-addxml2.patch
+fixjniinstall.patch
+fixjnisoname.patch
diff --git a/debian/rules b/debian/rules
index 11adb05..733983f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,6 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
- # technically a java module should not need a SONAME, use a trick from python module+cmake
- # http://lists.debian.org/debian-python/2012/04/msg00059.html
- sed -i -e 's/ -Wl,-soname,[^ ]\+ / /' obj-*/applications/JavaOpenJPEG/CMakeFiles/openjpegjni.dir/link.txt
override_dh_strip:
dh_strip --dbg-package=libopenjpeg5-dbg
@@ -45,7 +42,7 @@ override_dh_auto_install:
dh_auto_install
get-orig-source:
- uscan --verbose \
+ uscan --verbose --rename \
--force-download \
--download-version $(CURVER)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-phototools/openjpeg.git
More information about the Pkg-phototools-commits
mailing list