Control: tags 786333 + patch
Control: tags 786333 + pending
Dear maintainer,
I've prepared an NMU for openjpeg2 (versioned as 2.1.0-2.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru openjpeg2-2.1.0/debian/changelog openjpeg2-2.1.0/debian/changelog
--- openjpeg2-2.1.0/debian/changelog 2014-10-07 13:15:09.000000000 +0200
+++ openjpeg2-2.1.0/debian/changelog 2015-05-21 23:21:21.000000000 +0200
@@ -1,3 +1,19 @@
+openjpeg2 (2.1.0-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Apache 2.4 transition: (Closes: #786333)
+ + d/rules: Added --with apache2.
+ + Drop d/libopenjpip-server.install.
+ + Drop d/libopenjpip-server.prerm.
+ + d/control: Add build-depends on dh-apache2, replace depends on
+ apache2.2-bin by ${misc:Recommends}, add recommends on
+ libapache2-mod-fastcgi.
+ + New d/libopenjpip-server.conf for apache2 fastcgi setup.
+ + Drop d/libopenjpip-server.load.
+ + New d/libopenjpip-server.apache2 to set up the configuration.
+
+ -- Jean-Michel Vourgère <nir...@debian.org> Thu, 21 May 2015 23:05:40 +0200
+
openjpeg2 (2.1.0-2) unstable; urgency=low
* Install *.pc files. Closes: #762251
diff -Nru openjpeg2-2.1.0/debian/control openjpeg2-2.1.0/debian/control
--- openjpeg2-2.1.0/debian/control 2014-10-07 13:15:09.000000000 +0200
+++ openjpeg2-2.1.0/debian/control 2015-05-21 23:14:25.000000000 +0200
@@ -6,6 +6,7 @@
Build-Depends: cmake (>= 2.8.2),
debhelper (>= 9),
default-jdk,
+ dh-apache2,
help2man,
javahelper (>= 0.37~),
libcurl4-gnutls-dev | libcurl-ssl-dev,
@@ -118,11 +119,11 @@
Section: graphics
Architecture: any
Multi-Arch: foreign
-Depends: apache2.2-bin,
- libwww-perl,
+Depends: libwww-perl,
spawn-fcgi (>= 1.6.1),
${misc:Depends},
${shlibs:Depends}
+Recommends: ${misc:Recommends}, libapache2-mod-fastcgi
Conflicts: openjpip-server
Description: JPIP server for JPEG 2000 files
OpenJPIP software is an implementation of JPEG 2000 Part9: Interactivity tools,
diff -Nru openjpeg2-2.1.0/debian/libopenjpip-server.apache2 openjpeg2-2.1.0/debian/libopenjpip-server.apache2
--- openjpeg2-2.1.0/debian/libopenjpip-server.apache2 1970-01-01 01:00:00.000000000 +0100
+++ openjpeg2-2.1.0/debian/libopenjpip-server.apache2 2015-05-21 23:17:27.000000000 +0200
@@ -0,0 +1 @@
+conf debian/libopenjpip-server.conf
diff -Nru openjpeg2-2.1.0/debian/libopenjpip-server.conf openjpeg2-2.1.0/debian/libopenjpip-server.conf
--- openjpeg2-2.1.0/debian/libopenjpip-server.conf 1970-01-01 01:00:00.000000000 +0100
+++ openjpeg2-2.1.0/debian/libopenjpip-server.conf 2015-05-22 00:29:40.000000000 +0200
@@ -0,0 +1,4 @@
+# This is the config file for openjpip-server
+<IfModule mod_fastcgi.c>
+FastCGIExternalServer /var/www/html/openjpip -host 127.0.0.1:3000
+</IfModule>
diff -Nru openjpeg2-2.1.0/debian/libopenjpip-server.install openjpeg2-2.1.0/debian/libopenjpip-server.install
--- openjpeg2-2.1.0/debian/libopenjpip-server.install 2014-09-12 09:44:21.000000000 +0200
+++ openjpeg2-2.1.0/debian/libopenjpip-server.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#debian/openjpip.conf /etc/apache2/mods-available
-#debian/openjpip.load /etc/apache2/mods-available
diff -Nru openjpeg2-2.1.0/debian/libopenjpip-server.prerm openjpeg2-2.1.0/debian/libopenjpip-server.prerm
--- openjpeg2-2.1.0/debian/libopenjpip-server.prerm 2014-09-12 09:10:30.000000000 +0200
+++ openjpeg2-2.1.0/debian/libopenjpip-server.prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" != "remove" -a "$1" != "purge" ]; then
- exit 0
-fi
-
-if [ -e /etc/apache2/apache2.conf ]; then
- a2dismod openjpip || true
-fi
-
-exit 0
diff -Nru openjpeg2-2.1.0/debian/opj_jp3d_compress.1 openjpeg2-2.1.0/debian/opj_jp3d_compress.1
--- openjpeg2-2.1.0/debian/opj_jp3d_compress.1 1970-01-01 01:00:00.000000000 +0100
+++ openjpeg2-2.1.0/debian/opj_jp3d_compress.1 2015-05-21 23:22:55.000000000 +0200
@@ -0,0 +1,134 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4.
+.TH OPJ_JP3D_COMPRESS "1" "May 2015" "opj_jp3d_compress 2.1.0" "User Commands"
+.SH NAME
+opj_jp3d_compress \- Works with JPEG2000 files
+.SH DESCRIPTION
+List of parameters for the JPEG2000 Part 10 encoder:
+\fB\-\-\-\-\-\-\-\-\-\-\-\-\fR
+.PP
+Required Parameters (except with \fB\-h\fR):
+.PP
+\fB\-i\fR : source file (\fB\-i\fR source.bin or source*.pgx)
+.PP
+\fB\-m\fR : source characteristics file (\fB\-m\fR imgfile.img)
+.PP
+\fB\-o\fR : destination file (\fB\-o\fR dest.jp3d)
+.PP
+Optional Parameters:
+.PP
+\fB\-h\fR : display the help information
+.PP
+\fB\-n\fR : number of resolutions (\fB\-n\fR 3,3,3)
+.PP
+\fB\-I\fR : use the irreversible transforms: ICT + DWT 9\-7 (\fB\-I\fR)
+.PP
+\fB\-C\fR : coding algorithm (\fB\-C\fR 2EB) [2EB, 3EB]
+.PP
+\fB\-r\fR : different compression ratios for successive layers (\fB\-r\fR 20,10,5)
+.IP
+\- The rate specified for each quality level is the desired compression factor.
+\- Rate 1 means lossless compression
+.IP
+(options \fB\-r\fR and \fB\-q\fR cannot be used together)
+.PP
+\fB\-q\fR : different psnr for successive layers (\fB\-q\fR 30,40,50)
+.IP
+(options \fB\-r\fR and \fB\-q\fR cannot be used together)
+.PP
+\fB\-b\fR : size of code block (\fB\-b\fR 32,32,32)
+.PP
+\fB\-c\fR : size of precinct (\fB\-c\fR 128,128,128)
+.PP
+\fB\-t\fR : size of tile (\fB\-t\fR 512,512,512)
+.PP
+\fB\-p\fR : progression order (\fB\-p\fR LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL]
+.PP
+\fB\-s\fR : subsampling factor (\fB\-s\fR 2,2,2) [\-s X,Y,Z]
+.IP
+\- Remark: subsampling bigger than 2 can produce error
+.PP
+\fB\-SOP\fR : write SOP marker before each packet
+.PP
+\fB\-EPH\fR : write EPH marker after each header packet
+.PP
+\fB\-M\fR : code\-block style (\fB\-M\fR 0) [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL)
+.IP
+8=VSC 16=PTERM 32=SEGSYM 64=3DCTXT]
+Indicate multiple modes by adding their values.
+ex: RESTART(4) + RESET(2) + SEGMARK(32) = \fB\-M\fR 38
+.PP
+\fB\-D\fR : define DC offset (\fB\-D\fR 12)
+.PP
+\fB\-x\fR : create an index file *.Idx (\fB\-x\fR index_name.Idx)
+.PP
+\fB\-ROI\fR : c=%d,U=%d : quantization indices upshifted
+.IP
+for component c=%d [%d = 0,1,2]
+with a value of U=%d [0 <= %d <= 37] (i.e. \fB\-ROI\fR:c=0,U=25)
+.PP
+\fB\-d\fR : offset of the origin of the volume (\fB\-d\fR 150,300,100)
+.PP
+\fB\-l\fR : offset of the origin of the tiles (\fB\-l\fR 100,75,25)
+.PP
+DEFAULT CODING:
+\fB\-\-\-\-\-\-\-\-\-\-\-\-\fR
+.IP
+* Lossless
+* 1 tile
+* Size of precinct : 2^15 x 2^15 x 2^15 (means 1 precinct)
+* Size of code\-block : 64 x 64 x 64
+* Number of resolutions in x, y and z axis: 3
+* No SOP marker in the codestream
+* No EPH marker in the codestream
+* No sub\-sampling in x, y or z direction
+* No mode switch activated
+* Progression order: LRCP
+* No index file
+* No ROI upshifted
+* No offset of the origin of the volume
+* No offset of the origin of the tiles
+* Reversible DWT 5\-3 on each 2D slice
+* Coding algorithm: 2D\-EBCOT
+.PP
+REMARKS:
+\fB\-\-\-\-\-\-\-\-\-\fR
+.PP
+\- The markers written to the main_header are : SOC SIZ COD QCD COM.
+\- COD and QCD markers will never appear in the tile_header.
+.PP
+\- You need enough disk space memory (twice the original) to encode
+the volume,i.e. for a 1.5 GB volume you need a minimum of 3GB of disk memory)
+.PP
+\- When loading *.pgx files, a relative path to directory is needed for input argument
+.IP
+followed by the common prefix of the slices and a '*' character representing sequential numeration.
+.PP
+( \fB\-i\fR relativepath/slices*.pgx )
+.IP
+\- The index file has the structure below:
+.IP
+Image_height Image_width Image_depth
+Progression order: 0 (LRCP)
+Tiles_size_X Tiles_size_Y Tiles_size_Z
+Components_nb
+Layers_nb
+Decomposition_levels
+[Precincts_size_X_res_Nr Precincts_size_Y_res_Nr Precincts_size_Z_res_Nr]
+.IP
+\&...
+.IP
+[Precincts_size_X_res_0 Precincts_size_Y_res_0 Precincts_size_Z_res_0]
+Main_header_end_position
+Codestream_size
+Tile_0 [start_pos end_header end_pos TotalDisto NumPix MaxMSE]
+\&...
+Tile_Nt [ '' '' '' '' '' '' ]
+.IP
+Tpacket_0 [Tile layer res. comp. prec. start_pos end_pos disto]
+\&...
+Tpacket_Np ['' '' '' '' '' '' '' '' ]
+MaxDisto
+TotalDisto
+.SH AUTHOR
+This manual page was written by Mathieu Malaterre <ma...@debian.org> for
+the Debian GNU/Linux system, but may be used by others.
diff -Nru openjpeg2-2.1.0/debian/opj_jp3d_decompress.1 openjpeg2-2.1.0/debian/opj_jp3d_decompress.1
--- openjpeg2-2.1.0/debian/opj_jp3d_decompress.1 1970-01-01 01:00:00.000000000 +0100
+++ openjpeg2-2.1.0/debian/opj_jp3d_decompress.1 2015-05-21 23:22:55.000000000 +0200
@@ -0,0 +1,66 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4.
+.TH OPJ_JP3D_DECOMPRESS "1" "May 2015" "opj_jp3d_decompress 2.1.0" "User Commands"
+.SH NAME
+opj_jp3d_decompress \- Works with JPEG2000 files
+.SH DESCRIPTION
+HELP
+\fB\-\-\-\-\fR
+.PP
+\- the \fB\-h\fR option displays this help information on screen
+.PP
+List of parameters for the JPEG 2000 encoder:
+.IP
+Required arguments
+\fB\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\fR
+.HP
+\fB\-i\fR <compressed file> ( *.jp3d, *.j3d )
+.IP
+Currently accepts J3D\-files. The file type is identified based on its suffix.
+.HP
+\fB\-o\fR <decompressed file> ( *.pgx, *.bin )
+.IP
+Currently accepts PGX\-files and BIN\-files. Binary data is written to the file (not ascii).
+If a PGX filename is given, there will be as many output files as slices;
+an indice starting from 0 will then be appended to the output filename,
+just before the "pgx" extension.
+.HP
+\fB\-m\fR <characteristics file> ( *.img )
+.IP
+Required only for BIN\-files. Ascii data of volume characteristics is written.
+.IP
+Optional
+\fB\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\fR
+.HP
+\fB\-h\fR
+.IP
+Display the help information
+.HP
+\fB\-r\fR <RFx,RFy,RFz>
+.IP
+Set the number of highest resolution levels to be discarded on each dimension.
+The volume resolution is effectively divided by 2 to the power of the
+number of discarded levels. The reduce factor is limited by the
+smallest total number of decomposition levels among tiles.
+.HP
+\fB\-l\fR <number of quality layers to decode>
+.IP
+Set the maximum number of quality layers to decode. If there are
+less quality layers than the specified number, all the quality layers
+are decoded.
+.HP
+\fB\-O\fR original\-file
+.IP
+This option offers the possibility to compute some quality results
+for the decompressed volume, like the PSNR value achieved or the global SSIM value.
+Needs the original file in order to compare with the new one.
+NOTE: Only valid when \fB\-r\fR option is 0,0,0 (both original and decompressed volumes have same resolutions)
+NOTE: If original file is .BIN file, the volume characteristics file shall be defined with the \fB\-m\fR option.
+(i.e. \fB\-O\fR original\-BIN\-file \fB\-m\fR original\-IMG\-file)
+.HP
+\fB\-BE\fR
+.IP
+Define that the recovered volume data will be saved with big endian byte order.
+By default, little endian byte order is used.
+.SH AUTHOR
+This manual page was written by Mathieu Malaterre <ma...@debian.org> for
+the Debian GNU/Linux system, but may be used by others.
diff -Nru openjpeg2-2.1.0/debian/opj_jpip_addxml.1 openjpeg2-2.1.0/debian/opj_jpip_addxml.1
--- openjpeg2-2.1.0/debian/opj_jpip_addxml.1 1970-01-01 01:00:00.000000000 +0100
+++ openjpeg2-2.1.0/debian/opj_jpip_addxml.1 2015-05-21 23:22:55.000000000 +0200
@@ -0,0 +1,9 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4.
+.TH OPJ_JPIP_ADDXML "1" "May 2015" "opj_jpip_addxml 2.1.0" "User Commands"
+.SH NAME
+opj_jpip_addxml \- Works with JPEG2000 files
+.SH DESCRIPTION
+USAGE: opj_jpip_addxml modifing.jp2 adding.xml
+.SH AUTHOR
+This manual page was written by Mathieu Malaterre <ma...@debian.org> for
+the Debian GNU/Linux system, but may be used by others.
diff -Nru openjpeg2-2.1.0/debian/opj_jpip_test.1 openjpeg2-2.1.0/debian/opj_jpip_test.1
--- openjpeg2-2.1.0/debian/opj_jpip_test.1 1970-01-01 01:00:00.000000000 +0100
+++ openjpeg2-2.1.0/debian/opj_jpip_test.1 2015-05-21 23:22:55.000000000 +0200
@@ -0,0 +1,9 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4.
+.TH OPJ_JPIP_TEST "1" "May 2015" "opj_jpip_test 2.1.0" "User Commands"
+.SH NAME
+opj_jpip_test \- Works with JPEG2000 files
+.SH DESCRIPTION
+Error: Target \fB\-h\fR not found
+.SH AUTHOR
+This manual page was written by Mathieu Malaterre <ma...@debian.org> for
+the Debian GNU/Linux system, but may be used by others.
diff -Nru openjpeg2-2.1.0/debian/opj_jpip_transcode.1 openjpeg2-2.1.0/debian/opj_jpip_transcode.1
--- openjpeg2-2.1.0/debian/opj_jpip_transcode.1 1970-01-01 01:00:00.000000000 +0100
+++ openjpeg2-2.1.0/debian/opj_jpip_transcode.1 2015-05-21 23:22:55.000000000 +0200
@@ -0,0 +1,14 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4.
+.TH OPJ_JPIP_TRANSCODE "1" "May 2015" "opj_jpip_transcode 2.1.0" "User Commands"
+.SH NAME
+opj_jpip_transcode \- Works with JPEG2000 files
+.SH DESCRIPTION
+.SS "Too few arguments:"
+.TP
+\- input
+jpt or jpp file
+.IP
+\- output j2k file
+.SH AUTHOR
+This manual page was written by Mathieu Malaterre <ma...@debian.org> for
+the Debian GNU/Linux system, but may be used by others.
diff -Nru openjpeg2-2.1.0/debian/rules openjpeg2-2.1.0/debian/rules
--- openjpeg2-2.1.0/debian/rules 2014-09-26 17:01:40.000000000 +0200
+++ openjpeg2-2.1.0/debian/rules 2015-05-21 23:07:28.000000000 +0200
@@ -7,7 +7,7 @@
export DEB_CFLAGS_MAINT_APPEND = -fvisibility=hidden
%:
- dh $@ --parallel --with javahelper
+ dh $@ --parallel --with apache2,javahelper
CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_BUILD_TYPE:STRING=None \
