[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

compiz: Changes to 'debian-unstable'



 debian/changelog |    8 ++++++++
 debian/rules     |    8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 5e876dc6f16d9c053191625c84b39233cb3c046e
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Mar 9 18:18:58 2009 +0100

    Fix FTBFS and build against new metacity
    
    * Don't run glib-gettextize, to fix FTBFS caused by intltoolize changes
      (closes: #518909).
    * Rebuild against new metacity (closes: #518910).

diff --git a/debian/changelog b/debian/changelog
index c20d2cb..797dde1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+compiz (0.7.6-8) unstable; urgency=low
+
+  * Don't run glib-gettextize, to fix FTBFS caused by intltoolize changes
+    (closes: #518909).
+  * Rebuild against new metacity (closes: #518910).
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 09 Mar 2009 18:44:13 +0100
+
 compiz (0.7.6-7) unstable; urgency=medium
 
   * refresh quilt patches to apply with no fuzz/offsets. 
diff --git a/debian/rules b/debian/rules
index 1568f9a..894c1c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,13 +60,15 @@ AUTOFOO_DELETE:=aclocal.m4 config.guess config.h.in config.sub configure \
 # brief shorthand for cleaner rules below
 DESTDIR:=$(CURDIR)/debian/tmp
 
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	for f in $(UPSTREAM_PRESERVE); do \
 		cp -a $$f $$f.preserve; \
 	done
-	./autogen.sh --prefix=/usr --sysconfdir=\$${prefix}/share $(confflags) \
+	autoreconf -vi
+	intltoolize --copy --force --automake
+	./configure --prefix=/usr --sysconfdir=\$${prefix}/share $(confflags) \
 	             CFLAGS="$(CFLAGS)" QTDIR=/usr
 	$(MAKE)
 	touch $@


Reply to: