[neon/backports-jammy/libjpeg-turbo-jammy/Neon/release] debian: merge stable into release

Carlos De Maine null at kde.org
Tue Mar 7 21:40:06 GMT 2023


Git commit 60b439f78db4ecc03c0d6628caedca6b674f9823 by Carlos De Maine.
Committed on 07/03/2023 at 21:40.
Pushed by carlosdem into branch 'Neon/release'.

merge stable into release

M  +47   -47   debian/changelog
M  +56   -36   debian/control
M  +7    -7    debian/rules

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

diff --git a/debian/changelog b/debian/changelog
index 8185ce3..8c2785d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,7 @@ libjpeg-turbo (2.1.5-2ubuntu1) lunar; urgency=medium
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Wed, 08 Feb 2023 14:06:46 -0500
 
-libjpeg-turbo (1:2.1.5-2) unstable; urgency=medium
+libjpeg-turbo (2.1.5-2) unstable; urgency=medium
 
   * debian/patches:
     + Add 0001_initialize-simd-support-before-every-use.patch. (Closes:
@@ -28,7 +28,7 @@ libjpeg-turbo (1:2.1.5-2) unstable; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Fri, 03 Feb 2023 15:28:42 +0100
 
-libjpeg-turbo (1:2.1.5-1) unstable; urgency=medium
+libjpeg-turbo (2.1.5-1) unstable; urgency=medium
 
   * New upstream release.
   * debian/patches:
@@ -47,7 +47,7 @@ libjpeg-turbo (1:2.1.5-1) unstable; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Thu, 02 Feb 2023 11:45:21 +0100
 
-libjpeg-turbo (1:2.1.2-1) unstable; urgency=medium
+libjpeg-turbo (2.1.2-1) unstable; urgency=medium
 
   * New upstream release.
   * debian/rules:
@@ -64,7 +64,7 @@ libjpeg-turbo (1:2.1.2-1) unstable; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Fri, 26 Nov 2021 14:41:55 +0100
 
-libjpeg-turbo (1:2.1.1-2) unstable; urgency=medium
+libjpeg-turbo (2.1.1-2) unstable; urgency=medium
 
   [ Daniel Leidert ]
   * Build with Java enabled. (Closes: #989217).
@@ -83,7 +83,7 @@ libjpeg-turbo (1:2.1.1-2) unstable; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Thu, 11 Nov 2021 07:51:32 +0100
 
-libjpeg-turbo (1:2.1.1-1) unstable; urgency=medium
+libjpeg-turbo (2.1.1-1) unstable; urgency=medium
 
   [ Mike Gabriel ]
   * New upstream release. (Closes: #994632).
@@ -115,7 +115,7 @@ libjpeg-turbo (1:2.1.1-1) unstable; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Thu, 11 Nov 2021 01:17:59 +0100
 
-libjpeg-turbo (1:2.0.6-4) unstable; urgency=medium
+libjpeg-turbo (2.0.6-4) unstable; urgency=medium
 
   [ Adrian Bunk ]
   * debian/patches:
@@ -129,14 +129,14 @@ libjpeg-turbo (1:2.0.6-4) unstable; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Sun, 14 Mar 2021 15:45:05 +0100
 
-libjpeg-turbo (1:2.0.6-3) SKIPPED; urgency=medium
+libjpeg-turbo (2.0.6-3) SKIPPED; urgency=medium
 
   * This version never got uploaded to Debian, due to an error when
     creating d/changelog stanzas.
 
  -- Mike Gabriel <sunweaver at debian.org>  Mon, 01 Mar 2021 10:29:14 +0100
 
-libjpeg-turbo (1:2.0.6-2) unstable; urgency=medium
+libjpeg-turbo (2.0.6-2) unstable; urgency=medium
 
   [ Adrian Bunk ]
   * debian/rules:
@@ -144,7 +144,7 @@ libjpeg-turbo (1:2.0.6-2) unstable; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Tue, 23 Feb 2021 12:15:18 +0100
 
-libjpeg-turbo (1:2.0.6-1) unstable; urgency=medium
+libjpeg-turbo (2.0.6-1) unstable; urgency=medium
 
   [ Vagrant Cascadian ]
   * debian/extra/Makefile:
@@ -176,7 +176,7 @@ libjpeg-turbo (1:2.0.6-1) unstable; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Mon, 15 Feb 2021 13:39:05 +0100
 
-libjpeg-turbo (1:2.0.5-2) unstable; urgency=medium
+libjpeg-turbo (2.0.5-2) unstable; urgency=medium
 
   [ Debian Janitor ]
   * debian/copyright:
@@ -199,7 +199,7 @@ libjpeg-turbo (1:2.0.5-2) unstable; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Fri, 01 Jan 2021 21:43:20 +0100
 
-libjpeg-turbo (1:2.0.5-1.1) unstable; urgency=medium
+libjpeg-turbo (2.0.5-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
   * Fix incorrect FLOATTEST guesses causing test failures.
@@ -214,7 +214,7 @@ libjpeg-turbo (1:2.0.5-1.1) unstable; urgency=medium
 
  -- Adrian Bunk <bunk at debian.org>  Fri, 31 Jul 2020 17:51:51 +0300
 
-libjpeg-turbo (1:2.0.5-1) unstable; urgency=medium
+libjpeg-turbo (2.0.5-1) unstable; urgency=medium
 
   * Upload to unstable.
 
@@ -228,7 +228,7 @@ libjpeg-turbo (1:2.0.5-1) unstable; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Sat, 04 Jul 2020 23:57:20 +0200
 
-libjpeg-turbo (1:2.0.4-1~exp1) experimental; urgency=medium
+libjpeg-turbo (2.0.4-1~exp1) experimental; urgency=medium
 
   * New upstream release.
   * debian/patches:
@@ -238,7 +238,7 @@ libjpeg-turbo (1:2.0.4-1~exp1) experimental; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Tue, 14 Jan 2020 08:15:09 +0100
 
-libjpeg-turbo (1:2.0.3-1~exp1) experimental; urgency=medium
+libjpeg-turbo (2.0.3-1~exp1) experimental; urgency=medium
 
   * New upstream release.
     - CVE-2019-2201: TurboJPEG: Properly handle gigapixel images Prevent
@@ -257,7 +257,7 @@ libjpeg-turbo (1:2.0.3-1~exp1) experimental; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Thu, 19 Dec 2019 13:48:20 +0100
 
-libjpeg-turbo (1:2.0.2-1~exp4) experimental; urgency=medium
+libjpeg-turbo (2.0.2-1~exp4) experimental; urgency=medium
 
   * debian/rules:
     + Fix SIMD build option (we got it the wrong way 'round in the previous
@@ -265,7 +265,7 @@ libjpeg-turbo (1:2.0.2-1~exp4) experimental; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Tue, 27 Aug 2019 14:27:45 +0200
 
-libjpeg-turbo (1:2.0.2-1~exp3) experimental; urgency=medium
+libjpeg-turbo (2.0.2-1~exp3) experimental; urgency=medium
 
   * debian/rules:
     + Explicitly set CMAKE_INSTALL_MANDIR, fixes FTBFS for kfreebsd-<arch>
@@ -274,7 +274,7 @@ libjpeg-turbo (1:2.0.2-1~exp3) experimental; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Tue, 27 Aug 2019 08:31:12 +0200
 
-libjpeg-turbo (1:2.0.2-1~exp2) experimental; urgency=medium
+libjpeg-turbo (2.0.2-1~exp2) experimental; urgency=medium
 
   * debian/copyright:
     + Update Source: field. Upstream has moved to Github.
@@ -286,7 +286,7 @@ libjpeg-turbo (1:2.0.2-1~exp2) experimental; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Thu, 22 Aug 2019 16:32:54 +0200
 
-libjpeg-turbo (1:2.0.2-1~exp1) experimental; urgency=medium
+libjpeg-turbo (2.0.2-1~exp1) experimental; urgency=medium
 
   * New upstream release.
   * debian/patches:
@@ -336,14 +336,14 @@ libjpeg-turbo (1:2.0.2-1~exp1) experimental; urgency=medium
 
  -- Mike Gabriel <sunweaver at debian.org>  Wed, 21 Aug 2019 15:58:25 +0200
 
-libjpeg-turbo (1:1.5.2-2) unstable; urgency=medium
+libjpeg-turbo (1.5.2-2) unstable; urgency=medium
 
   * Drop env declaration patch on mips to fix FTBFS on mips
   * Add jpeg_simd_cpu_support symbol that exists only on any-i386 archs
 
  -- Ondřej Surý <ondrej at debian.org>  Fri, 25 Aug 2017 10:27:48 +0200
 
-libjpeg-turbo (1:1.5.2-1) unstable; urgency=medium
+libjpeg-turbo (1.5.2-1) unstable; urgency=medium
 
   * New upstream version 1.5.2
   * Stop using custom libjpeg.pc (Closes: #860219)
@@ -353,19 +353,19 @@ libjpeg-turbo (1:1.5.2-1) unstable; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Fri, 25 Aug 2017 09:16:54 +0200
 
-libjpeg-turbo (1:1.5.1-2) unstable; urgency=medium
+libjpeg-turbo (1.5.1-2) unstable; urgency=medium
 
   * Declare env on MIPS on first use (Courtesy of Aurelien Jarno) (Closes: #841129)
 
  -- Ondřej Surý <ondrej at debian.org>  Thu, 20 Oct 2016 15:51:27 +0200
 
-libjpeg-turbo (1:1.5.1-1) unstable; urgency=medium
+libjpeg-turbo (1.5.1-1) unstable; urgency=medium
 
   * Imported Upstream version 1.5.1
 
  -- Ondřej Surý <ondrej at debian.org>  Wed, 21 Sep 2016 14:01:53 +0200
 
-libjpeg-turbo (1:1.5.0-1) unstable; urgency=medium
+libjpeg-turbo (1.5.0-1) unstable; urgency=medium
 
   * Imported Upstream version 1.5.0
   * Remove MIPS SIMD patch; merged upstream
@@ -381,13 +381,13 @@ libjpeg-turbo (1:1.5.0-1) unstable; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Wed, 08 Jun 2016 11:05:07 +0200
 
-libjpeg-turbo (1:1.4.2-2) unstable; urgency=medium
+libjpeg-turbo (1.4.2-2) unstable; urgency=medium
 
   * Only disable SIMD on x32 instead of enabling it everywhere else
 
  -- Ondřej Surý <ondrej at debian.org>  Mon, 01 Feb 2016 18:13:32 +0100
 
-libjpeg-turbo (1:1.4.2-1) unstable; urgency=medium
+libjpeg-turbo (1.4.2-1) unstable; urgency=medium
 
   * Imported Upstream version 1.4.2
   * Reproducible builds are now achieved with --with-build-date
@@ -395,21 +395,21 @@ libjpeg-turbo (1:1.4.2-1) unstable; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Mon, 01 Feb 2016 16:30:16 +0100
 
-libjpeg-turbo (1:1.4.1-2) unstable; urgency=medium
+libjpeg-turbo (1.4.1-2) unstable; urgency=medium
 
   * Fix build error in MIPS SIMD when compiling with -mfpxx (Closes: #795845)
   * Add versioned provides for libjpeg62 (Closes: #787938)
 
  -- Ondřej Surý <ondrej at debian.org>  Wed, 26 Aug 2015 17:34:30 +0200
 
-libjpeg-turbo (1:1.4.1-1) unstable; urgency=medium
+libjpeg-turbo (1.4.1-1) unstable; urgency=medium
 
   * Imported Upstream version 1.4.1
   * All patches except the reproducible build has been merged upstream
 
  -- Ondřej Surý <ondrej at debian.org>  Tue, 28 Jul 2015 08:23:22 +0200
 
-libjpeg-turbo (1:1.4.0-7) unstable; urgency=medium
+libjpeg-turbo (1.4.0-7) unstable; urgency=medium
 
   * Add patch to make builds reproducible (Closes: #782893)
   * Adjust gbp.conf for releasing 1.4.0 to unstable
@@ -417,13 +417,13 @@ libjpeg-turbo (1:1.4.0-7) unstable; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Sun, 10 May 2015 22:14:45 +0200
 
-libjpeg-turbo (1:1.4.0-6) experimental; urgency=medium
+libjpeg-turbo (1.4.0-6) experimental; urgency=medium
 
   * Remove architecture list in nasm B-D (Closes: #776877)
 
  -- Ondřej Surý <ondrej at debian.org>  Mon, 02 Feb 2015 21:12:29 +0100
 
-libjpeg-turbo (1:1.4.0-5) experimental; urgency=medium
+libjpeg-turbo (1.4.0-5) experimental; urgency=medium
 
   * Add missing init_simd() call in jsimd_can_h2v[12]_merged_upsample
     functions in mips(el) SIMD and thus we can enable SIMD on mips(el)
@@ -432,7 +432,7 @@ libjpeg-turbo (1:1.4.0-5) experimental; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Wed, 21 Jan 2015 17:13:23 +0100
 
-libjpeg-turbo (1:1.4.0-4) experimental; urgency=medium
+libjpeg-turbo (1.4.0-4) experimental; urgency=medium
 
   * Enable hardening=+all in d/rules
   * Preserve user supplied CFLAGS by using foo_CPPFLAGS instead of
@@ -440,13 +440,13 @@ libjpeg-turbo (1:1.4.0-4) experimental; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Fri, 16 Jan 2015 09:15:29 +0100
 
-libjpeg-turbo (1:1.4.0-3) experimental; urgency=medium
+libjpeg-turbo (1.4.0-3) experimental; urgency=medium
 
   * Disable SIMD on mips as well (and match x32 against DEB_HOST_ARCH)
 
  -- Ondřej Surý <ondrej at debian.org>  Thu, 15 Jan 2015 10:41:33 +0100
 
-libjpeg-turbo (1:1.4.0-2) experimental; urgency=medium
+libjpeg-turbo (1.4.0-2) experimental; urgency=medium
 
   * Disable float tests (see https://sourceforge.net/p/libjpeg-turbo/bugs/83/
     for background)
@@ -455,7 +455,7 @@ libjpeg-turbo (1:1.4.0-2) experimental; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Wed, 14 Jan 2015 13:22:18 +0100
 
-libjpeg-turbo (1:1.4.0-1) experimental; urgency=medium
+libjpeg-turbo (1.4.0-1) experimental; urgency=medium
 
   * Add gbp.conf for experimental (1.4) branch
   * New upstream version 1.4.0
@@ -465,26 +465,26 @@ libjpeg-turbo (1:1.4.0-1) experimental; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Mon, 12 Jan 2015 12:11:11 +0100
 
-libjpeg-turbo (1:1.3.1-12) unstable; urgency=medium
+libjpeg-turbo (1.3.1-12) unstable; urgency=medium
 
   * No change upload to bump version in unstable
 
  -- Ondřej Surý <ondrej at debian.org>  Sun, 08 Mar 2015 18:57:07 +0100
 
-libjpeg-turbo (1:1.3.1-11) unstable; urgency=medium
+libjpeg-turbo (1.3.1-11) unstable; urgency=medium
 
   * Cleanup the list of maintainers and uploaders
   * [CVE-2014-9092]: Fix a Huffman local buffer overrun
 
  -- Ondřej Surý <ondrej at debian.org>  Wed, 26 Nov 2014 11:00:17 +0100
 
-libjpeg-turbo (1:1.3.1-10) unstable; urgency=medium
+libjpeg-turbo (1.3.1-10) unstable; urgency=medium
 
   * Drop extra and conflicting Provides (Closes: #766347)
 
  -- Ondřej Surý <ondrej at debian.org>  Wed, 22 Oct 2014 15:13:59 +0200
 
-libjpeg-turbo (1:1.3.1-9) unstable; urgency=medium
+libjpeg-turbo (1.3.1-9) unstable; urgency=medium
 
   * Fix multiarch library path in libjpeg.pc.in (Closes: #766002)
   * Drop dummy transitional libjpeg62{,-dev,-dbg} packages
@@ -492,13 +492,13 @@ libjpeg-turbo (1:1.3.1-9) unstable; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Mon, 20 Oct 2014 10:37:23 +0200
 
-libjpeg-turbo (1:1.3.1-8) unstable; urgency=medium
+libjpeg-turbo (1.3.1-8) unstable; urgency=medium
 
   * Fix the *.symbols file
 
  -- Ondřej Surý <ondrej at debian.org>  Mon, 13 Oct 2014 14:19:01 +0200
 
-libjpeg-turbo (1:1.3.1-7) unstable; urgency=medium
+libjpeg-turbo (1.3.1-7) unstable; urgency=medium
 
   * Rename libjpeg62{,-dev,-dbg} to libjpeg62-turbo{,-dev,-dbg}
     (Closes: #763360)
@@ -509,34 +509,34 @@ libjpeg-turbo (1:1.3.1-7) unstable; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Mon, 13 Oct 2014 01:23:44 +0200
 
-libjpeg-turbo (1:1.3.1-6) unstable; urgency=medium
+libjpeg-turbo (1.3.1-6) unstable; urgency=medium
 
   * Changes Breaks: libjpeg-progs to Conflicts: libjpeg-progs and drop
     Replaces: libjpeg-progs (Closes: #764322)
 
  -- Ondřej Surý <ondrej at debian.org>  Tue, 07 Oct 2014 10:03:41 +0200
 
-libjpeg-turbo (1:1.3.1-5) unstable; urgency=medium
+libjpeg-turbo (1.3.1-5) unstable; urgency=medium
 
   * Fix typo in description and other fixes (Closes: #763414, #763415)
   * Build without SIMD on x32 (Closes: #764170)
 
  -- Ondřej Surý <ondrej at debian.org>  Mon, 06 Oct 2014 12:24:41 +0200
 
-libjpeg-turbo (1:1.3.1-4) unstable; urgency=medium
+libjpeg-turbo (1.3.1-4) unstable; urgency=medium
 
   * Remove dummy libjpeg-progs from libjpeg-turbo
   * Fix invalid epoch in Conflicts field of libjpeg-dev
 
  -- Ondřej Surý <ondrej at debian.org>  Mon, 29 Sep 2014 21:09:17 +0200
 
-libjpeg-turbo (1:1.3.1-3) unstable; urgency=medium
+libjpeg-turbo (1.3.1-3) unstable; urgency=medium
 
   * Upload to unstable to proceed with transition (Ref: #754988)
 
  -- Ondřej Surý <ondrej at debian.org>  Fri, 26 Sep 2014 14:34:39 +0200
 
-libjpeg-turbo (1:1.3.1-2) experimental; urgency=high
+libjpeg-turbo (1.3.1-2) experimental; urgency=high
 
   * Add correct Breaks/Replaces: libjpeg-progs (<< 1.3.1-1~) to
     libjpeg-turbo-progs (Closes: #757860)
@@ -545,7 +545,7 @@ libjpeg-turbo (1:1.3.1-2) experimental; urgency=high
 
  -- Ondřej Surý <ondrej at debian.org>  Tue, 26 Aug 2014 12:39:52 +0200
 
-libjpeg-turbo (1:1.3.1-1) experimental; urgency=medium
+libjpeg-turbo (1.3.1-1) experimental; urgency=medium
 
   * Upload to experimental in preparation for libjpeg-turbo default JPEG
     library switch
@@ -766,4 +766,4 @@ libjpeg-turbo (1.1.90+svn702-0ubuntu1) oneiric; urgency=low
   * Initial Release based on svn 702
   * Initial Release and packaging based on svn 702 (LP: #852207)
 
- -- Tom Gall <tom.gall at linaro.org>  Tue, 13 Sep 2011 03:53:56 +0000
\ No newline at end of file
+ -- Tom Gall <tom.gall at linaro.org>  Tue, 13 Sep 2011 03:53:56 +0000
diff --git a/debian/control b/debian/control
index e4d5441..f3d3db2 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ XSBC-Original-Maintainer: Ondřej Surý <ondrej at debian.org>
 Uploaders: Mike Gabriel <sunweaver at debian.org>
 Build-Depends: cmake (>= 2.8.12),
                debhelper-compat (= 13),
-               default-jdk,
+#               default-jdk,
                help2man,
-               javahelper,
-	       nasm
+#               javahelper,
+			   nasm
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
 Homepage: https://www.libjpeg-turbo.org/
@@ -35,16 +35,21 @@ Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends: libc-dev,
-	 libjpeg-turbo8 (= ${binary:Version}),
-	 ${misc:Depends}
+		 libjpeg-turbo8 (= ${binary:Version}),
+		 ${misc:Depends}
+Breaks: libjpeg-turbo8-dev (<< 1:2.1.5-2+22.04+jammy)
 Conflicts: libjpeg62-dev,
-	   libjpeg7-dev,
-#	   libjpeg8-dev,
-	   libjpeg9-dev
+           libjpeg62-turbo-dev,
+	       libjpeg7-dev,
+#	       libjpeg8-dev,
+	       libjpeg9-dev,
+	       libjpeg-turbo8-dev (<< 1:2.1.5-2+22.04+jammy),
 Replaces: libjpeg62-dev,
-	  libjpeg7-dev,
-#	  libjpeg8-dev,
-	  libjpeg9-dev
+          libjpeg62-turbo-dev,
+	      libjpeg7-dev,
+#	      libjpeg8-dev,
+	      libjpeg9-dev,
+	      libjpeg-turbo8-dev (<< 1:2.1.5-2+22.04+jammy)
 Provides: libjpeg-dev
 Description: Development files for the libjpeg-turbo JPEG library
  The libjpeg-turbo JPEG library is a library for handling JPEG files.
@@ -61,7 +66,12 @@ Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends},
-	 ${shlibs:Depends}
+      	 ${shlibs:Depends}
+Breaks: libjpeg-turbo8 (<< 1:2.1.5-2+22.04+jammy)
+Replaces: libjpeg62-turbo,
+		  libjpeg-turbo8 (<< 1:2.1.5-2+22.04+jammy)
+Conflicts: libjpeg62-turbo,
+		   libjpeg-turbo8 (<< 1:2.1.5-2+22.04+jammy)
 Description: libjpeg-turbo JPEG runtime library
  The libjpeg-turbo JPEG library is a library for handling JPEG files.
  .
@@ -78,9 +88,12 @@ Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
-	 ${misc:Depends}
-Replaces: libturbojpeg0
-Conflicts: libturbojpeg0
+		 ${misc:Depends}
+Breaks: libturbojpeg (<< 1:2.1.5-2+22.04+jammy)
+Replaces: libturbojpeg0,
+		  libturbojpeg (<< 1:2.1.5-2+22.04+jammy)
+Conflicts: libturbojpeg0,
+		   libturbojpeg (<< 1:2.1.5-2+22.04+jammy),
 Description: TurboJPEG runtime library - SIMD optimized
  The libjpeg-turbo JPEG library is a library for handling JPEG files.
  .
@@ -95,10 +108,13 @@ Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends: libturbojpeg (= ${binary:Version}),
-	 ${misc:Depends},
+		 ${misc:Depends},
+Breaks: libturbojpeg0-dev (<< 1:2.1.5-2+22.04+jammy),
 Replaces: libturbojpeg-dev,
+		  libturbojpeg0-dev (<< 1:2.1.5-2+22.04+jammy),
 Conflicts: libturbojpeg-dev,
-	   libturbojpeg1-dev,
+		   libturbojpeg1-dev,
+		   libturbojpeg0-dev (<< 1:2.1.5-2+22.04+jammy),
 Provides: libturbojpeg-dev
 Description: Development files for the TurboJPEG library
  The libjpeg-turbo JPEG library is a library for handling JPEG files.
@@ -113,11 +129,14 @@ Description: Development files for the TurboJPEG library
 Package: libjpeg-turbo-progs
 Architecture: any
 Depends: ${misc:Depends},
-	 ${shlibs:Depends}
-Conflicts: libjpeg-progs
-Breaks: libjpeg-turbo-test (<< 1:2.1.5-2ubuntu1~)
+		 ${shlibs:Depends},
+Conflicts: libjpeg-progs,
+		   libjpeg-turbo-progs (<< 1:2.1.5-2+22.04+jammy)
+Breaks: libjpeg-turbo-test (<< 2.1.2-0ubuntu1),
+		libjpeg-turbo-progs (<< 1:2.1.5-2+22.04+jammy)
 Replaces: libjpeg-progs (<< 8c-2ubuntu5),
-          libjpeg-turbo-test (<< 1:2.1.5-2ubuntu1~)
+          libjpeg-turbo-test (<< 2.1.2-0ubuntu1),
+          libjpeg-turbo-progs (<< 1:2.1.5-2+22.04+jammy)
 Provides: libjpeg-progs
 Description: Programs for manipulating JPEG files
  This package contains programs for manipulating JPEG files from the
@@ -128,18 +147,19 @@ Description: Programs for manipulating JPEG files
   * jpegexiforient/exifautotran: manipulate EXIF orientation tag
   * tjbench: a simple JPEG benchmarking tool
 
-Package: libturbojpeg-java
-Architecture: all
-Section: java
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ${java:Depends},
-         libturbojpeg (>= ${source:Version})
-Description: Java bindings for the TurboJPEG library
- The libjpeg-turbo JPEG library is a library for handling JPEG files.
- .
- libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX,
- SSE2, NEON) to accelerate baseline JPEG compression and decompression
- on x86, x86-64, and ARM systems.
- .
- This package contains the Java bindings.
+#Package: libturbojpeg-java
+##Architecture: all
+#Section: java
+#Build-Profiles: <cross !nojava>
+#Depends: ${misc:Depends},
+#         ${shlibs:Depends},
+#         ${java:Depends},
+#         libturbojpeg (>= ${source:Version})
+#Description: Java bindings for the TurboJPEG library
+# The libjpeg-turbo JPEG library is a library for handling JPEG files.
+# .
+# libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX,
+# SSE2, NEON) to accelerate baseline JPEG compression and decompression
+# on x86, x86-64, and ARM systems.
+# .
+# This package contains the Java bindings.
diff --git a/debian/rules b/debian/rules
index 045d3ac..89df8eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 NULL =
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 include /usr/share/dpkg/default.mk
 
@@ -44,11 +44,11 @@ else
 endif
 
 %:
-	dh $@ --with javahelper
+	dh $@
+	#dh $@ --with javahelper
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(DISABLE_SIMD) $(FLOATTEST) \
-	                     -DWITH_JAVA=1 \
 	                     -DWITH_JPEG8=1 \
 	                     -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	                     -DCMAKE_INSTALL_MANDIR=/usr/share/man/
@@ -84,15 +84,15 @@ override_dh_install:
 override_dh_missing:
 	dh_missing --fail-missing
 
-execute_after_dh_gencontrol:
-	dh_gencontrol -p libturbojpeg0-dev -- -v1:$(DEB_VERSION)
-	dh_gencontrol -p libturbojpeg -- -v1:$(DEB_VERSION)
+#execute_after_dh_gencontrol:
+#	dh_gencontrol -p libturbojpeg0-dev -- -v1:$(DEB_VERSION)
+#	dh_gencontrol -p libturbojpeg -- -v1:$(DEB_VERSION)
 
 override_dh_makeshlibs:
 	: # keep the original libjpeg symbol version
 	dh_makeshlibs -- -v8c
 	: # ... and mark libjpeg-turbo only symbols with a different version
-	sed -i "$$(for i in $$(cat debian/libjpeg-turbo-only.symbols); do echo "/^ $$i/s/8c$$/8c-2ubuntu5~/;"; done)" debian/libjpeg-turbo8/DEBIAN/symbols
+	#sed -i "$$(for i in $$(cat debian/libjpeg-turbo-only.symbols); do echo "/^ $$i/s/8c$$/8c-2ubuntu5~/;"; done)" debian/libjpeg-turbo8/DEBIAN/symbols
 
 override_dh_installchangelogs:
 	dh_installchangelogs -plibjpeg-turbo8-dev change.log


More information about the Neon-commits mailing list