[Pkg-telepathy-commits] ./packages/experimental/empathy r157: Revert use debhelper 7 for this release cycle

[Laurent Bigonville]

------------------------------------------------------------
revno: 157
committer: Laurent Bigonville <bigon at bigon.be>
branch nick: experimental
timestamp: Sun 2008-08-10 17:00:07 +0200
message:
  Revert use debhelper 7 for this release cycle
modified:
  changelog
  compat
  control
  rules
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-08-04 20:57:12 +0000
+++ b/changelog	2008-08-10 15:00:07 +0000
@@ -4,13 +4,11 @@
   * Drop debian/patches/00_mark_unknown_presence_id_as_unset.patch: applied
     upstream
   * Use rarian-compat and librarian-dev instead of scrollkeeper as build-dep
-  * Bump debhelper compat to 7
-  * Use new dh mechanism instead of cdbs
   * Bump build-deps and remove libtelepathy-dev (not needed anymore)
   * Remove --enable-voip flags (voip enabled by default), rename
     --enable-aspell to --enable-spell
 
- -- Laurent Bigonville <bigon at bigon.be>  Mon, 04 Aug 2008 22:53:29 +0200
+ -- Laurent Bigonville <bigon at bigon.be>  Mon, 04 Aug 2008 20:44:25 +0200
 
 empathy (0.23.4-1) experimental; urgency=low
 

=== modified file 'compat'
--- a/compat	2008-08-04 20:28:33 +0000
+++ b/compat	2008-08-10 15:00:07 +0000
@@ -1,1 +1,1 @@
-7
+5

=== modified file 'control'
--- a/control	2008-08-04 21:27:20 +0000
+++ b/control	2008-08-10 15:00:07 +0000
@@ -7,7 +7,8 @@
            Simon McVittie <smcv at debian.org>,
            Riccardo Setti <giskard at debian.org>,
            Laurent Bigonville <bigon at bigon.be>
-Build-Depends: debhelper (>= 7),
+Build-Depends: cdbs,
+               debhelper (>= 5),
                rarian-compat,
                librarian-dev,
                libglib2.0-dev (>= 2.16.0),

=== modified file 'rules'
--- a/rules	2008-08-04 21:48:56 +0000
+++ b/rules	2008-08-10 15:00:07 +0000
@@ -1,29 +1,24 @@
 #!/usr/bin/make -f
 
+DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+
+# List any files which are not installed
+include /usr/share/cdbs/1/rules/utils.mk
+common-binary-post-install-arch:: list-missing
+
+# Ensure at build time that the library has no dependencies on undefined
+# symbols, and speed up loading.
+#LDFLAGS += -Wl,-z,defs -Wl,-O1
+
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
                              --enable-python \
                              --enable-megaphone \
                              --disable-tests
 
-build: build-stamp
-build-stamp:
-	dh build --before configure
-	dh_auto_configure -- ${DEB_CONFIGURE_EXTRA_FLAGS}
-	dh build --after configure
-	touch build-stamp
-
-clean:
-	dh clean
-
-install: build install-stamp
-install-stamp:
-	dh install
-	touch install-stamp
-
-binary-arch: install
-	dh binary-arch
-
-binary-indep: install
-	dh binary-indep
-
-binary: binary-arch binary-indep
+binary-install/python-empathy::
+	dh_pysupport -p$(cdbs_curpkg)