[packaging] Branch 'debian/kolab-2.3' - 6 commits - debian/changelog debian/control debian/gbp.conf debian/patches

vanmeeuwen at kolabsys.com vanmeeuwen at kolabsys.com
Thu Feb 17 14:50:56 CET 2011


 debian/changelog                      |   27 +++++++++++++++++++++++++++
 debian/control                        |    2 +-
 debian/gbp.conf                       |    2 +-
 debian/patches/92-slapd-template.diff |   17 +++++++++++++++++
 debian/patches/series                 |    1 +
 5 files changed, 47 insertions(+), 2 deletions(-)

New commits:
commit 257860593cbc2f6982d194019ab0d1f068c5c8d3
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Feb 17 14:47:15 2011 +0100

    Bump release

diff --git a/debian/changelog b/debian/changelog
index f6aa50f..711c9b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kolabd (2.3+git-4) unstable; urgency=low
+
+  [ Jeroen van Meeuwen (Kolab Systems) ]
+  * Patch out nested if/then/else from template
+
+  [ Jeroen van Meeuwen ]
+
+ -- Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>  Thu, 17 Feb 2011 14:46:56 +0100
+
 kolabd (2.3+git-3) stable; urgency=low
 
   [ Jeroen van Meeuwen (Kolab Systems) ]


commit 15acfda2e2b0e08dd50fdc2d5ce40e12701b611f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Feb 17 14:45:43 2011 +0100

    Patch out nested if/then/else from template

diff --git a/debian/patches/92-slapd-template.diff b/debian/patches/92-slapd-template.diff
new file mode 100644
index 0000000..580bb6a
--- /dev/null
+++ b/debian/patches/92-slapd-template.diff
@@ -0,0 +1,17 @@
+Index: kolabd/kolabd/templates/slapd.conf.template
+===================================================================
+--- kolabd.orig/kolabd/templates/slapd.conf.template	2011-02-17 14:45:15.000000000 +0100
++++ kolabd/kolabd/templates/slapd.conf.template	2011-02-17 14:45:26.000000000 +0100
+@@ -52,12 +52,8 @@
+ # or dynamically build.  When build dynamically the module must be loaded.
+ # As the slapd that comes with the openpkg version of kolab is statically
+ # build it is not necessary to load the module.
+-@@@if ldapserver_modulepath@@@
+ moduleload syncprov
+ @@@else@@@
+-# moduleload syncprov
+-@@@endif@@@
+-@@@else@@@
+ replica-pidfile	@@@ldapserverslurpd_pidfile@@@
+ replogfile      @@@ldapserver_replogfile@@@
+ replicationinterval 5
diff --git a/debian/patches/series b/debian/patches/series
index c6f9ee6..a45281f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+92-slapd-template.diff
 91-postfix-template.diff
 93-amavisd-template.diff


commit b802517292f9312305d0af31f443fc60fecc5b2d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Feb 15 17:29:28 2011 +0100

    Bump release

diff --git a/debian/changelog b/debian/changelog
index 72e38d5..f6aa50f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kolabd (2.3+git-3) stable; urgency=low
+
+  [ Jeroen van Meeuwen (Kolab Systems) ]
+  * Remove extra dependencies
+
+  [ Jeroen van Meeuwen ]
+
+ -- Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>  Tue, 15 Feb 2011 17:29:08 +0100
+
 kolabd (2.3+git-2) stable; urgency=low
 
   [ Jeroen van Meeuwen (Kolab Systems) ]


commit 4b5e1f0eeeadfe67f0bce892a72f80d4102819fe
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Feb 15 17:28:11 2011 +0100

    Remove extra dependencies

diff --git a/debian/control b/debian/control
index 41a1033..6453c6d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, libnet-netmask-perl, libmail-box-perl
  postfix (>= 2.4), postfix-ldap (>= 2.4),
  sasl2-bin, libsasl2-modules,
  libkolab-perl (>= 1:2.2.1-20081212-1),
- kolab-cyrus-admin, kolab-cyrus-clients, kolab-cyrus-imapd, kolab-cyrus-pop3d,
+ kolab-cyrus-imapd,
  php-kolab-filter, php-kolab-freebusy,
  adduser, lsb-base (>= 3.0-3)
 Recommends: slapd, ldap-utils


commit 6f2ac61b3ddd20161023d943e3ff72e04a822a47
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Feb 14 18:40:51 2011 +0100

    Bump release

diff --git a/debian/changelog b/debian/changelog
index 13ea1cd..72e38d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kolabd (2.3+git-2) stable; urgency=low
+
+  [ Jeroen van Meeuwen (Kolab Systems) ]
+  * Update gbp.conf
+
+  [ Jeroen van Meeuwen ]
+
+ -- Jeroen van Meeuwen <vanmeeuwen at auto.kolabsys.com>  Mon, 14 Feb 2011 18:40:34 +0100
+
 kolabd (2.3+git-1) stable; urgency=low
 
   * New upstream version


commit 5214142b056aba2189be4f660b7153a2da6592a4
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Feb 14 18:40:23 2011 +0100

    Update gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index aade40c..5552979 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = master
+debian-branch = debian/kolab-2.3
 
 [git-buildpackage]
 export-dir = ../builds/kolabd




More information about the packaging-commits mailing list