[pkg-kolab] r797 - in kolabconf/branches/2.2/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-04-20 18:07:20 +0000 (Sun, 20 Apr 2008)
New Revision: 797

Modified:
   kolabconf/branches/2.2/debian/changelog
   kolabconf/branches/2.2/debian/patches/95-runonchange.dpatch
Log:
RUNONCHANGE should also execute when no old file



Modified: kolabconf/branches/2.2/debian/changelog
===================================================================
--- kolabconf/branches/2.2/debian/changelog	2008-04-17 20:18:27 UTC (rev 796)
+++ kolabconf/branches/2.2/debian/changelog	2008-04-20 18:07:20 UTC (rev 797)
@@ -1,10 +1,16 @@
-kolabconf (2.2~rc2+20080314-2) experimental; urgency=low
+kolabconf (2.2~rc2+20080314-3) UNRELEASED; urgency=low
 
+  * RUNONCHANGE should also execute when no old file 
+
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 20 Apr 2008 20:05:31 +0200
+
+kolabconf (2.2~rc2+20080314-2) UNRELEASED; urgency=low
+
   * Added 95-runonchange patch: Fix RUNONCHANGE templace metadata 
 
  -- Mathieu Parent <math.parent at gmail.com>  Wed, 02 Apr 2008 23:55:14 +0200
 
-kolabconf (2.2~rc2+20080314-1) experimental; urgency=low
+kolabconf (2.2~rc2+20080314-1) UNRELEASED; urgency=low
 
   * New upstream version: 2.2rc2
   * Removed 50-postfix-hashes.dpatch, because of the use of RUNONCHANGE in the

Modified: kolabconf/branches/2.2/debian/patches/95-runonchange.dpatch
===================================================================
--- kolabconf/branches/2.2/debian/patches/95-runonchange.dpatch	2008-04-17 20:18:27 UTC (rev 796)
+++ kolabconf/branches/2.2/debian/patches/95-runonchange.dpatch	2008-04-20 18:07:20 UTC (rev 797)
@@ -5,9 +5,18 @@
 ## DP: See https://www.intevation.de/roundup/kolab/issue2550
 
 @DPATCH@
-diff -urNad kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm
---- kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm	2008-04-02 21:40:25.000000000 +0000
-+++ kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm	2008-04-02 21:45:19.000000000 +0000
+diff -urNad kolabconf-2.2~rc2+20080314~/lib/Kolab/Conf.pm kolabconf-2.2~rc2+20080314/lib/Kolab/Conf.pm
+--- kolabconf-2.2~rc2+20080314~/lib/Kolab/Conf.pm	2008-04-20 20:04:05.000000000 +0200
++++ kolabconf-2.2~rc2+20080314/lib/Kolab/Conf.pm	2008-04-20 20:04:50.000000000 +0200
+@@ -222,7 +222,7 @@
+     #chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $cfg);
+     #chmod(0600, $cfg) if ($cfg =~ /openldap/);
+ 
+-    if (-f $oldcfg && !defined $special_templates{$tmpl} ) {
++    if (!defined $special_templates{$tmpl} ) {
+         my $rc = `diff -q $cfg $oldcfg`;
+         chomp($rc);
+         if ($rc) {
 @@ -243,8 +243,8 @@
  #} elsif ($cfg =~ /example/) {
  	    } else {