compiz-fusion-plugins-main: Changes to 'debian-unstable'
debian/changelog | 11 +++++++++++
debian/control | 4 +++-
debian/rules | 7 ++++++-
3 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit b1e746e84b795fca847b1f80f071725f19cfbd63
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 24 00:12:36 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index ae5e0bf..b7415a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz-fusion-plugins-main (0.8.4-2) UNRELEASED; urgency=low
+compiz-fusion-plugins-main (0.8.4-2) unstable; urgency=low
* Add Vcs-* headers.
* Tighten dependencies on compiz-core:
@@ -7,7 +7,7 @@ compiz-fusion-plugins-main (0.8.4-2) UNRELEASED; urgency=low
compiz-core (e.g. compiz-core-abiversion-20090619), and use it in
dh_gencontrol.
- -- Cyril Brulebois <kibi@debian.org> Tue, 23 Mar 2010 23:44:31 +0100
+ -- Cyril Brulebois <kibi@debian.org> Wed, 24 Mar 2010 00:12:24 +0100
compiz-fusion-plugins-main (0.8.4-1) unstable; urgency=low
commit 3a47efefedb32c536d15b91d182e64c1f2f53881
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 24 00:10:34 2010 +0100
Try to detect ABI detection breakage, ensure COMPIZCORE_DEPENDS is not empty.
diff --git a/debian/rules b/debian/rules
index 5aeb8a2..29ec36b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,8 @@ COMPIZCORE_DEPENDS := $(shell dpkg-query --showformat='$${Provides}\n' -W compiz
configure: configure-stamp
configure-stamp: $(QUILT_STAMPFN)
dh_testdir
+ # Prevent from accidental breakage, early in the build process:
+ if [ -z "$(COMPIZCORE_DEPENDS)" ]; then echo 'Broken compiz-core ABI detection'; exit 1; fi
for f in $(UPSTREAM_PRESERVE); do \
cp -a $$f $$f.preserve; \
done
commit 2946acf979cfddb0fe97fb7e5cb0894e8e9287d9
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Mar 23 23:56:10 2010 +0100
Tighten dependencies on compiz-core.
diff --git a/debian/changelog b/debian/changelog
index 677c158..ae5e0bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
compiz-fusion-plugins-main (0.8.4-2) UNRELEASED; urgency=low
* Add Vcs-* headers.
+ * Tighten dependencies on compiz-core:
+ - Add ${compizcore:Depends} to Depends.
+ - Use dpkg-query to extract the name of the package provided by
+ compiz-core (e.g. compiz-core-abiversion-20090619), and use it in
+ dh_gencontrol.
-- Cyril Brulebois <kibi@debian.org> Tue, 23 Mar 2010 23:44:31 +0100
diff --git a/debian/control b/debian/control
index 61353db..b07cdd7 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/compiz-fusion-plugins-main.
Package: compiz-fusion-plugins-main
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${compizcore:Depends}
Description: Compiz Fusion plugins - main collection
Compiz Fusion is the result of the re-unification of the Beryl-project
and the community around the Compiz Window Manager. It seeks to provide
diff --git a/debian/rules b/debian/rules
index e311b45..5aeb8a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,9 @@ AUTOFOO_DELETE:=aclocal.m4 config.guess config.h.in config.sub configure \
depcomp install-sh intltool-extract.in intltool-merge.in \
intltool-update.in ltmain.sh missing mkinstalldirs
+# Detect which package is provided by compiz-core:
+COMPIZCORE_DEPENDS := $(shell dpkg-query --showformat='$${Provides}\n' -W compiz-core)
+
configure: configure-stamp
configure-stamp: $(QUILT_STAMPFN)
dh_testdir
@@ -89,7 +92,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- -Vcompizcore:Depends=$(COMPIZCORE_DEPENDS)
dh_md5sums
dh_builddeb
commit 2450c754018c886251b991750c1cd6f7500bc858
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Mar 23 23:44:49 2010 +0100
Add Vcs-* headers.
diff --git a/debian/changelog b/debian/changelog
index 15aeea0..677c158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz-fusion-plugins-main (0.8.4-2) UNRELEASED; urgency=low
+
+ * Add Vcs-* headers.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 23 Mar 2010 23:44:31 +0100
+
compiz-fusion-plugins-main (0.8.4-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 3c00ebd..61353db 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,8 @@ Build-Depends: autoconf, automake1.9, autotools-dev, compiz-dev (>= 0.8.4), comp
quilt
Standards-Version: 3.8.1
Section: x11
+Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compiz-fusion-plugins-main.git
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/compiz-fusion-plugins-main.git
Package: compiz-fusion-plugins-main
Architecture: any
Reply to: