[Pkg-telepathy-commits] [SCM] Butterfly packaging branch, debian, updated. debian/0.5.6-1-17-geefb2f3

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit c7cb575434e21a0ed68b99e5791aaf6fed46e17f
Author: Jonny Lamb <jonny at debian.org>
Date:   Sat Apr 3 23:53:55 2010 +0100

    debian/rules: Updated now that butterfly uses autoconf and automake.
    
    Signed-off-by: Jonny Lamb <jonny at debian.org>

diff --git a/debian/changelog b/debian/changelog
index d89f079..f54be85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ telepathy-butterfly (0.5.7-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/copyright: Updated.
+  * debian/rules: Updated now that butterfly uses autoconf and automake.
 
- -- Jonny Lamb <jonny at debian.org>  Sat, 03 Apr 2010 23:50:46 +0100
+ -- Jonny Lamb <jonny at debian.org>  Sat, 03 Apr 2010 23:53:37 +0100
 
 telepathy-butterfly (0.5.6-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index ec039f9..d3cdc3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,20 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/class/makefile.mk
+DEB_AUTO_CLEANUP_RCS := yes
+DEB_PYTHON_SYSTEM := pycentral
+DEB_COMPRESS_EXCLUDE := .py
+
+include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_MAKE_INVOKE = WAF_HOME=$(CURDIR)/debian/waftmp  NOCOLOR=1 ./waf -v
-DEB_MAKE_INSTALL_TARGET = install --destdir=$(DEB_DESTDIR)
-DEB_MAKE_CLEAN_TARGET = distclean
-
-common-configure-indep::
-	WAF_HOME=$(CURDIR)/debian/waftmp NOCOLOR=1 ./waf configure --prefix=/usr --libexecdir=/usr/lib/telepathy
-
-clean::
-	rm -rf $(CURDIR)/debian/waftmp
+DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=/usr/lib/telepathy
 
+binary-install/telepathy-butterfly::
+	dh_pycentral
 
 # List any files which are not installed
 include /usr/share/cdbs/1/rules/utils.mk
-common-binary-post-install-indep:: list-missing
-	dh_pycentral
+common-binary-post-install-arch:: list-missing
 
 include $(CURDIR)/debian/update-patches.mk

-- 
Butterfly packaging