X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=23f2f13399c4778f22902595cfdfe005f872efea;hb=83bf49d129ba5e5e4aeda1b193da2086ceac3f99;hp=b06f979fc9083cdb8c4a3d8c63473d9f3afb0d72;hpb=970d9ed6844a3dab606802738a20c63e724961f7;p=pkg-ncmpc.git

diff --git a/debian/rules b/debian/rules
index b06f979..23f2f13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # debian/rules for ncmpc
 #
-# Written by Sebastian Harl <sh@tokkee.org>
+# Written by Sebastian Harl <tokkee@debian.org>
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -19,9 +19,17 @@ else
 	CFLAGS += -O2
 endif
 
-config.status: configure
+CHECK = check
+
+ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	CHECK =
+endif
+
+include /usr/share/dpatch/dpatch.make
+
+config.status: configure $(DPATCH_STAMPFN)
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
+	./configure --host=$(DEB_HOST_GNU_TYPE) \
 			--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--disable-mini \
@@ -39,7 +47,8 @@ config.status: configure
 			--enable-key-screen \
 			--enable-lyrics-screen \
 			--enable-outputs-screen \
-			--with-ncursesw
+			--with-ncursesw \
+			CFLAGS="$(CFLAGS)"
 
 build: build-stamp
 
@@ -47,10 +56,11 @@ build-stamp: config.status
 	dh_testdir
 	
 	$(MAKE)
+	test -z '$(CHECK)' || make $(CHECK)
 	
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -62,7 +72,7 @@ clean:
 install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs -i
 	
 	mkdir -p debian/ncmpc-lyrics/usr/lib/ncmpc/lyrics/