compiz-fusion-plugins-unsupported: Changes to 'debian-unstable'
debian/changelog | 11 +++++++++++
debian/control | 4 +++-
debian/rules | 7 ++++++-
3 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit bc6dab79730a4d49b9b1e8f8f3bcf52df97000a6
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 24 01:19:31 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 2b65bd7..c7052b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz-fusion-plugins-unsupported (0.8.4-3) UNRELEASED; urgency=low
+compiz-fusion-plugins-unsupported (0.8.4-3) unstable; urgency=low
* Add Vcs-* fields.
* Tighten dependencies on compiz-core:
@@ -7,7 +7,7 @@ compiz-fusion-plugins-unsupported (0.8.4-3) 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 01:17:27 +0100
+ -- Cyril Brulebois <kibi@debian.org> Wed, 24 Mar 2010 01:19:26 +0100
compiz-fusion-plugins-unsupported (0.8.4-2) unstable; urgency=low
commit 269a12fb4cf287f5680c5d541e4be891c0a1f97d
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 24 01:19:15 2010 +0100
Tighten dependencies on compiz-core.
diff --git a/debian/changelog b/debian/changelog
index f783ae3..2b65bd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
compiz-fusion-plugins-unsupported (0.8.4-3) 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 01:17:27 +0100
diff --git a/debian/control b/debian/control
index 8b12da5..c5775ed 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/compiz-fusion-plugins-unsup
Package: compiz-fusion-plugins-unsupported
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${compizcore:Depends}
Description: Compiz Fusion plugins - "unsupported" 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 53d4c51..fd495a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,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: $(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
@@ -85,7 +90,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- -Vcompizcore:Depends=$(COMPIZCORE_DEPENDS)
dh_md5sums
dh_builddeb
commit d74909bfda3b2670ea6adc3f149525e4c79ba760
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 24 01:17:34 2010 +0100
Add Vcs-* fields.
diff --git a/debian/changelog b/debian/changelog
index e1d6f81..f783ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz-fusion-plugins-unsupported (0.8.4-3) UNRELEASED; urgency=low
+
+ * Add Vcs-* fields.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 24 Mar 2010 01:17:27 +0100
+
compiz-fusion-plugins-unsupported (0.8.4-2) unstable; urgency=low
* Add extra install rules for new svg files in 0.8.4.
diff --git a/debian/control b/debian/control
index 2701a71..8b12da5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Uploaders: Sean Finney <seanius@debian.org>
Build-Depends: automake1.9, autotools-dev, compiz-dev (>= 0.8.4), compiz-fusion-bcop (>= 0.8.4), compiz-fusion-plugins-main (>= 0.8.4), debhelper (>= 5), intltool, libgconf2-dev, libglib2.0-dev, libtool, libxml2-dev, libxslt1-dev, pkg-config, xsltproc, librsvg2-dev, libcairo2-dev, libsm-dev, libglu1-mesa-dev, libdbus-1-dev, libdecoration0-dev, libxml-parser-perl, x11proto-core-dev, libxrender-dev, quilt
Standards-Version: 3.7.2
Section: x11
+Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compiz-fusion-plugins-unsupported.git
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/compiz-fusion-plugins-unsupported.git
Package: compiz-fusion-plugins-unsupported
Architecture: any
Reply to: