compiz-fusion-plugins-extra: Changes to 'debian-unstable'
debian/changelog | 11 +++++++++++
debian/control | 4 +++-
debian/rules | 7 ++++++-
3 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit 983232c157c5e3c572a0b4dd1b9871ffb6d37b65
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 24 00:45:10 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 5e5c697..44241f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz-fusion-plugins-extra (0.8.4-2) UNRELEASED; urgency=low
+compiz-fusion-plugins-extra (0.8.4-2) unstable; urgency=low
* Add Vcs-* fields.
* Tighten dependencies on compiz-core:
@@ -7,7 +7,7 @@ compiz-fusion-plugins-extra (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> Wed, 24 Mar 2010 00:29:50 +0100
+ -- Cyril Brulebois <kibi@debian.org> Wed, 24 Mar 2010 00:45:05 +0100
compiz-fusion-plugins-extra (0.8.4-1) unstable; urgency=low
commit ab97f82970518081ddecb3b59ebe830acd5c59af
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 24 00:33:12 2010 +0100
Tighten dependencies on compiz-core.
diff --git a/debian/changelog b/debian/changelog
index 68d1541..5e5c697 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
compiz-fusion-plugins-extra (0.8.4-2) UNRELEASED; urgency=low
* Add Vcs-* fields.
+ * 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> Wed, 24 Mar 2010 00:29:50 +0100
diff --git a/debian/control b/debian/control
index 5c780d3..42ad522 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/compiz-fusion-plugins-extra
Package: compiz-fusion-plugins-extra
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${compizcore:Depends}
Description: Compiz Fusion plugins - extra 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 31f778d..a398e1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,14 @@ 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:
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
@@ -83,7 +88,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- -Vcompizcore:Depends=$(COMPIZCORE_DEPENDS)
dh_md5sums
dh_builddeb
commit 1e175e3e168f9d6480a86e18c035750aeec7da14
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 24 00:31:03 2010 +0100
Add Vcs-* fields.
diff --git a/debian/changelog b/debian/changelog
index f01d2ee..68d1541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz-fusion-plugins-extra (0.8.4-2) UNRELEASED; urgency=low
+
+ * Add Vcs-* fields.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 24 Mar 2010 00:29:50 +0100
+
compiz-fusion-plugins-extra (0.8.4-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 472e754..5c780d3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,8 @@ Build-Depends: automake1.9, autotools-dev, compiz-dev (>= 0.8.4), compiz-fusion-
libtool, libxml2-dev, libxslt1-dev, pkg-config, xsltproc, librsvg2-dev, libcairo2-dev, libsm-dev, libdbus-1-dev, libjpeg62-dev, libdecoration0-dev (>= 0.8.4)
Standards-Version: 3.7.2
Section: x11
+Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compiz-fusion-plugins-extra.git
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/compiz-fusion-plugins-extra.git
Package: compiz-fusion-plugins-extra
Architecture: any
Reply to: