# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1410362183 -7200
# Node ID e5b764ff60138ae6a34de0906f711486bec949fd
# Parent  3b1230152518acb73e252c16d9451b24118f2eb7# Parent  0ad30d8f85f40c06359778989bab68094284df3e
Merged upstream changes.

diff -r 3b1230152518 -r e5b764ff6013 debian/changelog
--- a/debian/changelog	Sun Mar 23 20:03:38 2014 +0100
+++ b/debian/changelog	Wed Sep 10 17:16:23 2014 +0200
@@ -1,3 +1,9 @@
+kolab-utils (3.1~dev20140624-0~kolab1) unstable; urgency=low
+
+  * New git master head snapshot
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 25 Jun 2014 23:00:55 +0100
+
 kolab-utils (3.0.5-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -r 3b1230152518 -r e5b764ff6013 debian/rules
--- a/debian/rules	Sun Mar 23 20:03:38 2014 +0100
+++ b/debian/rules	Wed Sep 10 17:16:23 2014 +0200
@@ -14,9 +14,7 @@
 	-DCMAKE_BUILD_TYPE=Release
 
 override_dh_install:
-	mkdir -p $(CURDIR)/debian/kolab-utils/etc/cron.d/
-	install -pm 644 $(CURDIR)/debian/kolab-freebusy.cron $(CURDIR)/debian/kolab-utils/etc/cron.d/kolab-freebusy
 	dh_install
 
 override_dh_shlibdeps:
-    dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info