[Pkg-phototools-commits] [openjpeg] 01/01: import change for 1.5.2

Mathieu Malaterre malat at moszumanska.debian.org
Thu Mar 27 19:23:49 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 9a9267100c84bff43c2a9546386e35fa32fe658e
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date:   Thu Mar 27 20:20:12 2014 +0100

    import change for 1.5.2
---
 debian/changelog                  |  7 ++++++
 debian/control                    | 14 +++++++----
 debian/patches/fixjnisoname.patch | 52 +++++++++------------------------------
 debian/patches/series             |  3 ---
 debian/rules                      |  1 +
 debian/watch                      |  4 +--
 6 files changed, 29 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca2dd86..46a0241 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openjpeg (1.5.2-1) unstable; urgency=low
+
+  * 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
+
 openjpeg (1.5.1-3) unstable; urgency=low
 
   * Fix cmake monolithic export.
diff --git a/debian/control b/debian/control
index ed12721..5ceb708 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,8 @@ Build-Depends:
  , doxygen
 Standards-Version: 3.9.5
 Section: libs
-Vcs-Browser: http://git.debian.org/?p=pkg-phototools/openjpeg.git
-Vcs-Git: git://git.debian.org/git/pkg-phototools/openjpeg.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-phototools/openjpeg.git
+Vcs-Git: git://anonscm.debian.org/pkg-phototools/openjpeg.git
 
 Package: libopenjpeg-dev
 Section: libdevel
@@ -31,12 +31,14 @@ Multi-Arch: same
 Depends:
  libopenjpeg5 (= ${binary:Version})
  , ${misc:Depends}
-Description: development files for OpenJPEG, a JPEG 2000 image library
+Description: development files for OpenJPEG, a JPEG 2000 image library - dev
  OpenJPEG is a library for handling the JPEG 2000 image compression format.
  JPEG 2000 is a wavelet-based image compression standard and permits progressive
  transmission by pixel and resolution accuracy for progressive downloads of an
  encoded image. It supports lossless and lossy compression, supports higher
  compression than JPEG 1991, and has resilience to errors in the image.
+ .
+ This is the development package
 
 Package: libopenjpeg5
 Architecture: any
@@ -45,17 +47,19 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${shlibs:Depends}
  , ${misc:Depends}
-Description: JPEG 2000 image compression/decompression library
+Description: JPEG 2000 image compression/decompression library - runtime
  OpenJPEG is a library for handling the JPEG 2000 image compression format.
  JPEG 2000 is a wavelet-based image compression standard and permits progressive
  transmission by pixel and resolution accuracy for progressive downloads of an
  encoded image. It supports lossless and lossy compression, supports higher
  compression than JPEG 1991, and has resilience to errors in the image.
+ .
+ this is the runtime package
 
 Package: libopenjpeg-java
 Section: java
 Architecture: any
-Multi-Arch: same
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
 Description: java bindings for libopenjpeg, a JPEG 2000 image library
  This package contains the java binding to match the runtime component of the
diff --git a/debian/patches/fixjnisoname.patch b/debian/patches/fixjnisoname.patch
index 69e70e0..86a5bd9 100644
--- a/debian/patches/fixjnisoname.patch
+++ b/debian/patches/fixjnisoname.patch
@@ -1,46 +1,16 @@
-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
+Description: Remove SONAME from java module
 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
+Forwarded: no
 
----
-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}
-   )
+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(WIN32)
-   SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
+ if(UNIX)
+   target_link_libraries(openjpegjni m)
diff --git a/debian/patches/series b/debian/patches/series
index 5f8c705..02b6bb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 defaulttmpfile.patch
-fixjniinstall.patch
 fixjnisoname.patch
-issue205.patch
-fixpthread.patch
diff --git a/debian/rules b/debian/rules
index cdf3a02..0123c02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ JAVA_HOME=/usr/lib/jvm/default-java
 CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
 	-DCMAKE_BUILD_TYPE:STRING=None \
 	-DOPENJPEG_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
+	-DOPENJPEG_INSTALL_JNI_DIR:STRING=lib/$(DEB_HOST_MULTIARCH)/jni \
 	-DBUILD_CODEC:BOOL=ON \
 	-DBUILD_JPIP:BOOL=ON \
 	-DBUILD_JPIP_SERVER:BOOL=ON \
diff --git a/debian/watch b/debian/watch
index aa038a1..1b955fa 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,3 @@
-# Compulsory line, this is a version 3 file
 version=3
-http://code.google.com/p/openjpeg/downloads/list?can=1 \
-		       .*/openjpeg-([0-9_.]+)\.tar\.gz \
+http://sf.net/openjpeg.mirror/openjpeg-([\d\.]+)\.tar\.gz \
 debian debian/orig-tar.sh

-- 
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