[pkg-kolab] r1567 - in kolab-webadmin/trunk/debian: . patches
Mathieu Parent
sathieu at alioth.debian.org
Sat Nov 19 17:59:26 UTC 2011
Author: sathieu
Date: 2011-11-19 17:59:24 +0000 (Sat, 19 Nov 2011)
New Revision: 1567
Added:
kolab-webadmin/trunk/debian/install
kolab-webadmin/trunk/debian/kolab-webadmin-apache.conf
Removed:
kolab-webadmin/trunk/debian/apache.conf
kolab-webadmin/trunk/debian/patches/10-dist_conf.diff
kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff
Modified:
kolab-webadmin/trunk/debian/changelog
kolab-webadmin/trunk/debian/compat
kolab-webadmin/trunk/debian/control
kolab-webadmin/trunk/debian/patches/series
kolab-webadmin/trunk/debian/rules
Log:
New upstream release (2.3.4-20110927-1
- Upstream is now a PEAR package, major rework
- removed 10-dist_conf.diff, 60-no_extra_doc.diff: not needed with PEAR
- Moved to debhelper compat level 8 and dh
- Moved to pkg-php-tools
Deleted: kolab-webadmin/trunk/debian/apache.conf
===================================================================
--- kolab-webadmin/trunk/debian/apache.conf 2011-11-19 17:45:10 UTC (rev 1566)
+++ kolab-webadmin/trunk/debian/apache.conf 2011-11-19 17:59:24 UTC (rev 1567)
@@ -1,15 +0,0 @@
-# Apache and PHP configuration for Kolab Webadmin
-#
-# Read /usr/share/doc/kolab-webadmin/README.Debian about setting up this
-# web site.
-
-Alias /admin /usr/share/kolab/admin
-
-<Directory /usr/share/kolab/admin>
- Options Indexes FollowSymLinks
- Order allow,deny
- Allow from all
- DirectoryIndex index.php
- php_value include_path /usr/share/php/kolab/admin/include:.:/usr/share/php
- php_value error_reporting 'E_ALL & ~E_WARNING & ~E_NOTICE'
-</Directory>
Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog 2011-11-19 17:45:10 UTC (rev 1566)
+++ kolab-webadmin/trunk/debian/changelog 2011-11-19 17:59:24 UTC (rev 1567)
@@ -1,8 +1,13 @@
-kolab-webadmin (2.2.3-20091217-5) UNRELEASED; urgency=low
+kolab-webadmin (2.3.4-20110927-1) UNRELEASED; urgency=low
+ * New upstream release (2.3.4-20110927-1)
+ - d/watch: updated
+ - d/uupdate-wrapper: updated as new upstream ar tgz instead of tar.bz2
+ - Upstream is now a PEAR package, major rework
+ - removed 10-dist_conf.diff, 60-no_extra_doc.diff: not needed with PEAR
* Drop php4 support (probably not working already)
- * d/watch: updated
- * d/uupdate-wrapper: updated as new upstream ar tgz instead of tar.bz2
+ * Moved to debhelper compat level 8 and dh
+ * Moved to pkg-php-tools
-- Mathieu Parent <sathieu at debian.org> Wed, 06 Apr 2011 19:23:56 +0200
Modified: kolab-webadmin/trunk/debian/compat
===================================================================
--- kolab-webadmin/trunk/debian/compat 2011-11-19 17:45:10 UTC (rev 1566)
+++ kolab-webadmin/trunk/debian/compat 2011-11-19 17:59:24 UTC (rev 1567)
@@ -1 +1 @@
-7
+8
Modified: kolab-webadmin/trunk/debian/control
===================================================================
--- kolab-webadmin/trunk/debian/control 2011-11-19 17:45:10 UTC (rev 1566)
+++ kolab-webadmin/trunk/debian/control 2011-11-19 17:59:24 UTC (rev 1567)
@@ -3,7 +3,7 @@
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>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 8), pkg-php-tools
Standards-Version: 3.9.1
Homepage: http://www.kolab.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolab-webadmin/trunk/
@@ -11,7 +11,7 @@
Package: kolab-webadmin
Architecture: all
-Depends: ${misc:Depends}, php5, smarty, php-net-sieve, php-net-ldap, php-mail
+Depends: ${misc:Depends}, ${phppear:Debian-Depends, php5, smarty, php-net-sieve, php-net-ldap, php-mail
Description: Kolab administration web interface
This package contains the web GUI for the administration of the Kolab
groupware server.
Added: kolab-webadmin/trunk/debian/install
===================================================================
--- kolab-webadmin/trunk/debian/install (rev 0)
+++ kolab-webadmin/trunk/debian/install 2011-11-19 17:59:24 UTC (rev 1567)
@@ -0,0 +1,3 @@
+debian/kolab-webadmin-apache.conf etc/kolab/
+debian/session_vars.php etc/kolab/
+
Copied: kolab-webadmin/trunk/debian/kolab-webadmin-apache.conf (from rev 1557, kolab-webadmin/trunk/debian/apache.conf)
===================================================================
--- kolab-webadmin/trunk/debian/kolab-webadmin-apache.conf (rev 0)
+++ kolab-webadmin/trunk/debian/kolab-webadmin-apache.conf 2011-11-19 17:59:24 UTC (rev 1567)
@@ -0,0 +1,15 @@
+# Apache and PHP configuration for Kolab Webadmin
+#
+# Read /usr/share/doc/kolab-webadmin/README.Debian about setting up this
+# web site.
+
+Alias /admin /usr/share/kolab/admin
+
+<Directory /usr/share/kolab/admin>
+ Options Indexes FollowSymLinks
+ Order allow,deny
+ Allow from all
+ DirectoryIndex index.php
+ php_value include_path /usr/share/php/kolab/admin/include:.:/usr/share/php
+ php_value error_reporting 'E_ALL & ~E_WARNING & ~E_NOTICE'
+</Directory>
Deleted: kolab-webadmin/trunk/debian/patches/10-dist_conf.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/10-dist_conf.diff 2011-11-19 17:45:10 UTC (rev 1566)
+++ kolab-webadmin/trunk/debian/patches/10-dist_conf.diff 2011-11-19 17:59:24 UTC (rev 1567)
@@ -1,330 +0,0 @@
-Goal: Correct dist_conf/debian
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Can be commited upstream
-
-Index: b/dist_conf/common
-===================================================================
---- a/dist_conf/common
-+++ b/dist_conf/common
-@@ -1,160 +1,160 @@
- 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_localedir[@],$(resmgr_localedir),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,[@]dimp_confdir[@],$(dimp_confdir),g' \
-- -e 's,[@]imp_confdir[@],$(imp_confdir),g' \
-- -e 's,[@]ingo_confdir[@],$(ingo_confdir),g' \
-- -e 's,[@]kronolith_confdir[@],$(kronolith_confdir),g' \
-- -e 's,[@]mimp_confdir[@],$(mimp_confdir),g' \
-- -e 's,[@]mnemo_confdir[@],$(mnemo_confdir),g' \
-- -e 's,[@]nag_confdir[@],$(nag_confdir),g' \
-- -e 's,[@]turba_confdir[@],$(turba_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_localedir[@]=$(resmgr_localedir)=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=[@]dimp_confdir[@]=$(dimp_confdir)=g' \
-+ -e 's=[@]imp_confdir[@]=$(imp_confdir)=g' \
-+ -e 's=[@]ingo_confdir[@]=$(ingo_confdir)=g' \
-+ -e 's=[@]kronolith_confdir[@]=$(kronolith_confdir)=g' \
-+ -e 's=[@]mimp_confdir[@]=$(mimp_confdir)=g' \
-+ -e 's=[@]mnemo_confdir[@]=$(mnemo_confdir)=g' \
-+ -e 's=[@]nag_confdir[@]=$(nag_confdir)=g' \
-+ -e 's=[@]turba_confdir[@]=$(turba_confdir)=g'
Deleted: kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff 2011-11-19 17:45:10 UTC (rev 1566)
+++ kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff 2011-11-19 17:59:24 UTC (rev 1567)
@@ -1,48 +0,0 @@
-Goal: Disables installation of unnecessary documentation
-
-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 \
-- COPYING \
-- NEWS \
-- AUTHORS
-+#kwadocdir = $(pkgdocdir)/@PACKAGE@
-+#dist_kwadoc_DATA = ChangeLog \
-+# COPYING \
-+# NEWS \
-+# AUTHORS
-
- EXTRA_DIST += dist_conf/common \
- dist_conf/debian \
-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)
--kwadocdir = $(pkgdocdir)/@PACKAGE@
--dist_kwadoc_DATA = ChangeLog \
-- COPYING \
-- NEWS \
-- AUTHORS
-+#kwadocdir = $(pkgdocdir)/@PACKAGE@
-+#dist_kwadoc_DATA = ChangeLog \
-+# COPYING \
-+# NEWS \
-+# AUTHORS
-
- all: all-am
-
Modified: kolab-webadmin/trunk/debian/patches/series
===================================================================
--- kolab-webadmin/trunk/debian/patches/series 2011-11-19 17:45:10 UTC (rev 1566)
+++ kolab-webadmin/trunk/debian/patches/series 2011-11-19 17:59:24 UTC (rev 1567)
@@ -1,5 +1,3 @@
-10-dist_conf.diff
-60-no_extra_doc.diff
70-sieve-port-i18n.diff
71-sieve-port-number.diff
80-issue4025.diff
Modified: kolab-webadmin/trunk/debian/rules
===================================================================
--- kolab-webadmin/trunk/debian/rules 2011-11-19 17:45:10 UTC (rev 1566)
+++ kolab-webadmin/trunk/debian/rules 2011-11-19 17:59:24 UTC (rev 1567)
@@ -1,46 +1,4 @@
#!/usr/bin/make -f
+%:
+ dh $@ --buildsystem=phppear --with phppear
-config.status: configure
- dh_testdir
- ./configure --prefix=/usr --sysconfdir=/etc --with-dist=debian
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- 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
- install -D -m 644 debian/session_vars.php $(CURDIR)/debian/kolab-webadmin/etc/kolab/session_vars.php
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs -i ChangeLog
- dh_installdocs -i
- dh_installexamples -i
- dh_installman -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install
More information about the pkg-kolab-devel
mailing list