x2go-commits January 2012

x2go-commits@lists.x2go.org

1 participants
126 discussions

libjpeg-turbo.git - master (branch) updated: debian/1.1.90+svn704-1-2-g1ddf034
by git-admin＠x2go.org 23 Jan '12

23 Jan '12

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 … [View More]Author: Mike Gabriel <mike.gabriel(a)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(a)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(a)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)). [View Less]

1 0

libjpeg-turbo.git - squeeze-backport (branch) updated: debian/1.1.90+svn704-1-1-gb8a9394
by git-admin＠x2go.org 23 Jan '12

23 Jan '12

The branch, squeeze-backport has been updated via b8a9394eecb0543cca820621388bf94f590e34af (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 b8a9394eecb0543cca820621388bf94f590e34af Author: Mike Gabriel <mike.gabriel(a)das-… [View More]netzwerkteam.de> Date: Mon Jan 23 20:57:44 2012 +0100 Backport for Debian squeeze. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ debian/compat | 2 +- debian/control | 7 +++---- debian/libjpeg-turbo62.postrm | 5 ++--- debian/libjpeg-turbo62.preinst | 5 ++--- 5 files changed, 14 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6bf3fce..e195a75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libjpeg-turbo (1.1.90+svn704-1+squeeze1) UNRELEASED; urgency=low + + * Backport for Debian squeeze. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 23 Jan 2012 20:55:32 +0100 + libjpeg-turbo (1.1.90+svn704-1) unstable; urgency=low * Initial release (Closes: #612341) diff --git a/debian/compat b/debian/compat index ec63514..301160a 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +8 \ No newline at end of file diff --git a/debian/control b/debian/control index 122c849..f50fd0a 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,14 @@ Source: libjpeg-turbo Priority: optional Maintainer: Linaro Developers <linaro-dev(a)lists.linaro.org> -Uploaders: Fathi Boudra <fabo(a)debian.org>, Tom Gall <tom.gall(a)linaro.org> -Build-Depends: debhelper (>= 8.1.3~), dh-autoreconf, nasm [amd64 i386] +Uploaders: Fathi Boudra <fabo(a)debian.org>, Tom Gall <tom.gall(a)linaro.org>, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, nasm [amd64 i386] Standards-Version: 3.9.2 Section: libs Homepage: http://www.libjpeg-turbo.org/ Package: libjpeg-turbo62 Architecture: any -Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: dpkg-dev, ${misc:Pre-Depends} Replaces: libjpeg62 @@ -35,7 +34,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.postrm b/debian/libjpeg-turbo62.postrm index 5244dae..5f2d4bc 100644 --- a/debian/libjpeg-turbo62.postrm +++ b/debian/libjpeg-turbo62.postrm @@ -5,12 +5,11 @@ set -e case "$1" in remove|abort-install|disappear) - HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` dpkg-divert --package libjpeg-turbo62 --rename \ - --remove /usr/lib/$HOST_MULTIARCH/libjpeg.so.62.0.0 + --remove /usr/lib/libjpeg.so.62.0.0 dpkg-divert --package libjpeg-turbo62 --rename \ - --remove /usr/lib/$HOST_MULTIARCH/libjpeg.so.62 + --remove /usr/lib/libjpeg.so.62 rm -rf /usr/lib/libjpeg-divert ;; diff --git a/debian/libjpeg-turbo62.preinst b/debian/libjpeg-turbo62.preinst index 771f28a..8265f5f 100644 --- a/debian/libjpeg-turbo62.preinst +++ b/debian/libjpeg-turbo62.preinst @@ -5,7 +5,6 @@ set -e case "$1" in install) - HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` if [ ! -d /usr/lib/libjpeg-divert ]; then mkdir -p /usr/lib/libjpeg-divert @@ -13,10 +12,10 @@ case "$1" in 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 + --add /usr/lib/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 + --add /usr/lib/libjpeg.so.62 ;; upgrade|abort-upgrade) 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)). [View Less]

1 0

libjpeg-turbo.git - squeeze-backport (branch) created: debian/1.1.90+svn704-1
by git-admin＠x2go.org 23 Jan '12

23 Jan '12

The branch, squeeze-backport has been created at 27edcbe73a3d10cd19311a0260b9540d08a608de (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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 … [View More]

1 0

libjpeg-turbo.git - pristine-tar (branch) created: 4f95718859959f669b91db4bf8a4aa39b3cbd9fd
by git-admin＠x2go.org 23 Jan '12

23 Jan '12

The branch, pristine-tar has been created at 4f95718859959f669b91db4bf8a4aa39b3cbd9fd (commit) - Log ----------------------------------------------------------------- commit 4f95718859959f669b91db4bf8a4aa39b3cbd9fd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 23 20:51:42 2012 +0100 pristine-tar data for libjpeg-turbo_1.1.90+svn704.orig.tar.bz2 ----------------------------------------------------------------------- hooks/post-receive -- … [View More]

1 0

libjpeg-turbo.git - upstream (branch) created: a32af0cecb2e047e00d1c16168ea6b8a91436686
by git-admin＠x2go.org 23 Jan '12

23 Jan '12

The branch, upstream has been created at a32af0cecb2e047e00d1c16168ea6b8a91436686 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- libjpeg-turbo.git (libjpeg-turbo upstream project) 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 upstream project).

1 0

libjpeg-turbo.git - master (branch) created: a4ab804b5b301896a80ce041c42df9a2479be542
by git-admin＠x2go.org 23 Jan '12

23 Jan '12

The branch, master has been created at a4ab804b5b301896a80ce041c42df9a2479be542 (commit) - Log ----------------------------------------------------------------- commit a4ab804b5b301896a80ce041c42df9a2479be542 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 23 20:57:44 2012 +0100 Backport for Debian squeeze. commit 27edcbe73a3d10cd19311a0260b9540d08a608de Author: Fathi Boudra <fabo(a)debian.org> Date: Sat Sep 17 12:51:45 2011 +0300 … [View More]

1 0

x2goserver.git - master (branch) updated: 3.0.99.9-5-gb94b429
by git-admin＠x2go.org 23 Jan '12

23 Jan '12

The branch, master has been updated via b94b429b96daf3afa71d83aca582a7de66f45495 (commit) from 835a18eeaca0e45002ad04ca0107de49fd268ad5 (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 b94b429b96daf3afa71d83aca582a7de66f45495 Author: John Williams <jwilliams4200(a)gmail.com> Date: … [View More]

1 0

buildscripts.git - master (branch) updated: d52afed8373ccb31a84089cf2dc0676ca7a3ec0a
by git-admin＠x2go.org 22 Jan '12

22 Jan '12

The branch, master has been updated via d52afed8373ccb31a84089cf2dc0676ca7a3ec0a (commit) via c66c5506234163ee7aa33ba4c47e8c0a549b4c78 (commit) from 146ca95e1971f3ddeb4819f22f1e97a07a659113 (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 d52afed8373ccb31a84089cf2dc0676ca7a3ec0a … [View More]

1 0

nx-libs.git - build-main (branch) created: redist-server/3.5.0.8
by git-admin＠x2go.org 22 Jan '12

22 Jan '12

The branch, build-main has been created at f4379f608a752d6d64e3bd3c7d27e17a2f71344c (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - build-main (branch) created: redist-server/3.5.0.8-1-g1046233
by git-admin＠x2go.org 22 Jan '12

22 Jan '12

The branch, build-main has been created at 10462339662ee0d99281efb0ed7e3bf865bf20b2 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

← Newer
1
2
3
4
5
6
7
8
...
13
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits January 2012