[X2Go-Commits] libjpeg-turbo.git - master (branch) updated: debian/1.1.90+svn704-1-131-g2ee4d48

X2Go dev team git-admin at x2go.org
Tue Mar 26 13:35:27 CET 2013


The branch, master has been updated
       via  2ee4d487895909b088527d359738386793a0c9e8 (commit)
      from  63bca8081f3208ece85076bb12e2d8a6ab79e7fa (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 2ee4d487895909b088527d359738386793a0c9e8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Mar 26 13:34:29 2013 +0100

    Upload to X2Go archive for Debian.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                   |   14 ++--
 debian/control                     |  131 ++++++++++++++++++++++++++++++++++--
 debian/docs                        |    1 +
 debian/libjpeg-turbo-progs.install |   10 ---
 debian/libjpeg-turbo-progs.postrm  |   36 ----------
 debian/libjpeg-turbo-progs.preinst |   55 ---------------
 debian/rules                       |   37 ++++++++++
 debian/source.lintian-overrides    |    4 --
 8 files changed, 169 insertions(+), 119 deletions(-)
 mode change 100644 => 100755 debian/libjpeg-turbo-progs.postrm
 mode change 100644 => 100755 debian/libjpeg-turbo-progs.preinst

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5db3af2..1771ca1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,10 @@
-libjpeg-turbo (1.2.90-2) unstable; urgency=low
+libjpeg-turbo (1.2.90-1~x2go1) UNRELEASED; urgency=low
 
-  * /debian/control:
-    + Do not ship the libjpeg8 compat packages (libjpeg8-turbo,
-      libjpeg8-turbo-dev, libjpeg-turbo-progs). Only ship the
-      files needed for applications building against the native
-      TURBOjpeg ABI.
-    + The libturbojpeg1(-dev) package conflict with libjpeg-turbo8(-dev)
-      as found in Ubuntu.
+  * Upload to X2Go archive for Debian.
 
- -- Mike Gabriel <sunweaver at debian.org>  Sun, 24 Mar 2013 12:53:01 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 26 Mar 2013 13:33:58 +0100
 
-libjpeg-turbo (1.2.90-1) UNRELEASED; urgency=low
+libjpeg-turbo (1.2.90-1) unstable; urgency=low
 
   [ Osamu Aoki ]
   * New upstream version. Closes: #612341
diff --git a/debian/control b/debian/control
index a858c73..e3c1b83 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,6 @@ Replaces:
  libturbojpeg,
 Conflicts:
  libturbojpeg,
- libjpeg-turbo8,
 Provides:
  libturbojpeg,
 Description: TurboJPEG runtime library - SIMD optimized
@@ -49,11 +48,10 @@ Depends:
  libturbojpeg1 (= ${binary:Version}),
  libc-dev,
  ${misc:Depends},
-Replaces:
- libturbojpeg-dev,
 Conflicts:
  libturbojpeg-dev,
- libjpeg-turbo8-dev,
+Replaces:
+ libturbojpeg-dev,
 Provides:
  libturbojpeg-dev,
 Description: Development files for the turbo JPEG library
@@ -65,6 +63,131 @@ Description: Development files for the turbo JPEG library
  This package contains the static library, headers and documentation for
  the libjpegturbo.so.1 library.
 
+Package: libjpeg8-turbo
+Architecture: any
+Multi-Arch: same
+Section: libs
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Conflicts:
+ libjpeg-turbo8,
+Replaces:
+ libjpeg8 (<< 9),
+ libjpeg-turbo8,
+Provides:
+ libjpeg-turbo8,
+Description: IJG JPEG compliant runtime library - SIMD optimized
+ This package provides a runtime library supporting the Independent JPEG
+ Group's standard for JPEG files.
+ .
+ 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.
+
+Package: libjpeg8-turbo-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends:
+ libjpeg8-turbo (= ${binary:Version}),
+ libc-dev,
+ ${misc:Depends},
+Conflicts:
+ libjpeg62-dev,
+ libjpeg7-dev,
+ libjpeg-turbo8-dev,
+Replaces:
+ libjpeg62-dev,
+ libjpeg7-dev,
+ libjpeg8-dev,
+ libjpeg-turbo8-dev,
+Provides:
+ libjpeg-dev,
+ libjpeg8-dev,
+ libjpeg-turbo8-dev,
+Description: Development files for the IJG JPEG library
+ This package provides a runtime library supporting the Independent JPEG
+ Group's standard for JPEG files.
+ .
+ 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 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,
+ libjpeg8-dbg,
+ libjpeg-turbo8-dbg,
+Replaces:
+ libjpeg62-dbg,
+ libjpeg7-dbg,
+ libjpeg8-dbg,
+ libjpeg-turbo8-dbg,
+Provides:
+ libjpeg-dbg,
+ libjpeg8-dbg,
+ libjpeg-turbo8-dbg,
+Description: Debugging symbols for the libjpeg8-turbo library
+ This package provides a runtime library supporting the Independent JPEG
+ Group's standard for JPEG files.
+ .
+ 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},
+ libjpeg8-turbo (= ${binary:Version}),
+ ${misc:Depends},
+Breaks:
+ libjpeg-progs,
+Replaces:
+ libjpeg-progs,
+Provides:
+ libjpeg-progs,
+Description: Programs for manipulating JPEG files
+ This package contains programs for manipulating JPEG files.
+ .
+ This package is the libjpeg-turbo library's toolbox. Installing it
+ will replace the standard libjpeg's toolbox.
+
 Package: libjpeg-turbo-test
 Architecture: any
 Priority: extra
diff --git a/debian/docs b/debian/docs
index e758a55..cea5a21 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,4 @@
+libjpeg.txt
 README
 README-turbo.txt
 structure.txt
diff --git a/debian/libjpeg-turbo-progs.install b/debian/libjpeg-turbo-progs.install
index 890ea31..b873669 100644
--- a/debian/libjpeg-turbo-progs.install
+++ b/debian/libjpeg-turbo-progs.install
@@ -2,19 +2,9 @@ usr/bin/cjpeg
 usr/bin/djpeg
 usr/bin/jpegtran
 usr/bin/rdjpgcom
-<<<<<<< HEAD
-usr/bin/tjbench
-usr/bin/wrjpgcom
-usr/share/man/man1/cjpeg.1
-usr/share/man/man1/djpeg.1
-usr/share/man/man1/jpegtran.1
-usr/share/man/man1/rdjpgcom.1
-usr/share/man/man1/wrjpgcom.1
-=======
 usr/bin/wrjpgcom
 # extra commands
 usr/bin/exifautotran
 usr/bin/jpegexiforient
 # skip installing 
 #usr/bin/tjbench
->>>>>>> with-libjpeg8-turbo
diff --git a/debian/libjpeg-turbo-progs.postrm b/debian/libjpeg-turbo-progs.postrm
old mode 100644
new mode 100755
index 64ac512..ed9d0f2
--- a/debian/libjpeg-turbo-progs.postrm
+++ b/debian/libjpeg-turbo-progs.postrm
@@ -4,41 +4,6 @@
 set -e
 
 case "$1" in
-<<<<<<< HEAD
-    remove|abort-install|disappear)
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --remove /usr/bin/rdjpgcom
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --remove /usr/bin/wrjpgcom
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --remove /usr/bin/jpegtran
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --remove /usr/bin/cjpeg
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --remove /usr/bin/djpeg
-
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --remove /usr/share/man/man1/wrjpgcom.1.gz
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --remove /usr/share/man/man1/cjpeg.1.gz
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --remove /usr/share/man/man1/djpeg.1.gz
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --remove /usr/share/man/man1/rdjpgcom.1.gz
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --remove /usr/share/man/man1/jpegtran.1.gz
-
-        rm -rf /usr/bin/libjpeg-progs-divert /usr/share/man/libjpeg-progs-divert
-    ;;
-
-    purge|upgrade|failed-upgrade|abort-upgrade)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-=======
 	remove|abort-install|disappear)
 		dpkg-divert --package libjpeg-turbo-progs --rename \
 		    --remove /usr/bin/rdjpgcom
@@ -71,7 +36,6 @@ case "$1" in
 		echo "postrm called with unknown argument \`$1'" >&2
 		exit 1
 	;;
->>>>>>> with-libjpeg8-turbo
 esac
 
 #DEBHELPER#
diff --git a/debian/libjpeg-turbo-progs.preinst b/debian/libjpeg-turbo-progs.preinst
old mode 100644
new mode 100755
index 7bed93c..c791117
--- a/debian/libjpeg-turbo-progs.preinst
+++ b/debian/libjpeg-turbo-progs.preinst
@@ -1,65 +1,11 @@
 #!/bin/sh
 # preinst script for libjpeg-turbo-progs
-<<<<<<< HEAD
-=======
 #
 # Moving files from package libjpeg-progs out of the way...
->>>>>>> with-libjpeg8-turbo
 
 set -e
 
 case "$1" in
-<<<<<<< HEAD
-    install)
-        if [ ! -d /usr/share/man/libjpeg-progs-divert ]; then
-            mkdir -p /usr/share/man/libjpeg-progs-divert
-        fi
-
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --divert /usr/share/man/libjpeg-progs-divert/wrjpgcom.1.gz \
-            --add /usr/share/man/man1/wrjpgcom.1.gz
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --divert /usr/share/man/libjpeg-progs-divert/cjpeg.1.gz \
-            --add /usr/share/man/man1/cjpeg.1.gz
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --divert /usr/share/man/libjpeg-progs-divert/djpeg.1.gz \
-            --add /usr/share/man/man1/djpeg.1.gz
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --divert /usr/share/man/libjpeg-progs-divert/rdjpgcom.1.gz \
-            --add /usr/share/man/man1/rdjpgcom.1.gz
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --divert /usr/share/man/libjpeg-progs-divert/jpegtran.1.gz \
-            --add /usr/share/man/man1/jpegtran.1.gz
-
-        if [ ! -d /usr/bin/libjpeg-progs-divert ]; then
-            mkdir -p /usr/bin/libjpeg-progs-divert
-        fi
-
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --divert /usr/bin/libjpeg-progs-divert/rdjpgcom \
-            --add /usr/bin/rdjpgcom
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --divert /usr/bin/libjpeg-progs-divert/wrjpgcom \
-            --add /usr/bin/wrjpgcom
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --divert /usr/bin/libjpeg-progs-divert/jpegtranm \
-            --add /usr/bin/jpegtran
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --divert /usr/bin/libjpeg-progs-divert/cjpeg \
-            --add /usr/bin/cjpeg
-        dpkg-divert --package libjpeg-turbo-progs --rename \
-            --divert /usr/bin/libjpeg-progs-divert/djpeg \
-            --add /usr/bin/djpeg
-    ;;
-
-    upgrade|abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-=======
 	install)
 
 		dpkg-divert --package libjpeg-turbo-progs --rename \
@@ -102,7 +48,6 @@ case "$1" in
 		echo "preinst called with unknown argument \`$1'" >&2
 		exit 1
 	;;
->>>>>>> with-libjpeg8-turbo
 esac
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index ff18382..96cc3d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,9 +31,46 @@ endif
 %:
 	dh $@  --with autoreconf
 
+override_dh_auto_configure:
+	dh_auto_configure -v -- --with-jpeg8 CFLAGS="$(CFLAGS)"
+
+override_dh_auto_build:
+	dh_auto_build -v
+	$(MAKE) -C debian/extra CC=$(CC) CFLAGS="$(CPPFLAGS) $(CFLAGS) -Wall" LDFLAGS="$(LDFLAGS)"
+
+override_dh_install:
+	$(MAKE) -C debian/extra install prefix=/usr DESTDIR=$(CURDIR)/debian/tmp
+	: # fix jconfig.h
+	rm -f debian/tmp/usr/include/jconfig.h
+	mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)
+	sed -e "s/#\(undef\|define\) HAVE_\(LOCALE\|\(STD\(DEF\|LIB\)\)\)_H 1//g" \
+		jconfig.h > debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/jconfig.h
+
+	: # A very dirty hack, provide a symlink with libjpeg8-turbo that
+	: # supersedes any libjpeg.so.8.x.y version. That will trick SO_NAME symlinking
+	: # of ldconfig.
+	cd debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/ && ln -s libjpeg.so.8.* libjpeg.so.8.99.0
+
+	dh_install
+
+override_dh_installchangelogs:
+	dh_installchangelogs -plibjpeg8-turbo-dev change.log
+	dh_installchangelogs -Nlibjpeg8-turbo-dev
+
+override_dh_strip:
+	dh_strip -plibjpeg8-turbo --dbg-package=libjpeg8-turbo-dbg
+	dh_strip -Nlibjpeg8-turbo libjpeg8-turbo-dbg
+
+override_dh_makeshlibs:
+	: # keep the original libjpeg symbol version
+	dh_makeshlibs -- -v8d
+	: # ... 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_clean:
 	if [ -e Makefile ]; then $(MAKE) testclean; fi
 	dh_auto_clean
+	$(MAKE) -C debian/extra clean
 	rm -f simd/jsimdcfg.inc
 
 deb_source := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index eecc67e..c242a70 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-libjpeg-turbo source: package-needs-versioned-debhelper-build-depends 9
-=======
 # 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
->>>>>>> with-libjpeg8-turbo


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)).




More information about the x2go-commits mailing list