[SVN] r868 - in /branches/cyrus23/cyrus-imapd-2.3-development/debian: ./ patches/

debian at incase.de debian at incase.de
Tue Jan 19 15:06:45 UTC 2010 

Author: myon
Date: Tue Jan 19 16:06:45 2010
New Revision: 868

URL: https://mail.incase.de/viewcvs?rev=868&root=cyrus22&view=rev
Log:
converted to use quilt

Added:
    branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/series
      - copied, changed from r862, branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/00list
Removed:
    branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/00list
Modified:
    branches/cyrus23/cyrus-imapd-2.3-development/debian/control
    branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0020-upstream-client-literal-prefix.dpatch   (props changed)
    branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0025a-upstream-cve-2009-3235-partial.dpatch   (props changed)
    branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0025b-cve-2009-3235-extras.dpatch   (props changed)
    branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/20-fix-bdb-for-4.5.dpatch   (props changed)
    branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/50-fix-imclient-manpage.dpatch   (props changed)
    branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/80-kbsd-no-psstrings.dpatch   (props changed)
    branches/cyrus23/cyrus-imapd-2.3-development/debian/rules

Modified: branches/cyrus23/cyrus-imapd-2.3-development/debian/control
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/control?rev=868&root=cyrus22&r1=867&r2=868&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/control (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/control Tue Jan 19 16:06:45 2010
@@ -5,11 +5,11 @@
 Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sven at debian.org>,
  Benjamin Seidenberg <benjamin at debian.org>, Ondřej Surý <ondrej at debian.org>,
  Christoph Berg <myon at debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 6.0.7~), tcl8.3-dev, libwrap0-dev, libpam0g-dev,
  libdb4.4-dev | libdb4.5-dev | libdb4.6-dev, libssl-dev, libzephyr-dev,
- libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev, perl (>= 5.6.0-16),
- flex, bison, autotools-dev, po-debconf, dpatch, transfig, ghostscript, groff,
+ libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev, perl (>= 5.6.0-16), autoconf,
+ flex, bison, autotools-dev, po-debconf, quilt, transfig, ghostscript, groff,
  libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64]
 Xs-Vcs-Browser: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/
 Xs-Vcs-Svn: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/

Propchange: branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0020-upstream-client-literal-prefix.dpatch
            ('svn:executable' removed)

Propchange: branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0025a-upstream-cve-2009-3235-partial.dpatch
            ('svn:executable' removed)

Propchange: branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0025b-cve-2009-3235-extras.dpatch
            ('svn:executable' removed)

Propchange: branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/20-fix-bdb-for-4.5.dpatch
            ('svn:executable' removed)

Propchange: branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/50-fix-imclient-manpage.dpatch
            ('svn:executable' removed)

Propchange: branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/80-kbsd-no-psstrings.dpatch
            ('svn:executable' removed)

Copied: branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/series (from r862, branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/00list)
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/series?p2=branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/series&p1=branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/00list&r1=862&r2=868&rev=868&root=cyrus22&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/00list (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/series Tue Jan 19 16:06:45 2010
@@ -1,3 +1,5 @@
+#0019-upstream-sieve_allowreferrals.dpatch
+#0020-upstream-client-literal-prefix.dpatch
 0024-upstream-fix-sieve.dpatch
 0025a-upstream-cve-2009-3235-partial.dpatch
 0025b-cve-2009-3235-extras.dpatch
@@ -18,14 +20,18 @@
 16-fix_mib.dpatch
 17-fix_tail_syntax_in_xversion.h.dpatch
 19-fix_tls_ssl.dpatch
+#20-fix-bdb-for-4.5.dpatch
 21-fix_config-parsing.dpatch
 25-update_install-sh.dpatch
 30-update_perlcalling.sh.dpatch
 35-masssievec_remove_unused_variable.dpatch
 40-rehash_fix_pathes.dpatch
+#45-kolab2-annotations.dpatch
 50-fix-imclient-manpage.dpatch
 65-sieveshell-enhancements.dpatch
 70-allow-larger-buffers.dpatch
 72-faster-isdigit.dpatch
 75-update-imapd.conf-documentation.dpatch
+#77-change-missing-sieve-notice.dpatch
 80-kbsd-no-psstrings.dpatch
+#99-update-autoconf.dpatch

Modified: branches/cyrus23/cyrus-imapd-2.3-development/debian/rules
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/rules?rev=868&root=cyrus22&r1=867&r2=868&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/rules (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/rules Tue Jan 19 16:06:45 2010
@@ -21,46 +21,7 @@
 
 export BDB_VERSION ?= $(shell dpkg-query -l 'libdb4.[2-6]-dev' | grep ^ii | sed -e 's|.*\s\libdb\(4\.[0-9]\)-dev\s.*|\1|')
 
-# 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:
-	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')

More information about the Pkg-Cyrus-imapd-Debian-devel mailing list