[SVN] r872 - in /trunk/cyrus-imapd-2.2.13/debian: changelog control patches/00list patches/series rules

[debian at incase.de]

Author: myon
Date: Fri Jan 22 21:44:49 2010
New Revision: 872

URL: https://mail.incase.de/viewcvs?rev=872&root=cyrus22&view=rev
Log:
* Add myself to Uploaders.
* Convert to use quilt.

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/series
      - copied unchanged from r871, trunk/cyrus-imapd-2.2.13/debian/patches/00list
Removed:
    trunk/cyrus-imapd-2.2.13/debian/patches/00list
Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/control
    trunk/cyrus-imapd-2.2.13/debian/rules

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=872&root=cyrus22&r1=871&r2=872&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Fri Jan 22 21:44:49 2010
@@ -1,12 +1,16 @@
-cyrus-imapd-2.2 (2.2.13-18) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
+cyrus-imapd-2.2 (2.2.13-18) unstable; urgency=low
+
+  [ Henrique de Moraes Holschuh ]
   * sieve/bc_eval.c (0025-upstream-fix-cve-2009-3235.dpatch):
     update for completeness to match the patch used by the security-team:
     use snprintf for scount, to future-proof against "int" larger than
     64 bits.
 
- -- Henrique de Moraes Holschuh <hmh at debian.org>  Wed, 23 Sep 2009 09:22:07 -0300
+  [ Christoph Berg ]
+  * Add myself to Uploaders.
+  * Convert to use quilt.
+
+ -- Christoph Berg <myon at debian.org>  Fri, 22 Jan 2010 21:44:15 +0100
 
 cyrus-imapd-2.2 (2.2.13-17) unstable; urgency=high
 

Modified: trunk/cyrus-imapd-2.2.13/debian/control
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/control?rev=872&root=cyrus22&r1=871&r2=872&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/control (original)
+++ trunk/cyrus-imapd-2.2.13/debian/control Fri Jan 22 21:44:49 2010
@@ -2,9 +2,9 @@
 Section: mail
 Priority: extra
 Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
-Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sven at debian.org>, Benjamin Seidenberg <benjamin at debian.org>, OndÃ…=C2™ej Surý <ondrej at debian.org>
+Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sven at debian.org>, Benjamin Seidenberg <benjamin at debian.org>, OndÃ…=C2™ej Surý <ondrej at debian.org>, Christoph Berg <myon at debian.org>
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 5), dpatch, tcl-dev | tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev | libsnmp9-dev, perl, xutils-dev | xutils, flex, bison, autotools-dev, po-debconf, transfig, ghostscript | gs-gpl, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev
+Build-Depends: debhelper (>= 5), quilt, tcl-dev | tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev | libsnmp9-dev, perl, xutils-dev | xutils, flex, bison, autotools-dev, po-debconf, transfig, ghostscript | gs-gpl, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev
 Vcs-Browser: https://mail.incase.de/viewcvs/trunk/?root=cyrus22
 Vcs-Svn: https://mail.incase.de/svn/cyrus22/trunk
 Homepage: http://cyrusimap.web.cmu.edu/

Modified: trunk/cyrus-imapd-2.2.13/debian/rules
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/rules?rev=872&root=cyrus22&r1=871&r2=872&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/rules (original)
+++ trunk/cyrus-imapd-2.2.13/debian/rules Fri Jan 22 21:44:49 2010
@@ -19,46 +19,7 @@
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 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	:= ${PATCHLIST}
-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}
-	dpatch ${_WORKDIR} cat${DPATCH_ALL} ${PATCHLIST} >>$@T
-	mv -f $@T $@
-
-unpatch: clean-patched
-	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/quilt/quilt.make
 
 # Extra version information to add to Cyrus IMAPd ID
 DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: \(.*-\)/\1/p')
@@ -116,7 +77,7 @@
 
 build: build-arch build-indep
 
-configure-stamp: ${DPATCH_STAMPFN}
+configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	# -rm -f config.sub config.guess
 	# cp /usr/share/misc/config.sub config.sub