From 4472beb5788afdda915645ff5c134028fe41dbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20COUDERC?= Date: Sun, 19 Feb 2017 22:50:21 +0000 Subject: [PATCH] Build with debhelper, bump compatibility level to 10, drop CDBS build dependency. --- debian/changelog | 5 ++++- debian/compat | 2 +- debian/control | 2 +- debian/rules | 10 ++-------- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a2d31c..91a4454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ -desktop-base (9.0.3) UNRELEASED; urgency=medium +desktop-base (10.0.0~exp1) UNRELEASED; urgency=medium + [ Aurélien COUDERC ] * Fix minor problems with maintainer scripts, thanks Raphaël Hertzog for the detailed review. (Closes: #853224) + * Build with debhelper, bump compatibility level to 10, drop CDBS build + dependency. -- Aurélien COUDERC Mon, 30 Jan 2017 22:21:40 +0100 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 1bb1010..a57b2b5 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Uploaders: Loïc Minier , Paul Tagliamonte , Eshat Cakar , Aurélien COUDERC -Build-Depends: cdbs (>= 0.4.93), debhelper (>= 9), librsvg2-bin +Build-Depends: debhelper (>= 10), librsvg2-bin Standards-Version: 3.9.8 Homepage: http://www.debian.org/devel/debian-desktop Vcs-Browser: https://anonscm.debian.org/viewvc/debian-desktop/packages/trunk/desktop-base diff --git a/debian/rules b/debian/rules index ed0db89..2d33f6a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,4 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/buildcore.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk - -DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/desktop-base/ - -binary-fixup/desktop-base:: - dh_gconf --priority=15 +%: + dh $@