Switch patch system from simple to quilt on Debian and Ubuntu

3 files changed, 4 insertions, 4 deletions

diff --git a/debian/squeeze/dependencies/libcarddav/debian/control b/debian/squeeze/dependencies/libcarddav/debian/control
index 7bf8ff1dc..7e3b740bb 100644
--- a/debian/squeeze/dependencies/libcarddav/debian/control
+++ b/debian/squeeze/dependencies/libcarddav/debian/control
@@ -1,5 +1,5 @@
 Source: libcarddav
-Build-Depends: debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev
 Section: graphics
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
diff --git a/debian/squeeze/dependencies/libcarddav/debian/patches/series b/debian/squeeze/dependencies/libcarddav/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/dependencies/libcarddav/debian/patches/series
diff --git a/debian/squeeze/dependencies/libcarddav/debian/rules b/debian/squeeze/dependencies/libcarddav/debian/rules
index 24bdcbc93..b22fbca64 100755
--- a/debian/squeeze/dependencies/libcarddav/debian/rules
+++ b/debian/squeeze/dependencies/libcarddav/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
@@ -28,7 +28,7 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
 
 make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
 
-build: $(QUILT_STAMPFN) build-stamp
+build: post-patches build-stamp
 build-stamp:
 	dh_testdir
 	./autogen.sh
@@ -38,7 +38,7 @@ build-stamp:
 
 	touch build-stamp
 
-clean: unpatch
+clean::
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp