Hi Yaroslav, hi all, On Mi 20 Mär 2013 20:26:24 CET Yaroslav Halchenko wrote:
[...]
I have worked-in (hopefully!) all comments/requests dicussed during the last days into libjpeg-turbo.git on collab-maint.
I have also attempted to allow a smooth update of libjpeg-turbo bin:package in Ubuntu by this version.
As there have been quite some commits on libjpeg-turbo.git for that, I have attached the (shorter) all-over diff between now and the last time you looked at the Git project to this mail.
Request for more comments. Also: shall we upload to unstable or to experimental? Greets+thanks, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
diff --git a/debian/changelog b/debian/changelog
index a3beea0..351ead7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,129 @@
libjpeg-turbo (1.2.90-1) UNRELEASED; urgency=low
+ [ Osamu Aoki ]
* New upstream version. Closes: #612341
+ * Merge package based on Ubuntu and Fathi Boudra.
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 23 Jan 2012 22:21:35 +0100
+ [ Mike Gabriel ]
+ * /debian/control:
+ + Set maintainer to: Debian TigerVNC Packaging Team
+ <pkg-tigervnc-devel@lists.alioth.debian.org>.
+ + Raise Standards: version to 3.9.4 (after several changes, as described
+ below).
+ + Build-depend on debhelper (>= 9).
+ + Fully re-arrange the bin:package naming scheme.
+ + Hard-coded unversioned dependecy on libc6 for libjpeg-turbo-progs.
+ + Hard-coded versioned dependency on libjpeg8-turbo for libjpeg-turbo-progs.
+ * /debian/copyright:
+ + License change for packaging files: BSD-3. Agreed upon by all copyright
+ holders (see backlog of #612341).
+ + Add TigerVNC Packaging Team to copyright holders of /debian/*.
+ + Mention files in debian/extras/* separately in license file.
+ * /debian/rules:
+ + Change over to building libjpeg8-turbo (as opposed to libjpeg-turbo62
+ in early versions of this src:package).
+ + Enable unit tests during package build. Clean up test images during
+ dh_auto_clean.
+ * /debian/patches:
+ + Add patch: 001_versioned-libjpegturbo.patch. Adds versioned .so file
+ support for libturbojpeg.so.
+ + Add patch: 002_test-progs.patch. Install test programmes to debian/tmp/*.
+ * Lintian overrides:
+ + Add override for: libjpeg8-turbo: shlib-calls-exit
+ usr/lib/x86_64-linux-gnu/libjpeg.so.8.0.2. Can be ignored as explained by
+ upstream.
+ + Add override for: libturbojpeg1: shlib-calls-exit
+ usr/lib/x86_64-linux-gnu/libturbojpeg.so.1.2.90. Can be ignored as
+ explained by upstream.
+ + Add override for: libjpeg-turbo-test: binary-without-manpage
+ usr/bin/tjunittest. No man page provided by upstream and only useful
+ for package maintainers.
+ + Add override for: libjpeg-turbo source: package-depends-on-hardcoded-libc
+ libjpeg-turbo-progs depends. The generation of shlibs dependencies fail
+ for bin:package libjpeg-turbo-progs. The result would be a versioned
+ dependency on libjpeg8 (>= 8d) which is inappropriate for the
+ libjpeg-turbo-progs package. The libjpeg-turbo-progs bin:package should be
+ used with bin:package libjpeg8-turbo instead.
+
+ -- Mike Gabriel <sunweaver@debian.org> Mon, 23 Jan 2012 22:21:35 +0100
+
+libjpeg-turbo (1.1.90+svn704-1) UNRELEASED; urgency=low
+
+ * Initial release (Closes: #612341)
+
+ -- Fathi Boudra <fabo@debian.org> Sat, 17 Sep 2011 12:51:45 +0300
+
+libjpeg-turbo (1.1.90+svn733-1) UNRELEASED; urgency=low
+
+ * Initial Debian version.
+
+ -- Osamu Aoki <osamu@debian.org> Sat, 26 May 2012 23:08:16 +0900
+
+libjpeg-turbo (1.1.90+svn733-0ubuntu4) precise; urgency=low
+
+ * Install jpegint.h in the -dev package.
+ * Install jconfig.h in the multiarch include directory.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 13 Jan 2012 12:02:38 +0100
+
+libjpeg-turbo (1.1.90+svn733-0ubuntu3) precise; urgency=low
+
+ * libjpeg-turbo-progs: Remove dependency on libturbojpeg.
+
+ -- Matthias Klose <doko@ubuntu.com> Wed, 21 Dec 2011 20:10:28 +0100
+
+libjpeg-turbo (1.1.90+svn733-0ubuntu2) precise; urgency=low
+
+ * Sync with upstream to svn733.
+
+ * Rename libjpeg-test to libjpeg-turbo-test.
+ * Rename libjpeg-turbo-dbg to libjpeg-turbo8-dbg.
+ * Rename libjpeg8-dev to libjpeg-turbo8-dev.
+ * Move the docs into the -dev package, install the upstream changelog
+ in the -dev only.
+ * Split out libturbojpeg.so into it's own package, don't let
+ libjpeg-turbo8-dev depend on it.
+ * Fix libjpeg-turbo8-dbg package description.
+ * Install jconfig.h into multiarch include path.
+ * Remove HAVE_STD{LIB,DEF}_H from jconfig.h since they are not used and
+ conflict with autoconf.
+ * libjpeg-turbo8:
+ - Add a symbols file, with a different version for symbols only found
+ in the libjpeg-turbo implementation.
+ - Remove the shlibs file.
+ - Breaks/Replaces libjpeg8 (<< 8c-2ubuntu5).
+ * Copy the exifautotran and jpegexiforient tools from the libjpeg8
+ sources, install into libjpeg-turbo-progs.
+ * Don't install tjbench in libjpeg-turbo-progs to avoid dependency
+ on libturbojpeg.
+
+ -- Matthias Klose <doko@ubuntu.com> Tue, 20 Dec 2011 23:12:52 +0100
+
+libjpeg-turbo (1.1.90+svn722-1ubuntu5) precise; urgency=low
+
+ * Remove all useage of diverts in preparation to replace
+ libjpeg8 in precise
+ * small clean up in debian/control
+
+ -- Tom Gall <tom.gall@linaro.org> Thu, 01 Dec 2011 09:50:26 -0600
+
+libjpeg-turbo (1.1.90+svn722-1ubuntu4) precise; urgency=low
+
+ * Switch package to include libjpeg8 compatibility
+ * Supply -dev -dbg and -test debs
+
+ -- Tom Gall <tom.gall@linaro.org> Wed, 16 Nov 2011 22:14:00 +0000
+
+libjpeg-turbo (1.1.90+svn722-1ubuntu2) oneiric; urgency=low
+
+ * 11.11 Release
+ * Sync with upstream to svn722
+
+ -- Tom Gall <tom.gall@linaro.org> Wed, 16 Nov 2011 14:32:12 +0000
+
+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@linaro.org> Tue, 13 Sep 2011 03:53:56 +0000
diff --git a/debian/control b/debian/control
index 8ee3531..2320871 100644
--- a/debian/control
+++ b/debian/control
@@ -6,21 +6,30 @@ Uploaders:
Fathi Boudra <fabo@debian.org>,
Osamu Aoki <osamu@debian.org>,
Tom Gall <tom.gall@linaro.org>,
- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends: debhelper (>= 9), dh-autoreconf, nasm [amd64 i386]
+ Mike Gabriel <sunweaver@debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ dh-autoreconf,
+ nasm [amd64 i386],
Standards-Version: 3.9.4
Homepage: http://www.libjpeg-turbo.org/
-Vcs-Git: git://git.debian.org/~osamu/libjpeg-turbo.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/osamu/libjpeg-turbo.git
-#Vcs-Git: git://git.debian.org/collab-maint/libjpeg-turbo.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/libjpeg-turbo.git
+Vcs-Git: git://git.debian.org/collab-maint/libjpeg-turbo.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/libjpeg-turbo.git
Package: libturbojpeg1
Architecture: any
Multi-Arch: same
Section: libs
Pre-Depends: multiarch-support
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Provides:
+ libturbojpeg,
+Replaces:
+ libturbojpeg,
+Conflicts:
+ libturbojpeg,
Description: TurboJPEG runtime library - SIMD optimized
This library is based on libjpeg-turbo and not on the IJG JPEG.
.
@@ -34,8 +43,16 @@ Package: libturbojpeg1-dev
Architecture: any
Section: libdevel
Multi-Arch: same
-Depends: libturbojpeg1 (= ${binary:Version}), libc-dev, ${misc:Depends}
-Provides: libturbojpeg-dev
+Depends:
+ libturbojpeg1 (= ${binary:Version}),
+ libc-dev,
+ ${misc:Depends},
+Provides:
+ libturbojpeg-dev,
+Conflicts:
+ libturbojpeg-dev,
+Replaces:
+ libturbojpeg-dev,
Description: Development files for the turbo JPEG library
This library is based on libjpeg-turbo and not on the IJG JPEG.
.
@@ -50,18 +67,27 @@ Architecture: any
Multi-Arch: same
Section: libs
Pre-Depends: multiarch-support
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libjpeg62, libjpeg7
-Replaces: libjpeg62, libjpeg7, libjpeg8 (<< 9)
-Provides: libjpeg8
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Conflicts:
+ libjpeg8,
+ libjpeg-turbo8,
+Replaces:
+ libjpeg8,
+ libjpeg-turbo8,
+Provides:
+ libjpeg8,
+ libjpeg-turbo8,
Description: IJG JPEG compliant runtime library - SIMD optimized
- This library is based on libjpeg-turbo and not on the IJG JPEG.
- .
- This package provides the runtime library supporting the Independent JPEG
+ This package provides a runtime library supporting the Independent JPEG
Group's standard for JPEG files.
.
- WARNING: This package contains a shared library which is a drop in
- replacement for libjpeg8. Replacing the standard libjpeg6 library
+ However, this library is based on libjpeg-turbo and not on the Independent
+ JPEG Group's code base (as provided in the Debian package libjpeg8).
+ .
+ WARNING: This package contains a shared library which is a drop-in
+ replacement for libjpeg8. Replacing the standard libjpeg8 library
may have unexpected/unknown effects on certain applications.
.
The library provided in this package has better performance than
@@ -71,68 +97,95 @@ Package: libjpeg8-turbo-dev
Architecture: any
Section: libdevel
Multi-Arch: same
-Depends: libjpeg8-turbo (= ${binary:Version}), libc-dev, ${misc:Depends}
-Provides: libjpeg-dev
-Conflicts: libjpeg62-dev, libjpeg7-dev
-Replaces: libjpeg62-dev, libjpeg7-dev, libjpeg8-dev (<< 9)
+Depends:
+ libjpeg8-turbo (= ${binary:Version}),
+ libc-dev,
+ ${misc:Depends},
+Provides:
+ libjpeg-dev,
+ libjpeg-turbo8-dev,
+Conflicts:
+ libjpeg8-dev,
+ libjpeg-turbo8-dev,
+Replaces:
+ libjpeg8-dev,
+ libjpeg-turbo8-dev,
Description: Development files for the IJG JPEG library
- This library is based on libjpeg-turbo and not on the IJG JPEG.
- .
- This package provides the runtime library supporting the Independent JPEG
+ This package provides a runtime library supporting the Independent JPEG
Group's standard for JPEG files.
.
- WARNING: This package contains a shared library which is a drop in
- replacement for libjpeg8. Replacing the standard libjpeg6 library
+ However, this library is based on libjpeg-turbo and not on the Independent
+ JPEG Group's code base (as provided in the Debian package libjpeg8).
+ .
+ WARNING: This package contains a shared library which is a drop-in
+ replacement for libjpeg8. Replacing the standard libjpeg8 library
may have unexpected/unknown effects on certain applications.
.
The library provided in this package has better performance than
standard libjpeg by making use of SIMD and other optimizations.
- This provides runtime library supporting the Independent JPEG
- Group's standard for JPEG files.
.
This package contains the static library, headers and documentation.
+ .
+ Note for package maintainers: do not reference this package as build
+ dependency in other packages. Always build-depend on libjpeg-dev.
Package: libjpeg8-turbo-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libjpeg8-turbo (= ${binary:Version}), ${misc:Depends}
-Conflicts: libjpeg62-dbg, libjpeg7-dbg
-Replaces: libjpeg62-dbg, libjpeg7-dbg, libjpeg8-dbg (<< 9)
-Provides: libjpeg8-dbg
+Depends:
+ libjpeg8-turbo (= ${binary:Version}),
+ ${misc:Depends},
+Conflicts:
+ libjpeg8-dbg,
+ libjpeg-turbo8-dbg,
+Replaces:
+ libjpeg8-dbg,
+ libjpeg-turbo8-dbg,
+Provides:
+ libjpeg8-dbg,
+ libjpeg-turbo8-dbg,
Description: Debugging symbols for the libjpeg8-turbo library
- This library is based on libjpeg-turbo and not on the IJG JPEG.
- .
- This package provides the runtime library supporting the Independent JPEG
+ This package provides a runtime library supporting the Independent JPEG
Group's standard for JPEG files.
.
- WARNING: This package contains a shared library which is a drop in
- replacement for libjpeg8. Replacing the standard libjpeg6 library
+ However, this library is based on libjpeg-turbo and not on the Independent
+ JPEG Group's code base (as provided in the Debian package libjpeg8).
+ .
+ WARNING: This package contains a shared library which is a drop-in
+ replacement for libjpeg8. Replacing the standard libjpeg8 library
may have unexpected/unknown effects on certain applications.
.
+ The library provided in this package has better performance than
+ standard libjpeg by making use of SIMD and other optimizations.
+ .
This package contains the debugging symbols for libjpeg-turbo.
Package: libjpeg-turbo-progs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libjpeg-progs
-Replaces: libjpeg-progs
-Provides: libjpeg-progs
+Depends:
+ libc6,
+ libjpeg8-turbo (= ${binary:Version}),
+ ${misc:Depends},
+Conflicts:
+ libjpeg-progs,
+Replaces:
+ libjpeg-progs,
+Provides:
+ libjpeg-progs,
Description: Programs for manipulating JPEG files
- This package contains programs for manipulating JPEG files:
- cjpeg/djpeg: convert to/from the JPEG file format
- rdjpgcom/wrjpgcom: read/write comments in JPEG files
- jpegtran: lossless transformations of JPEG files
- tjbench: a simple JPEG benchmarking tool
+ This package contains programs for manipulating JPEG files.
.
This package is the libjpeg-turbo library's toolbox. Installing it
- will replace the standard libjpeg library by libjpeg-turbo.
+ will replace the standard libjpeg's toolbox.
Package: libjpeg-turbo-test
Architecture: any
Priority: extra
Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
Description: Program for testing libjpeg-turbo
This package contains tjunittest which tests
the basic functionality of the library and
diff --git a/debian/copyright b/debian/copyright
index 8c46b3f..4d1e3da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,23 @@ Copyright: 1991-2010 Thomas G. Lane
License: BSD-BY-LC-NE
Files: debian/*
-Copyright: 2012 Debian TigerVNC Packaging Team <pkg-tigervnc-devel@lists.alioth.debian.org>
+Copyright:
+ 2012-2013 Debian TigerVNC Packaging Team <pkg-tigervnc-devel@lists.alioth.debian.org>
+ 2011-2012 Canonical Ltd.
+ 2011-2012 Linaro Inc.
+License: BSD-3
+
+Files: debian/extras/*
+Copyright:
+ 2005 Guido Vollbeding <guido@jpegclub.org>
+License: BSD-BY-LC-NE
+Comment:
+ No license information present in file headers.
+ .
+ Assume same license as for Files: * as author of these files
+ has also been involved in development of the rest of the
+ project files.
+
License: BSD-BY-LC-NE
The /debian folder of this package is free software; you can redistribute
it and/or modify it under the terms of the GNU General Public License as
@@ -137,3 +153,27 @@ License: BSD-BY-LC-NE
.
The complete text can be found in README-turbo.txt, supplied with the source.
+License: BSD-3
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ - Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ - Neither the name of the libjpeg-turbo Project nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/libjpeg-turbo-test.install b/debian/libjpeg-turbo-test.install
index 317b81c..0bf7f9e 100644
--- a/debian/libjpeg-turbo-test.install
+++ b/debian/libjpeg-turbo-test.install
@@ -1,2 +1 @@
usr/bin/tjunittest
-usr/bin/jcstest
diff --git a/debian/libjpeg-turbo-test.lintian-overrides b/debian/libjpeg-turbo-test.lintian-overrides
new file mode 100644
index 0000000..e37abb0
--- /dev/null
+++ b/debian/libjpeg-turbo-test.lintian-overrides
@@ -0,0 +1,3 @@
+# no upstream man page available for tjunittest.
+# Furthermore, tjunittest is only useful for the package maintainers and rather rarely used
+libjpeg-turbo-test: binary-without-manpage usr/bin/tjunittest
\ No newline at end of file
diff --git a/debian/libjpeg8-turbo.lintian-overrides b/debian/libjpeg8-turbo.lintian-overrides
index 0a4c736..84b7dcf 100644
--- a/debian/libjpeg8-turbo.lintian-overrides
+++ b/debian/libjpeg8-turbo.lintian-overrides
@@ -2,3 +2,7 @@
libjpeg8-turbo: shlibs-declares-dependency-on-other-package libjpeg8 (>= 8)
# yes, the package has a different name
libjpeg8-turbo: package-name-doesnt-match-sonames libjpeg8
+# upstream (DRC <dcommander@users.sourceforge.net>) states that the below issue
+# can be ignored, see:
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612341#255
+libjpeg8-turbo: shlib-calls-exit usr/lib/x86_64-linux-gnu/libjpeg.so.8.0.2
diff --git a/debian/libturbojpeg1.lintian-overrides b/debian/libturbojpeg1.lintian-overrides
new file mode 100644
index 0000000..19a8d73
--- /dev/null
+++ b/debian/libturbojpeg1.lintian-overrides
@@ -0,0 +1,4 @@
+# upstream (DRC <dcommander@users.sourceforge.net>) states that the below issue
+# can be ignored, see:
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612341#255
+libturbojpeg1: shlib-calls-exit usr/lib/x86_64-linux-gnu/libturbojpeg.so.1.2.90
diff --git a/debian/rules b/debian/rules
index ca414a4..d4d4dc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,9 +61,8 @@ override_dh_makeshlibs:
: # ... and mark libjpeg8-turbo only symbols with a different version
sed -i "$$(for i in $$(cat debian/libjpeg8-turbo-only.symbols); do echo "/^ $$i/s/8d$$/8d-1~/;"; done)" debian/libjpeg8-turbo/DEBIAN/symbols
-override_dh_auto_test:
-
override_dh_auto_clean:
+ if [ -e Makefile ]; then $(MAKE) testclean; fi
dh_auto_clean
$(MAKE) -C debian/extra clean
rm -f simd/jsimdcfg.inc
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..c242a70
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,5 @@
+# relying on dh_makeshlibs does not work here, as makeshlibs would provide a
+# versioned dependency on libjpeg8 (>= 8d).
+# Thus, we hard-codedly depend on libc6 and libjpeg8-turbo for
+# libjpeg-turbo-progs.
+libjpeg-turbo source: package-depends-on-hardcoded-libc libjpeg-turbo-progs depends
Attachment:
pgpPL0xHpjFIb.pgp
Description: Digitale PGP-Unterschrift