r1406 - /unstable/libass/debian/rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Wed Aug 27 05:05:58 2008
New Revision: 1406

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1406
Log:
cleanup debian/rules, use /usr/share/quilt/quilt.make instead of implementing it on our own

Modified:
    unstable/libass/debian/rules

Modified: unstable/libass/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libass/debian/rules?rev=1406&op=diff
==============================================================================
--- unstable/libass/debian/rules (original)
+++ unstable/libass/debian/rules Wed Aug 27 05:05:58 2008
@@ -1,14 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -20,14 +16,14 @@
 CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
-# how to call quilt
-QUILT := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
+CONFFLAGS = $(CROSS) 
+CONFFLAGS += --prefix=/usr --mandir=\$${prefix}/share/man 
+CONFFLAGS += --infodir=\$${prefix}/share/info 
+CONFFLAGS += CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" LIBS="-lm"
 
-config.status: configure
+config.status: $(QUILT_STAMPFN) configure
 	dh_testdir
-	$(QUILT) push -a || test $$? = 2
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" LIBS="-lm"
-
+	./configure $(CONFFLAGS)
 
 build: build-stamp
 build-stamp:  config.status 
@@ -35,12 +31,12 @@
 	$(MAKE)
 	touch $@
 
-clean: 
+clean: unpatch clean-real
+clean-real:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
 	[ ! -f Makefile ] || $(MAKE) distclean
-	$(QUILT) pop -a || test $$? = 2
 	rm -rf .pc 
 	dh_clean 
 
@@ -49,15 +45,12 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
+binary-indep: build install
+# We have nothing to do
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
+# Build architecture-dependent files
 binary-arch: build install
 	dh_testdir
 	dh_testroot