compiz: Changes to 'debian-unstable'
debian/changelog | 18 ++++++++++++++++++
debian/compiz-gtk.install | 1 +
debian/compiz-kde.install | 3 +++
debian/control | 6 +++---
debian/rules | 37 +++++++++++++++++++++++++------------
5 files changed, 50 insertions(+), 15 deletions(-)
New commits:
commit cd226f797ac0d8462ce66683fe6569614229f927
Author: Sean Finney <seanius@debian.org>
Date: Tue May 27 08:38:29 2008 +0200
Add versioned dependeny on libcompizconfig0 to compiz-core
diff --git a/debian/changelog b/debian/changelog
index f0c361d..c3175f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ compiz (0.7.4-2) unstable; urgency=low
packages respectively, as they are semi-obsoleted by the ccp plugin anyway
and cause potentially problematic dependencies. Thanks to Fabiano
Manoel de Andrade for the report (closes: #482150).
+ * Add versioned dependeny on libcompizconfig0 to compiz-core, to keep
+ packages in sync when the internal ABI changes after an upgrade. Thanks
+ to Mike Hommey for the report (closes: #482646).
* Make debian/rules stricter about catching uninstalled files.
* Make debian/rules able to build/clean/build again.
* Misc cleanups in debian/rules.
diff --git a/debian/control b/debian/control
index 4436497..4379f37 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Description: OpenGL window and compositing manager
Package: compiz-core
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mesa-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcompizconfig0 (>= 0.7.4), mesa-utils
Recommends: compiz-plugins (= ${binary:Version})
Suggests: nvidia-glx (>= 1.0.9625-1)
Description: OpenGL window and compositing manager
commit 1773553ac53dad6554adcd1f7f29d4cc968a5dc8
Author: Sean Finney <seanius@debian.org>
Date: Tue May 27 08:20:20 2008 +0200
debian/rules: fix for multi clean/build/clean/build
diff --git a/debian/changelog b/debian/changelog
index bb7a1ea..f0c361d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ compiz (0.7.4-2) unstable; urgency=low
and cause potentially problematic dependencies. Thanks to Fabiano
Manoel de Andrade for the report (closes: #482150).
* Make debian/rules stricter about catching uninstalled files.
+ * Make debian/rules able to build/clean/build again.
* Misc cleanups in debian/rules.
* Lintian fixes:
- Spelling correction in debian/control
diff --git a/debian/rules b/debian/rules
index 3603df4..3e6abe6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ AUTOFOO_DELETE:=aclocal.m4 config.guess config.h.in config.sub configure \
include/Makefile.in kde/Makefile.in \
kde/window-decorator/Makefile.in libdecoration/Makefile.in \
metadata/Makefile.in plugins/Makefile.in po/Makefile.in.in \
- src/Makefile.in
+ src/Makefile.in kde/window-decorator-kde4/Makefile.in
# brief shorthand for cleaner rules below
DESTDIR:=$(CURDIR)/debian/tmp
@@ -71,11 +71,15 @@ build-stamp:
$(MAKE)
touch $@
+unpatch: distclean
+
+distclean:
+ [ ! -f Makefile ] || $(MAKE) distclean
+
clean: unpatch
dh_testdir
dh_testroot
rm -f po/*.gmo
- [ ! -f Makefile ] || $(MAKE) distclean
rm -f build-stamp
rm -f $(AUTOFOO_DELETE)
for f in $(UPSTREAM_PRESERVE); do \
commit c2381126b304e34c1adf56fe323d543d18446aad
Author: Sean Finney <seanius@debian.org>
Date: Tue May 27 00:46:39 2008 +0200
rules fixup: use --fail-missing instead of --list-missing
no reason not to do so, as we were missing the warnings about files
not being installed in the mass of build output. this also includes
relevant fixes to catch the newly build-blocking omissions.
diff --git a/debian/changelog b/debian/changelog
index a0114b5..bb7a1ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
compiz (0.7.4-2) unstable; urgency=low
- * Misc cleanups in debian/rules
* Special-case the gconf and kconfig plugins to go into the -gtk and -kde
packages respectively, as they are semi-obsoleted by the ccp plugin anyway
and cause potentially problematic dependencies. Thanks to Fabiano
Manoel de Andrade for the report (closes: #482150).
+ * Make debian/rules stricter about catching uninstalled files.
+ * Misc cleanups in debian/rules.
* Lintian fixes:
- Spelling correction in debian/control
- Fix for build-depends-on-1-revision for x11proto-gl-dev
diff --git a/debian/compiz-kde.install b/debian/compiz-kde.install
index c32663b..0b2c67f 100644
--- a/debian/compiz-kde.install
+++ b/debian/compiz-kde.install
@@ -1,2 +1,4 @@
usr/bin/kde-window-decorator
usr/lib/compiz/libkconfig.so
+usr/share/config.kcfg/*.kcfg
+etc/kde3/compizrc
diff --git a/debian/rules b/debian/rules
index 1e7bfd2..3603df4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,7 +103,7 @@ binary-arch: build install
dh_installdocs
dh_installchangelogs ChangeLog
- dh_install --sourcedir=$(DESTDIR) --list-missing
+ dh_install --sourcedir=$(DESTDIR) --fail-missing
# the gconf and kconfig plugins are seperately installed into
# the -gnome and -kde packages respectively
rm $(CURDIR)/debian/tmp/usr/lib/compiz/libkconfig.so
commit 49f9efc10a6719267a48246439ae5c2cf0f686c8
Author: Sean Finney <seanius@debian.org>
Date: Mon May 26 23:34:06 2008 +0200
lintian fixes
diff --git a/debian/changelog b/debian/changelog
index bb91996..a0114b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ compiz (0.7.4-2) unstable; urgency=low
packages respectively, as they are semi-obsoleted by the ccp plugin anyway
and cause potentially problematic dependencies. Thanks to Fabiano
Manoel de Andrade for the report (closes: #482150).
+ * Lintian fixes:
+ - Spelling correction in debian/control
+ - Fix for build-depends-on-1-revision for x11proto-gl-dev
-- Sean Finney <seanius@debian.org> Mon, 26 May 2008 23:04:24 +0200
diff --git a/debian/control b/debian/control
index 544f5b4..4436497 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: autoconf, automake1.9, autotools-dev,
libsm-dev (>= 1:1.0.1), libtool, libwnck-dev, libxcomposite-dev (>= 1:0.3-2),
libxdamage-dev (>=1:1.0.3), libxfixes-dev (>= 1:4.0.1), libxinerama-dev,
libxml-parser-perl, libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1),
- quilt (>= 0.40), x11proto-gl-dev (>= 1.4.8-1), xsltproc
+ quilt (>= 0.40), x11proto-gl-dev (>= 1.4.8), xsltproc
Standards-Version: 3.7.3
Package: compiz
@@ -24,7 +24,7 @@ Description: OpenGL window and compositing manager
easier to use, more powerful and intuitive, and more accessible for users
with special needs.
.
- This meta-package provides the components necessary for running compiz. It
+ This metapackage provides the components necessary for running compiz. It
provides the compiz core, a set of standard plugins, a window decorator using
the Gtk toolkit and the files necessary to integrate compiz with the GNOME
desktop environment.
commit 43b769c857dd888d20be61f63e8e023e4cb3115c
Author: Sean Finney <seanius@debian.org>
Date: Mon May 26 23:21:06 2008 +0200
split out the kconfig/gconf plugins into -kde and -gtk respectively
diff --git a/debian/changelog b/debian/changelog
index b7bb2f8..bb91996 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
compiz (0.7.4-2) unstable; urgency=low
* Misc cleanups in debian/rules
+ * Special-case the gconf and kconfig plugins to go into the -gtk and -kde
+ packages respectively, as they are semi-obsoleted by the ccp plugin anyway
+ and cause potentially problematic dependencies. Thanks to Fabiano
+ Manoel de Andrade for the report (closes: #482150).
-- Sean Finney <seanius@debian.org> Mon, 26 May 2008 23:04:24 +0200
diff --git a/debian/compiz-gtk.install b/debian/compiz-gtk.install
index d1ab201..1fb0c50 100644
--- a/debian/compiz-gtk.install
+++ b/debian/compiz-gtk.install
@@ -1,2 +1,3 @@
usr/share/gconf/schemas/gwd.schemas
usr/bin/gtk-window-decorator
+usr/lib/compiz/libgconf.so
diff --git a/debian/compiz-kde.install b/debian/compiz-kde.install
index 7ab5b0a..c32663b 100644
--- a/debian/compiz-kde.install
+++ b/debian/compiz-kde.install
@@ -1 +1,2 @@
usr/bin/kde-window-decorator
+usr/lib/compiz/libkconfig.so
diff --git a/debian/rules b/debian/rules
index cf653fa..1e7bfd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,6 +104,12 @@ binary-arch: build install
dh_installdocs
dh_installchangelogs ChangeLog
dh_install --sourcedir=$(DESTDIR) --list-missing
+ # the gconf and kconfig plugins are seperately installed into
+ # the -gnome and -kde packages respectively
+ rm $(CURDIR)/debian/tmp/usr/lib/compiz/libkconfig.so
+ rm $(CURDIR)/debian/compiz-plugins/usr/lib/compiz/libkconfig.so
+ rm $(CURDIR)/debian/tmp/usr/lib/compiz/libgconf.so
+ rm $(CURDIR)/debian/compiz-plugins/usr/lib/compiz/libgconf.so
dh_installman
dh_link
dh_gconf
commit 46c28df93932985d3ffd76c0964deaa9cefa928e
Author: Sean Finney <seanius@debian.org>
Date: Mon May 26 23:07:07 2008 +0200
rules cleanup: whitespace normalizing
diff --git a/debian/rules b/debian/rules
index 33fc6e4..cf653fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,12 +50,12 @@ confflags += --disable-static \
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 \
- Makefile.in gtk/Makefile.in gtk/gnome/Makefile.in \
- gtk/window-decorator/Makefile.in images/Makefile.in \
- include/Makefile.in kde/Makefile.in \
- kde/window-decorator/Makefile.in libdecoration/Makefile.in \
- metadata/Makefile.in plugins/Makefile.in po/Makefile.in.in \
- src/Makefile.in
+ Makefile.in gtk/Makefile.in gtk/gnome/Makefile.in \
+ gtk/window-decorator/Makefile.in images/Makefile.in \
+ include/Makefile.in kde/Makefile.in \
+ kde/window-decorator/Makefile.in libdecoration/Makefile.in \
+ metadata/Makefile.in plugins/Makefile.in po/Makefile.in.in \
+ src/Makefile.in
# brief shorthand for cleaner rules below
DESTDIR:=$(CURDIR)/debian/tmp
commit 6791d3b5715a6b00c68a0adc174dd5cf1d257caf
Author: Sean Finney <seanius@debian.org>
Date: Mon May 26 23:05:39 2008 +0200
rules cleanup: use a variable to reference debian/tmp
diff --git a/debian/changelog b/debian/changelog
index 577b400..b7bb2f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz (0.7.4-2) unstable; urgency=low
+
+ * Misc cleanups in debian/rules
+
+ -- Sean Finney <seanius@debian.org> Mon, 26 May 2008 23:04:24 +0200
+
compiz (0.7.4-1) unstable; urgency=low
* New upstream release
diff --git a/debian/rules b/debian/rules
index 4c8262e..33fc6e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,9 @@ AUTOFOO_DELETE:=aclocal.m4 config.guess config.h.in config.sub configure \
metadata/Makefile.in plugins/Makefile.in po/Makefile.in.in \
src/Makefile.in
+# brief shorthand for cleaner rules below
+DESTDIR:=$(CURDIR)/debian/tmp
+
build: patch build-stamp
build-stamp:
dh_testdir
@@ -87,11 +90,11 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- mv $(CURDIR)/debian/tmp/usr/bin/compiz $(CURDIR)/debian/tmp/usr/bin/compiz.real
- $(INSTALL) --mode 0755 debian/compiz-manager $(CURDIR)/debian/tmp/usr/bin/compiz
+ $(MAKE) DESTDIR=$(DESTDIR) install
+ mv $(DESTDIR)/usr/bin/compiz $(DESTDIR)/usr/bin/compiz.real
+ $(INSTALL) --mode 0755 debian/compiz-manager $(DESTDIR)/usr/bin/compiz
# remove unneeded .la files
- find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.la' | xargs rm -f
+ find $(DESTDIR)/usr/lib -type f -name '*.la' | xargs rm -f
# Build architecture-dependent files here.
binary-arch: build install
@@ -100,7 +103,7 @@ binary-arch: build install
dh_installdocs
dh_installchangelogs ChangeLog
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=$(DESTDIR) --list-missing
dh_installman
dh_link
dh_gconf
Reply to: