[Pkg-phototools-commits] [SCM] openjpeg packaging branch, master, updated. 1.3+dfsg-4-58-g9a4b909

[Mathieu Malaterre]

The following commit has been merged in the master branch:
commit 9a4b9098f48dc4f4792d39133cd0e7522e5fd3b3
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date:   Mon Apr 16 16:33:23 2012 +0200

    Make package multi-arch

diff --git a/debian/changelog b/debian/changelog
index 1980c72..7c1fb3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ openjpeg (1.5.0-1) experimental; urgency=low
   * Import two patches from upstream svn:
    - Add explicit link to math lib (-lm)
    - Fix SONAME handling in 1.5.0 (import from 1.5 branch)
+  * Switch to dh(9), make multi-arch. Closes: #663045
 
  -- Mathieu Malaterre <malat at debian.org>  Mon, 16 Apr 2012 16:01:13 +0200
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 905f3ca..99adc6d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,9 @@ Uploaders:
  , Mathieu Malaterre <malat at debian.org>
 Homepage: http://www.openjpeg.org
 Build-Depends:
- debhelper (>= 8)
+ debhelper (>= 9)
  , cmake
+ , default-jdk
  , libtiff5-dev
  , libpng-dev
  , liblcms2-dev
@@ -37,6 +38,7 @@ Description: development files for OpenJPEG, a JPEG 2000 image library
 
 Package: libopenjpeg5
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${shlibs:Depends}
  , ${misc:Depends}
diff --git a/debian/libopenjpeg-dev.install b/debian/libopenjpeg-dev.install
index b67fe19..6b1fa47 100644
--- a/debian/libopenjpeg-dev.install
+++ b/debian/libopenjpeg-dev.install
@@ -1,3 +1,5 @@
-usr/include/openjpeg-1.5
-usr/lib/libopenjpeg.so
-usr/lib/libopenjpeg_JPWL.so
+usr/include/openjpeg-1.5/*.h
+usr/lib/*/libopenjpeg.so
+usr/lib/*/libopenjpeg_JPWL.so
+usr/lib/*/pkgconfig/libopenjpeg1.pc
+usr/lib/*/openjpeg-1.5/*.cmake
diff --git a/debian/libopenjpeg5.install b/debian/libopenjpeg5.install
index 9325fcc..5f60952 100644
--- a/debian/libopenjpeg5.install
+++ b/debian/libopenjpeg5.install
@@ -1,2 +1,2 @@
-usr/lib/libopenjpeg.so.*
-usr/lib/libopenjpeg_JPWL.so.*
+usr/lib/*/libopenjpeg.so.*
+usr/lib/*/libopenjpeg_JPWL.so.*
diff --git a/debian/patches/fixsoname.patch b/debian/patches/fixsoname.patch
index 359026f..8b46440 100644
--- a/debian/patches/fixsoname.patch
+++ b/debian/patches/fixsoname.patch
@@ -2,12 +2,13 @@ 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 14:52:41.000000000 +0200
-+++ openjpeg/CMakeLists.txt	2012-04-16 14:54:05.000000000 +0200
+--- 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
@@ -88,3 +89,16 @@ Index: openjpeg/CMakeLists.txt
 +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/rules b/debian/rules
index ffa56c7..6a9ea8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,14 @@
 #export DH_VERBOSE=1
 
 CURVER := $(shell dpkg-parsechangelog | grep ^Version | awk '{print $$2}' | cut -d- -f1 | cut -d+ -f1)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --buildsystem=cmake --parallel
 
 CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
 	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+	-DOPENJPEG_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
 	-DBUILD_CODEC:BOOL=ON \
 	-DBUILD_JPIP:BOOL=ON \
 	-DBUILD_JPIP_SERVER:BOOL=OFF \
@@ -26,6 +28,9 @@ override_dh_auto_configure:
 override_dh_strip:
 	dh_strip --dbg-package=libopenjpeg5-dbg
 
+override_dh_install:
+	dh_install --list-missing
+
 get-orig-source:
 	uscan --verbose \
 		--force-download \

-- 
openjpeg packaging