The branch, master has been updated via 0eab17a2211b55a50e80eb20d9a350a964459f54 (commit) from 36879bfecb4ddcd4d0069fddca78897bb1802695 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0eab17a2211b55a50e80eb20d9a350a964459f54 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jan 28 22:46:01 2012 +0100 Change over to building libjpeg-turbo8. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +- debian/control | 12 +- debian/libjpeg-turbo62.lintian-overrides | 2 - debian/libjpeg-turbo62.preinst | 50 ------- debian/libjpeg-turbo62.shlibs | 1 - debian/libjpeg-turbo62.symbols | 135 -------------------- ...jpeg-turbo62.install => libjpeg-turbo8.install} | 2 +- debian/libjpeg-turbo8.lintian-overrides | 2 + ...ibjpeg-turbo62.postrm => libjpeg-turbo8.postrm} | 10 +- debian/libjpeg-turbo8.preinst | 45 +++++++ debian/libjpeg-turbo8.shlibs | 1 + debian/rules | 2 + 12 files changed, 64 insertions(+), 201 deletions(-) delete mode 100644 debian/libjpeg-turbo62.lintian-overrides delete mode 100644 debian/libjpeg-turbo62.preinst delete mode 100644 debian/libjpeg-turbo62.shlibs delete mode 100644 debian/libjpeg-turbo62.symbols rename debian/{libjpeg-turbo62.install => libjpeg-turbo8.install} (50%) create mode 100644 debian/libjpeg-turbo8.lintian-overrides rename debian/{libjpeg-turbo62.postrm => libjpeg-turbo8.postrm} (56%) create mode 100644 debian/libjpeg-turbo8.preinst create mode 100644 debian/libjpeg-turbo8.shlibs The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 65d827a..c5fa199 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,8 @@ libjpeg-turbo (1.1.90+svn704-0+x2go1) UNRELEASED; urgency=low * Allow package upgrade when upgrading from X2Go's Debian squeeze backport of libjpeg-turbo. * Fix upgrade from squeeze-backport version. - * Fix multi arch variable in preinst script on upgrades. + * Fix multi-arch variable in preinst script on upgrades. + * Change over to building libjpeg-turbo8. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 23 Jan 2012 22:21:35 +0100 diff --git a/debian/control b/debian/control index e91e0bd..f166223 100644 --- a/debian/control +++ b/debian/control @@ -1,22 +1,22 @@ Source: libjpeg-turbo Priority: optional Maintainer: Linaro Developers <linaro-dev@lists.linaro.org> -Uploaders: Fathi Boudra <fabo@debian.org>, Tom Gall <tom.gall@linaro.org> +Uploaders: Fathi Boudra <fabo@debian.org>, Tom Gall <tom.gall@linaro.org>, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Build-Depends: debhelper (>= 8.1.3~), dh-autoreconf, nasm [amd64 i386] Standards-Version: 3.9.2 Section: libs Homepage: http://www.libjpeg-turbo.org/ -Package: libjpeg-turbo62 +Package: libjpeg-turbo8 Architecture: any Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: dpkg-dev, ${misc:Pre-Depends} -Replaces: libjpeg62 -Provides: libjpeg62 +Replaces: libjpeg8 +Provides: libjpeg8 Description: Independent JPEG Group's JPEG runtime library - SIMD optimized This package contains the libjpeg-turbo shared library which is a drop in - replacement for libjpeg 62, which has better performance than standard libjpeg + replacement for libjpeg 8, which has better performance than standard libjpeg by use of SIMD and other optimizations. Package: libjpeg-turbo-progs @@ -34,7 +34,7 @@ Package: libjpeg-turbo-dbg Priority: extra Section: debug Architecture: any -Depends: libjpeg-turbo62 (= ${binary:Version}), +Depends: libjpeg-turbo8 (= ${binary:Version}), libjpeg-turbo-progs, ${misc:Depends}, ${shlibs:Depends} diff --git a/debian/libjpeg-turbo62.lintian-overrides b/debian/libjpeg-turbo62.lintian-overrides deleted file mode 100644 index 45157ee..0000000 --- a/debian/libjpeg-turbo62.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libjpeg-turbo62: package-name-doesnt-match-sonames libjpeg62 libturbojpeg -libjpeg-turbo62: shlibs-declares-dependency-on-other-package libjpeg62 (>= 6b1) diff --git a/debian/libjpeg-turbo62.preinst b/debian/libjpeg-turbo62.preinst deleted file mode 100644 index 4a651eb..0000000 --- a/debian/libjpeg-turbo62.preinst +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# preinst script for libjpeg-turbo62 - -set -e - -case "$1" in - install) - HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` - - if [ ! -d /usr/lib/libjpeg-divert ]; then - mkdir -p /usr/lib/libjpeg-divert - fi - - dpkg-divert --package libjpeg-turbo62 --rename \ - --divert /usr/lib/libjpeg-divert/libjpeg.so.62.0.0 \ - --add /usr/lib/$HOST_MULTIARCH/libjpeg.so.62.0.0 - dpkg-divert --package libjpeg-turbo62 --rename \ - --divert /usr/lib/libjpeg-divert/libjpeg.so.62 \ - --add /usr/lib/$HOST_MULTIARCH/libjpeg.so.62 - ;; - - upgrade|abort-upgrade) - HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` - - if dpkg --compare-versions "$2" ge "1.1.90+svn704-0+squeeze1"; then - - dpkg-divert --package libjpeg-turbo62 --rename \ - --remove /usr/lib/libjpeg.so.62.0.0 - dpkg-divert --package libjpeg-turbo62 --rename \ - --remove /usr/lib/libjpeg.so.62 - - dpkg-divert --package libjpeg-turbo62 --rename \ - --divert /usr/lib/libjpeg-divert/libjpeg.so.62.0.0 \ - --add /usr/lib/$HOST_MULTIARCH/libjpeg.so.62.0.0 - dpkg-divert --package libjpeg-turbo62 --rename \ - --divert /usr/lib/libjpeg-divert/libjpeg.so.62 \ - --add /usr/lib/$HOST_MULTIARCH/libjpeg.so.62 - - fi - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/libjpeg-turbo62.shlibs b/debian/libjpeg-turbo62.shlibs deleted file mode 100644 index b73839d..0000000 --- a/debian/libjpeg-turbo62.shlibs +++ /dev/null @@ -1 +0,0 @@ -libjpeg 62 libjpeg62 (>= 6b1) diff --git a/debian/libjpeg-turbo62.symbols b/debian/libjpeg-turbo62.symbols deleted file mode 100644 index 1237f62..0000000 --- a/debian/libjpeg-turbo62.symbols +++ /dev/null @@ -1,135 +0,0 @@ -libjpeg.so.62 libjpeg-turbo62 #MINVER# - LIBJPEGTURBO_6.2@LIBJPEGTURBO_6.2 1.1.90svn704 - LIBJPEG_6.2@LIBJPEG_6.2 1.1.90svn704 - jcopy_block_row@LIBJPEG_6.2 1.1.90svn704 - jcopy_sample_rows@LIBJPEG_6.2 1.1.90svn704 - jdiv_round_up@LIBJPEG_6.2 1.1.90svn704 - jinit_1pass_quantizer@LIBJPEG_6.2 1.1.90svn704 - jinit_2pass_quantizer@LIBJPEG_6.2 1.1.90svn704 - jinit_arith_decoder@LIBJPEG_6.2 1.1.90svn704 - jinit_arith_encoder@LIBJPEG_6.2 1.1.90svn704 - jinit_c_coef_controller@LIBJPEG_6.2 1.1.90svn704 - jinit_c_main_controller@LIBJPEG_6.2 1.1.90svn704 - jinit_c_master_control@LIBJPEG_6.2 1.1.90svn704 - jinit_c_prep_controller@LIBJPEG_6.2 1.1.90svn704 - jinit_color_converter@LIBJPEG_6.2 1.1.90svn704 - jinit_color_deconverter@LIBJPEG_6.2 1.1.90svn704 - jinit_compress_master@LIBJPEG_6.2 1.1.90svn704 - jinit_d_coef_controller@LIBJPEG_6.2 1.1.90svn704 - jinit_d_main_controller@LIBJPEG_6.2 1.1.90svn704 - jinit_d_post_controller@LIBJPEG_6.2 1.1.90svn704 - jinit_downsampler@LIBJPEG_6.2 1.1.90svn704 - jinit_forward_dct@LIBJPEG_6.2 1.1.90svn704 - jinit_huff_decoder@LIBJPEG_6.2 1.1.90svn704 - jinit_huff_encoder@LIBJPEG_6.2 1.1.90svn704 - jinit_input_controller@LIBJPEG_6.2 1.1.90svn704 - jinit_inverse_dct@LIBJPEG_6.2 1.1.90svn704 - jinit_marker_reader@LIBJPEG_6.2 1.1.90svn704 - jinit_marker_writer@LIBJPEG_6.2 1.1.90svn704 - jinit_master_decompress@LIBJPEG_6.2 1.1.90svn704 - jinit_memory_mgr@LIBJPEG_6.2 1.1.90svn704 - jinit_merged_upsampler@LIBJPEG_6.2 1.1.90svn704 - jinit_phuff_decoder@LIBJPEG_6.2 1.1.90svn704 - jinit_phuff_encoder@LIBJPEG_6.2 1.1.90svn704 - jinit_upsampler@LIBJPEG_6.2 1.1.90svn704 - jpeg_CreateCompress@LIBJPEG_6.2 1.1.90svn704 - jpeg_CreateDecompress@LIBJPEG_6.2 1.1.90svn704 - jpeg_abort@LIBJPEG_6.2 1.1.90svn704 - jpeg_abort_compress@LIBJPEG_6.2 1.1.90svn704 - jpeg_abort_decompress@LIBJPEG_6.2 1.1.90svn704 - jpeg_add_quant_table@LIBJPEG_6.2 1.1.90svn704 - jpeg_alloc_huff_table@LIBJPEG_6.2 1.1.90svn704 - jpeg_alloc_quant_table@LIBJPEG_6.2 1.1.90svn704 - jpeg_aritab@LIBJPEG_6.2 1.1.90svn704 - jpeg_calc_output_dimensions@LIBJPEG_6.2 1.1.90svn704 - jpeg_consume_input@LIBJPEG_6.2 1.1.90svn704 - jpeg_copy_critical_parameters@LIBJPEG_6.2 1.1.90svn704 - jpeg_default_colorspace@LIBJPEG_6.2 1.1.90svn704 - jpeg_destroy@LIBJPEG_6.2 1.1.90svn704 - jpeg_destroy_compress@LIBJPEG_6.2 1.1.90svn704 - jpeg_destroy_decompress@LIBJPEG_6.2 1.1.90svn704 - jpeg_fdct_float@LIBJPEG_6.2 1.1.90svn704 - jpeg_fdct_ifast@LIBJPEG_6.2 1.1.90svn704 - jpeg_fdct_islow@LIBJPEG_6.2 1.1.90svn704 - jpeg_fill_bit_buffer@LIBJPEG_6.2 1.1.90svn704 - jpeg_finish_compress@LIBJPEG_6.2 1.1.90svn704 - jpeg_finish_decompress@LIBJPEG_6.2 1.1.90svn704 - jpeg_finish_output@LIBJPEG_6.2 1.1.90svn704 - jpeg_free_large@LIBJPEG_6.2 1.1.90svn704 - jpeg_free_small@LIBJPEG_6.2 1.1.90svn704 - jpeg_gen_optimal_table@LIBJPEG_6.2 1.1.90svn704 - jpeg_get_large@LIBJPEG_6.2 1.1.90svn704 - jpeg_get_small@LIBJPEG_6.2 1.1.90svn704 - jpeg_has_multiple_scans@LIBJPEG_6.2 1.1.90svn704 - jpeg_huff_decode@LIBJPEG_6.2 1.1.90svn704 - jpeg_idct_1x1@LIBJPEG_6.2 1.1.90svn704 - jpeg_idct_2x2@LIBJPEG_6.2 1.1.90svn704 - jpeg_idct_4x4@LIBJPEG_6.2 1.1.90svn704 - jpeg_idct_float@LIBJPEG_6.2 1.1.90svn704 - jpeg_idct_ifast@LIBJPEG_6.2 1.1.90svn704 - jpeg_idct_islow@LIBJPEG_6.2 1.1.90svn704 - jpeg_input_complete@LIBJPEG_6.2 1.1.90svn704 - jpeg_make_c_derived_tbl@LIBJPEG_6.2 1.1.90svn704 - jpeg_make_d_derived_tbl@LIBJPEG_6.2 1.1.90svn704 - jpeg_mem_available@LIBJPEG_6.2 1.1.90svn704 - jpeg_mem_init@LIBJPEG_6.2 1.1.90svn704 - jpeg_mem_term@LIBJPEG_6.2 1.1.90svn704 - jpeg_natural_order@LIBJPEG_6.2 1.1.90svn704 - jpeg_new_colormap@LIBJPEG_6.2 1.1.90svn704 - jpeg_open_backing_store@LIBJPEG_6.2 1.1.90svn704 - jpeg_quality_scaling@LIBJPEG_6.2 1.1.90svn704 - jpeg_read_coefficients@LIBJPEG_6.2 1.1.90svn704 - jpeg_read_header@LIBJPEG_6.2 1.1.90svn704 - jpeg_read_raw_data@LIBJPEG_6.2 1.1.90svn704 - jpeg_read_scanlines@LIBJPEG_6.2 1.1.90svn704 - jpeg_resync_to_restart@LIBJPEG_6.2 1.1.90svn704 - jpeg_save_markers@LIBJPEG_6.2 1.1.90svn704 - jpeg_set_colorspace@LIBJPEG_6.2 1.1.90svn704 - jpeg_set_defaults@LIBJPEG_6.2 1.1.90svn704 - jpeg_set_linear_quality@LIBJPEG_6.2 1.1.90svn704 - jpeg_set_marker_processor@LIBJPEG_6.2 1.1.90svn704 - jpeg_set_quality@LIBJPEG_6.2 1.1.90svn704 - jpeg_simple_progression@LIBJPEG_6.2 1.1.90svn704 - jpeg_start_compress@LIBJPEG_6.2 1.1.90svn704 - jpeg_start_decompress@LIBJPEG_6.2 1.1.90svn704 - jpeg_start_output@LIBJPEG_6.2 1.1.90svn704 - jpeg_std_error@LIBJPEG_6.2 1.1.90svn704 - jpeg_std_message_table@LIBJPEG_6.2 1.1.90svn704 - jpeg_stdio_dest@LIBJPEG_6.2 1.1.90svn704 - jpeg_stdio_src@LIBJPEG_6.2 1.1.90svn704 - jpeg_suppress_tables@LIBJPEG_6.2 1.1.90svn704 - jpeg_write_coefficients@LIBJPEG_6.2 1.1.90svn704 - jpeg_write_m_byte@LIBJPEG_6.2 1.1.90svn704 - jpeg_write_m_header@LIBJPEG_6.2 1.1.90svn704 - jpeg_write_marker@LIBJPEG_6.2 1.1.90svn704 - jpeg_write_raw_data@LIBJPEG_6.2 1.1.90svn704 - jpeg_write_scanlines@LIBJPEG_6.2 1.1.90svn704 - jpeg_write_tables@LIBJPEG_6.2 1.1.90svn704 - jround_up@LIBJPEG_6.2 1.1.90svn704 - jzero_far@LIBJPEG_6.2 1.1.90svn704 -libturbojpeg.so libjpeg-turbo62 #MINVER# - TJBUFSIZE@TURBOJPEG_1.0 1.1.90svn704 - TJBUFSIZEYUV@TURBOJPEG_1.1 1.1.90svn704 - TURBOJPEG_1.0@TURBOJPEG_1.0 1.1.90svn704 - TURBOJPEG_1.1@TURBOJPEG_1.1 1.1.90svn704 - TURBOJPEG_1.2@TURBOJPEG_1.2 1.1.90svn704 - tjAlloc@TURBOJPEG_1.2 1.1.90svn704 - tjBufSize@TURBOJPEG_1.2 1.1.90svn704 - tjBufSizeYUV@TURBOJPEG_1.2 1.1.90svn704 - tjCompress2@TURBOJPEG_1.2 1.1.90svn704 - tjCompress@TURBOJPEG_1.0 1.1.90svn704 - tjDecompress2@TURBOJPEG_1.2 1.1.90svn704 - tjDecompress@TURBOJPEG_1.0 1.1.90svn704 - tjDecompressHeader2@TURBOJPEG_1.1 1.1.90svn704 - tjDecompressHeader@TURBOJPEG_1.0 1.1.90svn704 - tjDecompressToYUV@TURBOJPEG_1.1 1.1.90svn704 - tjDestroy@TURBOJPEG_1.0 1.1.90svn704 - tjEncodeYUV2@TURBOJPEG_1.2 1.1.90svn704 - tjEncodeYUV@TURBOJPEG_1.1 1.1.90svn704 - tjFree@TURBOJPEG_1.2 1.1.90svn704 - tjGetErrorStr@TURBOJPEG_1.0 1.1.90svn704 - tjGetScalingFactors@TURBOJPEG_1.2 1.1.90svn704 - tjInitCompress@TURBOJPEG_1.0 1.1.90svn704 - tjInitDecompress@TURBOJPEG_1.0 1.1.90svn704 - tjInitTransform@TURBOJPEG_1.2 1.1.90svn704 - tjTransform@TURBOJPEG_1.2 1.1.90svn704 \ No newline at end of file diff --git a/debian/libjpeg-turbo62.install b/debian/libjpeg-turbo8.install similarity index 50% rename from debian/libjpeg-turbo62.install rename to debian/libjpeg-turbo8.install index 1d45450..f3cd5da 100644 --- a/debian/libjpeg-turbo62.install +++ b/debian/libjpeg-turbo8.install @@ -1,2 +1,2 @@ -usr/lib/*/libjpeg.so.62* +usr/lib/*/libjpeg.so.8* usr/lib/*/libturbojpeg.so diff --git a/debian/libjpeg-turbo8.lintian-overrides b/debian/libjpeg-turbo8.lintian-overrides new file mode 100644 index 0000000..eeccc15 --- /dev/null +++ b/debian/libjpeg-turbo8.lintian-overrides @@ -0,0 +1,2 @@ +libjpeg-turbo8: package-name-doesnt-match-sonames libjpeg8 libturbojpeg +libjpeg-turbo8: shlibs-declares-dependency-on-other-package libjpeg8 (>= 8) diff --git a/debian/libjpeg-turbo62.postrm b/debian/libjpeg-turbo8.postrm similarity index 56% rename from debian/libjpeg-turbo62.postrm rename to debian/libjpeg-turbo8.postrm index 5244dae..d7ca06e 100644 --- a/debian/libjpeg-turbo62.postrm +++ b/debian/libjpeg-turbo8.postrm @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for libjpeg-turbo62 +# postrm script for libjpeg-turbo8 set -e @@ -7,10 +7,10 @@ case "$1" in remove|abort-install|disappear) HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` - dpkg-divert --package libjpeg-turbo62 --rename \ - --remove /usr/lib/$HOST_MULTIARCH/libjpeg.so.62.0.0 - dpkg-divert --package libjpeg-turbo62 --rename \ - --remove /usr/lib/$HOST_MULTIARCH/libjpeg.so.62 + dpkg-divert --package libjpeg-turbo8 --rename \ + --remove /usr/lib/$HOST_MULTIARCH/libjpeg.so.8.0.2 + dpkg-divert --package libjpeg-turbo8 --rename \ + --remove /usr/lib/$HOST_MULTIARCH/libjpeg.so.8 rm -rf /usr/lib/libjpeg-divert ;; diff --git a/debian/libjpeg-turbo8.preinst b/debian/libjpeg-turbo8.preinst new file mode 100644 index 0000000..077c7e9 --- /dev/null +++ b/debian/libjpeg-turbo8.preinst @@ -0,0 +1,45 @@ +#!/bin/sh +# preinst script for libjpeg-turbo8 + +set -e + +case "$1" in + install) + HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` + + if [ ! -d /usr/lib/libjpeg-divert ]; then + mkdir -p /usr/lib/libjpeg-divert + fi + + dpkg-divert --package libjpeg-turbo8 --rename \ + --divert /usr/lib/libjpeg-divert/libjpeg.so.8.0.2 \ + --add /usr/lib/$HOST_MULTIARCH/libjpeg.so.8.0.2 + dpkg-divert --package libjpeg-turbo8 --rename \ + --divert /usr/lib/libjpeg-divert/libjpeg.so.8 \ + --add /usr/lib/$HOST_MULTIARCH/libjpeg.so.8 + ;; + + upgrade|abort-upgrade) + HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` + + if dpkg --compare-versions "$2" ge "1.1.90+svn704-0+squeeze1"; then + + dpkg-divert --package libjpeg-turbo8 --rename \ + --divert /usr/lib/libjpeg-divert/libjpeg.so.8.0.2 \ + --add /usr/lib/$HOST_MULTIARCH/libjpeg.so.8.0.2 + dpkg-divert --package libjpeg-turbo8 --rename \ + --divert /usr/lib/libjpeg-divert/libjpeg.so.8 \ + --add /usr/lib/$HOST_MULTIARCH/libjpeg.so.8 + + fi + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/libjpeg-turbo8.shlibs b/debian/libjpeg-turbo8.shlibs new file mode 100644 index 0000000..a5c8885 --- /dev/null +++ b/debian/libjpeg-turbo8.shlibs @@ -0,0 +1 @@ +libjpeg 80 libjpeg8 (>= 8) diff --git a/debian/rules b/debian/rules index 3b09e0e..ce681ba 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,8 @@ include debian/get-orig-source.mk # uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +JPEG_LIB_VERSION=80 + %: dh $@ --with autoreconf --parallel --list-missing --dbg-package=libjpeg-turbo-dbg hooks/post-receive -- libjpeg-turbo.git (libjpeg-turbo packaging (X2Go repositories only)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libjpeg-turbo.git" (libjpeg-turbo packaging (X2Go repositories only)).