Switch from cdbs to dh

4 files changed, 18 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index a4f4373..9190b20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dmz-cursor-theme (0.4.5) UNRELEASED; urgency=medium
   * Add Vcs fields
   * Update Maintainer
   * Bump Standards-Version to 4.1.2
+  * Switch from cdbs to dh
 
  -- Jeremy Bicha <jbicha@debian.org>  Mon, 18 Dec 2017 11:44:01 -0500
 
diff --git a/debian/control b/debian/control
index d449a5f..9ca2f78 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,17 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: dmz-cursor-theme
 Section: gnome
 Priority: optional
-Maintainer: Josselin Mouette <joss@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 4.1), cdbs, gnome-pkg-tools
-Build-Depends-Indep: x11-apps
-Standards-Version: 3.9.1
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Josselin Mouette <joss@debian.org>
+Build-Depends: debhelper (>= 4.1),
+               gnome-pkg-tools,
+               x11-apps
+Standards-Version: 4.1.2
+Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/dmz-cursor-theme.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/dmz-cursor-theme.git
 
 Package: dmz-cursor-theme
 Architecture: all
diff --git a/debian/control.in b/debian/control.in
index ef64486..6f44e42 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,8 +3,9 @@ Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.1), cdbs, gnome-pkg-tools
-Build-Depends-Indep: x11-apps
+Build-Depends: debhelper (>= 4.1),
+               gnome-pkg-tools,
+               x11-apps
 Standards-Version: 4.1.2
 Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/dmz-cursor-theme.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/dmz-cursor-theme.git
diff --git a/debian/rules b/debian/rules
index c0f8b48..473dbaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,13 @@
 #!/usr/bin/make -f
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+%:
+	dh $@ --with gnome
 
-common-build-indep::
-	# DMZ White
+override_dh_auto_build:
 	cd DMZ-White/pngs && ./make.sh
-	# DMZ Black
 	cd DMZ-Black/pngs && ./make.sh
 
-clean::
+override_dh_clean:
 	rm -rf DMZ-*/xcursors
+	dh_clean