Hi,

the compiz packages had a broken dependency on libdecoration0, which
would break partial upgrades with compiz from bpo.  I thought I fixed
this in 0.7.6-4 (uploaded before the freeze), but it turns out I didn't…
0.7.6-5 should be good to go; diff from 0.7.6-4 is at [0], debdiff from
the current testing version (0.7.6-3) follows.

Cheers,
Julien

[0] 
http://git.debian.org/?p=pkg-xorg/app/compiz.git;a=commitdiff;h=d350c862cbdd18d0e05e13e6a2ca3ce232cf096b

diff -u compiz-0.7.6/debian/changelog compiz-0.7.6/debian/changelog
--- compiz-0.7.6/debian/changelog
+++ compiz-0.7.6/debian/changelog
@@ -1,3 +1,21 @@
+compiz (0.7.6-5) unstable; urgency=high
+
+  * Brown paper bag: remove shlibs.local and libdecoration0.shlibs, call
+    dh_makeshlibs with the proper flags to actually fix dependencies on
+    libdecoration0.
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 01 Aug 2008 18:57:30 +0200
+
+compiz (0.7.6-4) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Bump libdecoration0 shlibs to >= 0.7.6 (closes: #485775).
+
+  [ Sean Finney ]
+  * Include fix for posixly-incorrect usage of ENV (closes: #484225).
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 26 Jul 2008 21:44:51 +0200
+
 compiz (0.7.6-3) unstable; urgency=high
 
   * Add a versioned Replaces on older compiz-plugins to compiz-gtk, to prevent
reverted:
--- compiz-0.7.6/debian/libdecoration0.shlibs
+++ compiz-0.7.6.orig/debian/libdecoration0.shlibs
@@ -1 +0,0 @@
-libdecoration 0 libdecoration0 (>= 0.5.0)
diff -u compiz-0.7.6/debian/compiz-manager compiz-0.7.6/debian/compiz-manager
--- compiz-0.7.6/debian/compiz-manager
+++ compiz-0.7.6/debian/compiz-manager
@@ -63,7 +63,6 @@
 
 COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
 COMPIZ_PLUGINS=""
-ENV=""
 
 # Use emerald by default if it exist
 USE_EMERALD="yes"
@@ -282,27 +281,23 @@
 build_env()
 {
        if check_nvidia; then
-               ENV="__GL_YIELD=NOTHING "
+               export __GL_YIELD=NOTHING
        fi
        if [ "$INDIRECT" = "yes" ]; then
-               ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
+               export LIBGL_ALWAYS_INDIRECT=1
        fi
        if check_xgl; then
                if [ -f ${LIBGL_NVIDIA} ]; then
-                       ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}"
+                       export LD_PRELOAD="${LD_PRELOAD:+${LD_PRELOAD} 
}${LIBGL_NVIDIA}"
                        verbose "Enabling Xgl with nVidia drivers...\n"
                fi
                if [ -f ${LIBGL_FGLRX} ]; then
-                       ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}"
+                       export LD_PRELOAD="${LD_PRELOAD:+${LD_PRELOAD} 
}${LIBGL_FGLRX}"
                        verbose "Enabling Xgl with fglrx ATi drivers...\n"
                fi
        fi
 
-       ENV="$ENV FROM_WRAPPER=yes"
-
-       if [ -n "$ENV" ]; then
-               export $ENV
-       fi
+       export FROM_WRAPPER=yes
 }
 
 build_args()
reverted:
--- compiz-0.7.6/debian/shlibs.local
+++ compiz-0.7.6.orig/debian/shlibs.local
@@ -1 +0,0 @@
-libdecoration 0 libdecoration0 (>= 0.5.0)
diff -u compiz-0.7.6/debian/rules compiz-0.7.6/debian/rules
--- compiz-0.7.6/debian/rules
+++ compiz-0.7.6/debian/rules
@@ -120,7 +120,7 @@
        dh_strip
        dh_compress
        dh_fixperms
-       dh_makeshlibs
+       dh_makeshlibs -plibdecoration0 -V'libdecoration0 (>= 0.7.6)'
        dh_shlibdeps
        dh_installdeb
        dh_gencontrol


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to