{"base_revision":"git-v1:8592e006308496b960bdabb5af5b0eb54ee7c7fe","content":"diff --git a/debian/control b/debian/control\nindex 5f7361c..3ad7d91 100644\n--- a/debian/control\n+++ b/debian/control\n@@ -15,7 +15,7 @@ Build-Depends-Indep: default-jdk,\n doxygen,\n javahelper,\n libxerces2-java\n-Standards-Version: 4.7.3\n+Standards-Version: 4.7.4\n Vcs-Browser: https://salsa.debian.org/debian-phototools-team/openjpeg2\n Vcs-Git: https://salsa.debian.org/debian-phototools-team/openjpeg2.git\n Homepage: https://www.openjpeg.org\ndiff --git a/debian/copyright b/debian/copyright\nindex 314994e..c879d43 100644\n--- a/debian/copyright\n+++ b/debian/copyright\n@@ -3,48 +3,6 @@ Upstream-Name: OpenJPEG\n Upstream-Contact: openjpeg@googlegroups.com\n Source: http://openjpeg.org\n \n-Files: src/lib/openjpip/*\n-Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2011, Professor Benoit Macq\n- 2010-2011, Kaori Hagihara\n-License: BSD-2\n-\n-Files: src/lib/openjpip/query_parser.h\n- src/lib/openjpip/query_parser.c\n- src/lib/openjpip/j2kheader_manager.h\n- src/lib/openjpip/j2kheader_manager.c\n- src/lib/openjpip/jpip_parser.h\n- src/lib/openjpip/jpip_parser.c\n- src/lib/openjpip/jp2k_encoder.h\n- src/lib/openjpip/jp2k_encoder.c\n- src/lib/openjpip/dec_clientmsg_handler.h\n- src/lib/openjpip/msgqueue_manager.h\n- src/lib/openjpip/msgqueue_manager.c\n- .gitignore\n-Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2011, Professor Benoit Macq\n- 2010-2011, Kaori Hagihara\n- 2011, Lucian Corlaciu, GSoC\n-License: BSD-2\n-\n-Files: src/lib/openjp2/mqc_inl.h\n-Copyright: 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2005, Francois Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium\n- 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain\n-License: BSD-2\n-\n-Files: src/lib/openjp2/jp2.h\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2002-2003, Yannick Verschueren\n- 2005, Herve Drolon, FreeImage Team\n- 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France\n- 2012, CS Systemes d'Information, France\n-License: BSD-2\n-\n Files:\n AUTHORS.md\n CHANGELOG.md\n@@ -153,369 +111,44 @@ Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite c\n 2002-2003, Yannick Verschueren\n License: BSD-2\n \n-Files: src/lib/openjp2/opj_malloc.h\n-Copyright: 2005, Herve Drolon, FreeImage Team\n- 2007, Callum Lerwick \n-License: BSD-2\n-\n-Files: src/lib/openjp2/j2k.h\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2006-2007, Parvatha Elangovan\n- 2008, Jerome Fimes, Communications & Systemes \n- 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n- 2012, CS Systemes d'Information, France\n-License: BSD-2\n-\n-Files: src/bin/common/opj_string.h\n-Copyright: Copyright (c) 2015, Matthieu Darbois\n-License: BSD-2\n-\n-Files: src/lib/openjp2/opj_malloc.c\n-Copyright: Copyright (c) 2015, Mathieu Malaterre \n- Copyright (c) 2015, Matthieu Darbois\n-License: BSD-2\n-\n-Files: src/lib/openjp2/mqc.h\n- src/lib/openjp2/mqc.c\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2008, Jerome Fimes, Communications & Systemes \n+Files: tests/compare_dump_files.c\n+ tests/compare_images.c\n+ tests/compare_raw_files.c\n+Copyright: 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n License: BSD-2\n \n-Files: src/lib/openjp2/tgt.h\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2008, Jerome Fimes, Communications & Systemes \n- 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+Files: tests/j2k_random_tile_access.c\n+Copyright: 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n 2012, CS Systemes d'Information, France\n License: BSD-2\n \n-Files: src/lib/openjp2/pi.c\n- src/bin/jp2/convertbmp.c\n- src/bin/jp2/convertpng.c\n- src/bin/jp2/converttif.c\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2006-2007, Parvatha Elangovan\n-License: BSD-2\n-\n-Files: src/lib/openjp2/t1_generate_luts.c\n- src/lib/openjp2/t1.c\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2007, Callum Lerwick \n-License: BSD-2\n-\n-Files: src/lib/openjp2/invert.h\n- src/lib/openjp2/invert.c\n- src/lib/openjp2/function_list.h\n- src/lib/openjp2/function_list.c\n+Files: tests/test_tile_decoder.c\n+ tests/test_tile_encoder.c\n Copyright: 2008, Jerome Fimes, Communications & Systemes \n License: BSD-2\n \n-Files: src/lib/openjp2/bio.c\n- src/lib/openjp2/bio.h\n- src/lib/openjp2/dwt.h\n- src/lib/openjp2/opj_intmath.h\n- src/lib/openjp2/pi.h\n- src/lib/openjp2/t1.h\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n-License: BSD-2\n-\n-Files: src/lib/openjp2/tcd.c\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2006-2007, Parvatha Elangovan\n- 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France\n- 2012, CS Systemes d'Information, France\n-License: BSD-2\n-\n-Files: src/lib/openjp2/dwt.c\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2007, Jonathan Ballard \n- 2007, Callum Lerwick \n-License: BSD-2\n-\n-Files: src/lib/openjp2/j2k.c\n- src/lib/openjp2/openjpeg.h\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2006-2007, Parvatha Elangovan\n- 2008, Jerome Fimes, Communications & Systemes \n- 2010-2011, Kaori Hagihara\n- 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n- 2012, CS Systemes d'Information, France\n-License: BSD-2\n-\n-Files: src/lib/openjp2/t2.h\n- src/lib/openjp2/t2.c\n- src/lib/openjp2/tcd.h\n- src/lib/openjp2/mct.h\n- src/lib/openjp2/mct.c\n- src/lib/openjp2/tgt.c\n- src/lib/openjp2/jp2.c\n- src/lib/openjp2/cio.h\n- src/lib/openjp2/cio.c\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France\n- 2012, CS Systemes d'Information, France\n-License: BSD-2\n-\n-Files: src/lib/openjp2/image.h\n- src/lib/openjp2/image.c\n- src/lib/openjp2/opj_clock.c\n- src/lib/openjp2/opj_clock.h\n-Copyright: 2005, Herve Drolon, FreeImage Team\n-License: BSD-2\n-\n-Files: src/lib/openjp2/thix_manager.c\n- src/lib/openjp2/phix_manager.c\n- src/lib/openjp2/ppix_manager.c\n- src/lib/openjp2/cidx_manager.h\n- src/lib/openjp2/cidx_manager.c\n- src/lib/openjp2/tpix_manager.c\n- src/lib/openjp2/indexbox_manager.h\n+Files: doc/openjpip.dox.in\n Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n 2002-2011, Professor Benoit Macq\n- 2003-2004, Yannick Verschueren\n 2010-2011, Kaori Hagihara\n License: BSD-2\n \n-Files: src/lib/openjp2/openjpeg.c\n- src/lib/openjp2/opj_includes.h\n- src/lib/openjp2/event.h\n- src/lib/openjp2/event.c\n-Copyright: 2005, Herve Drolon, FreeImage Team\n- 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France\n- 2012, CS Systemes d'Information, France\n+Files: doc/mainpage.dox.in\n+Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2011, Mickael Savinaud, Communications & Systemes \n License: BSD-2\n \n-Files: src/bin/wx/OPJViewer/source/license.txt\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy\n+Files: cmake/FindCPPCHECK.cmake\n+Copyright: 2011 Mathieu Malaterre \n License: BSD-2\n \n-Files: src/bin/wx/OPJViewer/source/OPJViewer.cpp\n- src/bin/wx/OPJViewer/source/OPJViewer.h\n- src/bin/wx/OPJViewer/source/wxjp2parser.cpp\n- src/bin/wx/OPJViewer/source/OPJDialogs.cpp\n- src/bin/wx/OPJViewer/source/imagjpeg2000.h\n- src/bin/wx/OPJViewer/source/imagjpeg2000.cpp\n- src/bin/wx/OPJViewer/source/wxj2kparser.cpp\n- src/bin/wx/OPJViewer/source/OPJThreads.cpp\n- src/bin/wx/OPJViewer/source/OPJAbout.cpp\n- src/bin/wx/OPJViewer/source/imagmxf.h\n- src/bin/wx/OPJViewer/source/imagmxf.cpp\n-Copyright: 2007, Digital Signal Processing Laboratory, Universita' degli studi di Perugia (UPG), Italy\n+Files: cmake/FindKAKADU.cmake\n+Copyright: 2006-2011 Mathieu Malaterre \n License: BSD-2\n \n-Files: src/bin/jp2/index.c\n- src/bin/jp2/index.h\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2003-2007, Francois-Olivier Devaux\n-License: BSD-2\n-\n-Files: src/bin/jp2/windirent.h\n-Copyright: 1998-2002 Toni Ronkko\n-License: MIT\n-\n-Files: src/bin/jp2/opj_decompress.c\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2006-2007, Parvatha Elangovan\n- 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France\n- 2012, CS Systemes d'Information, France\n-License: BSD-2\n-\n-Files: src/bin/jp2/opj_compress.c\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2006-2007, Parvatha Elangovan\n- 2008, Jerome Fimes, Communications & Systemes \n- 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n- 2012, CS Systemes d'Information, France\n-License: BSD-2\n-\n-Files: src/bin/jp2/convert.h\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n-License: BSD-2\n-\n-Files: src/bin/jp2/convert.c\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2006-2007, Parvatha Elangovan\n-License: BSD-2\n-\n-Files: src/bin/jp2/opj_dump.c\n-Copyright: 2010, Mathieu Malaterre, GDCM\n- 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n- 2012, CS Systemes d'Information, France\n-License: BSD-2\n-\n-Files: src/bin/common/opj_getopt.c\n-Copyright: 1987, 1993, 1994, The Regents of the University of California\n-License: BSD-3\n- Redistribution and use in source and binary forms, with or without\n- modification, are permitted provided that the following conditions\n- are met:\n- 1. Redistributions of source code must retain the above copyright\n- notice, this list of conditions and the following disclaimer.\n- 2. Redistributions in binary form must reproduce the above copyright\n- notice, this list of conditions and the following disclaimer in the\n- documentation and/or other materials provided with the distribution.\n- 3. All advertising materials mentioning features or use of this software\n- must display the following acknowledgement:\n- This product includes software developed by the University of\n- California, Berkeley and its contributors.\n- .\n- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\n- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\n- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n- SUCH DAMAGE.\n-\n-Files: src/bin/common/color.c\n- src/bin/common/color.h\n- src/bin/common/format_defs.h\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n-License: BSD-2\n-\n-Files: src/bin/jpip/*\n-Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2011, Professor Benoit Macq\n- 2010-2011, Kaori Hagihara\n-License: BSD-2\n-\n-Files: src/bin/jpip/opj_server.c\n-Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2011, Professor Benoit Macq\n- 2010-2011, Kaori Hagihara\n- 2011, Lucian Corlaciu, GSoC\n-License: BSD-2\n-\n-Files: tests/compare_dump_files.c\n- tests/compare_images.c\n- tests/compare_raw_files.c\n-Copyright: 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n-License: BSD-2\n-\n-Files: tests/j2k_random_tile_access.c\n-Copyright: 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n- 2012, CS Systemes d'Information, France\n-License: BSD-2\n-\n-Files: tests/unit/testempty2.c\n- tests/unit/testempty1.c\n-Copyright: 2012, Mathieu Malaterre\n-License: BSD-2\n-\n-Files: tests/test_tile_decoder.c\n- tests/test_tile_encoder.c\n-Copyright: 2008, Jerome Fimes, Communications & Systemes \n-License: BSD-2\n-\n-Files: wrapping/java/openjp2/index.c\n- wrapping/java/openjp2/index.h\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2003-2007, Francois-Olivier Devaux\n-License: BSD-2\n-\n-Files: wrapping/java/openjp2/JavaOpenJPEG.c\n- wrapping/java/openjp2/JavaOpenJPEGDecoder.c\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2001-2003, David Janssens\n- 2002-2003, Yannick Verschueren\n- 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n- 2005, Herve Drolon, FreeImage Team\n- 2006-2007, Parvatha Elangovan\n- 2007, Patrick Piscaglia (Telemis)\n-License: BSD-2\n-\n-Files: wrapping/java/openjp2/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java\n- wrapping/java/openjp2/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java\n-Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2007, Professor Benoit Macq\n- 2002-2007, Patrick Piscaglia, Telemis s.a.\n+Files: tests/unit/testempty2.c\n+ tests/unit/testempty1.c\n+Copyright: 2012, Mathieu Malaterre\n License: BSD-2\n \n Files: thirdparty/libpng/*\n@@ -768,30 +401,11 @@ Copyright: 1992-1997 Sam Leffler\n 1992-1997 Silicon Graphics, Inc.\n License: LIBTIFF\n \n-Files: doc/openjpip.dox.in\n-Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2002-2011, Professor Benoit Macq\n- 2010-2011, Kaori Hagihara\n-License: BSD-2\n-\n-Files: doc/mainpage.dox.in\n-Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n- 2011, Mickael Savinaud, Communications & Systemes \n-License: BSD-2\n-\n-Files: cmake/FindCPPCHECK.cmake\n-Copyright: 2011 Mathieu Malaterre \n-License: BSD-2\n-\n Files: tools/ctest_scripts/toolchain-mingw64.cmake\n tools/ctest_scripts/toolchain-mingw32.cmake\n Copyright: 2006-2014 Mathieu Malaterre \n License: BSD-2\n \n-Files: cmake/FindKAKADU.cmake\n-Copyright: 2006-2011 Mathieu Malaterre \n-License: BSD-2\n-\n Files: tests/profiling/filter_massif_output.py\n tests/performance/compare_perfs.py\n tests/performance/perf_test.py\n@@ -812,19 +426,405 @@ Files: tests/profiling/filter_massif_output.py\n Copyright: Copyright (c) 2017, IntoPIX SA\n License: BSD-2\n \n-Files: src/lib/openjp2/tls_keys.h\n- src/lib/openjp2/thread.h\n- src/lib/openjp2/thread.c\n- tests/unit/testjp2.c\n-Copyright: Copyright (c) 2016, Even Rouault\n+Files: src/lib/openjpip/*\n+Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2011, Professor Benoit Macq\n+ 2010-2011, Kaori Hagihara\n License: BSD-2\n \n-Files: src/lib/openjp2/ht_dec.c\n- src/lib/openjp2/t1_ht_generate_luts.c\n- src/lib/openjp2/t1_ht_luts.h\n-Copyright: Copyright (c) 2021, Aous Naman\n- Copyright (c) 2021, Kakadu Software Pty Ltd, Australia\n- Copyright (c) 2021, The University of New South Wales, Australia\n+Files: src/lib/openjpip/query_parser.h\n+ src/lib/openjpip/query_parser.c\n+ src/lib/openjpip/j2kheader_manager.h\n+ src/lib/openjpip/j2kheader_manager.c\n+ src/lib/openjpip/jpip_parser.h\n+ src/lib/openjpip/jpip_parser.c\n+ src/lib/openjpip/jp2k_encoder.h\n+ src/lib/openjpip/jp2k_encoder.c\n+ src/lib/openjpip/dec_clientmsg_handler.h\n+ src/lib/openjpip/msgqueue_manager.h\n+ src/lib/openjpip/msgqueue_manager.c\n+ .gitignore\n+Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2011, Professor Benoit Macq\n+ 2010-2011, Kaori Hagihara\n+ 2011, Lucian Corlaciu, GSoC\n+License: BSD-2\n+\n+Files: src/lib/openjp2/mqc_inl.h\n+Copyright: 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2005, Francois Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium\n+ 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain\n+License: BSD-2\n+\n+Files: src/lib/openjp2/jp2.h\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2002-2003, Yannick Verschueren\n+ 2005, Herve Drolon, FreeImage Team\n+ 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+ 2012, CS Systemes d'Information, France\n+License: BSD-2\n+\n+Files: src/lib/openjp2/opj_malloc.h\n+Copyright: 2005, Herve Drolon, FreeImage Team\n+ 2007, Callum Lerwick \n+License: BSD-2\n+\n+Files: src/lib/openjp2/j2k.h\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2006-2007, Parvatha Elangovan\n+ 2008, Jerome Fimes, Communications & Systemes \n+ 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+ 2012, CS Systemes d'Information, France\n+License: BSD-2\n+\n+Files: src/bin/common/opj_string.h\n+Copyright: Copyright (c) 2015, Matthieu Darbois\n+License: BSD-2\n+\n+Files: src/lib/openjp2/opj_malloc.c\n+Copyright: Copyright (c) 2015, Mathieu Malaterre \n+ Copyright (c) 2015, Matthieu Darbois\n+License: BSD-2\n+\n+Files: src/lib/openjp2/mqc.h\n+ src/lib/openjp2/mqc.c\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2008, Jerome Fimes, Communications & Systemes \n+License: BSD-2\n+\n+Files: src/lib/openjp2/tgt.h\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2008, Jerome Fimes, Communications & Systemes \n+ 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+ 2012, CS Systemes d'Information, France\n+License: BSD-2\n+\n+Files: src/lib/openjp2/pi.c\n+ src/bin/jp2/convertbmp.c\n+ src/bin/jp2/convertpng.c\n+ src/bin/jp2/converttif.c\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2006-2007, Parvatha Elangovan\n+License: BSD-2\n+\n+Files: src/lib/openjp2/t1_generate_luts.c\n+ src/lib/openjp2/t1.c\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2007, Callum Lerwick \n+License: BSD-2\n+\n+Files: src/lib/openjp2/invert.h\n+ src/lib/openjp2/invert.c\n+ src/lib/openjp2/function_list.h\n+ src/lib/openjp2/function_list.c\n+Copyright: 2008, Jerome Fimes, Communications & Systemes \n+License: BSD-2\n+\n+Files: src/lib/openjp2/bio.c\n+ src/lib/openjp2/bio.h\n+ src/lib/openjp2/dwt.h\n+ src/lib/openjp2/opj_intmath.h\n+ src/lib/openjp2/pi.h\n+ src/lib/openjp2/t1.h\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+License: BSD-2\n+\n+Files: src/lib/openjp2/tcd.c\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2006-2007, Parvatha Elangovan\n+ 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+ 2012, CS Systemes d'Information, France\n+License: BSD-2\n+\n+Files: src/lib/openjp2/dwt.c\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2007, Jonathan Ballard \n+ 2007, Callum Lerwick \n+License: BSD-2\n+\n+Files: src/lib/openjp2/j2k.c\n+ src/lib/openjp2/openjpeg.h\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2006-2007, Parvatha Elangovan\n+ 2008, Jerome Fimes, Communications & Systemes \n+ 2010-2011, Kaori Hagihara\n+ 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+ 2012, CS Systemes d'Information, France\n+License: BSD-2\n+\n+Files: src/lib/openjp2/t2.h\n+ src/lib/openjp2/t2.c\n+ src/lib/openjp2/tcd.h\n+ src/lib/openjp2/mct.h\n+ src/lib/openjp2/mct.c\n+ src/lib/openjp2/tgt.c\n+ src/lib/openjp2/jp2.c\n+ src/lib/openjp2/cio.h\n+ src/lib/openjp2/cio.c\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+ 2012, CS Systemes d'Information, France\n+License: BSD-2\n+\n+Files: src/lib/openjp2/image.h\n+ src/lib/openjp2/image.c\n+ src/lib/openjp2/opj_clock.c\n+ src/lib/openjp2/opj_clock.h\n+Copyright: 2005, Herve Drolon, FreeImage Team\n+License: BSD-2\n+\n+Files: src/lib/openjp2/thix_manager.c\n+ src/lib/openjp2/phix_manager.c\n+ src/lib/openjp2/ppix_manager.c\n+ src/lib/openjp2/cidx_manager.h\n+ src/lib/openjp2/cidx_manager.c\n+ src/lib/openjp2/tpix_manager.c\n+ src/lib/openjp2/indexbox_manager.h\n+Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2011, Professor Benoit Macq\n+ 2003-2004, Yannick Verschueren\n+ 2010-2011, Kaori Hagihara\n+License: BSD-2\n+\n+Files: src/lib/openjp2/openjpeg.c\n+ src/lib/openjp2/opj_includes.h\n+ src/lib/openjp2/event.h\n+ src/lib/openjp2/event.c\n+Copyright: 2005, Herve Drolon, FreeImage Team\n+ 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+ 2012, CS Systemes d'Information, France\n+License: BSD-2\n+\n+Files: src/bin/jp2/index.c\n+ src/bin/jp2/index.h\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2003-2007, Francois-Olivier Devaux\n+License: BSD-2\n+\n+Files: src/bin/jp2/windirent.h\n+Copyright: 1998-2002 Toni Ronkko\n+License: MIT\n+\n+Files: src/bin/jp2/opj_decompress.c\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2006-2007, Parvatha Elangovan\n+ 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+ 2012, CS Systemes d'Information, France\n+License: BSD-2\n+\n+Files: src/bin/jp2/opj_compress.c\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2006-2007, Parvatha Elangovan\n+ 2008, Jerome Fimes, Communications & Systemes \n+ 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+ 2012, CS Systemes d'Information, France\n+License: BSD-2\n+\n+Files: src/bin/jp2/convert.h\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+License: BSD-2\n+\n+Files: src/bin/jp2/convert.c\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2006-2007, Parvatha Elangovan\n+License: BSD-2\n+\n+Files: src/bin/jp2/opj_dump.c\n+Copyright: 2010, Mathieu Malaterre, GDCM\n+ 2011-2012, Centre National d'Etudes Spatiales (CNES), France\n+ 2012, CS Systemes d'Information, France\n+License: BSD-2\n+\n+Files: src/bin/common/opj_getopt.c\n+Copyright: 1987, 1993, 1994, The Regents of the University of California\n+License: BSD-3\n+ Redistribution and use in source and binary forms, with or without\n+ modification, are permitted provided that the following conditions\n+ are met:\n+ 1. Redistributions of source code must retain the above copyright\n+ notice, this list of conditions and the following disclaimer.\n+ 2. Redistributions in binary form must reproduce the above copyright\n+ notice, this list of conditions and the following disclaimer in the\n+ documentation and/or other materials provided with the distribution.\n+ 3. All advertising materials mentioning features or use of this software\n+ must display the following acknowledgement:\n+ This product includes software developed by the University of\n+ California, Berkeley and its contributors.\n+ .\n+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\n+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\n+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n+ SUCH DAMAGE.\n+\n+Files: src/bin/common/color.c\n+ src/bin/common/color.h\n+ src/bin/common/format_defs.h\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+License: BSD-2\n+\n+Files: src/bin/jpip/*\n+Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2011, Professor Benoit Macq\n+ 2010-2011, Kaori Hagihara\n+License: BSD-2\n+\n+Files: src/bin/jpip/opj_server.c\n+Copyright: 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2011, Professor Benoit Macq\n+ 2010-2011, Kaori Hagihara\n+ 2011, Lucian Corlaciu, GSoC\n+License: BSD-2\n+\n+Files: wrapping/java/openjp2/index.c\n+ wrapping/java/openjp2/index.h\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2003-2007, Francois-Olivier Devaux\n+License: BSD-2\n+\n+Files: wrapping/java/openjp2/JavaOpenJPEG.c\n+ wrapping/java/openjp2/JavaOpenJPEGDecoder.c\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2006-2007, Parvatha Elangovan\n+ 2007, Patrick Piscaglia (Telemis)\n+License: BSD-2\n+\n+Files: src/lib/openjp2/tls_keys.h\n+ src/lib/openjp2/thread.h\n+ src/lib/openjp2/thread.c\n+ tests/unit/testjp2.c\n+Copyright: Copyright (c) 2016, Even Rouault\n+License: BSD-2\n+\n+Files: src/lib/openjp2/ht_dec.c\n+ src/lib/openjp2/t1_ht_generate_luts.c\n+ src/lib/openjp2/t1_ht_luts.h\n+Copyright: Copyright (c) 2021, Aous Naman\n+ Copyright (c) 2021, Kakadu Software Pty Ltd, Australia\n+ Copyright (c) 2021, The University of New South Wales, Australia\n+License: BSD-2\n+\n+Files: src/bin/wx/OPJViewer/source/license.txt\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2001-2003, David Janssens\n+ 2002-2003, Yannick Verschueren\n+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe\n+ 2005, Herve Drolon, FreeImage Team\n+ 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy\n+License: BSD-2\n+\n+Files: src/bin/wx/OPJViewer/source/OPJViewer.cpp\n+ src/bin/wx/OPJViewer/source/OPJViewer.h\n+ src/bin/wx/OPJViewer/source/wxjp2parser.cpp\n+ src/bin/wx/OPJViewer/source/OPJDialogs.cpp\n+ src/bin/wx/OPJViewer/source/imagjpeg2000.h\n+ src/bin/wx/OPJViewer/source/imagjpeg2000.cpp\n+ src/bin/wx/OPJViewer/source/wxj2kparser.cpp\n+ src/bin/wx/OPJViewer/source/OPJThreads.cpp\n+ src/bin/wx/OPJViewer/source/OPJAbout.cpp\n+ src/bin/wx/OPJViewer/source/imagmxf.h\n+ src/bin/wx/OPJViewer/source/imagmxf.cpp\n+Copyright: 2007, Digital Signal Processing Laboratory, Universita' degli studi di Perugia (UPG), Italy\n+License: BSD-2\n+\n+Files: wrapping/java/openjp2/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java\n+ wrapping/java/openjp2/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java\n+Copyright: 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium\n+ 2002-2007, Professor Benoit Macq\n+ 2002-2007, Patrick Piscaglia, Telemis s.a.\n License: BSD-2\n \n Files: debian/*\ndiff --git a/debian/rules b/debian/rules\nindex a5211c8..b52a9ed 100755\n--- a/debian/rules\n+++ b/debian/rules\n@@ -3,7 +3,7 @@\n \n export DEB_BUILD_MAINT_OPTIONS = hardening=+all\n \n-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)\n+include /usr/share/dpkg/architecture.mk\n \n # as per upstream request:\n export DEB_CFLAGS_MAINT_APPEND = -fvisibility=hidden\ndiff --git a/debian/watch b/debian/watch\nindex 49745fb..a7f65d5 100644\n--- a/debian/watch\n+++ b/debian/watch\n@@ -1,3 +1,6 @@\n-version=4\n-opts=filenamemangle=s/.+\\/v?(\\d\\S*)\\.tar\\.gz/openjpeg-$1\\.tar\\.gz/ \\\n- https://github.com/uclouvain/openjpeg/tags .*/v?(\\d\\S*)\\.tar\\.gz\n+Version: 5\n+\n+Filenamemangle: s/.+\\/v?(\\d\\S*)\\.tar\\.gz/openjpeg-$1\\.tar\\.gz/\n+Template: GitHub\n+Owner: uclouvain\n+Project: openjpeg\n","content_type":"text/plain","diff_type":"vcs","new_revision":"git-v1:df8311805be6ecc7e6936ae446649dbaf90b97c1"}