[pkg-kolab] r998 - in kolabd/trunk/debian: . patches

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Mon Nov 17 21:02:11 UTC 2008 

Author: mparent-guest
Date: 2008-11-17 21:02:11 +0000 (Mon, 17 Nov 2008)
New Revision: 998

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/patches/10-dist_conf.diff
   kolabd/trunk/debian/patches/30-bootstrap.diff
   kolabd/trunk/debian/patches/40-disable-amavis.diff
   kolabd/trunk/debian/patches/50-postfix-hashes.diff
   kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff
   kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.diff
   kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff
   kolabd/trunk/debian/patches/80-kolab_globals.diff
   kolabd/trunk/debian/patches/85-slapd-2.4-compat.diff
   kolabd/trunk/debian/patches/86-slapd-syncrepl-24.diff
   kolabd/trunk/debian/patches/90-slapd-template.diff
   kolabd/trunk/debian/patches/91-postfix-template.diff
   kolabd/trunk/debian/patches/92-resmgr-template.diff
   kolabd/trunk/debian/patches/93-freebusy-template.diff
Log:
Use quilt headers


Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/changelog	2008-11-17 21:02:11 UTC (rev 998)
@@ -5,9 +5,9 @@
       10026. Default port make messages bounce when amavis is enabled.
     - debian/rules to keep this template
     - added /etc/amavis/conf.d directory as template target
-  * refreshed patches 
+  * refreshed patches, use quilt headers
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 12 Nov 2008 23:24:36 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Mon, 17 Nov 2008 22:00:06 +0100
 
 kolabd (2.2.0-20080709.dfsg-1) unstable; urgency=low
 

Modified: kolabd/trunk/debian/patches/10-dist_conf.diff
===================================================================
--- kolabd/trunk/debian/patches/10-dist_conf.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/10-dist_conf.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,9 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-dist_conf.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: Fixups for Debian
+Goal: fix dist_conf/debian
 
- at DPATCH@
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Already included, will be in 2.2.1
+
 Index: b/dist_conf/debian
 ===================================================================
 --- a/dist_conf/debian

Modified: kolabd/trunk/debian/patches/30-bootstrap.diff
===================================================================
--- kolabd/trunk/debian/patches/30-bootstrap.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/30-bootstrap.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,9 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 30-bootstrap.dpatch by Noèl Köthe <noel at debian.org>
-##
-## DP: Fixups for Debian
+Goal: kolab_bootstrap debian specificic stuff
 
- at DPATCH@
+Author: Noèl Köthe <noel at debian.org>
+
+Upstream status: Parts can be included
+
 Index: b/kolab_bootstrap.in
 ===================================================================
 --- a/kolab_bootstrap.in

Modified: kolabd/trunk/debian/patches/40-disable-amavis.diff
===================================================================
--- kolabd/trunk/debian/patches/40-disable-amavis.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/40-disable-amavis.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40-disable-amavis.dpatch by  <math.parent at gmail.com>
-##
-## DP: amavis is only suggested, so disable by default
+Goal: amavis is only suggested, so disable by default
 
- at DPATCH@
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Specific to Debian
+
 Index: b/kolab_bootstrap.in
 ===================================================================
 --- a/kolab_bootstrap.in

Modified: kolabd/trunk/debian/patches/50-postfix-hashes.diff
===================================================================
--- kolabd/trunk/debian/patches/50-postfix-hashes.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/50-postfix-hashes.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50-postfix-hashes.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: Postfix hashes templates
+Goal: Postfix hashes templates
 
- at DPATCH@
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Already included, will be in 2.2.1
+
 Index: b/Makefile.am
 ===================================================================
 --- a/Makefile.am
@@ -59,7 +59,7 @@
 +TARGET=@emailserver_confdir@/access
 +PERMISSIONS=0640
 +OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/access
++RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/access
 +KOLAB_META_END
 +# (c) 2008 Mathieu Parent <math.parent at gmail.com>
 +# This program is Free Software under the GNU General Public License (>=v2).
@@ -78,7 +78,7 @@
 +TARGET=@emailserver_confdir@/canonical
 +PERMISSIONS=0640
 +OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/canonical
++RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/canonical
 +KOLAB_META_END
 +# (c) 2008 Mathieu Parent <math.parent at gmail.com>
 +# This program is Free Software under the GNU General Public License (>=v2).
@@ -97,7 +97,7 @@
 +TARGET=@emailserver_confdir@/relocated
 +PERMISSIONS=0640
 +OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/relocated
++RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/relocated
 +KOLAB_META_END
 +# (c) 2008 Mathieu Parent <math.parent at gmail.com>
 +# This program is Free Software under the GNU General Public License (>=v2).
@@ -115,7 +115,7 @@
  TARGET=@emailserver_confdir@/virtual
  PERMISSIONS=0640
  OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/virtual
++RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/virtual
  KOLAB_META_END
  # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
  # (c) 2003 Martin Konold <martin.konold at erfrakon.de>

Modified: kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff
===================================================================
--- kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 55-no-distconf_kolabsrv.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: distconf/kolabsrv.in is not shipped in. We don't need it anyway.
+Goal: kolabsrv is missing, don't install it
 
- at DPATCH@
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Specific to kolab 2.2.0 (this file was missing in the tarballs)
+
 Index: b/Makefile.am
 ===================================================================
 --- a/Makefile.am

Modified: kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.diff
===================================================================
--- kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,9 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 60-kolabdcachetool-cachefiles.dpatch by Noèl Köthe <noel at debian.org>
-##
-## DP: This is the patch to correct the path of the cachefiles
+Goal: correct the path of the cachefiles
 
- at DPATCH@
+Author: Noèl Köthe <noel at debian.org>
+
+Upstream status: Specific to Debian
+
 diff -urNad kolabd-1.9.4-20060707.dfsg~/kolabdcachetool kolabd-1.9.4-20060707.dfsg/kolabdcachetool
 --- kolabd-1.9.4-20060707.dfsg~/kolabdcachetool	2006-11-08 10:08:39.000000000 +0100
 +++ kolabd-1.9.4-20060707.dfsg/kolabdcachetool	2006-11-08 10:08:40.000000000 +0100

Modified: kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff
===================================================================
--- kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,10 +1,12 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 70-kolab2.schema-removal.of.rfc2739.dpatch by Noèl Köthe <noel at debian.org>
-##
-## DP: remove upstream rfc2739 schema because it is not dfsg
-## DP: see rules that install a dfsg version of it
+Goal: remove upstream rfc2739 schema
 
- at DPATCH@
+Upstream rfc2739 schema is not dfsg.
+See debian/rules that install a dfsg version of it
+
+Author: Noèl Köthe <noel at debian.org>
+
+Upstream status: Specific to Debian
+
 Index: b/Makefile.am
 ===================================================================
 --- a/Makefile.am

Modified: kolabd/trunk/debian/patches/80-kolab_globals.diff
===================================================================
--- kolabd/trunk/debian/patches/80-kolab_globals.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/80-kolab_globals.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,10 +1,12 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 80-kolab-syslog-facility.dpatch by Marc Brockschmidt <marc.brockschmidt at credativ.de>
-##
-## DP: -Use Fedora Directory Server (persistent searches) LDAP backend
-## DP: -Use syslog
+Goal: kolab.globals
 
- at DPATCH@
+- Use syncrepl LDAP backend (OpenLDAP >= 2.3)
+- Use syslog
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Specific to Debian
+
 Index: b/kolab.globals.in
 ===================================================================
 --- a/kolab.globals.in

Modified: kolabd/trunk/debian/patches/85-slapd-2.4-compat.diff
===================================================================
--- kolabd/trunk/debian/patches/85-slapd-2.4-compat.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/85-slapd-2.4-compat.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 85-slapd-2.4-compat.dpatch by  <math.parent at gmail.com>
-##
-## DP: Purpose : be compatible with OpenLDAP 2.4
+Goal: be compatible with OpenLDAP 2.4
 
- at DPATCH@
+- remove schemacheck
+- indent syntax correction
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Already included, will be in 2.2.1
+
 Index: b/templates/slapd.conf.template.in
 ===================================================================
 --- a/templates/slapd.conf.template.in

Modified: kolabd/trunk/debian/patches/86-slapd-syncrepl-24.diff
===================================================================
--- kolabd/trunk/debian/patches/86-slapd-syncrepl-24.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/86-slapd-syncrepl-24.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 86-slapd-syncrepl-24.dpatch by  <math.parent at gmail.com>
-##
-## DP: Purpose : enable syncrepl instead of slurpd
+Goal: enable syncrepl instead of slurpd
 
- at DPATCH@
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Already included, will be in 2.2.1
+
 Index: b/kolab_bootstrap.in
 ===================================================================
 --- a/kolab_bootstrap.in

Modified: kolabd/trunk/debian/patches/90-slapd-template.diff
===================================================================
--- kolabd/trunk/debian/patches/90-slapd-template.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/90-slapd-template.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80-slapd-template.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: slapd.conf template fixes
+Goal: slapd.conf template fixes
 
- at DPATCH@
+- DB_CONFIG ownership
+- load modules
+- path of kolab2.schema
+- enable horde schema
+
+Author: Peter Eisentraut <petere at debian.org>
+
+Upstream status: Specific to Debian, parts can be included
+
 Index: b/templates/DB_CONFIG.slapd.template.in
 ===================================================================
 --- a/templates/DB_CONFIG.slapd.template.in

Modified: kolabd/trunk/debian/patches/91-postfix-template.diff
===================================================================
--- kolabd/trunk/debian/patches/91-postfix-template.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/91-postfix-template.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91-postfix-template.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Adjustments in Postfix templates
+Goal: Adjustments in Postfix templates
 
- at DPATCH@
+Author: Peter Eisentraut <petere at debian.org>
+
+Upstream status: Specific to Debian, parts can be included
+
 Index: b/templates/main.cf.template.in
 ===================================================================
 --- a/templates/main.cf.template.in

Modified: kolabd/trunk/debian/patches/92-resmgr-template.diff
===================================================================
--- kolabd/trunk/debian/patches/92-resmgr-template.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/92-resmgr-template.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 92-resmgr-template.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Adjustments in resmgr template
+Goal: Adjustments in resmgr template
 
- at DPATCH@
+Author: Peter Eisentraut <petere at debian.org>
+
+Upstream status: Specific to Debian
+
 Index: b/templates/resmgr.conf.template.in
 ===================================================================
 --- a/templates/resmgr.conf.template.in

Modified: kolabd/trunk/debian/patches/93-freebusy-template.diff
===================================================================
--- kolabd/trunk/debian/patches/93-freebusy-template.diff	2008-11-12 22:28:28 UTC (rev 997)
+++ kolabd/trunk/debian/patches/93-freebusy-template.diff	2008-11-17 21:02:11 UTC (rev 998)
@@ -1,9 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 93-freebusy-template.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Adjustments in freebusy template
+Goal: Adjustments in freebusy template
 
- at DPATCH@
+Author: Peter Eisentraut <petere at debian.org>
+
+Upstream status: Specific to Debian
+
 Index: b/templates/freebusy.conf.template.in
 ===================================================================
 --- a/templates/freebusy.conf.template.in

More information about the pkg-kolab-devel mailing list