[pkg-kolab] r656 - in libkolab-perl/trunk/debian: . patches

[petere at alioth.debian.org]

Author: petere
Date: 2007-07-27 17:34:47 +0000 (Fri, 27 Jul 2007)
New Revision: 656

Added:
   libkolab-perl/trunk/debian/patches/20-buildCyrusConfig.dpatch
Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/patches/00list
Log:
* Disabled buildCyrusConfig function, because we don't want to provide the
  necessary template files.  This unbreaks kolabconf.

Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog	2007-07-27 17:26:26 UTC (rev 655)
+++ libkolab-perl/trunk/debian/changelog	2007-07-27 17:34:47 UTC (rev 656)
@@ -1,8 +1,10 @@
-libkolab-perl (5.8.7-20070420-2) unstable; urgency=low
+libkolab-perl (5.8.7-20070420-2) UNRELEASED; urgency=low
 
   * Remove no longer necessary parts from 10-Kolab.pm.dpatch
   * Don't ignore errors from make distclean, as per lintian check
   * Added XS-Vcs-Browser control field
+  * Disabled buildCyrusConfig function, because we don't want to provide the
+    necessary template files.  This unbreaks kolabconf.
 
  -- Peter Eisentraut <petere at debian.org>  Fri, 27 Jul 2007 19:26:13 +0200
 

Modified: libkolab-perl/trunk/debian/patches/00list
===================================================================
--- libkolab-perl/trunk/debian/patches/00list	2007-07-27 17:26:26 UTC (rev 655)
+++ libkolab-perl/trunk/debian/patches/00list	2007-07-27 17:34:47 UTC (rev 656)
@@ -1,2 +1,3 @@
 10-Kolab.pm
+20-buildCyrusConfig
 40-dist_conf

Added: libkolab-perl/trunk/debian/patches/20-buildCyrusConfig.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/20-buildCyrusConfig.dpatch	                        (rev 0)
+++ libkolab-perl/trunk/debian/patches/20-buildCyrusConfig.dpatch	2007-07-27 17:34:47 UTC (rev 656)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-cyrusBuildConfig.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: Disables buildCyrusConfig function, because we don't want to provide the
+## DP: necessary template files.  This unbreaks kolabconf.
+
+ at DPATCH@
+diff -urNad libkolab-perl-5.8.7-20070420~/Kolab-Conf/Conf.pm.in libkolab-perl-5.8.7-20070420/Kolab-Conf/Conf.pm.in
+--- libkolab-perl-5.8.7-20070420~/Kolab-Conf/Conf.pm.in	2007-01-06 22:36:20.000000000 +0100
++++ libkolab-perl-5.8.7-20070420/Kolab-Conf/Conf.pm.in	2007-07-27 19:29:00.000000000 +0200
+@@ -434,6 +434,7 @@
+ 
+ sub buildCyrusConfig
+ {
++    return; # not used on Debian
+     Kolab::log('T', 'Building Cyrus config', KOLAB_DEBUG);
+ 
+     my $keytemplate = "$templatedir/cyrus.conf.template";


Property changes on: libkolab-perl/trunk/debian/patches/20-buildCyrusConfig.dpatch
___________________________________________________________________
Name: svn:executable
   + *