[SVN] r659 - /trunk/cyrus-imapd-2.2.13/debian/rules

[debian at incase.de]

Author: sven
Date: Tue Oct 10 16:17:25 2006
New Revision: 659

URL: https://mail.incase.de/viewcvs?rev=659&root=cyrus22&view=rev
Log:
Revert the dpatch modification in debian/rules (include the dpatch.make file again instead of using an inline modified version thereof)

Modified:
    trunk/cyrus-imapd-2.2.13/debian/rules

Modified: trunk/cyrus-imapd-2.2.13/debian/rules
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/rules?rev=659&root=cyrus22&r1=658&r2=659&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/rules (original)
+++ trunk/cyrus-imapd-2.2.13/debian/rules Tue Oct 10 16:17:25 2006
@@ -20,45 +20,7 @@
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 # enable dpatch usage
-#include /usr/share/dpatch/dpatch.make
-# -*- Makefile -*-, you silly Emacs!
-# vim: set ft=make:
-
-DPATCH_PACKAGE	?= ${DEB_SOURCE_PACKAGE}
-DPATCH_PACKAGE	?= ${PACKAGE}
-DPATCH_STAMPDIR	?= debian/patched
-DPATCH_STAMPFN	?= patch-stamp
-
-ifdef PATCHLIST
-UNPATCHLIST	:= $(shell echo ${PATCHLIST} | tr ' ' '\n' | tac)
-DPATCH_ALL	:=
-else
-DPATCH_ALL	:= -all
-endif
-
-ifneq (${DPATCH_STAMPDIR},debian/patched)
-_STAMPDIR	:= --stampdir=${DPATCH_STAMPDIR}
-endif
-
-ifdef DPATCH_WORKDIR
-_WORKDIR	:= --workdir ${DPATCH_WORKDIR}
-endif
-
-patch: ${DPATCH_STAMPFN}
-${DPATCH_STAMPFN}:
-	test -d ${DPATCH_STAMPDIR} || install -d ${DPATCH_STAMPDIR}
-	@echo "Patches applied in the Debian version of ${DPATCH_PACKAGE}:" > $@T
-	@echo >> $@T
-	dpatch ${_WORKDIR} apply${DPATCH_ALL} -v ${_STAMPDIR} ${PATCHLIST} || bash
-	dpatch ${_WORKDIR} cat${DPATCH_ALL} ${PATCHLIST} >>$@T
-	mv -f $@T $@
-
-unpatch:
-	dpatch ${_WORKDIR} deapply${DPATCH_ALL} ${_STAMPDIR} ${UNPATCHLIST}
-	rm -rf ${DPATCH_STAMPFN} ${DPATCH_STAMPFN}T ${DPATCH_STAMPDIR}
-
-# arch-tag: 6bb4c625-9a85-41d9-ab37-23cb0a16fb39
-#END_dpatch.make
+include /usr/share/dpatch/dpatch.make
 
 # Extra version information to add to Cyrus IMAPd ID
 DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: \(.*-\)/\1/p')