[X2go-Commits] libjpeg-turbo.git - squeeze-backport (branch) updated: debian/1.1.90+svn704-1-1-gb8a9394

X2go dev team git-admin at x2go.org
Mon Jan 23 21:04:14 CET 2012


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 at das-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 at 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 at lists.linaro.org>
-Uploaders: Fathi Boudra <fabo at debian.org>, Tom Gall <tom.gall at linaro.org>
-Build-Depends: debhelper (>= 8.1.3~), dh-autoreconf, nasm [amd64 i386]
+Uploaders: Fathi Boudra <fabo at debian.org>, Tom Gall <tom.gall at linaro.org>, Mike Gabriel <mike.gabriel at 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)).




More information about the x2go-commits mailing list