[pkg-kolab] r1263 - in kolab-webadmin/trunk/debian: . patches
Mathieu Parent
mparent-guest at alioth.debian.org
Thu Apr 9 01:00:12 UTC 2009
Author: mparent-guest
Date: 2009-04-09 01:00:11 +0000 (Thu, 09 Apr 2009)
New Revision: 1263
Added:
kolab-webadmin/trunk/debian/patches/10-dist_conf.diff
kolab-webadmin/trunk/debian/patches/20-fix-require.diff
Removed:
kolab-webadmin/trunk/debian/patches/10-fix-require.diff
kolab-webadmin/trunk/debian/patches/20-service_index.diff
Modified:
kolab-webadmin/trunk/debian/changelog
kolab-webadmin/trunk/debian/compat
kolab-webadmin/trunk/debian/control
kolab-webadmin/trunk/debian/copyright
kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff
kolab-webadmin/trunk/debian/patches/series
kolab-webadmin/trunk/debian/rules
kolab-webadmin/trunk/debian/uupdate-wrapper
Log:
Merginf branch 2.2.1
Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog 2009-04-09 00:51:29 UTC (rev 1262)
+++ kolab-webadmin/trunk/debian/changelog 2009-04-09 01:00:11 UTC (rev 1263)
@@ -1,8 +1,20 @@
-kolab-webadmin (2.2.0-20080709-2) UNRELEASED; urgency=low
+kolab-webadmin (2.2.1-20090304-1) experimental; urgency=low
+ * New beta release 2.2.1-beta-1 (2.2.1-20081212)
+ + removed 20-service_index.diff, integrated
+ * New rc release 2.2.1-rc-1 (2.2.1-20090304)
+ + renamed 10-fix-require.diff to 20-fix-require.diff
* updated debian/watch
+ * patches refreshed
+ * debian/copyright: refers to versionned license version
+ * debian/uupdate-wrapper: updated to keep upsteam version number
+ * 10-dist_conf.diff: synced with kolabd
+ * 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> Tue, 16 Dec 2008 23:54:32 +0100
+ -- Mathieu Parent <math.parent at gmail.com> Fri, 27 Mar 2009 20:07:40 +0100
kolab-webadmin (2.2.0-20080709-1) unstable; urgency=low
Modified: kolab-webadmin/trunk/debian/compat
===================================================================
--- kolab-webadmin/trunk/debian/compat 2009-04-09 00:51:29 UTC (rev 1262)
+++ kolab-webadmin/trunk/debian/compat 2009-04-09 01:00:11 UTC (rev 1263)
@@ -1 +1 @@
-4
+7
Modified: kolab-webadmin/trunk/debian/control
===================================================================
--- kolab-webadmin/trunk/debian/control 2009-04-09 00:51:29 UTC (rev 1262)
+++ kolab-webadmin/trunk/debian/control 2009-04-09 01:00:11 UTC (rev 1263)
@@ -3,8 +3,8 @@
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 <math.parent at gmail.com>
-Build-Depends: debhelper (>= 4), quilt (>= 0.40)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), quilt (>= 0.40)
+Standards-Version: 3.8.1
Homepage: http://www.kolab.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolab-webadmin/branches/2.2/
Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolab-webadmin/branches/2.2/
Modified: kolab-webadmin/trunk/debian/copyright
===================================================================
--- kolab-webadmin/trunk/debian/copyright 2009-04-09 00:51:29 UTC (rev 1262)
+++ kolab-webadmin/trunk/debian/copyright 2009-04-09 01:00:11 UTC (rev 1263)
@@ -1,8 +1,11 @@
-This package was debianized by Steffen Joeris <steffen.joeris at skolelinux.de> on
-Mon, 19 Dec 2005 14:45:55 +0100.
+This package was debianized by:
-It was downloaded from <http://kolab.org/>
+ Steffen Joeris <steffen.joeris at skolelinux.de> on Mon, 19 Dec 2005 14:45:55 +0100
+It was downloaded from:
+
+ <http://kolab.org/>
+
Copyright holders:
Copyright (c) 2004-2006 Klarälvdalens Datakonsult AB
@@ -17,7 +20,7 @@
(at your option) any later version.
On Debian systems, the complete text of the GNU General Public License
-can be found in the file /usr/share/common-licenses/GPL.
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
The following applies to the file php/admin/include/Sieve.php:
Copied: kolab-webadmin/trunk/debian/patches/10-dist_conf.diff (from rev 1262, kolab-webadmin/branches/2.2.1/debian/patches/10-dist_conf.diff)
===================================================================
--- kolab-webadmin/trunk/debian/patches/10-dist_conf.diff (rev 0)
+++ kolab-webadmin/trunk/debian/patches/10-dist_conf.diff 2009-04-09 01:00:11 UTC (rev 1263)
@@ -0,0 +1,343 @@
+Goal: Correct dist_conf/debian
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Can be commited upstream
+
+Index: b/dist_conf/debian
+===================================================================
+--- a/dist_conf/debian
++++ b/dist_conf/debian
+@@ -148,12 +148,13 @@
+ resmgr_conffile_usr=kolab
+ resmgr_conffile_grp=root
+ #resmgr_tmpdir=
++resmgr_locksdir=${kolab_statedir}/filter/locks
++resmgr_localedir=${libdir}/usr/share/php/data/Kolab_Filter/locale
+ resmgr_scriptsdir=${bindir}
+ resmgr_usr=root
+ resmgr_grp=www-data
+-resmgr_filterdir=${kolab_statedir}/resmgr/filter
+ resmgr_log_type=syslog
+-resmgr_log_name=cons, pid
++resmgr_log_name='cons,pid'
+
+ fbview_logfile=${localstatedir}/log/fbview.log
+ freebusy_logdir=${localstatedir}/log
+@@ -162,7 +163,7 @@
+ freebusy_usr=root
+ freebusy_grp=www-data
+ freebusy_log_type=syslog
+-freebusy_log_name=cons, pid
++freebusy_log_name='cons,pid'
+
+ graveyard_uidcache=${kolab_statedir}/graveyard_uidcache.db
+ graveyard_tscache=${kolab_statedir}/graveyard_tscache.db
+Index: b/dist_conf/common
+===================================================================
+--- a/dist_conf/common
++++ b/dist_conf/common
+@@ -1,152 +1,152 @@
+ do_subst = sed \
+- -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+- -e 's,[@]bindir[@],$(bindir),g' \
+- -e 's,[@]sbindir[@],$(sbindir),g' \
+- -e 's,[@]prefix[@],$(prefix),g' \
+- -e 's,[@]libdir[@],$(libdir),g' \
+- -e 's,[@]datadir[@],$(datadir),g' \
+- -e 's,[@]libexecdir[@],$(libexecdir),g' \
+- -e 's,[@]localstatedir[@],$(localstatedir),g' \
+- -e 's,[@]phpini_dir[@],$(phpini_dir),g' \
+- -e 's,[@]phplibdir[@],$(phplibdir),g' \
+- -e 's,[@]phplibdir2[@],$(phplibdir2),g' \
+- -e 's,[@]phppeardir[@],$(phppeardir),g' \
+- -e 's,[@]BASH[@],$(BASHELL),g' \
+- -e 's,[@]CHKCONFIG[@],$(CHKCONFIG),g' \
+- -e 's,[@]KOLABRC[@],$(KOLABRC),g' \
+- -e 's,[@]LDAPD[@],$(LDAPD),g' \
+- -e 's,[@]PERL[@],$(PERL),g' \
+- -e 's,[@]PHP[@],$(PHP),g' \
+- -e 's,[@]RPM[@],$(RPM),g' \
+- -e 's,[@]TAR[@],$(TAR),g' \
+- -e 's,[@]VERSION[@],$(VERSION),g' \
+- -e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
+- -e 's,[@]aliases_file[@],$(aliases_file),g' \
+- -e 's,[@]syslog_facility[@],$(syslog_facility),g' \
+- -e 's,[@]directory_mode[@],$(directory_mode),g' \
+- -e 's,[@]amavisd_conffile[@],$(amavisd_conffile),g' \
+- -e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
+- -e 's,[@]amavisd_home[@],$(amavisd_home),g' \
+- -e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
+- -e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
+- -e 's,[@]amavisd_templatedir[@],$(amavisd_templatedir),g' \
+- -e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
+- -e 's,[@]backupdir[@],$(backupdir),g' \
+- -e 's,[@]backupfiles[@],$(backupfiles),g' \
+- -e 's,[@]clamav_confdir[@],$(clamav_confdir),g' \
+- -e 's,[@]clamav_datadir[@],$(clamav_datadir),g' \
+- -e 's,[@]clamav_grp[@],$(clamav_grp),g' \
+- -e 's,[@]clamav_logdir[@],$(clamav_logdir),g' \
+- -e 's,[@]clamav_logfile[@],$(clamav_logfile),g' \
+- -e 's,[@]clamav_pidfile[@],$(clamav_pidfile),g' \
+- -e 's,[@]clamav_rusr[@],$(clamav_rusr),g' \
+- -e 's,[@]clamav_socket[@],$(clamav_socket),g' \
+- -e 's,[@]clamav_usr[@],$(clamav_usr),g' \
+- -e 's,[@]emailserver_confdir[@],$(emailserver_confdir),g' \
+- -e 's,[@]emailserver_default_privs[@],$(emailserver_default_privs),g' \
+- -e 's,[@]emailserver_grp[@],$(emailserver_grp),g' \
+- -e 's,[@]emailserver_localstatedir[@],$(emailserver_localstatedir),g' \
+- -e 's,[@]emailserver_logfile[@],$(emailserver_logfile),g' \
+- -e 's,[@]emailserver_mail_owner[@],$(emailserver_mail_owner),g' \
+- -e 's,[@]emailserver_master_usr[@],$(emailserver_master_usr),g' \
+- -e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
+- -e 's,[@]emailserver_setgid_grp[@],$(emailserver_setgid_grp),g' \
+- -e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
+- -e 's,[@]emailserver_tables_usr[@],$(emailserver_tables_usr),g' \
+- -e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
+- -e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
+- -e 's,[@]freebusy_confdir[@],$(freebusy_confdir),g' \
+- -e 's,[@]freebusy_cachedir[@],$(freebusy_cachedir),g' \
+- -e 's,[@]freebusy_grp[@],$(freebusy_grp),g' \
+- -e 's,[@]freebusy_logdir[@],$(freebusy_logdir),g' \
+- -e 's,[@]freebusy_usr[@],$(freebusy_usr),g' \
+- -e 's,[@]freebusy_log_type[@],$(freebusy_log_type),g' \
+- -e 's,[@]freebusy_log_name[@],$(freebusy_log_name),g' \
+- -e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
+- -e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
+- -e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
+- -e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \
+- -e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \
+- -e 's,[@]imap_confdir[@],$(imap_confdir),g' \
+- -e 's,[@]imap_confperm[@],$(imap_confperm),g' \
+- -e 's,[@]imap_grp[@],$(imap_grp),g' \
+- -e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \
+- -e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
+- -e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \
+- -e 's,[@]imap_notify_socket[@],$(imap_notify_socket),g' \
+- -e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
+- -e 's,[@]imap_spool[@],$(imap_spool),g' \
+- -e 's,[@]imap_statedir[@],$(imap_statedir),g' \
+- -e 's,[@]imap_usr[@],$(imap_usr),g' \
+- -e 's,[@]kolab_gid[@],$(kolab_gid),g' \
+- -e 's,[@]kolab_grp[@],$(kolab_grp),g' \
+- -e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
+- -e 's,[@]kolab_mgrp[@],$(kolab_mgrp),g' \
+- -e 's,[@]kolab_musr[@],$(kolab_musr),g' \
+- -e 's,[@]kolab_php_module_prefix[@],$(kolab_php_module_prefix),g' \
+- -e 's,[@]kolab_php_smarty_prefix[@],$(kolab_php_smarty_prefix),g' \
+- -e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
+- -e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
+- -e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
+- -e 's,[@]kolab_pkgs[@],$(kolab_pkgs),g' \
+- -e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
+- -e 's,[@]kolab_scriptsdir[@],$(kolab_scriptsdir),g' \
+- -e 's,[@]kolab_statedir[@],$(kolab_statedir),g' \
+- -e 's,[@]kolab_smtpdpolicy_conffile_grp[@],$(kolab_smtpdpolicy_conffile_grp),g' \
+- -e 's,[@]kolab_smtpdpolicy_conffile_usr[@],$(kolab_smtpdpolicy_conffile_usr),g' \
+- -e 's,[@]kolab_susr[@],$(kolab_susr),g' \
+- -e 's,[@]kolab_usr[@],$(kolab_usr),g' \
+- -e 's,[@]kolab_wui[@],$(kolab_wui),g' \
+- -e 's,[@]kolab_quotawarning[@],$(kolab_quotawarning),g' \
+- -e 's,[@]kolabconf_script[@],$(kolabconf_script),g' \
+- -e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
+- -e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
+- -e 's,[@]ldapserver_dir[@],$(ldapserver_dir),g' \
+- -e 's,[@]ldapserver_grp[@],$(ldapserver_grp),g' \
+- -e 's,[@]ldapserver_logfile[@],$(ldapserver_logfile),g' \
+- -e 's,[@]ldapserver_pidfile[@],$(ldapserver_pidfile),g' \
+- -e 's,[@]ldapserver_replogfile[@],$(ldapserver_replogfile),g' \
+- -e 's,[@]ldapserver_rgrp[@],$(ldapserver_rgrp),g' \
+- -e 's,[@]ldapserver_rusr[@],$(ldapserver_rusr),g' \
+- -e 's,[@]ldapserver_schemadir[@],$(ldapserver_schemadir),g' \
+- -e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
+- -e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \
+- -e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
+- -e 's,[@]pear_horde_pkgs[@],$(pear_horde_pkgs),g' \
+- -e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
+- -e 's,[@]pki_grp[@],$(pki_grp),g' \
+- -e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
+- -e 's,[@]resmgr_conffile_grp[@],$(resmgr_conffile_grp),g' \
+- -e 's,[@]resmgr_conffile_usr[@],$(resmgr_conffile_usr),g' \
+- -e 's,[@]resmgr_tmpdir[@],$(resmgr_tmpdir),g' \
+- -e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
+- -e 's,[@]resmgr_logdir[@],$(resmgr_logdir),g' \
+- -e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
+- -e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
+- -e 's,[@]resmgr_log_type[@],$(resmgr_log_type),g' \
+- -e 's,[@]resmgr_log_name[@],$(resmgr_log_name),g' \
+- -e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
+- -e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
+- -e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \
+- -e 's,[@]smarty_compiledir[@],$(smarty_compiledir),g' \
+- -e 's,[@]spamassassin_confdir[@],$(spamassassin_confdir),g' \
+- -e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \
+- -e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
+- -e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \
+- -e 's,[@]webserver_confdir[@],$(webserver_confdir),g' \
+- -e 's,[@]webserver_document_root[@],$(webserver_document_root),g' \
+- -e 's,[@]webserver_logdir[@],$(webserver_logdir),g' \
+- -e 's,[@]webserver_errorlogfile[@],$(webserver_errorlogfile),g' \
+- -e 's,[@]webserver_grp[@],$(webserver_grp),g' \
+- -e 's,[@]webserver_musr[@],$(webserver_musr),g' \
+- -e 's,[@]webserver_pidfile[@],$(webserver_pidfile),g' \
+- -e 's,[@]webserver_runtime_status[@],$(webserver_runtime_status),g' \
+- -e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
+- -e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \
+- -e 's,[@]webserver_sslscache[@],$(webserver_sslscache),g' \
+- -e 's,[@]webserver_tmpdir[@],$(webserver_tmpdir),g' \
+- -e 's,[@]webserver_usr[@],$(webserver_usr),g' \
+- -e 's,[@]webserver_web_prefix[@],$(webserver_web_prefix),g' \
+- -e 's,[@]horde_cookie_path[@],$(horde_cookie_path),g' \
+- -e 's,[@]horde_confdir[@],$(horde_confdir),g' \
+- -e 's,[@]kronolith_confdir[@],$(kronolith_confdir),g'
++ -e 's=[@]sysconfdir[@]=$(sysconfdir)=g' \
++ -e 's=[@]bindir[@]=$(bindir)=g' \
++ -e 's=[@]sbindir[@]=$(sbindir)=g' \
++ -e 's=[@]prefix[@]=$(prefix)=g' \
++ -e 's=[@]libdir[@]=$(libdir)=g' \
++ -e 's=[@]datadir[@]=$(datadir)=g' \
++ -e 's=[@]libexecdir[@]=$(libexecdir)=g' \
++ -e 's=[@]localstatedir[@]=$(localstatedir)=g' \
++ -e 's=[@]phpini_dir[@]=$(phpini_dir)=g' \
++ -e 's=[@]phplibdir[@]=$(phplibdir)=g' \
++ -e 's=[@]phplibdir2[@]=$(phplibdir2)=g' \
++ -e 's=[@]phppeardir[@]=$(phppeardir)=g' \
++ -e 's=[@]BASH[@]=$(BASHELL)=g' \
++ -e 's=[@]CHKCONFIG[@]=$(CHKCONFIG)=g' \
++ -e 's=[@]KOLABRC[@]=$(KOLABRC)=g' \
++ -e 's=[@]LDAPD[@]=$(LDAPD)=g' \
++ -e 's=[@]PERL[@]=$(PERL)=g' \
++ -e 's=[@]PHP[@]=$(PHP)=g' \
++ -e 's=[@]RPM[@]=$(RPM)=g' \
++ -e 's=[@]TAR[@]=$(TAR)=g' \
++ -e 's=[@]VERSION[@]=$(VERSION)=g' \
++ -e 's=[@]WITHOPENPKG[@]=$(WITHOPENPKG)=g' \
++ -e 's=[@]aliases_file[@]=$(aliases_file)=g' \
++ -e 's=[@]syslog_facility[@]=$(syslog_facility)=g' \
++ -e 's=[@]directory_mode[@]=$(directory_mode)=g' \
++ -e 's=[@]amavisd_conffile[@]=$(amavisd_conffile)=g' \
++ -e 's=[@]amavisd_grp[@]=$(amavisd_grp)=g' \
++ -e 's=[@]amavisd_home[@]=$(amavisd_home)=g' \
++ -e 's=[@]amavisd_logfile[@]=$(amavisd_logfile)=g' \
++ -e 's=[@]amavisd_rusr[@]=$(amavisd_rusr)=g' \
++ -e 's=[@]amavisd_templatedir[@]=$(amavisd_templatedir)=g' \
++ -e 's=[@]amavisd_usr[@]=$(amavisd_usr)=g' \
++ -e 's=[@]backupdir[@]=$(backupdir)=g' \
++ -e 's=[@]backupfiles[@]=$(backupfiles)=g' \
++ -e 's=[@]clamav_confdir[@]=$(clamav_confdir)=g' \
++ -e 's=[@]clamav_datadir[@]=$(clamav_datadir)=g' \
++ -e 's=[@]clamav_grp[@]=$(clamav_grp)=g' \
++ -e 's=[@]clamav_logdir[@]=$(clamav_logdir)=g' \
++ -e 's=[@]clamav_logfile[@]=$(clamav_logfile)=g' \
++ -e 's=[@]clamav_pidfile[@]=$(clamav_pidfile)=g' \
++ -e 's=[@]clamav_rusr[@]=$(clamav_rusr)=g' \
++ -e 's=[@]clamav_socket[@]=$(clamav_socket)=g' \
++ -e 's=[@]clamav_usr[@]=$(clamav_usr)=g' \
++ -e 's=[@]emailserver_confdir[@]=$(emailserver_confdir)=g' \
++ -e 's=[@]emailserver_default_privs[@]=$(emailserver_default_privs)=g' \
++ -e 's=[@]emailserver_grp[@]=$(emailserver_grp)=g' \
++ -e 's=[@]emailserver_localstatedir[@]=$(emailserver_localstatedir)=g' \
++ -e 's=[@]emailserver_logfile[@]=$(emailserver_logfile)=g' \
++ -e 's=[@]emailserver_mail_owner[@]=$(emailserver_mail_owner)=g' \
++ -e 's=[@]emailserver_master_usr[@]=$(emailserver_master_usr)=g' \
++ -e 's=[@]emailserver_musr[@]=$(emailserver_musr)=g' \
++ -e 's=[@]emailserver_setgid_grp[@]=$(emailserver_setgid_grp)=g' \
++ -e 's=[@]emailserver_socket[@]=$(emailserver_socket)=g' \
++ -e 's=[@]emailserver_tables_usr[@]=$(emailserver_tables_usr)=g' \
++ -e 's=[@]emailserver_usr[@]=$(emailserver_usr)=g' \
++ -e 's=[@]fbview_logfile[@]=$(fbview_logfile)=g' \
++ -e 's=[@]freebusy_confdir[@]=$(freebusy_confdir)=g' \
++ -e 's=[@]freebusy_cachedir[@]=$(freebusy_cachedir)=g' \
++ -e 's=[@]freebusy_grp[@]=$(freebusy_grp)=g' \
++ -e 's=[@]freebusy_logdir[@]=$(freebusy_logdir)=g' \
++ -e 's=[@]freebusy_usr[@]=$(freebusy_usr)=g' \
++ -e 's=[@]freebusy_log_type[@]=$(freebusy_log_type)=g' \
++ -e 's=[@]freebusy_log_name[@]=$(freebusy_log_name)=g' \
++ -e 's=[@]freshclam_logfile[@]=$(freshclam_logfile)=g' \
++ -e 's=[@]freshclam_pidfile[@]=$(freshclam_pidfile)=g' \
++ -e 's=[@]fsl_logfile[@]=$(fsl_logfile)=g' \
++ -e 's=[@]graveyard_tscache[@]=$(graveyard_tscache)=g' \
++ -e 's=[@]graveyard_uidcache[@]=$(graveyard_uidcache)=g' \
++ -e 's=[@]imap_confdir[@]=$(imap_confdir)=g' \
++ -e 's=[@]imap_confperm[@]=$(imap_confperm)=g' \
++ -e 's=[@]imap_grp[@]=$(imap_grp)=g' \
++ -e 's=[@]imap_lmtp[@]=$(imap_lmtp)=g' \
++ -e 's=[@]imap_masterlogfile[@]=$(imap_masterlogfile)=g' \
++ -e 's=[@]imap_misclogfile[@]=$(imap_misclogfile)=g' \
++ -e 's=[@]imap_notify_socket[@]=$(imap_notify_socket)=g' \
++ -e 's=[@]imap_sievedir[@]=$(imap_sievedir)=g' \
++ -e 's=[@]imap_spool[@]=$(imap_spool)=g' \
++ -e 's=[@]imap_statedir[@]=$(imap_statedir)=g' \
++ -e 's=[@]imap_usr[@]=$(imap_usr)=g' \
++ -e 's=[@]kolab_gid[@]=$(kolab_gid)=g' \
++ -e 's=[@]kolab_grp[@]=$(kolab_grp)=g' \
++ -e 's=[@]kolab_mailboxuiddb[@]=$(kolab_mailboxuiddb)=g' \
++ -e 's=[@]kolab_mgrp[@]=$(kolab_mgrp)=g' \
++ -e 's=[@]kolab_musr[@]=$(kolab_musr)=g' \
++ -e 's=[@]kolab_php_module_prefix[@]=$(kolab_php_module_prefix)=g' \
++ -e 's=[@]kolab_php_smarty_prefix[@]=$(kolab_php_smarty_prefix)=g' \
++ -e 's=[@]kolab_pidfile[@]=$(kolab_pidfile)=g' \
++ -e 's=[@]kolab_rcdir[@]=$(kolab_rcdir)=g' \
++ -e 's=[@]kolab_rgrp[@]=$(kolab_rgrp)=g' \
++ -e 's=[@]kolab_pkgs[@]=$(kolab_pkgs)=g' \
++ -e 's=[@]kolab_rusr[@]=$(kolab_rusr)=g' \
++ -e 's=[@]kolab_scriptsdir[@]=$(kolab_scriptsdir)=g' \
++ -e 's=[@]kolab_statedir[@]=$(kolab_statedir)=g' \
++ -e 's=[@]kolab_smtpdpolicy_conffile_grp[@]=$(kolab_smtpdpolicy_conffile_grp)=g' \
++ -e 's=[@]kolab_smtpdpolicy_conffile_usr[@]=$(kolab_smtpdpolicy_conffile_usr)=g' \
++ -e 's=[@]kolab_susr[@]=$(kolab_susr)=g' \
++ -e 's=[@]kolab_usr[@]=$(kolab_usr)=g' \
++ -e 's=[@]kolab_wui[@]=$(kolab_wui)=g' \
++ -e 's=[@]kolab_quotawarning[@]=$(kolab_quotawarning)=g' \
++ -e 's=[@]kolabconf_script[@]=$(kolabconf_script)=g' \
++ -e 's=[@]ldapserver_argsfile[@]=$(ldapserver_argsfile)=g' \
++ -e 's=[@]ldapserver_confdir[@]=$(ldapserver_confdir)=g' \
++ -e 's=[@]ldapserver_dir[@]=$(ldapserver_dir)=g' \
++ -e 's=[@]ldapserver_grp[@]=$(ldapserver_grp)=g' \
++ -e 's=[@]ldapserver_logfile[@]=$(ldapserver_logfile)=g' \
++ -e 's=[@]ldapserver_pidfile[@]=$(ldapserver_pidfile)=g' \
++ -e 's=[@]ldapserver_replogfile[@]=$(ldapserver_replogfile)=g' \
++ -e 's=[@]ldapserver_rgrp[@]=$(ldapserver_rgrp)=g' \
++ -e 's=[@]ldapserver_rusr[@]=$(ldapserver_rusr)=g' \
++ -e 's=[@]ldapserver_schemadir[@]=$(ldapserver_schemadir)=g' \
++ -e 's=[@]ldapserverslurpd_pidfile[@]=$(ldapserverslurpd_pidfile)=g' \
++ -e 's=[@]ldapserver_statedir[@]=$(ldapserver_statedir)=g' \
++ -e 's=[@]ldapserver_usr[@]=$(ldapserver_usr)=g' \
++ -e 's=[@]pear_horde_pkgs[@]=$(pear_horde_pkgs)=g' \
++ -e 's=[@]pkgdocdir[@]=$(pkgdocdir)=g' \
++ -e 's=[@]pki_grp[@]=$(pki_grp)=g' \
++ -e 's=[@]resmgr_confdir[@]=$(resmgr_confdir)=g' \
++ -e 's=[@]resmgr_conffile_grp[@]=$(resmgr_conffile_grp)=g' \
++ -e 's=[@]resmgr_conffile_usr[@]=$(resmgr_conffile_usr)=g' \
++ -e 's=[@]resmgr_tmpdir[@]=$(resmgr_tmpdir)=g' \
++ -e 's=[@]resmgr_grp[@]=$(resmgr_grp)=g' \
++ -e 's=[@]resmgr_logdir[@]=$(resmgr_logdir)=g' \
++ -e 's=[@]resmgr_scriptsdir[@]=$(resmgr_scriptsdir)=g' \
++ -e 's=[@]resmgr_usr[@]=$(resmgr_usr)=g' \
++ -e 's=[@]resmgr_log_type[@]=$(resmgr_log_type)=g' \
++ -e 's=[@]resmgr_log_name[@]=$(resmgr_log_name)=g' \
++ -e 's=[@]sasl_authdconffile[@]=$(sasl_authdconffile)=g' \
++ -e 's=[@]sasl_logfile[@]=$(sasl_logfile)=g' \
++ -e 's=[@]sasl_smtpconffile[@]=$(sasl_smtpconffile)=g' \
++ -e 's=[@]smarty_compiledir[@]=$(smarty_compiledir)=g' \
++ -e 's=[@]spamassassin_confdir[@]=$(spamassassin_confdir)=g' \
++ -e 's=[@]webserver_acceptlock[@]=$(webserver_acceptlock)=g' \
++ -e 's=[@]webserver_accesslogfile[@]=$(webserver_accesslogfile)=g' \
++ -e 's=[@]webserver_cgidir[@]=$(webserver_cgidir)=g' \
++ -e 's=[@]webserver_confdir[@]=$(webserver_confdir)=g' \
++ -e 's=[@]webserver_document_root[@]=$(webserver_document_root)=g' \
++ -e 's=[@]webserver_logdir[@]=$(webserver_logdir)=g' \
++ -e 's=[@]webserver_errorlogfile[@]=$(webserver_errorlogfile)=g' \
++ -e 's=[@]webserver_grp[@]=$(webserver_grp)=g' \
++ -e 's=[@]webserver_musr[@]=$(webserver_musr)=g' \
++ -e 's=[@]webserver_pidfile[@]=$(webserver_pidfile)=g' \
++ -e 's=[@]webserver_runtime_status[@]=$(webserver_runtime_status)=g' \
++ -e 's=[@]webserver_sessions[@]=$(webserver_sessions)=g' \
++ -e 's=[@]webserver_sslmutex[@]=$(webserver_sslmutex)=g' \
++ -e 's=[@]webserver_sslscache[@]=$(webserver_sslscache)=g' \
++ -e 's=[@]webserver_tmpdir[@]=$(webserver_tmpdir)=g' \
++ -e 's=[@]webserver_usr[@]=$(webserver_usr)=g' \
++ -e 's=[@]webserver_web_prefix[@]=$(webserver_web_prefix)=g' \
++ -e 's=[@]horde_cookie_path[@]=$(horde_cookie_path)=g' \
++ -e 's=[@]horde_confdir[@]=$(horde_confdir)=g' \
++ -e 's=[@]kronolith_confdir[@]=$(kronolith_confdir)=g'
Deleted: kolab-webadmin/trunk/debian/patches/10-fix-require.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/10-fix-require.diff 2009-04-09 00:51:29 UTC (rev 1262)
+++ kolab-webadmin/trunk/debian/patches/10-fix-require.diff 2009-04-09 01:00:11 UTC (rev 1263)
@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-fix-requrires.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Correction of the require paths
-
- at DPATCH@
-diff -urNad kolab-webadmin-2.1.99+20080314~/php/admin/include/ldap.class.php.in kolab-webadmin-2.1.99+20080314/php/admin/include/ldap.class.php.in
---- kolab-webadmin-2.1.99+20080314~/php/admin/include/ldap.class.php.in 2008-03-06 12:46:29.000000000 +0100
-+++ kolab-webadmin-2.1.99+20080314/php/admin/include/ldap.class.php.in 2008-03-17 19:52:48.000000000 +0100
-@@ -19,7 +19,7 @@
- */
-
- require_once('mysmarty.php');
--require_once('@sysconfdir@/kolab/session_vars.php');
-+require_once('/etc/kolab-webadmin/session_vars.php');
- require_once('debug.php');
-
- /* We dont have any better place to put this right now... */
Copied: kolab-webadmin/trunk/debian/patches/20-fix-require.diff (from rev 1262, kolab-webadmin/branches/2.2.1/debian/patches/20-fix-require.diff)
===================================================================
--- kolab-webadmin/trunk/debian/patches/20-fix-require.diff (rev 0)
+++ kolab-webadmin/trunk/debian/patches/20-fix-require.diff 2009-04-09 01:00:11 UTC (rev 1263)
@@ -0,0 +1,19 @@
+Goal: Correction of the require paths
+
+Author: Steffen Joeris <steffen.joeris at skolelinux.de>
+
+Upstream status: Specific to Debian
+
+Index: b/php/admin/include/ldap.class.php.in
+===================================================================
+--- a/php/admin/include/ldap.class.php.in
++++ b/php/admin/include/ldap.class.php.in
+@@ -19,7 +19,7 @@
+ */
+
+ require_once('mysmarty.php');
+-require_once('@sysconfdir@/kolab/session_vars.php');
++require_once('/etc/kolab-webadmin/session_vars.php');
+ require_once('debug.php');
+
+ /* We dont have any better place to put this right now... */
Deleted: kolab-webadmin/trunk/debian/patches/20-service_index.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/20-service_index.diff 2009-04-09 00:51:29 UTC (rev 1262)
+++ kolab-webadmin/trunk/debian/patches/20-service_index.diff 2009-04-09 01:00:11 UTC (rev 1263)
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-service_index.dpatch by Tobias König <tokoe at kde.org>
-##
-## DP: opportunity to delete freebusy value
-
- at DPATCH@
---- index.php.in.orig 2006-02-02 09:08:17.000000000 +0100
-+++ kolab-webadmin-0.4.0/www/admin/settings/index.php.in 2006-02-02 08:56:14.000000000 +0100
-@@ -151,7 +151,9 @@ if( $_REQUEST['submithttpallowunauthfb']
-
- if( $_REQUEST['submitfreebusypast'] ) {
- $attrs = array();
-- $attrs['kolabFreeBusyPast'] = trim( $_REQUEST['freebusypast'] );
-+ $value = trim( $_REQUEST['freebusypast'] );
-+ if( $value == '' ) $value = array();
-+ $attrs['kolabFreeBusyPast'] = $value;
- if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
- $errors[] = _("LDAP Error: failed to modify kolab configuration object: ")
- .ldap_error($ldap->connection);
Modified: kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff 2009-04-09 00:51:29 UTC (rev 1262)
+++ kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff 2009-04-09 01:00:11 UTC (rev 1263)
@@ -1,15 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60-no_extra_doc.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Disables installation of unnecessary documentation
+Goal: Disables installation of unnecessary documentation
- at DPATCH@
-diff -urNad kolab-webadmin-2.1.0-20070510~/Makefile.am kolab-webadmin-2.1.0-20070510/Makefile.am
---- kolab-webadmin-2.1.0-20070510~/Makefile.am 2007-01-10 16:59:58.000000000 +0100
-+++ kolab-webadmin-2.1.0-20070510/Makefile.am 2007-06-18 02:23:33.000000000 +0200
-@@ -187,11 +187,11 @@
- dist_phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
- dist_phplocalees_DATA = $(PHP_LOCALE_ES_MO)
+Author: Peter Eisentraut <petere at debian.org>
+
+Upstream status: Specific to Debian
+
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -210,11 +210,11 @@
+ $(PHP_LOCALE_IT_PO) \
+ $(PHP_LOCALE_ES_PO)
-kwadocdir = $(pkgdocdir)/@PACKAGE@
-dist_kwadoc_DATA = ChangeLog \
@@ -24,10 +25,11 @@
EXTRA_DIST += dist_conf/common \
dist_conf/debian \
-diff -urNad kolab-webadmin-2.1.99-20080314~/Makefile.in kolab-webadmin-2.1.99-20080314/Makefile.in
---- kolab-webadmin-2.1.99-20080314~/Makefile.in 2008-05-20 19:28:39.000000000 +0200
-+++ kolab-webadmin-2.1.99-20080314/Makefile.in 2008-05-20 19:38:22.000000000 +0200
-@@ -386,11 +386,11 @@
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -385,11 +385,11 @@
phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
phplocalees_DATA = $(PHP_LOCALE_ES_MO)
@@ -44,4 +46,3 @@
all: all-am
-
Modified: kolab-webadmin/trunk/debian/patches/series
===================================================================
--- kolab-webadmin/trunk/debian/patches/series 2009-04-09 00:51:29 UTC (rev 1262)
+++ kolab-webadmin/trunk/debian/patches/series 2009-04-09 01:00:11 UTC (rev 1263)
@@ -1,3 +1,3 @@
-10-fix-require.diff
-20-service_index.diff
+10-dist_conf.diff
+20-fix-require.diff
60-no_extra_doc.diff
Modified: kolab-webadmin/trunk/debian/rules
===================================================================
--- kolab-webadmin/trunk/debian/rules 2009-04-09 00:51:29 UTC (rev 1262)
+++ kolab-webadmin/trunk/debian/rules 2009-04-09 01:00:11 UTC (rev 1263)
@@ -23,7 +23,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/kolab-webadmin
install -D -m 644 debian/apache.conf $(CURDIR)/debian/kolab-webadmin/etc/kolab/kolab-webadmin-apache.conf
Modified: kolab-webadmin/trunk/debian/uupdate-wrapper
===================================================================
--- kolab-webadmin/trunk/debian/uupdate-wrapper 2009-04-09 00:51:29 UTC (rev 1262)
+++ kolab-webadmin/trunk/debian/uupdate-wrapper 2009-04-09 01:00:11 UTC (rev 1263)
@@ -1,7 +1,11 @@
#!/bin/sh
+package=kolab-webadmin
version=$2
file=$3
-rpm2cpio $file | cpio -i --quiet '*-*.tar.bz2'
-bunzip2 -c *.tar.bz2 | gzip > kolab-webadmin-$version.tar.gz
+rpm2cpio "$file" | \
+cpio --extract --quiet --to-stdout "${package}-*.tar.bz2" | \
+bunzip2 --stdout | \
+gzip > "${package}_${version}.orig.tar.gz"
+rm "$file"
More information about the pkg-kolab-devel
mailing list