Commit 3bd11a6e authored by Mathieu Malaterre's avatar Mathieu Malaterre

Import Debian changes 2.1.0-2

openjpeg2 (2.1.0-2) unstable; urgency=low

  * Install *.pc files. Closes: #762251
  * Remove cmake-fatal-error export stuff
  * Fix warnings in d/copyright
  * Bump Std-Vers to 3.9.6, no changes needed
  * Fix include path in export file to handle multi-arch install
    + debian/patches/multiarch_path.patch
parent dca69c0a
openjpeg2 (2.1.0-2) unstable; urgency=low
* Install *.pc files. Closes: #762251
* Remove cmake-fatal-error export stuff
* Fix warnings in d/copyright
* Bump Std-Vers to 3.9.6, no changes needed
* Fix include path in export file to handle multi-arch install
+ debian/patches/multiarch_path.patch
-- Mathieu Malaterre <malat@debian.org> Tue, 07 Oct 2014 13:14:43 +0200
openjpeg2 (2.1.0-1) unstable; urgency=low
* New upstream. Closes: #761154, #761155
......
......@@ -15,7 +15,7 @@ Build-Depends: cmake (>= 2.8.2),
libtiff-dev,
libxerces2-java,
zlib1g-dev
Standards-Version: 3.9.5
Standards-Version: 3.9.6
Section: libs
Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/openjpeg2/trunk/
Vcs-Svn: svn://anonscm.debian.org/collab-maint/deb-maint/openjpeg2/trunk
......
......@@ -202,6 +202,111 @@ Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite c
2012, CS Systemes d'Information, France
License: BSD-2
Files:
AUTHORS
CHANGES
CMakeLists.txt
CTestConfig.cmake
INSTALL
LICENSE
NEWS
README
THANKS
cmake/CTestCustom.cmake.in
cmake/EnsureFileInclude.cmake
cmake/FindFCGI.cmake
cmake/FindLCMS.cmake
cmake/FindLCMS2.cmake
cmake/JPIPTestDriver.cmake
cmake/OpenJPEGCPack.cmake
cmake/OpenJPEGConfig.cmake.in
cmake/TestFileOffsetBits.c
cmake/TestLargeFiles.c.cmake.in
cmake/TestLargeFiles.cmake
cmake/TestWindowsFSeek.c
cmake/openjpeg_valgrind.supp
doc/CMakeLists.txt
doc/Doxyfile.dox.cmake.in
doc/jpip_architect.png
doc/jpip_protocol.png
doc/man/man1/opj_compress.1
doc/man/man1/opj_decompress.1
doc/man/man1/opj_dump.1
doc/man/man3/libopenjp2.3
src/CMakeLists.txt
src/bin/CMakeLists.txt
src/bin/common/CMakeLists.txt
src/bin/common/opj_apps_config.h.cmake.in
src/bin/common/opj_getopt.h
src/bin/jp2/CMakeLists.txt
src/bin/jp3d/CMakeLists.txt
src/bin/jp3d/getopt.h
src/bin/jp3d/tcltk/LPI_JP3D_VM.tcl
src/bin/jp3d/tcltk/README
src/bin/jp3d/tcltk/Thumbs.db
src/bin/jp3d/tcltk/decoder.tcl
src/bin/jp3d/tcltk/encoder.tcl
src/bin/jp3d/tcltk/logoLPI.gif
src/bin/jpwl/CMakeLists.txt
src/bin/mj2/CMakeLists.txt
src/bin/mj2/meta_out.h
src/bin/mj2/mj2_to_metadata.h
src/bin/mj2/mj2_to_metadata.sln
src/bin/mj2/mj2_to_metadata.vcproj
src/bin/mj2/mj2_to_metadata_Notes.doc
src/bin/mj2/readme.txt
src/bin/wx/CMakeLists.txt
src/bin/wx/OPJViewer/CMakeLists.txt
src/bin/wx/OPJViewer/OPJViewer.iss
src/bin/wx/OPJViewer/Readme.txt
src/bin/wx/OPJViewer/about/about.htm
src/bin/wx/OPJViewer/about/opj_logo.png
src/bin/wx/OPJViewer/source/OPJChild.ico
src/bin/wx/OPJViewer/source/OPJChild16.xpm
src/bin/wx/OPJViewer/source/OPJViewer.ico
src/bin/wx/OPJViewer/source/OPJViewer.rc
src/bin/wx/OPJViewer/source/OPJViewer16.xpm
src/bin/wx/OPJViewer/source/about_htm.h
src/bin/wx/OPJViewer/source/build.h
src/bin/wx/OPJViewer/source/icon1.xpm
src/bin/wx/OPJViewer/source/icon2.xpm
src/bin/wx/OPJViewer/source/icon3.xpm
src/bin/wx/OPJViewer/source/icon4.xpm
src/bin/wx/OPJViewer/source/icon5.xpm
src/bin/wx/OPJViewer/source/opj_logo.xpm
src/bin/wx/OPJViewer/source/readmeafter.txt
src/bin/wx/OPJViewer/source/readmebefore.txt
src/lib/CMakeLists.txt
src/lib/openjp2/CMakeLists.txt
src/lib/openjp2/libopenjp2.pc.cmake.in
src/lib/openjp2/opj_codec.h
src/lib/openjp2/opj_config.h.cmake.in
src/lib/openjp2/opj_config_private.h.cmake.in
src/lib/openjp2/t1_luts.h
tests/CMakeLists.txt
tests/compare_raw_files.c
tests/conformance/CMakeLists.txt
tests/nonregression/CMakeLists.txt
tests/nonregression/checkmd5refs.cmake
tests/nonregression/md5refs.txt
tests/nonregression/test_suite.ctest.in
thirdparty/libz/CMakeLists.txt
tests/pdf2jp2.c
tests/ppm2rgb3.c
tests/unit/CMakeLists.txt
tests/unit/testempty0.c
thirdparty/CMakeLists.txt
thirdparty/README.txt
wrapping/CMakeLists.txt
wrapping/java/CMakeLists.txt
wrapping/java/openjp2/CMakeLists.txt
wrapping/java/openjp2/org_openJpeg_OpenJPEGJavaDecoder.h
wrapping/java/openjp2/org_openJpeg_OpenJPEGJavaEncoder.h
Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
2002-2007, Professor Benoit Macq
2002-2003, Yannick Verschueren
License: BSD-2
Files: src/lib/openjp2/opj_stdint.h
src/lib/openjp2/opj_inttypes.h
Copyright: 2012, Mathieu Malaterre <mathieu.malaterre@gmail.com>
......@@ -494,7 +599,7 @@ License: BSD-2
Files: src/bin/jp3d/getopt.c
src/bin/common/opj_getopt.c
Copyright: 1987, 1993, 1994, The Regents of the University of California
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:
......@@ -507,9 +612,6 @@ License: BSD-4
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
may be used to endorse or promote products derived from this software
without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
......@@ -551,7 +653,8 @@ Files: src/bin/mj2/mj2_to_metadata.c
src/bin/mj2/meta_out.c
src/bin/mj2/mj2_to_metadata.dtd
Copyright: None
License: The base code in this file was developed by the author as part of a video archiving
License: public-domain
The base code in this file was developed by the author as part of a video archiving
project for the U.S. National Library of Medicine, Bethesda, MD.
It is the policy of NLM (and U.S. government) to not assert copyright.
.
......@@ -605,8 +708,8 @@ Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite c
License: BSD-2
Files: tests/compare_dump_files.c
tests/comparePGXimages.c
tests/compareRAWimages.c
tests/compare_images.c
tests/compare_raw_images.c
Copyright: 2011-2012, Centre National d'Etudes Spatiales (CNES), France
License: BSD-2
......@@ -753,6 +856,9 @@ Files: thirdparty/include/zconf.h
thirdparty/include/zconf.h.cmake.msvc
thirdparty/libz/zutil.h
thirdparty/libz/trees.c
thirdparty/libz/trees.h
thirdparty/libz/inffixed.h
thirdparty/libz/crc32.h
thirdparty/libz/deflate.h
Copyright: 1995-2010 Jean-loup Gailly.
License: ZLIB
......
Description: Upstream did not handle multi-arch installation path
It naively assumed the include location to be two levels above the lib
installation.
Author: Mathieu Malaterre <malat@debian.org>
--- openjpeg2-2.1.0.orig/cmake/OpenJPEGConfig.cmake.in
+++ openjpeg2-2.1.0/cmake/OpenJPEGConfig.cmake.in
@@ -26,7 +26,7 @@ get_filename_component(SELF_DIR "${CMAKE
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}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
else()
fix_typos.patch
multiarch_path.patch
......@@ -42,6 +42,8 @@ override_dh_strip:
dh_strip --dbg-package=$(pkg_dbg)
override_dh_install:
# annoying cmake-fatal-error export stuff:
sed -i -e "s/FATAL_ERROR/STATUS/g" debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/openjpeg-2.1/OpenJPEGTargets*.cmake
# install opj_dump/compress/decompress:
dh_install -p$(pkg_bin) --autodest -Xjp3d -Xserver -Xjpip usr/bin/*
dh_install -p$(pkg_bin) --autodest -Xserver -Xjpip usr/share/man/man1/*.1
......@@ -50,6 +52,7 @@ override_dh_install:
# dev:
dh_install -p$(pkg_dev) --autodest usr/lib/$(DEB_HOST_MULTIARCH)/libopenjp2.so
dh_install -p$(pkg_dev) --autodest usr/lib/$(DEB_HOST_MULTIARCH)/openjpeg-2.1/*.cmake
dh_install -p$(pkg_dev) --autodest usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc
dh_install -p$(pkg_dev) --autodest usr/include/openjpeg-2.1
# jp3d:
dh_install -p$(pkg_lib3d) --autodest usr/lib/$(DEB_HOST_MULTIARCH)/libopenjp3d.so.*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment