[packaging] Branch 'debian/hosted-kolabd-2.2' - 6 commits - debian/changelog debian/control debian/gbp.conf debian/NEWS debian/patches debian/uupdate-wrapper debian/watch

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu Dec 9 16:24:20 CET 2010


 debian/NEWS                                                |   18 
 debian/changelog                                           |  381 -------------
 debian/control                                             |    8 
 debian/gbp.conf                                            |   17 
 debian/patches/0001-Add-customers-capability.patch         |   77 ++
 debian/patches/0002-Add-domains-to-groupOfNames.patch      |   22 
 debian/patches/0003-Add-mail-quota-per-customer.patch      |   35 +
 debian/patches/0004-Add-kolabHomeServer-per-customer.patch |   21 
 debian/patches/series                                      |    4 
 debian/uupdate-wrapper                                     |   12 
 debian/watch                                               |    7 
 11 files changed, 180 insertions(+), 422 deletions(-)

New commits:
commit 5abde098de55e4b0bdf2062391054c6aa40fdfa0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 9 16:23:15 2010 +0100

    And lets remove the news as well

diff --git a/debian/NEWS b/debian/NEWS
deleted file mode 100644
index 7311ea5..0000000
--- a/debian/NEWS
+++ /dev/null
@@ -1,18 +0,0 @@
-kolabd (2.2.1-20090304-1) experimental; urgency=low
-
-  backups are now in /var/lib/kolab/backups instead of /var/lib/backups/kolab. 
-
-  Horde prefs are now longer stored in LDAP. As such, the "horde.schema" has
-  been removed from "slapd.conf.template". Make sure to remove any *Prefs
-  attributes BEFORE upgrading. You can do this by script with awk:
-  (Use slapcat and slapadd to export and import those ldif files)
-  .
-  awk '!/^ /{ok=1;}
-    /^(objectClass: hordePerson|[a-z]*Prefs:.*)$/{ok=0;}
-    {if(ok)print;}' from-slapcat.ldif > to-slapadd.ldif
-  .
-  More info at <https://issues.kolab.org/issue3567> and
-  <http://bugs.debian.org/599491>.
-
- -- Mathieu Parent <math.parent at gmail.com>  Fri, 27 Mar 2009 20:11:16 +0100
-


commit fe7857b6de8896bfab3066f6ae38525764574b3f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 9 16:22:01 2010 +0100

    Add a git-buildpackage configuration file

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..2899876
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,17 @@
+[git-buildpackage]
+debian-branch = debian/hosted-kolabd-2.2
+
+# Let's use an export directory
+export-dir = ../builds
+
+# Ignore files / changes that have not been committed
+# This is necessary because the build process removes
+# plenty of files.
+ignore-new = True
+
+pristine-tar = False
+
+# Tag after successful build
+tag = True
+
+upstream-tag = upstream/2.2.4


commit 47f8bedc0d8c80f7adc90b439704eb9253b37081
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 9 16:18:10 2010 +0100

    Clear out debian changelog

diff --git a/debian/changelog b/debian/changelog
index 28461b9..ce1f203 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,384 +4,3 @@ hosted-kolabd (2.2.4-1) stable; urgency=low
 
  -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>  Thu, 09 Dec 2010 14:57:00 +0000
 
-kolabd (2.2.4-20100624-5) unstable; urgency=low
-
-  * NEWS: Document horde.schema removal causing "Problem Upgrading Older Kolab
-    Server to Newest Slapd" (Closes: #599491). The problem is not fixed but
-    only documented: manual steps are needed.
-
- -- Mathieu Parent <sathieu at debian.org>  Sat, 09 Oct 2010 20:48:36 +0200
-
-kolabd (2.2.4-20100624-4) unstable; urgency=low
-
-  * 94-cyrus-template.diff: use absolute path to ensure that the binaries
-    are found (Closes: #597822: Some cyrus commands are not found by cyrus
-    master)
-  * updated Standards-Version to 3.9.1: no changes
-
- -- Mathieu Parent <sathieu at debian.org>  Thu, 23 Sep 2010 15:41:25 +0200
-
-kolabd (2.2.4-20100624-3) unstable; urgency=low
-
-  * Revert "disabling slapd runtime configuration"
-
- -- Mathieu Parent <sathieu at debian.org>  Mon, 13 Sep 2010 18:18:40 +0200
-
-kolabd (2.2.4-20100624-2) unstable; urgency=low
-
-  * Fix "kolab_bootstrap no longer works with slapd (version 2.4.23)"
-    by disabling slapd runtime configuration (Closes: #595539)
-
- -- Mathieu Parent <sathieu at debian.org>  Fri, 10 Sep 2010 00:02:49 +0200
-
-kolabd (2.2.4-20100624-1) unstable; urgency=low
-
-  * New upstream release (2.2.4-20100624)
-  * Change cyrus user and group in templates. Fix "Permissions on
-    /etc/imapd.group are wrong" (Closes: #581757) and chmod as upstream
-    does (640) instead of 644
-  * Switch to dpkg-source 3.0 (quilt) format and move templates to patches
-    (amavisd.conf.template.in and templates/imapd.conf.template.in)
-  * Fix "I can't enable/disable pop3/s and imap/s" by providing a brand new
-    cyrus.conf.template. Thanks to Matthias Geerdsen's initial patch
-    (Closes: #579933 and issue4374)
-  * Updated Standards-Version to 3.9.0: use Breaks instead of Conflicts
-    with kolab-resource-handlers and kolab-freebusy as suggested by lintian
-
- -- Mathieu Parent <sathieu at debian.org>  Mon, 05 Jul 2010 23:18:15 +0200
-
-kolabd (2.2.3-20091217-2) unstable; urgency=medium
-
-  * Urgency set to medium as it fixes a serious bug
-  * Add ${misc:Depends} to debian/control
-  * Updated Standards-Version to 3.8.4: no changes
-  * kolabd.init: Move slapd from Required-{Start,Stop} to Should-{Start,Stop}
-    as it is only a recommend. Fix "fails to install due to incorrect
-    dependencies in init.d LSB header" (Closes: #571946)
-  * (NB: previous upload was not a snapshot)
-
- -- Mathieu Parent <sathieu at debian.org>  Wed, 10 Mar 2010 09:40:18 +0100
-
-kolabd (2.2.3-20091217-1) unstable; urgency=low
-
-  * Package snapshot
-  * New upstream release (2.2.3-20091217)
-  * Updated patches 
-
- -- Mathieu Parent <sathieu at debian.org>  Mon, 04 Jan 2010 22:52:25 +0100
-
-kolabd (2.2.2-20090514-2) unstable; urgency=low
-
-  * Correct Vcs-{Browser,Svn} to point to trunk
-  * Updated Standards-Version to 3.8.3: no changes
-  * Merge README.Debian with the version on wiki.kolab.org:
-    "Debian - Administrators - Kolab Installation"
-  * Add README.source as required by policy 4.14
-  * Change my email address, as I am now Debian developer
-  * apache.conf: freebusy is now in /usr/share/php/htdocs
-
- -- Mathieu Parent <sathieu at debian.org>  Sat, 17 Oct 2009 19:45:34 +0200
-
-kolabd (2.2.2-20090514-1) unstable; urgency=low
-
-  * New upstream release 2.2.2 (2.2.2-20090514)
-
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 17 May 2009 19:09:12 +0200
-
-kolabd (2.2.1-20090407-1) unstable; urgency=low
-
-  * Upload to unstable
-  * New upstream release (2.2.1-20090407)
-    - 10-dist_conf.diff: partially integrated 
-  * debian/watch:
-    - Use main download server files.kolab.org
-    - No more mangle
-  * debian/uupdate-wrapper: Updated
-  * debian/preinst:
-    - really remove unused conffile fbview.conf.template 
-    - also remove proftpd.conf.template
-
- -- Mathieu Parent <math.parent at gmail.com>  Mon, 11 May 2009 19:09:12 +0200
-
-kolabd (2.2.1-20090304-1) experimental; urgency=low
-
-  * New beta release 2.2.1-beta-1 (20081212)
-    + Integrated patches (wow!):
-      - 10-dist_conf
-      - 50-postfix-hashes
-      - 60-kolabdcachetool-cachefiles
-      - 80-kolab_globals
-      - 85-slapd-2.4-compat
-      - 86-slapd-syncrepl-24
-    + Moved patch: 30-bootstrap to libkolab-perl 
-    + Moved patch: 40-disable-amavis to libkolab-perl 
-    + Updated patch: 55-no-distconf_kolabsrv
-      - depends on 2.2.1 version of libkolab-perl as binaries are now there
-    + several perl script are now in libkolab-perl
-    + kolabconf has been integrated in libkolab-perl, remove dependency 
-    + kolab.conf removed (kolab/issue2994)
-    + debian/kolabd.lintian-overrides: removed, as kolab.conf is removed
-    + replaces kolab-{freebusy,filter} by php-kolab-{freebusy,filter} in
-      depends
-  * New rc release 2.2.1-rc-1 (2.2.1-20090304)
-    + part of 10-dist_conf.diff integrated
-      - for graveyard path
-      - backups are now in /var/lib/kolab/backups instead of 
-        /var/lib/backups/kolab (Closes: #510210)
-      - kolabfilter is now in /usr/bin/
-    + 92-resmgr-template.diff integrated
-    + 93-freebusy-template.diff integrated
-    + 98-freebusy-ldap.diff integrated: freebusy.conf.template: ldap server can
-      be on another machine
-  * 10-dist_conf.diff is back (again):
-    - corrected shell syntax error in dist_conf/debian
-    - corrected sed regexp to allow comma in dist_conf/common
-    - added resmgr_locksdir and resmgr_localedir
-  * 90-slapd.template.diff updated:
-    - load module syncprov
-    - don't install horde schema anymore as horde now use flat files for
-      preferences
-  * 95-resmgr-issue1383-issue2499.diff from TRUNK: Prepare kolabd for
-    kolab/issue1382 (resmgr accepts concurrent overlapping invitations) and
-    kolab/issue2499 (Notification messages by the resource manager sould be
-    localized)
-  * debian/rules
-    - don't create manpage for undocumented (s)bin
-  * debian/control:
-    - suggests clamav, clamav-daemon, spamassassin 
-  * taken from kolab-freebusy:
-    - apache.conf (referenced path changed)
-    - prerm and postinst scripts
-    - freebusy cache directory
-    - conflicts/replaces kolab-freebusy and kolab-resource-handlers 
-  * debian/copyright: refers to versionned license version
-  * debian/uupdate-wrapper: corrected tarball name 
-  * debian/uupdate-wrapper: updated to keep upsteam version
-  * updated Standards-Version to 3.8.1: no changes
-  * debian/compat: switching to compatibility-version 7:
-    - build-depends on debhelper 7
-    - replace 'dh_clean -k' by 'dh_prep'
-
- -- Mathieu Parent <math.parent at gmail.com>  Fri, 27 Mar 2009 20:11:02 +0100
-
-kolabd (2.2.0-20080709.dfsg-2) unstable; urgency=low
-
-  * amavis-new (Closes: #499094):
-    - amavisd.conf.template to redirect scanned messages to the postfix port
-      10026. Default port make messages bounce when amavis is enabled.
-    - debian/rules to keep this template
-    - added /etc/amavis/conf.d directory as template target
-  * refreshed patches, use quilt headers
-  * debian/rules, debian/patches/90-slapd-template.diff, debian/dirs:
-    move LDAP schemas to /etc/ldap/schema 
-  * debian/patches/30-bootstrap.diff, debian/dirs: Create /var/backups/kolab
-    on package installation. Reduce the bootstrap patch
-  * 30-bootstrap.diff: moved sasl configuration from master-only to master and
-    slave part 
-  * debian/patches/30-bootstrap.diff: run newaliases on main part (not slave
-    only) 
-
- -- Mathieu Parent <math.parent at gmail.com>  Fri, 12 Dec 2008 20:48:03 +0100
-
-kolabd (2.2.0-20080709.dfsg-1) unstable; urgency=low
-
-  * New upstream version: 2.2.0
-    - removed 80-kolab-syslog-facility.dpatch: partially applied upstream
-  * README.Debian: 
-    - Mention which daemons to stop/start,
-    - Remove unneeded creation of cyrus mailboxes
-  * switch from dpatch to quilt
-  * debian/control
-    - updated versioned dependency on libkolab-perl (Closes: #498202)
-    - added versioned dependency on kolabconf
-  * debian/rules
-    - add user postfix to group sasl during postinst, to allow authentication
-      within postfix
-    - remove /etc/kolab/templates/local.cf.template (new amavisd config)
-  * updated then removed common/dist_conf.dpatch
-    - smarty has now the good path
-    - kolab-webadmin url is now /admin
-    - added spamassassin_confdir (not used) as requested by Sascha Wilde on
-      http://kolab.org/pipermail/kolab-devel/2008-June/009079.html
-    - removed: integrated upstream
-    - back for some time
-  * updated patch 30-bootstrap
-    - run newaliases at the end of kolab_bootstrap
-    - gethostname rewriten upstream to use Net::Domain
-    - slapcat run under openldap user to prevent creation of files as root
-  * new patch 40-disable-amavis: amavis is suggested, so disabled as default
-  * new patch 50-postfix-hashes: Postfix hashes templates
-    - Added RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/... so that 
-      kolabconf doesn't need to know about postfix
-  * new patch 55-no-distconf_kolabsrv: distconf/kolabsrv.in is not shipped in.
-    We don't need it anyway.
-  * new patch 80-kolab_globals.dpatch:
-    - use syncrepl LDAP backend, the only one compatible with slapd 2.4
-    - use syslog
-  * new patch 85-slapd-2.4-compat: to be compatible with slapd 2.4 (Closes: 
-    #473881)
-  * new patch 86-slapd-syncrepl-24: to enable syncrepl
-    (Closes: #463791)
-  * updated patch 90-slapd-template: enable horde.schema by default 
-  * updated patch 91-postfix-template: partially applied upstream
-  * updated patch 92-resmgr-template, path is now /etc/kolab/filter/config.php
-    and format has changed (updated debian/dirs accordingly)
-  * updated patch 93-freebusy-template, path is now
-    /etc/kolab/freebusy/config.php and format has changed (updated debian/dirs
-    accordingly)
-  * Re-add rfc2739 schema with a copyright notice: see
-    http://lists.debian.org/debian-legal/2008/04/msg00087.html
-  * debian/postinst: add user cyrus to group kolab. This is needed for PKI.
-  * Bump Standards-Version to 3.8.0 (updated Vcs-Browser and Vcs-Svn fields) 
-  * debian/preinst: remove unused_conffile
-    /etc/kolab/templates/fbview.conf.template 
-
- -- Mathieu Parent <math.parent at gmail.com>  Thu, 30 Oct 2008 21:52:55 +0100
-
-kolabd (2.1.0-20070510.dfsg-3) unstable; urgency=low
-
-  * Internal Subversion repository reorganization to keep common patches in
-    common location, in particular patches/common/dist_conf.dpatch
-  * Updated standards version
-  * Set syslog as logging method in freebusy.conf template (closes: #455071)
-  * Changed control fields XS-Vcs-* to Vcs-*
-
- -- Peter Eisentraut <petere at debian.org>  Fri, 22 Feb 2008 15:52:14 +0100
-
-kolabd (2.1.0-20070510.dfsg-2) unstable; urgency=low
-
-  [ Peter Eisentraut ]
-  * Aligned installation paths in templates with kolab-resource-handlers
-    package
-  * Dropped Apache templates; configuration is currently provided by
-    kolab-resource-handlers package
-  * Added Homepage control field
-
-  [ Philip Hands ]
-  * Added aliases_file definition to dist_conf/debian
-  * Added emailserver_master_usr definition to dist_conf/debian
-  * Added Suggests of amavisd-new
-  * Replaced flags=n by null_sender= in postfix master.cf template
-  * Corrected resmgr.conf permissions
-
- -- Peter Eisentraut <petere at debian.org>  Fri, 02 Nov 2007 16:52:09 +0100
-
-kolabd (2.1.0-20070510.dfsg-1) unstable; urgency=low
-
-  * New upstream release
-    - Updated patches
-    - Obsoleted patches: 10-perl-path-fixes.dpatch,
-      40-kolabd-pid-file.dpatch,
-      50-kolabpasswd-slappasswd-path
-  * Removed obsolete horde-sarge-iCal.patch
-  * Raised Postfix dependencies to version 2.4
-  * Revived kolab_bootstrap
-  * Don't ignore errors from make distclean, as per lintian check
-  * Fixed default hostname suggested by kolab_bootstrap
-  * Removed cache initialization from postinst, because kolabdcachetool
-    was removed
-  * Updated installation instructions in README.Debian
-
- -- Peter Eisentraut <petere at debian.org>  Tue, 31 Jul 2007 18:49:48 +0200
-
-kolabd (1.9.4-20060707.dfsg-4) unstable; urgency=low
-
-  [ Steffen Joeris ]
-  * Change maintainer address
-
-  [ Noèl Köthe ]
-  * remove $mydestination from kolab-ldapdistlist.cf; doesn't work there
-
-  [ Peter Eisentraut ]
-  * Install kolab_bootstrap under /usr/share/doc, so it doesn't look so
-    much like you can actually use it (closes: #365876)
-  * Added XS-Vcs-Browser field
-
- -- Peter Eisentraut <petere at debian.org>  Tue, 29 May 2007 14:40:51 +0200
-
-kolabd (1.9.4-20060707.dfsg-3) unstable; urgency=medium
-
-  [ Peter Eisentraut ]
-  * Moved slapd to Recommends, and removed some other unnecessary
-    dependencies (closes: #400022)
-  * Added pointer to kolab-webadmin setup instructions (closes: #370531)
-  * Changed php path to /usr/bin/php4 to be explicit (closes: #401831)
-  * Improve explanation about apache configuration
-
-  [ Steffen Joeris ]
-  * Minor fixes to README.Debian and adding some useful information
-  * Fix README part about ldap configuration to avoid slapd
-    complaints about DB_CONFIG file and slapd.args file
-
- -- Noèl Köthe <noel at debian.org>  Thu, 28 Dec 2006 11:56:29 +0100
-
-kolabd (1.9.4-20060707.dfsg-2) unstable; urgency=medium
-
-  * Added version number to lsb-base dependency
-  * Restricted permissions on configuration files containing passwords
-  * Enhanced init script
-  * Put Postfix LDAP configuration into separate files
-  * Added XS-X-Vcs-Svn field
-  * Fixed quotawarn.db path
-  * Ensure complete purge
-
- -- Peter Eisentraut <petere at debian.org>  Wed,  8 Nov 2006 17:56:15 +0100
-
-kolabd (1.9.4-20060707.dfsg-1) unstable; urgency=low
-
-  * New upstream release
-
-  [ Steffen Joeris ]
-  * Include patch to allow configuration for syslog (Closes: #368977)
-    Thanks to Marc Brockschmidt
-  * Add minor remind to README.Debian
-  * Include parts of the patch for the README.Debian documentation
-    (Closes: #375431) Thanks to Shri Shrikumar
-  * Correct order of slapd.conf in README.Debian to avoid complainings
-    from slapd (Closes: #370032) Thanks to Johannes Graumann
-  * Add specific dependency against postfix to make sure null_sender
-    patch is available in postfix and update the README.Debian to make
-    sure that we use the option null_sender= (Closes: #347262)
-
-  [ Noèl Köthe ]
-  * add horde-sarge-iCal.patch to package. Only sarge
-    horde needs it so README.Debian becomes shorter.:)
-  * replace unclear command with more understandable command
-    (closes: Bug#370529)
-  * corrected svn.debian.org URL for new structure
-
-  [ Peter Eisentraut ]
-  * Improved package description
-  * Updated standards version
-  * Fixed Build-Depends vs. Build-Depends-Indep
-  * Added watch file
-  * Changed priority to extra for policy conformance
-  * Added placeholder man pages
-
- -- Peter Eisentraut <petere at debian.org>  Fri, 15 Sep 2006 15:56:22 +0200
-
-kolabd (1.9.4dfsg-3) unstable; urgency=low
-
-  * Fixed init script messages (closes: #360936)
-  * Clean everything on purge (closes: #360932)
-  * Use /usr/share/dpatch/dpatch-run in dpatches
-  * Do not create /var/log in this package (closes: #360934)
-  * Fixed kolab2.schema patch (closes: #360949)
-
- -- Peter Eisentraut <petere at debian.org>  Fri,  7 Apr 2006 15:08:40 +0200
-
-kolabd (1.9.4dfsg-2) unstable; urgency=low
-
-  * fix problem with removed rfc2739
-
- -- Noèl Köthe <noel at debian.org>  Tue, 21 Mar 2006 22:51:29 +0100
-
-kolabd (1.9.4dfsg-1) experimental; urgency=low
-
-  * Initial release
-  part of the Kolab Groupware. See ITP #180634 or Kolab on alioth
-  https://alioth.debian.org/projects/pkg-kolab/
-  (closes: Bug#180634)
-
- -- Steffen Joeris <steffen.joeris at skolelinux.de>  Sat, 04 Mar 2006 19:03:25 +0100
-


commit 4c787d1c83662a1c655fc21fc2e17431cb40f252
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 9 16:16:34 2010 +0100

    Add hosted patches

diff --git a/debian/patches/0001-Add-customers-capability.patch b/debian/patches/0001-Add-customers-capability.patch
new file mode 100644
index 0000000..7826f90
--- /dev/null
+++ b/debian/patches/0001-Add-customers-capability.patch
@@ -0,0 +1,77 @@
+Index: kolabd/kolab2.schema
+===================================================================
+--- kolabd.orig/kolab2.schema	2010-12-09 15:51:58.000000000 +0100
++++ kolabd/kolab2.schema	2010-12-09 16:14:38.000000000 +0100
+@@ -578,6 +578,37 @@
+   NAME 'proftpd-userPassword'
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ 
++#START###################################
++#                                       #
++# TBits.net schema attribute extensions #
++# (c) 2008 TBits.net GmbH               #
++# Author: Martin Zapfl <mz at tbits.net>   #
++#                                       #
++
++# Extension attributes for class
++# kolabGroupOfNames
++
++attributetype ( 1.3.6.1.4.1.32283.2.1.6
++  NAME 'domains'
++  DESC 'The commonNames of the domains for this customer'
++  EQUALITY caseIgnoreIA5Match
++  SUBSTR caseIgnoreIA5SubstringsMatch
++  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
++
++# Extension attributes for class
++# kolabInetOrgPerson
++
++# Extension attributes for class
++# kolab
++
++#                                       #
++# OIDs are temporary and may change if  #
++# attributes are included in future     #
++# Kolab Server Development releases     #
++#                                       #
++#END#####################################
++
++
+ ########################
+ # kolab object classes #
+ ########################
+@@ -697,7 +728,8 @@
+   MAY ( c $
+         mail $
+         kolabDeleteflag $
+-        alias ) )
++        alias $
++        domains ) )
+ 
+ # kolab organizational unit with country support
+ objectclass ( 1.3.6.1.4.1.19414.3.2.4 
+Index: kolabd/kolabd.spec.in
+===================================================================
+--- kolabd.orig/kolabd.spec.in	2010-12-09 15:51:58.000000000 +0100
++++ kolabd/kolabd.spec.in	2010-12-09 16:14:38.000000000 +0100
+@@ -34,7 +34,7 @@
+ Group:        Mail
+ License:      GPL
+ Version:      @VERSION@
+-Release:      @spec_build_date@
++Release:      @spec_build_date at _hosted1
+ 
+ #   list of sources
+ Source0:      kolabd-%{version}.tar.bz2
+Index: kolabd/templates/slapd.conf.template.in
+===================================================================
+--- kolabd.orig/templates/slapd.conf.template.in	2010-12-09 16:13:00.000000000 +0100
++++ kolabd/templates/slapd.conf.template.in	2010-12-09 16:14:38.000000000 +0100
+@@ -112,6 +112,7 @@
+ index   kolabHomeServer pres,eq
+ index   kolabDeleteflag pres,eq
+ index   member          pres,eq
++index   domains         pres,eq
+ 
+ include @ldapserver_confdir@/slapd.access
+ 
diff --git a/debian/patches/0002-Add-domains-to-groupOfNames.patch b/debian/patches/0002-Add-domains-to-groupOfNames.patch
new file mode 100644
index 0000000..4f076df
--- /dev/null
+++ b/debian/patches/0002-Add-domains-to-groupOfNames.patch
@@ -0,0 +1,22 @@
+diff -ur kolabd-2.2.4-0001-Add-customers-capability/kolab2.schema kolabd-2.2.4-0002-Add-domains-to-groupOfNames/kolab2.schema
+--- kolabd-2.2.4-0001-Add-customers-capability/kolab2.schema	2010-11-09 17:49:52.471421875 +0000
++++ kolabd-2.2.4-0002-Add-domains-to-groupOfNames/kolab2.schema	2010-11-09 17:54:12.051421874 +0000
+@@ -753,4 +753,5 @@
+   DESC 'Kolab group of names (DNs) derived from RFC2256'
+   SUP groupOfNames STRUCTURAL
+   MAY ( mail $
+-        kolabDeleteflag ) )
++        kolabDeleteflag  $
++        domains ) )
+diff -ur kolabd-2.2.4-0001-Add-customers-capability/kolabd.spec.in kolabd-2.2.4-0002-Add-domains-to-groupOfNames/kolabd.spec.in
+--- kolabd-2.2.4-0001-Add-customers-capability/kolabd.spec.in	2010-11-09 17:49:52.472421875 +0000
++++ kolabd-2.2.4-0002-Add-domains-to-groupOfNames/kolabd.spec.in	2010-11-09 17:54:12.051421874 +0000
+@@ -34,7 +34,7 @@
+ Group:        Mail
+ License:      GPL
+ Version:      @VERSION@
+-Release:      @spec_build_date at _hosted1
++Release:      @spec_build_date at _hosted2
+ 
+ #   list of sources
+ Source0:      kolabd-%{version}.tar.bz2
diff --git a/debian/patches/0003-Add-mail-quota-per-customer.patch b/debian/patches/0003-Add-mail-quota-per-customer.patch
new file mode 100644
index 0000000..9da3f2d
--- /dev/null
+++ b/debian/patches/0003-Add-mail-quota-per-customer.patch
@@ -0,0 +1,35 @@
+diff -ur kolabd-2.2.4-0002-Add-domains-to-groupOfNames/kolab2.schema kolabd-2.2.4-0003-Add-mail-quota-per-customer/kolab2.schema
+--- kolabd-2.2.4-0002-Add-domains-to-groupOfNames/kolab2.schema	2010-11-09 17:54:12.051421874 +0000
++++ kolabd-2.2.4-0003-Add-mail-quota-per-customer/kolab2.schema	2010-11-09 17:57:33.357421875 +0000
+@@ -595,6 +595,13 @@
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ 
++attributetype ( 1.3.6.1.4.1.32283.2.1.7
++  NAME 'customerQuota'
++  DESC 'Total mail quota for this customer (across all domains)'
++  EQUALITY integerMatch
++  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
++  SINGLE-VALUE )
++
+ # Extension attributes for class
+ # kolabInetOrgPerson
+ 
+@@ -754,4 +761,5 @@
+   SUP groupOfNames STRUCTURAL
+   MAY ( mail $
+         kolabDeleteflag  $
++        customerQuota $
+         domains ) )
+diff -ur kolabd-2.2.4-0002-Add-domains-to-groupOfNames/kolabd.spec.in kolabd-2.2.4-0003-Add-mail-quota-per-customer/kolabd.spec.in
+--- kolabd-2.2.4-0002-Add-domains-to-groupOfNames/kolabd.spec.in	2010-11-09 17:54:12.051421874 +0000
++++ kolabd-2.2.4-0003-Add-mail-quota-per-customer/kolabd.spec.in	2010-11-09 17:57:33.357421875 +0000
+@@ -34,7 +34,7 @@
+ Group:        Mail
+ License:      GPL
+ Version:      @VERSION@
+-Release:      @spec_build_date at _hosted2
++Release:      @spec_build_date at _hosted3
+ 
+ #   list of sources
+ Source0:      kolabd-%{version}.tar.bz2
diff --git a/debian/patches/0004-Add-kolabHomeServer-per-customer.patch b/debian/patches/0004-Add-kolabHomeServer-per-customer.patch
new file mode 100644
index 0000000..28dc492
--- /dev/null
+++ b/debian/patches/0004-Add-kolabHomeServer-per-customer.patch
@@ -0,0 +1,21 @@
+diff -ur kolabd-2.2.4-0003-Add-mail-quota-per-customer/kolab2.schema kolabd-2.2.4-0004-Add-kolabHomeServer-per-customer/kolab2.schema
+--- kolabd-2.2.4-0003-Add-mail-quota-per-customer/kolab2.schema	2010-11-09 17:57:33.357421875 +0000
++++ kolabd-2.2.4-0004-Add-kolabHomeServer-per-customer/kolab2.schema	2010-11-09 17:59:00.207421874 +0000
+@@ -762,4 +762,5 @@
+   MAY ( mail $
+         kolabDeleteflag  $
+         customerQuota $
++        kolabHomeServer $
+         domains ) )
+diff -ur kolabd-2.2.4-0003-Add-mail-quota-per-customer/kolabd.spec.in kolabd-2.2.4-0004-Add-kolabHomeServer-per-customer/kolabd.spec.in
+--- kolabd-2.2.4-0003-Add-mail-quota-per-customer/kolabd.spec.in	2010-11-09 17:57:33.357421875 +0000
++++ kolabd-2.2.4-0004-Add-kolabHomeServer-per-customer/kolabd.spec.in	2010-11-09 17:59:00.207421874 +0000
+@@ -34,7 +34,7 @@
+ Group:        Mail
+ License:      GPL
+ Version:      @VERSION@
+-Release:      @spec_build_date at _hosted3
++Release:      @spec_build_date at _hosted4
+ 
+ #   list of sources
+ Source0:      kolabd-%{version}.tar.bz2
diff --git a/debian/patches/series b/debian/patches/series
index 507ec54..a814f54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,7 @@
 94-cyrus-template.diff
 95-resmgr-issue1383-issue2499.diff
 96-imap-user-group.diff
+0001-Add-customers-capability.patch
+0002-Add-domains-to-groupOfNames.patch
+0003-Add-mail-quota-per-customer.patch
+0004-Add-kolabHomeServer-per-customer.patch


commit bcbacefa936499ceed2a7e0a3a93519fd62d5281
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 9 16:09:43 2010 +0100

    Remove the uupdate-wrapper and watch debian files

diff --git a/debian/uupdate-wrapper b/debian/uupdate-wrapper
deleted file mode 100755
index 4c2d358..0000000
--- a/debian/uupdate-wrapper
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-upackage=kolabd
-dpackage=kolabd
-version=$2
-file=$3
-
-rpm2cpio "$file" | \
-cpio --extract --quiet --to-stdout "${upackage}-*.tar.bz2" | \
-bunzip2 --stdout | gzip \
-> "${dpackage}_${version}.orig.tar.gz"
-rm "$file"
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index b212109..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,7 +0,0 @@
-version=3
-# original URL for stable releases:
-http://files.kolab.org/server/release/kolab-server-([\d.]+)/sources/kolabd-([\d\w.-]+).src.rpm debian debian/uupdate-wrapper
-# URL for development releases:
-#http://files.kolab.org/server/development-2.2/current/sources/kolabd-([\d\w.-]+).src.rpm  debian  debian/uupdate-wrapper
-# URL for beta releases:
-#http://files.kolab.org/server/beta/kolab-server-([\d\w.-]*)/sources/kolabd-([\d\w.-]*).src.rpm  debian  debian/uupdate-wrapper


commit ee212819f9d6842e62d2040f1bd8c0c0fff6b33a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 9 16:08:21 2010 +0100

    Touch up debian/control a little more

diff --git a/debian/control b/debian/control
index 518152f..66861be 100644
--- a/debian/control
+++ b/debian/control
@@ -5,20 +5,20 @@ Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.9.1
 Homepage: http://www.kolab.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolabd/trunk/
-Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolabd/trunk/
+Vcs-Browser: http://git.kolabsys.com/apt/kolabd/
+Vcs-Git: git://git.kolabsys.com/apt/kolabd/
 
 Package: hosted-kolabd
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, libnet-netmask-perl, libmail-box-perl, libterm-readkey-perl, libterm-readline-gnu-perl,
  postfix (>= 2.4), postfix-ldap (>= 2.4),
  sasl2-bin, libsasl2-modules,
- perl-Kolab (>= 1:2.2.1-20081212-1),
+ perl-Kolab (>= 2.2.4-1),
  kolab-cyrus-imapd,
  php-pear-Kolab-Filter, php-pear-Kolab-FreeBusy,
  adduser, lsb-base (>= 3.0-3)
 Recommends: slapd, ldap-utils
-Suggests: openssl, db4.2-util, kolab-webadmin, amavisd-new, clamav, clamav-daemon, spamassassin
+Suggests: openssl, db4.2-util, hosted-kolab-webadmin, amavisd-new, clamav, clamav-daemon, spamassassin
 Replaces: kolab-freebusy (<<2.2.1), kolab-resource-handlers (<<2.2.1)
 Breaks: kolab-freebusy (<<2.2.1), kolab-resource-handlers (<<2.2.1)
 Description: groupware server




More information about the packaging-commits mailing list