[Pkg-phototools-commits] [openjpeg] 01/01: prepare next upload: 1.5.2-2
Mathieu Malaterre
malat at moszumanska.debian.org
Tue Apr 1 13:45:10 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 db2cba581e873122f739f3bf47629fd531d80963
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date: Tue Apr 1 10:47:13 2014 +0000
prepare next upload: 1.5.2-2
---
debian/changelog | 13 ++++++++++++-
debian/copyright | 10 +++-------
debian/patches/fixjnisoname.patch | 16 ----------------
debian/patches/getopt.patch | 37 +++++++++++++++++++++++++++++++++++++
debian/patches/javavers.patch | 35 +++++++++++++++++++++++++++++++++++
debian/patches/series | 3 ++-
debian/rules | 1 +
7 files changed, 90 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 46a0241..d7d88c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,17 @@
+openjpeg (1.5.2-2) unstable; urgency=low
+
+ * Remove patch applied upstream already
+ - d/p/fixjnisoname.patch
+ * Really fix java compilation. Closes: #741915
+ * Use system installed getopt. Closes: #716594
+ * Update d/copyright. Closes: #697806
+
+ -- Mathieu Malaterre <malat at debian.org> Tue, 01 Apr 2014 13:38:56 +0000
+
openjpeg (1.5.2-1) unstable; urgency=low
- * New upstream. Closes: #731237, #697806, #716594, #716595, #741915, #741974, #741916
+ * New upstream.
+ Closes: #731237, #697806, #716594, #716595, #741915, #741974, #741916
* Update watch file to now point to sf.net mirror
-- Mathieu Malaterre <malat at debian.org> Thu, 27 Mar 2014 20:19:41 +0100
diff --git a/debian/copyright b/debian/copyright
index 662237d..d4b32a0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,7 +43,7 @@ License: Expat
Files: applications/common/opj_getopt.c
Copyright: © 1987, 1993-1994, The Regents of the University of California.
-License: BSD-4
+License: BSD-3
Files: applications/JavaOpenJPEG/JavaOpenJPEG.c
applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c
@@ -221,7 +221,7 @@ License: Expat
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-License: BSD-4
+License: BSD-3
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -230,11 +230,7 @@ License: BSD-4
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed by the University of
- California, Berkeley and its contributors.
- 4. Neither the name of the University nor the names of its contributors
+ 3. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
.
diff --git a/debian/patches/fixjnisoname.patch b/debian/patches/fixjnisoname.patch
deleted file mode 100644
index 86a5bd9..0000000
--- a/debian/patches/fixjnisoname.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove SONAME from java module
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: no
-
-Index: openjpeg-1.5.2/applications/JavaOpenJPEG/CMakeLists.txt
-===================================================================
---- openjpeg-1.5.2.orig/applications/JavaOpenJPEG/CMakeLists.txt 2014-03-27 20:06:18.261111521 +0100
-+++ openjpeg-1.5.2/applications/JavaOpenJPEG/CMakeLists.txt 2014-03-27 20:06:21.601111628 +0100
-@@ -28,6 +28,7 @@
- set_property(TARGET openjpegjni PROPERTY NO_SONAME 1)
-
- TARGET_LINK_LIBRARIES(openjpegjni ${OPENJPEG_LIBRARY_NAME})
-+set_property(TARGET openjpegjni PROPERTY NO_SONAME 1)
-
- if(UNIX)
- target_link_libraries(openjpegjni m)
diff --git a/debian/patches/getopt.patch b/debian/patches/getopt.patch
new file mode 100644
index 0000000..f484ed9
--- /dev/null
+++ b/debian/patches/getopt.patch
@@ -0,0 +1,37 @@
+Description: Set java target version
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
+Origin: vendor, https://code.google.com/p/openjpeg/source/detail?r=2826
+ vendor, https://code.google.com/p/openjpeg/source/detail?r=2827
+
+Index: openjpeg-1.5.2/applications/mj2/CMakeLists.txt
+===================================================================
+--- openjpeg-1.5.2.orig/applications/mj2/CMakeLists.txt 2014-04-01 13:38:21.058305902 +0000
++++ openjpeg-1.5.2/applications/mj2/CMakeLists.txt 2014-04-01 13:38:21.054305901 +0000
+@@ -1,6 +1,8 @@
+ # Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2
+
++if(NOT USE_SYSTEM_GETOPT)
+ SET(common_SRCS ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
++endif()
+
+ # While mj2 executables do not use the API correctly, we do not link with the library but rather compile the sources files.
+ SET(OPJ_SRCS
+Index: openjpeg-1.5.2/applications/JavaOpenJPEG/CMakeLists.txt
+===================================================================
+--- openjpeg-1.5.2.orig/applications/JavaOpenJPEG/CMakeLists.txt 2014-04-01 13:38:21.058305902 +0000
++++ openjpeg-1.5.2/applications/JavaOpenJPEG/CMakeLists.txt 2014-04-01 13:38:21.054305901 +0000
+@@ -7,8 +7,12 @@
+ ${OPENJPEG_SOURCE_DIR}/applications/codec/index.c
+ ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c
+ #${OPENJPEG_SOURCE_DIR}/applications/common/color.c
+- ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c
+ )
++if(NOT USE_SYSTEM_GETOPT)
++ list(APPEND openjpegjni_SRCS
++ ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c
++ )
++endif()
+
+ # JNI binding:
+ find_package(JNI REQUIRED)
diff --git a/debian/patches/javavers.patch b/debian/patches/javavers.patch
new file mode 100644
index 0000000..51a2575
--- /dev/null
+++ b/debian/patches/javavers.patch
@@ -0,0 +1,35 @@
+Description: Set java target version
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
+Origin: vendor, https://code.google.com/p/openjpeg/source/detail?r=2827
+
+Index: openjpeg-1.5.2/applications/JavaOpenJPEG/CMakeLists.txt
+===================================================================
+--- openjpeg-1.5.2.orig/applications/JavaOpenJPEG/CMakeLists.txt 2014-04-01 11:55:08.950107753 +0000
++++ openjpeg-1.5.2/applications/JavaOpenJPEG/CMakeLists.txt 2014-04-01 11:55:08.946107753 +0000
+@@ -41,6 +41,14 @@
+ # build jar:
+ FIND_PACKAGE(Java 1.5 REQUIRED) # javac, jar
+
++# User can override this:
++if(NOT DEFINED JAVA_SOURCE_VERSION)
++ set(JAVA_SOURCE_VERSION 1.5)
++endif()
++if(NOT DEFINED JAVA_TARGET_VERSION)
++ set(JAVA_TARGET_VERSION 1.5)
++endif()
++
+ # build dep list:
+ file(GLOB java_srcs "java-sources/org/openJpeg/*.java")
+
+@@ -49,7 +57,9 @@
+ # Build java
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
+- COMMAND ${Java_JAVAC_EXECUTABLE} -sourcepath "${CMAKE_CURRENT_SOURCE_DIR}/java-sources"
++ COMMAND ${Java_JAVAC_EXECUTABLE}
++ -source ${JAVA_SOURCE_VERSION} -target ${JAVA_TARGET_VERSION}
++ -sourcepath "${CMAKE_CURRENT_SOURCE_DIR}/java-sources"
+ ${java_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes
+ COMMAND ${Java_JAR_EXECUTABLE} cvf ${LIBRARY_OUTPUT_PATH}/openjpeg.jar org
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes
diff --git a/debian/patches/series b/debian/patches/series
index 02b6bb0..3d45a69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
defaulttmpfile.patch
-fixjnisoname.patch
+javavers.patch
+getopt.patch
diff --git a/debian/rules b/debian/rules
index 0123c02..ddaf16a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-DBUILD_JAVA:BOOL=ON \
-DBUILD_MJ2:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
+ -DUSE_SYSTEM_GETOPT:BOOL=ON \
-DBUILD_TESTING:BOOL=OFF \
-DBUILD_THIRDPARTY:BOOL=OFF
--
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