3 files changed, 5 insertions, 6 deletions
diff --git a/ubuntu/maverick/applications/piklab/debian/control b/ubuntu/maverick/applications/piklab/debian/control
index e36481273..7864a446b 100644
--- a/ubuntu/maverick/applications/piklab/debian/control
+++ b/ubuntu/maverick/applications/piklab/debian/control
@@ -2,7 +2,7 @@ Source: piklab-trinity
 Section: electronics
 Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath,
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, quilt, chrpath,
  libusb-dev, tdelibs14-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://piklab.sourceforge.net/
diff --git a/ubuntu/maverick/applications/piklab/debian/patches/.gitignore b/ubuntu/maverick/applications/piklab/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/piklab/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/piklab/debian/patches/series
diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules
index 6d0a1d510..d15b8b977 100755
--- a/ubuntu/maverick/applications/piklab/debian/rules
+++ b/ubuntu/maverick/applications/piklab/debian/rules
@@ -26,7 +26,9 @@ else
 	CFLAGS += -O2
 endif
 
-config: config-stamp
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+config: post-patches config-stamp
 config-stamp:  configure
 	dh_testdir
 
@@ -39,8 +41,6 @@ config-stamp:  configure
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -62,7 +62,7 @@ build-stamp:  config-stamp
 	#docbook-to-man debian/piklab.sgml > piklab.1
 	touch $@
 
-clean:
+clean::
 	dh_testdir
 	dh_testroot
 
@@ -80,7 +80,6 @@ clean:
 	rm -f po/*.gmo
 	rm -f src/common/global/svn_revision/svn_revision.h
 	rm -f config.sub config.guess config.status config.log
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build-stamp