[pkg-kolab] r606 - in kolab-webadmin/trunk/debian: . patches
petere at alioth.debian.org
petere at alioth.debian.org
Mon Jun 18 01:21:38 UTC 2007
Author: petere
Date: 2007-06-18 01:21:38 +0000 (Mon, 18 Jun 2007)
New Revision: 606
Added:
kolab-webadmin/trunk/debian/patches/50-dist_conf.dpatch
kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch
Removed:
kolab-webadmin/trunk/debian/patches/30-admin_distributionlist_list.dpatch
kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch
Modified:
kolab-webadmin/trunk/debian/changelog
kolab-webadmin/trunk/debian/patches/00list
kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch
kolab-webadmin/trunk/debian/patches/20-service_index.dpatch
kolab-webadmin/trunk/debian/rules
Log:
* New upstream release
Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog 2007-06-17 21:31:51 UTC (rev 605)
+++ kolab-webadmin/trunk/debian/changelog 2007-06-18 01:21:38 UTC (rev 606)
@@ -1,3 +1,9 @@
+kolab-webadmin (2.1.0-20070510-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Peter Eisentraut <petere at debian.org> Mon, 18 Jun 2007 00:19:40 +0200
+
kolab-webadmin (0.4.0-20060810-5) unstable; urgency=low
* Changed 40-kolab_prefix.dpatch to patch config.php.in instead of
Modified: kolab-webadmin/trunk/debian/patches/00list
===================================================================
--- kolab-webadmin/trunk/debian/patches/00list 2007-06-17 21:31:51 UTC (rev 605)
+++ kolab-webadmin/trunk/debian/patches/00list 2007-06-18 01:21:38 UTC (rev 606)
@@ -1,4 +1,4 @@
10-fix-require
20-service_index
-30-admin_distributionlist_list
-40-kolab_prefix
+50-dist_conf
+60-no_extra_doc
Modified: kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch 2007-06-17 21:31:51 UTC (rev 605)
+++ kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch 2007-06-18 01:21:38 UTC (rev 606)
@@ -17,13 +17,13 @@
/* We dont have any better place to put this right now... */
diff -urNad kolab-webadmin-0.4.0-20060810~/php/admin/include/mysmarty.php kolab-webadmin-0.4.0-20060810/php/admin/include/mysmarty.php
---- kolab-webadmin-0.4.0-20060810~/php/admin/include/mysmarty.php 2006-08-10 20:18:16.000000000 +0200
-+++ kolab-webadmin-0.4.0-20060810/php/admin/include/mysmarty.php 2006-10-25 20:28:23.000000000 +0200
+--- kolab-webadmin-0.4.0-20060810~/php/admin/include/mysmarty.php.in 2006-08-10 20:18:16.000000000 +0200
++++ kolab-webadmin-0.4.0-20060810/php/admin/include/mysmarty.php.in 2006-10-25 20:28:23.000000000 +0200
@@ -19,7 +19,7 @@
*/
require_once('config.php');
--require_once('Smarty/Smarty.class.php');
+-require_once('@kolab_php_smarty_prefix@/Smarty.class.php');
+require_once('smarty/libs/Smarty.class.php');
require_once('locale.php');
Modified: kolab-webadmin/trunk/debian/patches/20-service_index.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/20-service_index.dpatch 2007-06-17 21:31:51 UTC (rev 605)
+++ kolab-webadmin/trunk/debian/patches/20-service_index.dpatch 2007-06-18 01:21:38 UTC (rev 606)
@@ -4,8 +4,8 @@
## DP: opportunity to delete freebusy value
@DPATCH@
---- index.php.orig 2006-02-02 09:08:17.000000000 +0100
-+++ kolab-webadmin-0.4.0/www/admin/service/index.php 2006-02-02 08:56:14.000000000 +0100
+--- index.php.in.orig 2006-02-02 09:08:17.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/service/index.php.in 2006-02-02 08:56:14.000000000 +0100
@@ -151,7 +151,9 @@ if( $_REQUEST['submithttpallowunauthfb']
if( $_REQUEST['submitfreebusypast'] ) {
Deleted: kolab-webadmin/trunk/debian/patches/30-admin_distributionlist_list.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/30-admin_distributionlist_list.dpatch 2007-06-17 21:31:51 UTC (rev 605)
+++ kolab-webadmin/trunk/debian/patches/30-admin_distributionlist_list.dpatch 2007-06-18 01:21:38 UTC (rev 606)
@@ -1,17 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 30-admin_distributionlist_list.patch by Tobias König <tobias.koenig at credativ.de>
-##
-## DP: admin_distributionlist_list
-
- at DPATCH@
---- list.php.orig 2006-02-02 14:10:08.000000000 +0100
-+++ kolab-webadmin-0.4.0/www/admin/distributionlist/list.php 2006-02-02 14:10:23.000000000 +0100
-@@ -309,7 +309,7 @@ if( !$errors ) {
- if( $ldap->deleteGroupOfNames($dn) ) {
- $messages[] = _('Distribution List ').$_REQUEST['cn']._(' deleted');
- $heading = _('Entry Deleted');
-- $contenttemplate = 'sfdeleted.tpl';
-+ $contenttemplate = 'distdeleted.tpl';
- } else {
- array_push($errors, _("LDAP Error: could delete $dn: ").ldap_error($link));
- }
Deleted: kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch 2007-06-17 21:31:51 UTC (rev 605)
+++ kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch 2007-06-18 01:21:38 UTC (rev 606)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40-kolab_prefix.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: correct path of res_pub.pem (bug #361000)
-
- at DPATCH@
-diff -urNad kolab-webadmin-0.4.0-20060810~/php/admin/include/config.php.in kolab-webadmin-0.4.0-20060810/php/admin/include/config.php.in
---- kolab-webadmin-0.4.0-20060810~/php/admin/include/config.php.in 2006-08-10 20:18:30.000000000 +0200
-+++ kolab-webadmin-0.4.0-20060810/php/admin/include/config.php.in 2006-08-21 19:24:36.000000000 +0200
-@@ -19,7 +19,7 @@
- */
-
- $topdir = '/admin';
--$kolab_prefix = '@prefix@';
-+$kolab_prefix = '';
- $php_dir = '@phpdir@';
- $locale_dir = "$php_dir/admin/locale/";
-
Added: kolab-webadmin/trunk/debian/patches/50-dist_conf.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/50-dist_conf.dpatch (rev 0)
+++ kolab-webadmin/trunk/debian/patches/50-dist_conf.dpatch 2007-06-18 01:21:38 UTC (rev 606)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-dist_conf.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: Adjusts some paths
+
+ at DPATCH@
+diff -urNad kolab-webadmin-2.1.0-20070510~/dist_conf/debian kolab-webadmin-2.1.0-20070510/dist_conf/debian
+--- kolab-webadmin-2.1.0-20070510~/dist_conf/debian 2007-06-18 01:53:54.000000000 +0200
++++ kolab-webadmin-2.1.0-20070510/dist_conf/debian 2007-06-18 01:54:35.000000000 +0200
+@@ -98,7 +98,7 @@
+ ldapserver_grp=ldap
+ ldapserver_rusr=ldap
+
+-webserver_document_root=/var/www
++webserver_document_root=/usr/share
+ webserver_cgidir=${webserver_document_root}/cgi-bin
+ webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
+ webserver_logdir=${localstatedir}/log/apache2
+@@ -112,13 +112,13 @@
+ webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
+ webserver_sslscache=${sysrundir}/ssl_scache
+ webserver_sslmutex=${sysrundir}/ssl_mutex
+-webserver_web_prefix=/kolab
++webserver_web_prefix=/kolab-webadmin
+ webserver_musr=kolab
+ webserver_usr=wwwrun
+ webserver_grp=www
+
+ phplibdir=${datadir}/php
+-phplibdir2=${datadir}/php
++phplibdir2=${datadir}/kolab-webadmin
+ phppeardir=${phplibdir}/PEAR
+
+ sasl_authdconffile=${sysconfdir}/sasl/____
Property changes on: kolab-webadmin/trunk/debian/patches/50-dist_conf.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch (rev 0)
+++ kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch 2007-06-18 01:21:38 UTC (rev 606)
@@ -0,0 +1,250 @@
+#! /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
+
+ 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)
+
+-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 \
+diff -urNad kolab-webadmin-2.1.0-20070510~/Makefile.in kolab-webadmin-2.1.0-20070510/Makefile.in
+--- kolab-webadmin-2.1.0-20070510~/Makefile.in 2007-05-10 12:29:03.000000000 +0200
++++ kolab-webadmin-2.1.0-20070510/Makefile.in 2007-06-18 02:23:33.000000000 +0200
+@@ -36,11 +36,10 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ subdir = .
+-DIST_COMMON = README $(am__configure_deps) $(dist_kwadoc_DATA) \
+- $(dist_phplocalede_DATA) $(dist_phplocalees_DATA) \
+- $(dist_phplocalefr_DATA) $(dist_phplocaleit_DATA) \
+- $(dist_phplocalenl_DATA) $(dist_wspics_DATA) \
+- $(dist_wstoplevel_DATA) $(noinst_HEADERS) \
++DIST_COMMON = README $(am__configure_deps) $(dist_phplocalede_DATA) \
++ $(dist_phplocalees_DATA) $(dist_phplocalefr_DATA) \
++ $(dist_phplocaleit_DATA) $(dist_phplocalenl_DATA) \
++ $(dist_wspics_DATA) $(dist_wstoplevel_DATA) $(noinst_HEADERS) \
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/kolab-webadmin.spec.in $(top_srcdir)/configure \
+ AUTHORS COPYING ChangeLog INSTALL NEWS install-sh missing
+@@ -60,11 +59,10 @@
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kwadocdir)" \
+- "$(DESTDIR)$(phplocalededir)" "$(DESTDIR)$(phplocaleesdir)" \
+- "$(DESTDIR)$(phplocalefrdir)" "$(DESTDIR)$(phplocaleitdir)" \
+- "$(DESTDIR)$(phplocalenldir)" "$(DESTDIR)$(wspicsdir)" \
+- "$(DESTDIR)$(wstopleveldir)" \
++am__installdirs = "$(DESTDIR)$(phplocalededir)" \
++ "$(DESTDIR)$(phplocaleesdir)" "$(DESTDIR)$(phplocalefrdir)" \
++ "$(DESTDIR)$(phplocaleitdir)" "$(DESTDIR)$(phplocalenldir)" \
++ "$(DESTDIR)$(wspicsdir)" "$(DESTDIR)$(wstopleveldir)" \
+ "$(DESTDIR)$(php_includes_configdir)" \
+ "$(DESTDIR)$(phpincludesdir)" "$(DESTDIR)$(phptemplatesdir)" \
+ "$(DESTDIR)$(wsaboutdir)" "$(DESTDIR)$(wsaddressbookdir)" \
+@@ -73,7 +71,6 @@
+ "$(DESTDIR)$(wsdomainmaintainerdir)" "$(DESTDIR)$(wskolabdir)" \
+ "$(DESTDIR)$(wsmaintainerdir)" "$(DESTDIR)$(wsservicedir)" \
+ "$(DESTDIR)$(wssharedfolderdir)" "$(DESTDIR)$(wsuserdir)"
+-dist_kwadocDATA_INSTALL = $(INSTALL_DATA)
+ dist_phplocaledeDATA_INSTALL = $(INSTALL_DATA)
+ dist_phplocaleesDATA_INSTALL = $(INSTALL_DATA)
+ dist_phplocalefrDATA_INSTALL = $(INSTALL_DATA)
+@@ -94,16 +91,15 @@
+ wsserviceDATA_INSTALL = $(INSTALL_DATA)
+ wssharedfolderDATA_INSTALL = $(INSTALL_DATA)
+ wsuserDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(dist_kwadoc_DATA) $(dist_phplocalede_DATA) \
+- $(dist_phplocalees_DATA) $(dist_phplocalefr_DATA) \
+- $(dist_phplocaleit_DATA) $(dist_phplocalenl_DATA) \
+- $(dist_wspics_DATA) $(dist_wstoplevel_DATA) \
+- $(php_includes_config_DATA) $(phpincludes_DATA) \
+- $(phptemplates_DATA) $(wsabout_DATA) $(wsaddressbook_DATA) \
+- $(wsadminstrator_DATA) $(wsdistributionlist_DATA) \
+- $(wsdomainmaintainer_DATA) $(wskolab_DATA) \
+- $(wsmaintainer_DATA) $(wsservice_DATA) $(wssharedfolder_DATA) \
+- $(wsuser_DATA)
++DATA = $(dist_phplocalede_DATA) $(dist_phplocalees_DATA) \
++ $(dist_phplocalefr_DATA) $(dist_phplocaleit_DATA) \
++ $(dist_phplocalenl_DATA) $(dist_wspics_DATA) \
++ $(dist_wstoplevel_DATA) $(php_includes_config_DATA) \
++ $(phpincludes_DATA) $(phptemplates_DATA) $(wsabout_DATA) \
++ $(wsaddressbook_DATA) $(wsadminstrator_DATA) \
++ $(wsdistributionlist_DATA) $(wsdomainmaintainer_DATA) \
++ $(wskolab_DATA) $(wsmaintainer_DATA) $(wsservice_DATA) \
++ $(wssharedfolder_DATA) $(wsuser_DATA)
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -151,31 +147,43 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ WITHOPENPKG = @WITHOPENPKG@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ am__leading_dot = @am__leading_dot@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+ build_alias = @build_alias@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = $(phpkolabdir)/locale
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ spec_build_date = @spec_build_date@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
++#kwadocdir = $(pkgdocdir)/@PACKAGE@
++#dist_kwadoc_DATA = ChangeLog \
++# COPYING \
++# NEWS \
++# AUTHORS
+ EXTRA_DIST = www/admin/style.css $(PHP_INCLUDES) $(PHP_TEMPLATES) \
+ dist_conf/common dist_conf/debian dist_conf/gentoo \
+ dist_conf/kolab dist_conf/mandriva dist_conf/suse \
+@@ -365,7 +373,6 @@
+ PHP_LOCALE_IT_MO = php/admin/locale/it/LC_MESSAGES/messages.mo
+ PHP_LOCALE_ES_PO = php/admin/locale/es/LC_MESSAGES/messages.po
+ PHP_LOCALE_ES_MO = php/admin/locale/es/LC_MESSAGES/messages.mo
+-localedir = $(phpkolabdir)/locale
+ phplocalededir = $(localedir)/de/LC_MESSAGES
+ phplocalefrdir = $(localedir)/fr/LC_MESSAGES
+ phplocalenldir = $(localedir)/nl/LC_MESSAGES
+@@ -376,12 +383,6 @@
+ dist_phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
+ dist_phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
+ dist_phplocalees_DATA = $(PHP_LOCALE_ES_MO)
+-kwadocdir = $(pkgdocdir)/@PACKAGE@
+-dist_kwadoc_DATA = ChangeLog \
+- COPYING \
+- NEWS \
+- AUTHORS
+-
+ all: all-am
+
+ .SUFFIXES:
+@@ -422,23 +423,6 @@
+ kolab-webadmin.spec: $(top_builddir)/config.status $(srcdir)/kolab-webadmin.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ uninstall-info-am:
+-install-dist_kwadocDATA: $(dist_kwadoc_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(kwadocdir)" || $(mkdir_p) "$(DESTDIR)$(kwadocdir)"
+- @list='$(dist_kwadoc_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(dist_kwadocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kwadocdir)/$$f'"; \
+- $(dist_kwadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kwadocdir)/$$f"; \
+- done
+-
+-uninstall-dist_kwadocDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(dist_kwadoc_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(kwadocdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(kwadocdir)/$$f"; \
+- done
+ install-dist_phplocaledeDATA: $(dist_phplocalede_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(phplocalededir)" || $(mkdir_p) "$(DESTDIR)$(phplocalededir)"
+@@ -958,7 +942,7 @@
+ check: check-am
+ all-am: Makefile $(DATA) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(kwadocdir)" "$(DESTDIR)$(phplocalededir)" "$(DESTDIR)$(phplocaleesdir)" "$(DESTDIR)$(phplocalefrdir)" "$(DESTDIR)$(phplocaleitdir)" "$(DESTDIR)$(phplocalenldir)" "$(DESTDIR)$(wspicsdir)" "$(DESTDIR)$(wstopleveldir)" "$(DESTDIR)$(php_includes_configdir)" "$(DESTDIR)$(phpincludesdir)" "$(DESTDIR)$(phptemplatesdir)" "$(DESTDIR)$(wsaboutdir)" "$(DESTDIR)$(wsaddressbookdir)" "$(DESTDIR)$(wsadminstratordir)" "$(DESTDIR)$(wsdistributionlistdir)" "$(DESTDIR)$(wsdomainmaintainerdir)" "$(DESTDIR)$(wskolabdir)" "$(DESTDIR)$(wsmaintainerdir)" "$(DESTDIR)$(wsservicedir)" "$(DESTDIR)$(wssharedfolderdir)" "$(DESTDIR)$(wsuserdir)"; do \
++ for dir in "$(DESTDIR)$(phplocalededir)" "$(DESTDIR)$(phplocaleesdir)" "$(DESTDIR)$(phplocalefrdir)" "$(DESTDIR)$(phplocaleitdir)" "$(DESTDIR)$(phplocalenldir)" "$(DESTDIR)$(wspicsdir)" "$(DESTDIR)$(wstopleveldir)" "$(DESTDIR)$(php_includes_configdir)" "$(DESTDIR)$(phpincludesdir)" "$(DESTDIR)$(phptemplatesdir)" "$(DESTDIR)$(wsaboutdir)" "$(DESTDIR)$(wsaddressbookdir)" "$(DESTDIR)$(wsadminstratordir)" "$(DESTDIR)$(wsdistributionlistdir)" "$(DESTDIR)$(wsdomainmaintainerdir)" "$(DESTDIR)$(wskolabdir)" "$(DESTDIR)$(wsmaintainerdir)" "$(DESTDIR)$(wsservicedir)" "$(DESTDIR)$(wssharedfolderdir)" "$(DESTDIR)$(wsuserdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -1006,7 +990,7 @@
+
+ info-am:
+
+-install-data-am: install-dist_kwadocDATA install-dist_phplocaledeDATA \
++install-data-am: install-dist_phplocaledeDATA \
+ install-dist_phplocaleesDATA install-dist_phplocalefrDATA \
+ install-dist_phplocaleitDATA install-dist_phplocalenlDATA \
+ install-dist_wspicsDATA install-dist_wstoplevelDATA \
+@@ -1046,7 +1030,7 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-dist_kwadocDATA uninstall-dist_phplocaledeDATA \
++uninstall-am: uninstall-dist_phplocaledeDATA \
+ uninstall-dist_phplocaleesDATA uninstall-dist_phplocalefrDATA \
+ uninstall-dist_phplocaleitDATA uninstall-dist_phplocalenlDATA \
+ uninstall-dist_wspicsDATA uninstall-dist_wstoplevelDATA \
+@@ -1064,22 +1048,21 @@
+ distclean-generic distclean-local distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-dist_kwadocDATA \
+- install-dist_phplocaledeDATA install-dist_phplocaleesDATA \
+- install-dist_phplocalefrDATA install-dist_phplocaleitDATA \
+- install-dist_phplocalenlDATA install-dist_wspicsDATA \
+- install-dist_wstoplevelDATA install-exec install-exec-am \
+- install-info install-info-am install-man \
+- install-php_includes_configDATA install-phpincludesDATA \
+- install-phptemplatesDATA install-strip install-wsaboutDATA \
+- install-wsaddressbookDATA install-wsadminstratorDATA \
+- install-wsdistributionlistDATA install-wsdomainmaintainerDATA \
+- install-wskolabDATA install-wsmaintainerDATA \
+- install-wsserviceDATA install-wssharedfolderDATA \
+- install-wsuserDATA installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-dist_kwadocDATA \
++ install-data-am install-data-hook install-dist_phplocaledeDATA \
++ install-dist_phplocaleesDATA install-dist_phplocalefrDATA \
++ install-dist_phplocaleitDATA install-dist_phplocalenlDATA \
++ install-dist_wspicsDATA install-dist_wstoplevelDATA \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-php_includes_configDATA \
++ install-phpincludesDATA install-phptemplatesDATA install-strip \
++ install-wsaboutDATA install-wsaddressbookDATA \
++ install-wsadminstratorDATA install-wsdistributionlistDATA \
++ install-wsdomainmaintainerDATA install-wskolabDATA \
++ install-wsmaintainerDATA install-wsserviceDATA \
++ install-wssharedfolderDATA install-wsuserDATA installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
++ pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-dist_phplocaledeDATA uninstall-dist_phplocaleesDATA \
+ uninstall-dist_phplocalefrDATA uninstall-dist_phplocaleitDATA \
+ uninstall-dist_phplocalenlDATA uninstall-dist_wspicsDATA \
Property changes on: kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: kolab-webadmin/trunk/debian/rules
===================================================================
--- kolab-webadmin/trunk/debian/rules 2007-06-17 21:31:51 UTC (rev 605)
+++ kolab-webadmin/trunk/debian/rules 2007-06-18 01:21:38 UTC (rev 606)
@@ -7,11 +7,8 @@
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --enable-wsdocrootdir=/usr/share/kolab-webadmin \
- --enable-phpdir=/usr/share/kolab-webadmin \
- --enable-pkgdocdir=/usr/share/doc/kolab-webadmin
+ --sysconfdir=/etc \
+ --with-dist=debian
build: build-stamp
build-stamp: config.status
@@ -25,9 +22,6 @@
dh_testroot
rm -f build-stamp
-$(MAKE) distclean
- rm -f php/admin/locale/de/LC_MESSAGES/messages.mo
- rm -f php/admin/locale/fr/LC_MESSAGES/messages.mo
- rm -f php/admin/locale/nl/LC_MESSAGES/messages.mo
dh_clean
install: build
More information about the pkg-kolab-devel
mailing list