[neon/backports-jammy/libjxl-jammy/Neon/release] debian: Bump so version in package name, bring changes over from salsa, add new files to install.

Scarlett Moore null at kde.org
Wed Sep 6 17:42:31 BST 2023 

Git commit 6cad868e75546f9fd79d3627db8ec6f1477ab1da by Scarlett Moore.
Committed on 06/09/2023 at 18:42.
Pushed by scarlettmoore into branch 'Neon/release'.

Bump so version in package name, bring changes over from salsa, add new files to install.

A  +6    -0    debian/cjpegli.1.in
M  +35   -2    debian/control
A  +6    -0    debian/djpegli.1.in
A  +2    -0    debian/libjpegli-tools.install
A  +2    -0    debian/libjpegli-tools.manpages
A  +1    -0    debian/libjpegli62-dev.install
A  +1    -0    debian/libjpegli62.install
A  +2    -0    debian/libjpegli62.lintian-overrides
M  +1    -1    debian/libjxl-dev.install
M  +2    -0    debian/libjxl-devtools.install
R  +0    -0    debian/libjxl0.8.install [from: debian/libjxl0.7.install - 100% similarity]
R  +1    -1    debian/libjxl0.8.symbols [from: debian/libjxl0.7.symbols - 099% similarity]
M  +6    -2    debian/rules

https://invent.kde.org/neon/backports-jammy/libjxl-jammy/-/commit/6cad868e75546f9fd79d3627db8ec6f1477ab1da

diff --git a/debian/cjpegli.1.in b/debian/cjpegli.1.in
new file mode 100644
index 0000000..93416bb
--- /dev/null
+++ b/debian/cjpegli.1.in
@@ -0,0 +1,6 @@
+[NAME]
+cjpegli - cjpegli
+
+[AUTHOR]
+This manual page was written by Mathieu Malaterre <malat at debian.org> for the
+Debian GNU/Linux system (but may be used by others).
diff --git a/debian/control b/debian/control
index 218a844..1c662ba 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Architecture: any
 Section: libdevel
 Depends: libbrotli-dev,
          libhwy-dev,
-         libjxl0.7 (= ${binary:Version}),
+         libjxl0.8 (= ${binary:Version}),
          liblcms-dev,
          ${misc:Depends}
 Multi-Arch: same
@@ -65,7 +65,7 @@ Description: JPEG XL Image Coding System - "JXL" (development files)
  .
  This package installs development files.
 
-Package: libjxl0.7
+Package: libjxl0.8
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -120,3 +120,36 @@ Description: JPEG XL Image Coding System - "JXL" (java bindings)
  several features that help transition from the legacy JPEG format.
  .
  This package installs the Java Bindings.
+
+Package: libjpegli62-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends: libc-dev, libjpegli62 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libjpeg62-dev,
+           libjpeg62-turbo-dev,
+           libjpeg7-dev,
+           libjpeg8-dev,
+           libjpeg9-dev
+Replaces: libjpeg62-dev,
+          libjpeg62-turbo-dev,
+          libjpeg7-dev,
+          libjpeg8-dev,
+          libjpeg9-dev
+Provides: libjpeg-dev
+Description: Improved JPEG encoder and decoder implementation (development files)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs jpegli jpeg62 headers.
+
+Package: libjpegli-tools
+Architecture: any
+Section: utils
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Improved JPEG encoder and decoder implementation (command line utility)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs the JPEGLI tools command line utilities.
+
diff --git a/debian/djpegli.1.in b/debian/djpegli.1.in
new file mode 100644
index 0000000..851047b
--- /dev/null
+++ b/debian/djpegli.1.in
@@ -0,0 +1,6 @@
+[NAME]
+djpegli - djpegli
+
+[AUTHOR]
+This manual page was written by Mathieu Malaterre <malat at debian.org> for the
+Debian GNU/Linux system (but may be used by others).
diff --git a/debian/libjpegli-tools.install b/debian/libjpegli-tools.install
new file mode 100644
index 0000000..d5e6af8
--- /dev/null
+++ b/debian/libjpegli-tools.install
@@ -0,0 +1,2 @@
+usr/bin/cjpegli
+usr/bin/djpegli
diff --git a/debian/libjpegli-tools.manpages b/debian/libjpegli-tools.manpages
new file mode 100644
index 0000000..af23b77
--- /dev/null
+++ b/debian/libjpegli-tools.manpages
@@ -0,0 +1,2 @@
+debian/cjpegli.1
+debian/djpegli.1
diff --git a/debian/libjpegli62-dev.install b/debian/libjpegli62-dev.install
new file mode 100644
index 0000000..97516eb
--- /dev/null
+++ b/debian/libjpegli62-dev.install
@@ -0,0 +1 @@
+usr/lib/*/libjpeg*.so
diff --git a/debian/libjpegli62.install b/debian/libjpegli62.install
new file mode 100644
index 0000000..5dd0e11
--- /dev/null
+++ b/debian/libjpegli62.install
@@ -0,0 +1 @@
+usr/lib/*/libjpeg*.so.*
diff --git a/debian/libjpegli62.lintian-overrides b/debian/libjpegli62.lintian-overrides
new file mode 100644
index 0000000..16a95b1
--- /dev/null
+++ b/debian/libjpegli62.lintian-overrides
@@ -0,0 +1,2 @@
+# Debian has libjpeg62 and it's IJG libjpeg, this one is libjpegli...
+libjpegli62: package-name-doesnt-match-sonames libjpeg62
diff --git a/debian/libjxl-dev.install b/debian/libjxl-dev.install
index ebe4ac4..257a27f 100644
--- a/debian/libjxl-dev.install
+++ b/debian/libjxl-dev.install
@@ -1,3 +1,3 @@
 usr/include/jxl/*.h
-usr/lib/*/*.so
+usr/lib/*/libjxl*.so
 usr/lib/*/pkgconfig/*.pc
diff --git a/debian/libjxl-devtools.install b/debian/libjxl-devtools.install
index 7fdd98e..a53ef11 100644
--- a/debian/libjxl-devtools.install
+++ b/debian/libjxl-devtools.install
@@ -11,3 +11,5 @@ usr/bin/ssimulacra_main
 usr/bin/texture_to_cube
 usr/bin/tone_map
 usr/bin/xyb_range
+usr/bin/exr_to_pq
+usr/bin/ssimulacra2
diff --git a/debian/libjxl0.7.install b/debian/libjxl0.8.install
similarity index 100%
rename from debian/libjxl0.7.install
rename to debian/libjxl0.8.install
diff --git a/debian/libjxl0.7.symbols b/debian/libjxl0.8.symbols
similarity index 99%
rename from debian/libjxl0.7.symbols
rename to debian/libjxl0.8.symbols
index a4cc3f5..4d1714a 100644
--- a/debian/libjxl0.7.symbols
+++ b/debian/libjxl0.8.symbols
@@ -1,4 +1,4 @@
-libjxl.so.0.7 libjxl0.7 #MINVER#
+libjxl.so.0.8 libjxl0.8 #MINVER#
 * Build-Depends-Package: libjxl-dev
  JXL_0 at JXL_0 0.6.1
  JxlButteraugliApiCreate at JXL_0 0.6.1
diff --git a/debian/rules b/debian/rules
index e364ac1..759eea2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,6 +69,7 @@ CMAKE_EXTRA_FLAGS += \
 	-DJPEGXL_FORCE_SYSTEM_LCMS2:BOOL=ON \
 	-DJPEGXL_INSTALL_JARDIR:PATH=share/java \
 	-DJPEGXL_INSTALL_JNIDIR:PATH=lib/$(DEB_HOST_MULTIARCH)/jni \
+	-DJPEGXL_INSTALL_JPEGLI_LIBJPEG:BOOL=ON \
 	-DJPEGXL_TEST_DATA_PATH:PATH=/usr/share/libjxl-testdata \
 
 override_dh_auto_configure:
@@ -87,7 +88,7 @@ override_dh_auto_test-indep:
 override_dh_auto_test-arch:
 	timeout 4h dh_auto_test --
 
-override_dh_installman-arch: tools_manpages devtools_manpages
+override_dh_installman-arch: tools_manpages devtools_manpages jpegli_manpages
 	dh_installman
 
 override_dh_clean-arch:
@@ -106,7 +107,7 @@ VER_FULL = $(DEB_VERSION_UPSTREAM)
 debian/%.1: debian/%.1.in
 	LD_PRELOAD= LD_LIBRARY_PATH=./debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) help2man --no-discard-stderr --include=$< --output=$@ --help-option=--help --version-string=$(VER_FULL) --no-info ./debian/tmp/usr/bin/`basename $@ .1`
 
-.PHONY: tools_manpages devtools_manpages get-orig-source
+.PHONY: tools_manpages devtools_manpages jpegli_manpages get-orig-source
 
 tools_manpages: debian/cjpeg_hdr.1 debian/jxlinfo.1
 	echo "all tools manpages generated"
@@ -115,6 +116,9 @@ devtools_manpages: debian/butteraugli_main.1 debian/decode_and_encode.1 debian/d
 	echo $(DEVTOOLS)
 	echo "all devtools manpages generated"
 
+jpegli_manpages: debian/cjpegli.1 debian/djpegli.1
+	echo "all jpegli manpages generated"
+
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902846
 get-orig-source:
 	uscan --download --force-download --rename

More information about the Neon-commits mailing list