[pkg-kolab] r1382 - in kolab-cyrus-imapd: scripts trunk/debian trunk/debian/patches

[Mathieu Parent]

Author: sathieu
Date: 2009-11-06 07:26:28 +0000 (Fri, 06 Nov 2009)
New Revision: 1382

Modified:
   kolab-cyrus-imapd/scripts/cyrus-to-kolab
   kolab-cyrus-imapd/trunk/debian/changelog
   kolab-cyrus-imapd/trunk/debian/patches/00list
Log:
Disable 101-fix_Makefile.in.dpatch (redundant with above patch)



Modified: kolab-cyrus-imapd/scripts/cyrus-to-kolab
===================================================================
--- kolab-cyrus-imapd/scripts/cyrus-to-kolab	2009-11-06 07:23:05 UTC (rev 1381)
+++ kolab-cyrus-imapd/scripts/cyrus-to-kolab	2009-11-06 07:26:28 UTC (rev 1382)
@@ -22,7 +22,6 @@
 kolab_maintainer="Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>"
 kolab_uploaders="Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <sathieu at debian.org>"
 kolab_patches='100-kolab-imapd.dpatch
-101-fix_Makefile.in.dpatch
 105-cyradm.sh.dpatch
 130-kolab-imapd-goodchars.dpatch
 140-kolab-ldap.dpatch
@@ -30,7 +29,8 @@
 160-kolab-imapd.folderchar.dpatch
 170-ldap-deprecated.dpatch'
 
-kolab_patches_disabled='45-kolab2-annotations.dpatch'
+kolab_patches_disabled='45-kolab2-annotations.dpatch
+101-fix_Makefile.in.dpatch'
 #==============================================================================
 # Functions
 error() {

Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog	2009-11-06 07:23:05 UTC (rev 1381)
+++ kolab-cyrus-imapd/trunk/debian/changelog	2009-11-06 07:26:28 UTC (rev 1382)
@@ -3,6 +3,7 @@
   * Remove kolab-cyrus-common.linda 
   * 01-fix_Makefile.in.dpatch: sync with cyrus-imapd-2.2
     (add '@WARNERROR@ -fPIC' to CFLAGS)
+  * Disable 101-fix_Makefile.in.dpatch (redundant with above patch)
   * README.source: describe "cyrus-to-kolab" process
 
  -- Mathieu Parent <sathieu at debian.org>  Sun, 18 Oct 2009 14:23:31 +0200

Modified: kolab-cyrus-imapd/trunk/debian/patches/00list
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/00list	2009-11-06 07:23:05 UTC (rev 1381)
+++ kolab-cyrus-imapd/trunk/debian/patches/00list	2009-11-06 07:26:28 UTC (rev 1382)
@@ -68,7 +68,7 @@
 # 82-allow-from_-header.dpatch
 99-update-autoconf.dpatch
 100-kolab-imapd.dpatch
-101-fix_Makefile.in.dpatch
+#101-fix_Makefile.in.dpatch
 105-cyradm.sh.dpatch
 130-kolab-imapd-goodchars.dpatch
 140-kolab-ldap.dpatch