[packaging] 6 commits - debian/changelog debian/control debian/patches

Christoph Wickert wickert at kolabsys.com
Mon Mar 4 15:15:10 CET 2013


 debian/changelog                                                |    9 +
 debian/control                                                  |    2 
 debian/patches/0001-Fix-future_days-past_days-calculation.patch |   37 ++++++
 debian/patches/0002-Fix-return-value-in-getMtime.patch          |   26 ++++
 debian/patches/Fix-vCal-cache-invalidation-Bug-1653.patch       |   61 ++++++++++
 debian/patches/series                                           |    3 
 6 files changed, 137 insertions(+), 1 deletion(-)

New commits:
commit 6e9bd571cbb3e15793dd78cdad4a1f14abe96cc1
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Mar 1 14:08:29 2013 +0100

    Rename 0003-Fix-vCal-cache-invalidation-Bug-1653.patch Fix-vCal-cache-invalidation-Bug-1653.patch (to indicate it is not really the same as in GIT)

diff --git a/debian/patches/0003-Fix-vCal-cache-invalidation-Bug-1653.patch b/debian/patches/0003-Fix-vCal-cache-invalidation-Bug-1653.patch
deleted file mode 100644
index 2464952..0000000
--- a/debian/patches/0003-Fix-vCal-cache-invalidation-Bug-1653.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 4a614642a51c7031b6274d4effdaec659fad52a3 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <machniak at kolabsys.com>
-Date: Thu, 28 Feb 2013 13:45:50 +0100
-Subject: [PATCH 3/3] Fix vCal cache invalidation (Bug #1653)
-
-Note: Respun by wickert at kolabsys.com to apply on 0.5.4dev5
----
- Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php |    9 ++++++++-
- .../lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php   |   11 ++++++++++-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff -dur php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php
---- php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php	2013-02-28 16:18:21.502237934 +0100
-+++ php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php	2013-02-28 16:19:38.638239404 +0100
-@@ -175,11 +175,18 @@
-             return true;
-         }
- 
-+        global $conf;
-+        $cache_dir = $conf['fb']['cache_dir'];
-+
-         /* Check the file mtimes */
- /* This will fail as there is no such method */
- /*        $files = $combined->getFiles();
-         foreach ($files as $file) {
--            if (filemtime($this->_data['mtimes'][$file][0]) != $this->_data['mtimes'][$file][1]) {
-+            $file_name = $cache_dir . '/' . $file . '.pvc';
-+            if (!($mtime = $this->_data['mtimes'][$file])) {
-+                return true;
-+            }
-+            if (@filemtime($file_name) != $mtime) {
-                 return true;
-             }
-         }
-diff -dur php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php
---- php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php	2013-02-28 16:18:13.166237356 +0100
-+++ php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php	2013-02-28 16:18:45.198217545 +0100
-@@ -274,7 +274,6 @@
-         require_once 'Horde/Kolab/FreeBusy/Helper/Freebusy/StatusMap/Config.php';
-         require_once 'Horde/Kolab/FreeBusy/Resource/Event/Decorator/Log.php';
-         require_once 'Horde/Kolab/FreeBusy/Resource/Event/Decorator/Mcache.php';
--;
-         require_once 'Horde/Kolab/FreeBusy/Logger.php';
- 
-         $server = $conf['fb']['exchange_server'];
-@@ -312,4 +311,14 @@
- 
-         return $export->export();
-     }
-+
-+    /**
-+     * Return the IDs of the partials that are relevant to this combined result.
-+     *
-+     * @return array List of IDs
-+     */
-+    public function getFiles()
-+    {
-+        return $this->_combined->getPartialIds();
-+    }
- }
-\ No newline at end of file
diff --git a/debian/patches/Fix-vCal-cache-invalidation-Bug-1653.patch b/debian/patches/Fix-vCal-cache-invalidation-Bug-1653.patch
new file mode 100644
index 0000000..2464952
--- /dev/null
+++ b/debian/patches/Fix-vCal-cache-invalidation-Bug-1653.patch
@@ -0,0 +1,61 @@
+From 4a614642a51c7031b6274d4effdaec659fad52a3 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak at kolabsys.com>
+Date: Thu, 28 Feb 2013 13:45:50 +0100
+Subject: [PATCH 3/3] Fix vCal cache invalidation (Bug #1653)
+
+Note: Respun by wickert at kolabsys.com to apply on 0.5.4dev5
+---
+ Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php |    9 ++++++++-
+ .../lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php   |   11 ++++++++++-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+diff -dur php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php
+--- php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php	2013-02-28 16:18:21.502237934 +0100
++++ php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php	2013-02-28 16:19:38.638239404 +0100
+@@ -175,11 +175,18 @@
+             return true;
+         }
+ 
++        global $conf;
++        $cache_dir = $conf['fb']['cache_dir'];
++
+         /* Check the file mtimes */
+ /* This will fail as there is no such method */
+ /*        $files = $combined->getFiles();
+         foreach ($files as $file) {
+-            if (filemtime($this->_data['mtimes'][$file][0]) != $this->_data['mtimes'][$file][1]) {
++            $file_name = $cache_dir . '/' . $file . '.pvc';
++            if (!($mtime = $this->_data['mtimes'][$file])) {
++                return true;
++            }
++            if (@filemtime($file_name) != $mtime) {
+                 return true;
+             }
+         }
+diff -dur php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php
+--- php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php	2013-02-28 16:18:13.166237356 +0100
++++ php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php	2013-02-28 16:18:45.198217545 +0100
+@@ -274,7 +274,6 @@
+         require_once 'Horde/Kolab/FreeBusy/Helper/Freebusy/StatusMap/Config.php';
+         require_once 'Horde/Kolab/FreeBusy/Resource/Event/Decorator/Log.php';
+         require_once 'Horde/Kolab/FreeBusy/Resource/Event/Decorator/Mcache.php';
+-;
+         require_once 'Horde/Kolab/FreeBusy/Logger.php';
+ 
+         $server = $conf['fb']['exchange_server'];
+@@ -312,4 +311,14 @@
+ 
+         return $export->export();
+     }
++
++    /**
++     * Return the IDs of the partials that are relevant to this combined result.
++     *
++     * @return array List of IDs
++     */
++    public function getFiles()
++    {
++        return $this->_combined->getPartialIds();
++    }
+ }
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 27e6b5d..202fa7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@
 fix-freebusy-publishing.patch
 0001-Fix-future_days-past_days-calculation.patch
 0002-Fix-return-value-in-getMtime.patch
-0003-Fix-vCal-cache-invalidation-Bug-1653.patch
+Fix-vCal-cache-invalidation-Bug-1653.patch


commit c9e828d1f6b5752353523d25653cb1126ca3bc70
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Mar 1 14:06:45 2013 +0100

    Renema 0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch to 0002-Fix-return-value-in-getMtime.patch (#1653)

diff --git a/debian/patches/0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch b/debian/patches/0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch
deleted file mode 100644
index c8fd92e..0000000
--- a/debian/patches/0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f9ec13f8d14351e527d9131f864e374890ef6741 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <machniak at kolabsys.com>
-Date: Thu, 28 Feb 2013 13:00:44 +0100
-Subject: [PATCH 2/3] Fix return value in getMtime(), needed for cache
- invalidation
-
----
- Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php
-index 9efd789..a6880fc 100644
---- a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php
-+++ b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php
-@@ -126,6 +126,6 @@ implements Horde_Kolab_FreeBusy-0.5.4dev5_Cache_Partial
-      */
-     public function getMtime()
-     {
--        $this->_partial_cache->getMtime();
-+        return $this->_partial_cache->getMtime();
-     }
- }
-\ No newline at end of file
--- 
-1.7.10.4
-
diff --git a/debian/patches/0002-Fix-return-value-in-getMtime.patch b/debian/patches/0002-Fix-return-value-in-getMtime.patch
new file mode 100644
index 0000000..c8fd92e
--- /dev/null
+++ b/debian/patches/0002-Fix-return-value-in-getMtime.patch
@@ -0,0 +1,26 @@
+From f9ec13f8d14351e527d9131f864e374890ef6741 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak at kolabsys.com>
+Date: Thu, 28 Feb 2013 13:00:44 +0100
+Subject: [PATCH 2/3] Fix return value in getMtime(), needed for cache
+ invalidation
+
+---
+ Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php
+index 9efd789..a6880fc 100644
+--- a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php
++++ b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php
+@@ -126,6 +126,6 @@ implements Horde_Kolab_FreeBusy-0.5.4dev5_Cache_Partial
+      */
+     public function getMtime()
+     {
+-        $this->_partial_cache->getMtime();
++        return $this->_partial_cache->getMtime();
+     }
+ }
+\ No newline at end of file
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index ae28621..27e6b5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,5 @@
 577.patch
 fix-freebusy-publishing.patch
 0001-Fix-future_days-past_days-calculation.patch
-0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch
+0002-Fix-return-value-in-getMtime.patch
 0003-Fix-vCal-cache-invalidation-Bug-1653.patch


commit d2b87a8a24a2de7b45b0f2d062f3b3b7f6b341fd
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Mar 1 14:05:19 2013 +0100

    Rename 0001-Fix-future_days-past_days-calculation.-This-fixes-FB.patch to 0001-Fix-future_days-past_days-calculation.patch (#1653)

diff --git a/debian/patches/0001-Fix-future_days-past_days-calculation.-This-fixes-FB.patch b/debian/patches/0001-Fix-future_days-past_days-calculation.-This-fixes-FB.patch
deleted file mode 100644
index b87a4c2..0000000
--- a/debian/patches/0001-Fix-future_days-past_days-calculation.-This-fixes-FB.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 533ae9fa035c9626e6a0262231eb20558271bdf2 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <machniak at kolabsys.com>
-Date: Thu, 28 Feb 2013 10:10:57 +0100
-Subject: [PATCH 1/3] Fix future_days/past_days calculation. This fixes FB
- cache generation for events in next month (Bug #1653)
-
----
- Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
-index a28a877..4007ed4 100644
---- a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
-+++ b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
-@@ -126,6 +126,9 @@ implements Horde_Kolab_FreeBusy-0.5.4dev5_Export_Freebusy
-         }
-         $start = $this->_today();
-         $start->mday = $start->mday - $past;
-+        // correct() is required after mday modification
-+        $start->correct(HORDE_DATE_MASK_DAY);
-+
-         return $start;
-     }
- 
-@@ -145,6 +148,9 @@ implements Horde_Kolab_FreeBusy-0.5.4dev5_Export_Freebusy
-         }
-         $end = $this->_today();
-         $end->mday = $end->mday + $future;
-+        // correct() is required after mday modification
-+        $end->correct(HORDE_DATE_MASK_DAY);
-+
-         return $end;
-     }
- 
--- 
-1.7.10.4
-
diff --git a/debian/patches/0001-Fix-future_days-past_days-calculation.patch b/debian/patches/0001-Fix-future_days-past_days-calculation.patch
new file mode 100644
index 0000000..b87a4c2
--- /dev/null
+++ b/debian/patches/0001-Fix-future_days-past_days-calculation.patch
@@ -0,0 +1,37 @@
+From 533ae9fa035c9626e6a0262231eb20558271bdf2 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak at kolabsys.com>
+Date: Thu, 28 Feb 2013 10:10:57 +0100
+Subject: [PATCH 1/3] Fix future_days/past_days calculation. This fixes FB
+ cache generation for events in next month (Bug #1653)
+
+---
+ Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
+index a28a877..4007ed4 100644
+--- a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
++++ b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
+@@ -126,6 +126,9 @@ implements Horde_Kolab_FreeBusy-0.5.4dev5_Export_Freebusy
+         }
+         $start = $this->_today();
+         $start->mday = $start->mday - $past;
++        // correct() is required after mday modification
++        $start->correct(HORDE_DATE_MASK_DAY);
++
+         return $start;
+     }
+ 
+@@ -145,6 +148,9 @@ implements Horde_Kolab_FreeBusy-0.5.4dev5_Export_Freebusy
+         }
+         $end = $this->_today();
+         $end->mday = $end->mday + $future;
++        // correct() is required after mday modification
++        $end->correct(HORDE_DATE_MASK_DAY);
++
+         return $end;
+     }
+ 
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index a3d8b84..ae28621 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 10-php-shebang.patch
 577.patch
 fix-freebusy-publishing.patch
-0001-Fix-future_days-past_days-calculation.-This-fixes-FB.patch
+0001-Fix-future_days-past_days-calculation.patch
 0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch
 0003-Fix-vCal-cache-invalidation-Bug-1653.patch


commit eab712fab26197ca5ecbe0e6253a463788869448
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Feb 28 17:01:32 2013 +0100

    0.5.4~dev5-17: Update changelog

diff --git a/debian/changelog b/debian/changelog
index 5e34d6c..99f4a7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+php-kolab-freebusy (0.5.4~dev5-17) unstable; urgency=low
+
+  * Add 3 patches from git to fix #1653
+    + 0001-Fix-future_days-past_days-calculation.-This-fixes-FB.patch
+    + 0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch
+    + 0003-Fix-vCal-cache-invalidation-Bug-1653.patch (respun)
+
+ -- Christoph Wickert <wickert at kolabsys.com>  Thu, 28 Feb 2013 16:44:43 +0100
+
 php-kolab-freebusy (0.5.4~dev5-16) unstable; urgency=low
 
   [ Jeroen van Meeuwen (Kolab Systems) ]


commit e49ed12553811f66e3afc8485f11c27b69d4631f
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Feb 28 17:01:25 2013 +0100

    Add 3 patches to fix #1653

diff --git a/debian/patches/0001-Fix-future_days-past_days-calculation.-This-fixes-FB.patch b/debian/patches/0001-Fix-future_days-past_days-calculation.-This-fixes-FB.patch
new file mode 100644
index 0000000..b87a4c2
--- /dev/null
+++ b/debian/patches/0001-Fix-future_days-past_days-calculation.-This-fixes-FB.patch
@@ -0,0 +1,37 @@
+From 533ae9fa035c9626e6a0262231eb20558271bdf2 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak at kolabsys.com>
+Date: Thu, 28 Feb 2013 10:10:57 +0100
+Subject: [PATCH 1/3] Fix future_days/past_days calculation. This fixes FB
+ cache generation for events in next month (Bug #1653)
+
+---
+ Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
+index a28a877..4007ed4 100644
+--- a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
++++ b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
+@@ -126,6 +126,9 @@ implements Horde_Kolab_FreeBusy-0.5.4dev5_Export_Freebusy
+         }
+         $start = $this->_today();
+         $start->mday = $start->mday - $past;
++        // correct() is required after mday modification
++        $start->correct(HORDE_DATE_MASK_DAY);
++
+         return $start;
+     }
+ 
+@@ -145,6 +148,9 @@ implements Horde_Kolab_FreeBusy-0.5.4dev5_Export_Freebusy
+         }
+         $end = $this->_today();
+         $end->mday = $end->mday + $future;
++        // correct() is required after mday modification
++        $end->correct(HORDE_DATE_MASK_DAY);
++
+         return $end;
+     }
+ 
+-- 
+1.7.10.4
+
diff --git a/debian/patches/0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch b/debian/patches/0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch
new file mode 100644
index 0000000..c8fd92e
--- /dev/null
+++ b/debian/patches/0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch
@@ -0,0 +1,26 @@
+From f9ec13f8d14351e527d9131f864e374890ef6741 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak at kolabsys.com>
+Date: Thu, 28 Feb 2013 13:00:44 +0100
+Subject: [PATCH 2/3] Fix return value in getMtime(), needed for cache
+ invalidation
+
+---
+ Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php
+index 9efd789..a6880fc 100644
+--- a/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php
++++ b/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php
+@@ -126,6 +126,6 @@ implements Horde_Kolab_FreeBusy-0.5.4dev5_Cache_Partial
+      */
+     public function getMtime()
+     {
+-        $this->_partial_cache->getMtime();
++        return $this->_partial_cache->getMtime();
+     }
+ }
+\ No newline at end of file
+-- 
+1.7.10.4
+
diff --git a/debian/patches/0003-Fix-vCal-cache-invalidation-Bug-1653.patch b/debian/patches/0003-Fix-vCal-cache-invalidation-Bug-1653.patch
new file mode 100644
index 0000000..2464952
--- /dev/null
+++ b/debian/patches/0003-Fix-vCal-cache-invalidation-Bug-1653.patch
@@ -0,0 +1,61 @@
+From 4a614642a51c7031b6274d4effdaec659fad52a3 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak at kolabsys.com>
+Date: Thu, 28 Feb 2013 13:45:50 +0100
+Subject: [PATCH 3/3] Fix vCal cache invalidation (Bug #1653)
+
+Note: Respun by wickert at kolabsys.com to apply on 0.5.4dev5
+---
+ Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php |    9 ++++++++-
+ .../lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php   |   11 ++++++++++-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+diff -dur php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php
+--- php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php	2013-02-28 16:18:21.502237934 +0100
++++ php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php	2013-02-28 16:19:38.638239404 +0100
+@@ -175,11 +175,18 @@
+             return true;
+         }
+ 
++        global $conf;
++        $cache_dir = $conf['fb']['cache_dir'];
++
+         /* Check the file mtimes */
+ /* This will fail as there is no such method */
+ /*        $files = $combined->getFiles();
+         foreach ($files as $file) {
+-            if (filemtime($this->_data['mtimes'][$file][0]) != $this->_data['mtimes'][$file][1]) {
++            $file_name = $cache_dir . '/' . $file . '.pvc';
++            if (!($mtime = $this->_data['mtimes'][$file])) {
++                return true;
++            }
++            if (@filemtime($file_name) != $mtime) {
+                 return true;
+             }
+         }
+diff -dur php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php
+--- php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5.patched/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php	2013-02-28 16:18:13.166237356 +0100
++++ php-kolab-freebusy/Kolab_FreeBusy-0.5.4dev5/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php	2013-02-28 16:18:45.198217545 +0100
+@@ -274,7 +274,6 @@
+         require_once 'Horde/Kolab/FreeBusy/Helper/Freebusy/StatusMap/Config.php';
+         require_once 'Horde/Kolab/FreeBusy/Resource/Event/Decorator/Log.php';
+         require_once 'Horde/Kolab/FreeBusy/Resource/Event/Decorator/Mcache.php';
+-;
+         require_once 'Horde/Kolab/FreeBusy/Logger.php';
+ 
+         $server = $conf['fb']['exchange_server'];
+@@ -312,4 +311,14 @@
+ 
+         return $export->export();
+     }
++
++    /**
++     * Return the IDs of the partials that are relevant to this combined result.
++     *
++     * @return array List of IDs
++     */
++    public function getFiles()
++    {
++        return $this->_combined->getPartialIds();
++    }
+ }
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 69de236..a3d8b84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
 10-php-shebang.patch
 577.patch
 fix-freebusy-publishing.patch
+0001-Fix-future_days-past_days-calculation.-This-fixes-FB.patch
+0002-Fix-return-value-in-getMtime-needed-for-cache-invali.patch
+0003-Fix-vCal-cache-invalidation-Bug-1653.patch


commit 28f4ca95b5bd941e136bc754c37bec967848371b
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Feb 28 14:50:00 2013 +0100

    Add myself to uploaders

diff --git a/debian/control b/debian/control
index a9fdd22..7d75431 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: php-kolab-freebusy
 Section: php
 Priority: extra
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
-Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Mathieu Parent <sathieu at debian.org>, Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>
+Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Mathieu Parent <sathieu at debian.org>, Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>, Christoph Wickert <wickert at kolabsys.com>
 Build-Depends-Indep: pear-horde-channel
 Build-Depends: debhelper (>= 5), dh-make-php (>= 0.2.3), cdbs, quilt
 Standards-Version: 3.9.1




More information about the packaging-commits mailing list