compiz: Changes to 'debian-unstable'
debian/control | 3 ++-
debian/rules | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b36c8cf83f0be89c30b691d12c7caf173e16f7dd
Author: Loïc Minier <lool@dooz.org>
Date: Fri Apr 24 14:03:40 2009 +0200
compiz-core Breaks libcompizconfig 0.8.0; #523514
Bump the compiz-core Breaks on libcompizconfig0 to 0.8.0 as the last
CORE_ABIVERSION bump happened between 0.7.8 and 0.8.0; closes: #523514.
diff --git a/debian/control b/debian/control
index 1b5f191..5add7d0 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Description: OpenGL window and compositing manager
Package: compiz-core
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, mesa-utils
-Breaks: libcompizconfig0 (<< 0.7.6)
+Breaks: libcompizconfig0 (<< 0.8.0)
Recommends: compiz-plugins (= ${binary:Version})
Suggests: nvidia-glx (>= 1.0.9625-1)
Provides: compiz-core-abiversion-${coreabiversion}
commit 98700a1c2d56bf70092769dfb3643b5e3fea3703
Author: Loïc Minier <lool@dooz.org>
Date: Fri Apr 24 14:02:06 2009 +0200
compiz-core use Breaks libcompizcore not Conflicts
Use the new Breaks feature for the compiz-core -> libcompizconfig0 dep.
This makes upgrades smoother than Conflicts.
diff --git a/debian/control b/debian/control
index 3e835bb..1b5f191 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Description: OpenGL window and compositing manager
Package: compiz-core
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, mesa-utils
-Conflicts: libcompizconfig0 (<< 0.7.6)
+Breaks: libcompizconfig0 (<< 0.7.6)
Recommends: compiz-plugins (= ${binary:Version})
Suggests: nvidia-glx (>= 1.0.9625-1)
Provides: compiz-core-abiversion-${coreabiversion}
commit 89535bd02d91cfb6cd3f01b61cff4b2f277621e2
Author: Loïc Minier <lool@dooz.org>
Date: Fri Apr 24 13:35:31 2009 +0200
Add Provides -abiversion-2009xxyy to compiz-core
Add a virtual compiz-core-abiversion-2009xxyy provides to compiz-core to
allow for strict dependencies of plugins on the compiz-core
CORE_ABIVERSION they were built with, as read from
include/compiz-core.h.
diff --git a/debian/control b/debian/control
index 4e8d1d3..3e835bb 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, mesa-utils
Conflicts: libcompizconfig0 (<< 0.7.6)
Recommends: compiz-plugins (= ${binary:Version})
Suggests: nvidia-glx (>= 1.0.9625-1)
+Provides: compiz-core-abiversion-${coreabiversion}
Description: OpenGL window and compositing manager
Compiz brings to life a variety of visual effects that make the Linux desktop
easier to use, more powerful and intuitive, and more accessible for users
diff --git a/debian/rules b/debian/rules
index 35b6260..26faff6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,8 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
+CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' include/compiz-core.h )
+
INSTALL = /usr/bin/install
confflags += --disable-static \
@@ -126,7 +128,7 @@ binary-arch: build install
dh_makeshlibs -plibdecoration0 -V'libdecoration0 (>= 0.8.2)'
dh_shlibdeps
dh_installdeb
- dh_gencontrol
+ dh_gencontrol -Vcoreabiversion=$(CORE_ABIVERSION)
dh_md5sums
dh_builddeb
Reply to: