[neon/backports-jammy/libjpeg-turbo-jammy/Neon/release] debian: adapt for ubuntu to still using libjpeg8

Carlos De Maine null at kde.org
Mon Feb 20 05:11:51 GMT 2023


Git commit b4b8466dc432392e020d9a8ebdf1df8810feb14b by Carlos De Maine.
Committed on 20/02/2023 at 05:11.
Pushed by carlosdem into branch 'Neon/release'.

adapt for ubuntu to still using libjpeg8

M  +9    -9    debian/control
D  +0    -1    debian/libjpeg62-turbo.install
D  +0    -7    debian/libjpeg62-turbo.lintian-overrides
D  +0    -129  debian/libjpeg62-turbo.symbols
R  +0    -0    debian/libjpeg8-turbo-dev.docs [from: debian/libjpeg62-turbo-dev.docs - 100% similarity]
R  +0    -0    debian/libjpeg8-turbo-dev.examples [from: debian/libjpeg62-turbo-dev.examples - 100% similarity]
R  +0    -0    debian/libjpeg8-turbo-dev.install [from: debian/libjpeg62-turbo-dev.install - 100% similarity]
A  +1    -0    debian/libjpeg8-turbo.install
M  +4    -3    debian/rules

https://invent.kde.org/neon/backports-jammy/libjpeg-turbo-jammy/commit/b4b8466dc432392e020d9a8ebdf1df8810feb14b

diff --git a/debian/control b/debian/control
index a64cac0..86f3437 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Package: libjpeg-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libjpeg62-turbo-dev (>= ${source:Version}),
+Depends: libjpeg8-turbo-dev (>= ${source:Version}),
  	 ${misc:Depends}
 Conflicts: libjpeg62-dev,
 	   libjpeg7-dev,
@@ -29,12 +29,12 @@ Description: Development files for the JPEG library [dummy package]
  This package depends on default Debian implementation of
  libjpeg.so.62 JPEG library.
 
-Package: libjpeg62-turbo-dev
+Package: libjpeg8-turbo-dev
 Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends: libc-dev,
-	 libjpeg62-turbo (= ${binary:Version}),
+	 libjpeg8-turbo (= ${binary:Version}),
 	 ${misc:Depends}
 Conflicts: libjpeg62-dev,
 	   libjpeg7-dev,
@@ -55,15 +55,15 @@ Description: Development files for the libjpeg-turbo JPEG library
  .
  This package contains the static library, headers and documentation.
 
-Package: libjpeg62-turbo
+Package: libjpeg8-turbo
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends},
 	 ${shlibs:Depends}
-Conflicts: libjpeg62
-Replaces: libjpeg62
-Provides: libjpeg62 (= ${binary:Version})
+Conflicts: libjpeg8
+Replaces: libjpeg8
+Provides: libjpeg8 (= ${binary:Version})
 Description: libjpeg-turbo JPEG runtime library
  The libjpeg-turbo JPEG library is a library for handling JPEG files.
  .
@@ -83,7 +83,7 @@ Depends: ${shlibs:Depends},
 	 ${misc:Depends}
 Replaces: libturbojpeg
 Conflicts: libturbojpeg,
-	   libjpeg-turbo8
+	   libjpeg-turbo62
 Description: TurboJPEG runtime library - SIMD optimized
  The libjpeg-turbo JPEG library is a library for handling JPEG files.
  .
@@ -102,7 +102,7 @@ Depends: libturbojpeg0 (= ${binary:Version}),
 Replaces: libturbojpeg-dev,
 Conflicts: libturbojpeg-dev,
 	   libturbojpeg1-dev,
-	   libjpeg-turbo8-dev,
+	   libjpeg-turbo62-dev,
 Provides: libturbojpeg-dev
 Description: Development files for the TurboJPEG library
  The libjpeg-turbo JPEG library is a library for handling JPEG files.
diff --git a/debian/libjpeg62-turbo.install b/debian/libjpeg62-turbo.install
deleted file mode 100644
index 6f14c3b..0000000
--- a/debian/libjpeg62-turbo.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libjpeg.so.62*
diff --git a/debian/libjpeg62-turbo.lintian-overrides b/debian/libjpeg62-turbo.lintian-overrides
deleted file mode 100644
index edcb280..0000000
--- a/debian/libjpeg62-turbo.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-# Debian has libjpeg62 and it's IJG libjpeg, this one is libjpeg-turbo...
-libjpeg62-turbo: package-name-doesnt-match-sonames libjpeg62
-
-# upstream (DRC <dcommander at users.sourceforge.net>) states that the below issue
-# can be ignored, see:
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612341#255
-libjpeg62-turbo: exit-in-shared-library [usr/lib/x86_64-linux-gnu/libjpeg.so.62.3.0]
diff --git a/debian/libjpeg62-turbo.symbols b/debian/libjpeg62-turbo.symbols
deleted file mode 100644
index 634d3bb..0000000
--- a/debian/libjpeg62-turbo.symbols
+++ /dev/null
@@ -1,129 +0,0 @@
-libjpeg.so.62 libjpeg62-turbo #MINVER#
-* Build-Depends-Package: libjpeg62-turbo-dev
- LIBJPEGTURBO_6.2 at LIBJPEGTURBO_6.2 1.3.1
- LIBJPEG_6.2 at LIBJPEG_6.2 1.3.1
- jcopy_block_row at LIBJPEG_6.2 1.3.1
- jcopy_sample_rows at LIBJPEG_6.2 1.3.1
- jdiv_round_up at LIBJPEG_6.2 1.3.1
- jinit_1pass_quantizer at LIBJPEG_6.2 1.3.1
- jinit_2pass_quantizer at LIBJPEG_6.2 1.3.1
- jinit_arith_decoder at LIBJPEG_6.2 1.3.1
- jinit_arith_encoder at LIBJPEG_6.2 1.3.1
- jinit_c_coef_controller at LIBJPEG_6.2 1.3.1
- jinit_c_main_controller at LIBJPEG_6.2 1.3.1
- jinit_c_master_control at LIBJPEG_6.2 1.3.1
- jinit_c_prep_controller at LIBJPEG_6.2 1.3.1
- jinit_color_converter at LIBJPEG_6.2 1.3.1
- jinit_color_deconverter at LIBJPEG_6.2 1.3.1
- jinit_compress_master at LIBJPEG_6.2 1.3.1
- jinit_d_coef_controller at LIBJPEG_6.2 1.3.1
- jinit_d_main_controller at LIBJPEG_6.2 1.3.1
- jinit_d_post_controller at LIBJPEG_6.2 1.3.1
- jinit_downsampler at LIBJPEG_6.2 1.3.1
- jinit_forward_dct at LIBJPEG_6.2 1.3.1
- jinit_huff_decoder at LIBJPEG_6.2 1.3.1
- jinit_huff_encoder at LIBJPEG_6.2 1.3.1
- jinit_input_controller at LIBJPEG_6.2 1.3.1
- jinit_inverse_dct at LIBJPEG_6.2 1.3.1
- jinit_marker_reader at LIBJPEG_6.2 1.3.1
- jinit_marker_writer at LIBJPEG_6.2 1.3.1
- jinit_master_decompress at LIBJPEG_6.2 1.3.1
- jinit_memory_mgr at LIBJPEG_6.2 1.3.1
- jinit_merged_upsampler at LIBJPEG_6.2 1.3.1
- jinit_phuff_decoder at LIBJPEG_6.2 1.3.1
- jinit_phuff_encoder at LIBJPEG_6.2 1.3.1
- jinit_upsampler at LIBJPEG_6.2 1.3.1
- jpeg_CreateCompress at LIBJPEG_6.2 1.3.1
- jpeg_CreateDecompress at LIBJPEG_6.2 1.3.1
- jpeg_abort at LIBJPEG_6.2 1.3.1
- jpeg_abort_compress at LIBJPEG_6.2 1.3.1
- jpeg_abort_decompress at LIBJPEG_6.2 1.3.1
- jpeg_add_quant_table at LIBJPEG_6.2 1.3.1
- jpeg_alloc_huff_table at LIBJPEG_6.2 1.3.1
- jpeg_alloc_quant_table at LIBJPEG_6.2 1.3.1
- jpeg_aritab at LIBJPEG_6.2 1.3.1
- jpeg_calc_output_dimensions at LIBJPEG_6.2 1.3.1
- jpeg_consume_input at LIBJPEG_6.2 1.3.1
- jpeg_copy_critical_parameters at LIBJPEG_6.2 1.3.1
- jpeg_crop_scanline at LIBJPEG_6.2 1:1.5.0
- jpeg_default_colorspace at LIBJPEG_6.2 1.3.1
- jpeg_destroy at LIBJPEG_6.2 1.3.1
- jpeg_destroy_compress at LIBJPEG_6.2 1.3.1
- jpeg_destroy_decompress at LIBJPEG_6.2 1.3.1
- jpeg_fdct_float at LIBJPEG_6.2 1.3.1
- jpeg_fdct_ifast at LIBJPEG_6.2 1.3.1
- jpeg_fdct_islow at LIBJPEG_6.2 1.3.1
- jpeg_fill_bit_buffer at LIBJPEG_6.2 1.3.1
- jpeg_finish_compress at LIBJPEG_6.2 1.3.1
- jpeg_finish_decompress at LIBJPEG_6.2 1.3.1
- jpeg_finish_output at LIBJPEG_6.2 1.3.1
- jpeg_free_large at LIBJPEG_6.2 1.3.1
- jpeg_free_small at LIBJPEG_6.2 1.3.1
- jpeg_gen_optimal_table at LIBJPEG_6.2 1.3.1
- jpeg_get_large at LIBJPEG_6.2 1.3.1
- jpeg_get_small at LIBJPEG_6.2 1.3.1
- jpeg_has_multiple_scans at LIBJPEG_6.2 1.3.1
- jpeg_huff_decode at LIBJPEG_6.2 1.3.1
- jpeg_idct_10x10 at LIBJPEG_6.2 1.3.1
- jpeg_idct_11x11 at LIBJPEG_6.2 1.3.1
- jpeg_idct_12x12 at LIBJPEG_6.2 1.3.1
- jpeg_idct_13x13 at LIBJPEG_6.2 1.3.1
- jpeg_idct_14x14 at LIBJPEG_6.2 1.3.1
- jpeg_idct_15x15 at LIBJPEG_6.2 1.3.1
- jpeg_idct_16x16 at LIBJPEG_6.2 1.3.1
- jpeg_idct_1x1 at LIBJPEG_6.2 1.3.1
- jpeg_idct_2x2 at LIBJPEG_6.2 1.3.1
- jpeg_idct_3x3 at LIBJPEG_6.2 1.3.1
- jpeg_idct_4x4 at LIBJPEG_6.2 1.3.1
- jpeg_idct_5x5 at LIBJPEG_6.2 1.3.1
- jpeg_idct_6x6 at LIBJPEG_6.2 1.3.1
- jpeg_idct_7x7 at LIBJPEG_6.2 1.3.1
- jpeg_idct_9x9 at LIBJPEG_6.2 1.3.1
- jpeg_idct_float at LIBJPEG_6.2 1.3.1
- jpeg_idct_ifast at LIBJPEG_6.2 1.3.1
- jpeg_idct_islow at LIBJPEG_6.2 1.3.1
- jpeg_input_complete at LIBJPEG_6.2 1.3.1
- jpeg_make_c_derived_tbl at LIBJPEG_6.2 1.3.1
- jpeg_make_d_derived_tbl at LIBJPEG_6.2 1.3.1
- jpeg_mem_available at LIBJPEG_6.2 1.3.1
- jpeg_mem_dest at LIBJPEGTURBO_6.2 1.3.1
- jpeg_mem_init at LIBJPEG_6.2 1.3.1
- jpeg_mem_src at LIBJPEGTURBO_6.2 1.3.1
- jpeg_mem_term at LIBJPEG_6.2 1.3.1
- jpeg_natural_order at LIBJPEG_6.2 1.3.1
- jpeg_new_colormap at LIBJPEG_6.2 1.3.1
- jpeg_open_backing_store at LIBJPEG_6.2 1.3.1
- jpeg_quality_scaling at LIBJPEG_6.2 1.3.1
- jpeg_read_coefficients at LIBJPEG_6.2 1.3.1
- jpeg_read_header at LIBJPEG_6.2 1.3.1
- jpeg_read_icc_profile at LIBJPEG_6.2 1:2.0.2
- jpeg_read_raw_data at LIBJPEG_6.2 1.3.1
- jpeg_read_scanlines at LIBJPEG_6.2 1.3.1
- jpeg_resync_to_restart at LIBJPEG_6.2 1.3.1
- jpeg_save_markers at LIBJPEG_6.2 1.3.1
- jpeg_set_colorspace at LIBJPEG_6.2 1.3.1
- jpeg_set_defaults at LIBJPEG_6.2 1.3.1
- jpeg_set_linear_quality at LIBJPEG_6.2 1.3.1
- jpeg_set_marker_processor at LIBJPEG_6.2 1.3.1
- jpeg_set_quality at LIBJPEG_6.2 1.3.1
-#MISSING: 2.0.2# (arch=any-i386)jpeg_simd_cpu_support at LIBJPEG_6.2 1.4.0
- jpeg_simple_progression at LIBJPEG_6.2 1.3.1
- jpeg_skip_scanlines at LIBJPEG_6.2 1:1.5.0
- jpeg_start_compress at LIBJPEG_6.2 1.3.1
- jpeg_start_decompress at LIBJPEG_6.2 1.3.1
- jpeg_start_output at LIBJPEG_6.2 1.3.1
- jpeg_std_error at LIBJPEG_6.2 1.3.1
- jpeg_std_message_table at LIBJPEG_6.2 1.3.1
- jpeg_stdio_dest at LIBJPEG_6.2 1.3.1
- jpeg_stdio_src at LIBJPEG_6.2 1.3.1
- jpeg_suppress_tables at LIBJPEG_6.2 1.3.1
- jpeg_write_coefficients at LIBJPEG_6.2 1.3.1
- jpeg_write_icc_profile at LIBJPEG_6.2 1:2.0.2
- jpeg_write_m_byte at LIBJPEG_6.2 1.3.1
- jpeg_write_m_header at LIBJPEG_6.2 1.3.1
- jpeg_write_marker at LIBJPEG_6.2 1.3.1
- jpeg_write_raw_data at LIBJPEG_6.2 1.3.1
- jpeg_write_scanlines at LIBJPEG_6.2 1.3.1
- jpeg_write_tables at LIBJPEG_6.2 1.3.1
- jround_up at LIBJPEG_6.2 1.3.1
- jzero_far at LIBJPEG_6.2 1.3.1
diff --git a/debian/libjpeg62-turbo-dev.docs b/debian/libjpeg8-turbo-dev.docs
similarity index 100%
rename from debian/libjpeg62-turbo-dev.docs
rename to debian/libjpeg8-turbo-dev.docs
diff --git a/debian/libjpeg62-turbo-dev.examples b/debian/libjpeg8-turbo-dev.examples
similarity index 100%
rename from debian/libjpeg62-turbo-dev.examples
rename to debian/libjpeg8-turbo-dev.examples
diff --git a/debian/libjpeg62-turbo-dev.install b/debian/libjpeg8-turbo-dev.install
similarity index 100%
rename from debian/libjpeg62-turbo-dev.install
rename to debian/libjpeg8-turbo-dev.install
diff --git a/debian/libjpeg8-turbo.install b/debian/libjpeg8-turbo.install
new file mode 100644
index 0000000..1e5caa0
--- /dev/null
+++ b/debian/libjpeg8-turbo.install
@@ -0,0 +1 @@
+usr/lib/*/libjpeg.so.8*
diff --git a/debian/rules b/debian/rules
index 5905900..bf873c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,8 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(DISABLE_SIMD) $(FLOATTEST) \
 	                     -DWITH_JAVA=1 \
 	                     -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	                     -DCMAKE_INSTALL_MANDIR=/usr/share/man/
+	                     -DCMAKE_INSTALL_MANDIR=/usr/share/man/ \
+	                     -DWITH_JPEG8=1
 	                     $(NULL)
 
 override_dh_auto_build:
@@ -83,8 +84,8 @@ override_dh_missing:
 	dh_missing --fail-missing
 
 override_dh_installchangelogs:
-	dh_installchangelogs -plibjpeg62-turbo-dev change.log
-	dh_installchangelogs -Nlibjpeg62-turbo-dev
+	dh_installchangelogs -plibjpeg8-turbo-dev change.log
+	dh_installchangelogs -Nlibjpeg8-turbo-dev
 
 # See debhelper:
 DEFAULT_BUILD_DIRECTORY = obj-$(DEB_HOST_GNU_TYPE)


More information about the Neon-commits mailing list