The branch, master has been updated via 1ddf0347e7a3985d021ff0d641de77bbab063461 (commit) via 94a9623f1655b8d1a0b6d13f709295e48a01d590 (commit) from 27edcbe73a3d10cd19311a0260b9540d08a608de (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 1ddf0347e7a3985d021ff0d641de77bbab063461 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jan 23 22:24:38 2012 +0100 Allow package upgrade when upgrading from X2Go's Debian squeeze backport of libjpeg-turbo. commit 94a9623f1655b8d1a0b6d13f709295e48a01d590 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jan 23 22:23:57 2012 +0100 Fix dependency of libjpeg-turbo-dbg on libjpeg-turbo-progs (not libjpeg-turbo62-progs). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 +++++++++ debian/control | 2 +- debian/libjpeg-turbo62.preinst | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6bf3fce..7457e89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libjpeg-turbo (1.1.90+svn704-1~x2go1) UNRELEASED; urgency=low + + * Fix dependency of libjpeg-turbo-dbg on libjpeg-turbo-progs + (not libjpeg-turbo62-progs). + * Allow package upgrade when upgrading from X2Go's Debian squeeze + backport of libjpeg-turbo. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 23 Jan 2012 22:21:35 +0100 + libjpeg-turbo (1.1.90+svn704-1) unstable; urgency=low * Initial release (Closes: #612341) diff --git a/debian/control b/debian/control index 122c849..e91e0bd 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Priority: extra Section: debug Architecture: any Depends: libjpeg-turbo62 (= ${binary:Version}), - libjpeg-turbo62-progs, + libjpeg-turbo-progs, ${misc:Depends}, ${shlibs:Depends} Description: Debugging files for the libjpeg-turbo library diff --git a/debian/libjpeg-turbo62.preinst b/debian/libjpeg-turbo62.preinst index 771f28a..b1dcf1d 100644 --- a/debian/libjpeg-turbo62.preinst +++ b/debian/libjpeg-turbo62.preinst @@ -20,6 +20,22 @@ case "$1" in ;; upgrade|abort-upgrade) + + if dpkg --compare-versions "$2" ge "1.1.90+svn704-1+squeeze1"; then + + dpkg-divert --package libjpeg-turbo62 --rename \ + --remove /usr/lib/libjpeg.so.62.0.0 + dpkg-divert --package libjpeg-turbo62 --rename \ + --remove /usr/lib/libjpeg.so.62 + + dpkg-divert --package libjpeg-turbo62 --rename \ + --divert /usr/lib/libjpeg-divert/libjpeg.so.62.0.0 \ + --add /usr/lib/$HOST_MULTIARCH/libjpeg.so.62.0.0 + dpkg-divert --package libjpeg-turbo62 --rename \ + --divert /usr/lib/libjpeg-divert/libjpeg.so.62 \ + --add /usr/lib/$HOST_MULTIARCH/libjpeg.so.62 + + fi ;; *) 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)).