I updated the packaging to use dh7 instead of cdbs and it seems to build
now in pbuilder.
Attached is the debdiff.
diff -Nru bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.install bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.install
--- bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.install	2010-02-07 20:55:23.000000000 -0600
+++ bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.install	2010-02-14 06:22:26.000000000 -0600
@@ -1,11 +1,10 @@
-/usr/share/lintian/overrides/bzr-gtk
 /usr/share/pixmaps/bzr-icon-64.png
 /usr/lib/python*
 /usr/share/bzr-gtk
 /usr/bin/bzr-notify
 /usr/bin/olive-gtk
 /usr/bin/bzr-handle-patch
-/etc/xdg/autostart/bzr-notify.desktop
+bzr-notify.desktop etc/xdg/autostart/
 /usr/share/locale/*/LC_MESSAGES/olive-gtk.mo
 /usr/share/olive/cmenu.ui
 /usr/share/applications/*.desktop
diff -Nru bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.lintian-overrides bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.lintian-overrides
--- bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.lintian-overrides	2010-02-07 20:55:23.000000000 -0600
+++ bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.lintian-overrides	2010-02-14 06:17:41.000000000 -0600
@@ -1,2 +1 @@
-# These .desktop files start via "/usr/bin/bzr"
-bzr-gtk: desktop-command-not-in-package /usr/share/applications/bazaar-properties.desktop bzr
+debian/overrides/bzr-gtk
diff -Nru bzr-gtk-0.97.0+bzr674/debian/changelog bzr-gtk-0.97.0+bzr674/debian/changelog
--- bzr-gtk-0.97.0+bzr674/debian/changelog	2010-02-07 20:55:23.000000000 -0600
+++ bzr-gtk-0.97.0+bzr674/debian/changelog	2010-02-14 06:56:49.000000000 -0600
@@ -1,3 +1,12 @@
+bzr-gtk (0.97.0+bzr674-4) unstable; urgency=low
+
+  * Remove CDBS packaging in favor of DH7
+    + fix nautilus-bzr.py installation
+    + install lintian-overrides properly
+    + install bzr-notify.desktop properly
+
+ -- Taylor LeMasurier-Wren <ripps...@gmail.com>  Sun, 14 Feb 2010 06:55:00 -0600
+
 bzr-gtk (0.97.0+bzr674-3) unstable; urgency=low
 
   * Actually merge newer upstream revision.
diff -Nru bzr-gtk-0.97.0+bzr674/debian/compat bzr-gtk-0.97.0+bzr674/debian/compat
--- bzr-gtk-0.97.0+bzr674/debian/compat	2010-02-07 20:55:23.000000000 -0600
+++ bzr-gtk-0.97.0+bzr674/debian/compat	2010-02-14 06:07:25.000000000 -0600
@@ -1 +1 @@
-5
+7
diff -Nru bzr-gtk-0.97.0+bzr674/debian/control bzr-gtk-0.97.0+bzr674/debian/control
--- bzr-gtk-0.97.0+bzr674/debian/control	2010-02-07 20:55:23.000000000 -0600
+++ bzr-gtk-0.97.0+bzr674/debian/control	2010-02-14 06:16:21.000000000 -0600
@@ -4,7 +4,7 @@
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-ma...@lists.alioth.debian.org>
 Uploaders: Jelmer Vernooij <jel...@debian.org>, John Francesco Ferlito <jo...@inodes.org>
 Build-Depends-Indep: bzr (>= 1.17~), bzr-stats, python-nautilus (>= 0.5.0)
-Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), python, debhelper (>= 5.0.37.2)
+Build-Depends: python-central (>= 0.5), python, debhelper (>= 7.0.15)
 Standards-Version: 3.8.4
 Homepage: http://bazaar-vcs.org/bzr-gtk
 XS-Python-Version: >= 2.4
diff -Nru bzr-gtk-0.97.0+bzr674/debian/nautilus-bzr.install bzr-gtk-0.97.0+bzr674/debian/nautilus-bzr.install
--- bzr-gtk-0.97.0+bzr674/debian/nautilus-bzr.install	2010-02-07 20:55:23.000000000 -0600
+++ bzr-gtk-0.97.0+bzr674/debian/nautilus-bzr.install	2010-02-14 06:25:44.000000000 -0600
@@ -1,3 +1,2 @@
-/usr/lib/nautilus/extensions-2.0
 /usr/share/icons/hicolor/scalable/emblems/*
-/usr/lib/nautilus/extensions-2.0/python/nautilus-bzr.py
+nautilus-bzr.py usr/lib/nautilus/extensions-2.0/python/
diff -Nru bzr-gtk-0.97.0+bzr674/debian/overrides/bzr-gtk bzr-gtk-0.97.0+bzr674/debian/overrides/bzr-gtk
--- bzr-gtk-0.97.0+bzr674/debian/overrides/bzr-gtk	1969-12-31 18:00:00.000000000 -0600
+++ bzr-gtk-0.97.0+bzr674/debian/overrides/bzr-gtk	2010-02-07 20:55:23.000000000 -0600
@@ -0,0 +1,2 @@
+# These .desktop files start via "/usr/bin/bzr"
+bzr-gtk: desktop-command-not-in-package /usr/share/applications/bazaar-properties.desktop bzr
diff -Nru bzr-gtk-0.97.0+bzr674/debian/rules bzr-gtk-0.97.0+bzr674/debian/rules
--- bzr-gtk-0.97.0+bzr674/debian/rules	2010-02-07 20:55:23.000000000 -0600
+++ bzr-gtk-0.97.0+bzr674/debian/rules	2010-02-14 06:12:35.000000000 -0600
@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
-DEB_DH_INSTALL_SOURCEDIR=debian/tmp
-DEB_DH_INSTALL_ARGS=--list-missing
+%:
+	dh $@ --with python-central
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-install/bzr-gtk::
-	install -m644 -D debian/bzr-gtk.lintian-overrides $(DEB_DESTDIR)/usr/share/lintian/overrides/bzr-gtk
-	install -d $(DEB_DESTDIR)/etc/xdg/autostart
-	install -m644 -D bzr-notify.desktop $(DEB_DESTDIR)/etc/xdg/autostart
+clean:
+	rm -rf build/*
+	dh clean --remaining

Reply via email to