[pkg-kolab] r947 - in kolab-webadmin/trunk/debian: . patches

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Tue Sep 30 16:10:11 UTC 2008


Author: mparent-guest
Date: 2008-09-30 16:10:11 +0000 (Tue, 30 Sep 2008)
New Revision: 947

Added:
   kolab-webadmin/trunk/debian/uupdate-wrapper
Removed:
   kolab-webadmin/trunk/debian/patches/common/
Modified:
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/control
   kolab-webadmin/trunk/debian/copyright
   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/patches/60-no_extra_doc.dpatch
   kolab-webadmin/trunk/debian/rules
   kolab-webadmin/trunk/debian/svn-deblayout
   kolab-webadmin/trunk/debian/watch
Log:
Merge branches/2.2


Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2008-09-30 16:06:28 UTC (rev 946)
+++ kolab-webadmin/trunk/debian/changelog	2008-09-30 16:10:11 UTC (rev 947)
@@ -1,3 +1,18 @@
+kolab-webadmin (2.2.0-20080709-1) unstable; urgency=low
+
+  * New upstream version: 2.2.0
+  * updated 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
+  * updated 10-fix-requires.dpatch
+  * 60-no_extra_doc partially dropped
+  * Bump Standards-Version to 3.8.0 (updated Vcs-Browser and Vcs-Svn fields)
+
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 30 Sep 2008 18:04:47 +0200
+
 kolab-webadmin (2.1.0-20070510-3) unstable; urgency=low
 
   * Internal Subversion repository reorganization to keep common patches in

Modified: kolab-webadmin/trunk/debian/control
===================================================================
--- kolab-webadmin/trunk/debian/control	2008-09-30 16:06:28 UTC (rev 946)
+++ kolab-webadmin/trunk/debian/control	2008-09-30 16:10:11 UTC (rev 947)
@@ -2,12 +2,12 @@
 Section: admin
 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>, Peter Eisentraut <petere at debian.org>
+Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <math.parent at gmail.com>
 Build-Depends: debhelper (>= 4), dpatch
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://www.kolab.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolab-webadmin/trunk/
-Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolab-webadmin/trunk/
+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/
 
 Package: kolab-webadmin
 Architecture: all

Modified: kolab-webadmin/trunk/debian/copyright
===================================================================
--- kolab-webadmin/trunk/debian/copyright	2008-09-30 16:06:28 UTC (rev 946)
+++ kolab-webadmin/trunk/debian/copyright	2008-09-30 16:10:11 UTC (rev 947)
@@ -1,7 +1,7 @@
 This package was debianized by Steffen Joeris <steffen.joeris at skolelinux.de> on
 Mon, 19 Dec 2005 14:45:55 +0100.
 
-It was downloaded from <http://max.kde.org:8080/mirrors/ftp.kolab.org/server/release/>.
+It was downloaded from <http://kolab.org/>
 
 Copyright holders:
 
@@ -23,7 +23,7 @@
 The following applies to the file php/admin/include/Sieve.php:
 
 // +-----------------------------------------------------------------------+
-// | Copyright (c) 2002-2003, Richard Heyes                                     |
+// | Copyright (c) 2002-2003, Richard Heyes                                |
 // | All rights reserved.                                                  |
 // |                                                                       |
 // | Redistribution and use in source and binary forms, with or without    |

Modified: kolab-webadmin/trunk/debian/patches/00list
===================================================================
--- kolab-webadmin/trunk/debian/patches/00list	2008-09-30 16:06:28 UTC (rev 946)
+++ kolab-webadmin/trunk/debian/patches/00list	2008-09-30 16:10:11 UTC (rev 947)
@@ -1,4 +1,3 @@
-common/dist_conf
 10-fix-require
 20-service_index
 60-no_extra_doc

Modified: kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch	2008-09-30 16:06:28 UTC (rev 946)
+++ kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch	2008-09-30 16:10:11 UTC (rev 947)
@@ -4,27 +4,15 @@
 ## DP: Correction of the require paths
 
 @DPATCH@
-diff -urNad kolab-webadmin-0.4.0-20060810~/php/admin/include/ldap.class.php kolab-webadmin-0.4.0-20060810/php/admin/include/ldap.class.php
---- kolab-webadmin-0.4.0-20060810~/php/admin/include/ldap.class.php	2006-08-10 20:18:16.000000000 +0200
-+++ kolab-webadmin-0.4.0-20060810/php/admin/include/ldap.class.php	2006-10-25 20:28:23.000000000 +0200
+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('session_vars.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... */
-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.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
-@@ -36,7 +36,7 @@
- 	
- 	$basedir = "$php_dir/admin/";
- 	$this->template_dir = $basedir.'templates/';
--	$this->compile_dir = $basedir.'templates_c/';
-+	$this->compile_dir = '/var/cache/kolab-webadmin/templates/';
- 	$this->config_dir = $basedir.'configs/';
- 	//$this->cache_dir = $basedir.'cache/';
- 	// Added for i18n management (Romain 05-03-03)

Modified: kolab-webadmin/trunk/debian/patches/20-service_index.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/20-service_index.dpatch	2008-09-30 16:06:28 UTC (rev 946)
+++ kolab-webadmin/trunk/debian/patches/20-service_index.dpatch	2008-09-30 16:10:11 UTC (rev 947)
@@ -5,7 +5,7 @@
 
 @DPATCH@
 --- 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
++++ 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'] ) {

Modified: kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch	2008-09-30 16:06:28 UTC (rev 946)
+++ kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch	2008-09-30 16:10:11 UTC (rev 947)
@@ -24,227 +24,24 @@
  
  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)
+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 @@
+ 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
  
- .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 \
+

Modified: kolab-webadmin/trunk/debian/rules
===================================================================
--- kolab-webadmin/trunk/debian/rules	2008-09-30 16:06:28 UTC (rev 946)
+++ kolab-webadmin/trunk/debian/rules	2008-09-30 16:10:11 UTC (rev 947)
@@ -26,7 +26,6 @@
 	dh_clean -k 
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kolab-webadmin
-	rmdir $(CURDIR)/debian/kolab-webadmin/usr/share/php/kolab/admin/templates_c/
 	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-webadmin/session_vars.php
 

Modified: kolab-webadmin/trunk/debian/svn-deblayout
===================================================================
--- kolab-webadmin/trunk/debian/svn-deblayout	2008-09-30 16:06:28 UTC (rev 946)
+++ kolab-webadmin/trunk/debian/svn-deblayout	2008-09-30 16:10:11 UTC (rev 947)
@@ -1 +1,2 @@
-origDir=../upstream
+origDir=../../upstream
+buildArea=../../build-area

Copied: kolab-webadmin/trunk/debian/uupdate-wrapper (from rev 946, kolab-webadmin/branches/2.2/debian/uupdate-wrapper)
===================================================================
--- kolab-webadmin/trunk/debian/uupdate-wrapper	                        (rev 0)
+++ kolab-webadmin/trunk/debian/uupdate-wrapper	2008-09-30 16:10:11 UTC (rev 947)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+version=$2
+file=$3
+
+rpm2cpio $file | cpio -i --quiet '*-*.tar.bz2'
+bunzip2 -c *.tar.bz2 | gzip > kolab-webadmin-$version.tar.gz

Modified: kolab-webadmin/trunk/debian/watch
===================================================================
--- kolab-webadmin/trunk/debian/watch	2008-09-30 16:06:28 UTC (rev 946)
+++ kolab-webadmin/trunk/debian/watch	2008-09-30 16:10:11 UTC (rev 947)
@@ -1,2 +1,6 @@
 version=3
-ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-(?:[\d.]+)/sources/kolab-webadmin-([\d.-]+).src.rpm
+opts=dversionmangle=s/~rc/.rc/ \
+# original URL for stable releases:
+ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-(?:[\d.]+)/sources/kolab-webadmin-([\d.-]+).src.rpm debian debian/uupdate-wrapper
+# URL for development releases:
+#ftp://ftp.belnet.be/packages/kolab/server/development-2.2/current/sources/kolab-webadmin-([\d\w.-]+).src.rpm debian debian/uupdate-wrapper




More information about the pkg-kolab-devel mailing list