gunnar: server Makefile, 1.19.2.3, 1.19.2.4 obmtool-webclient.conf, 1.5, 1.5.2.1

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv19773

Modified Files:
      Tag: kolab_2_1_branch
	Makefile obmtool-webclient.conf 
Log Message:
Fixed a typo and added horde to the default tasks.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -d -r1.19.2.3 -r1.19.2.4
--- Makefile	20 Jul 2007 15:07:46 -0000	1.19.2.3
+++ Makefile	20 Jul 2007 16:29:45 -0000	1.19.2.4
@@ -34,18 +34,20 @@
                horde/horde-nag          \
                horde/horde-turba
 
-BASE_FILES=obmtool      \
-           obmtool.conf \
+BASE_FILES=obmtool                \
+           obmtool.conf           \
+           obmtool-webclient.conf \
+           README.webclient       \
            README.1st
 
 .PHONY: dist
-dist: stage base kolab files
+dist: stage base kolab horde files
 
 stage:
 	mkdir stage
 
 .PHONY: base
-bsae: stage
+base: stage
 	for PKG in $(BASE_PACKAGES);     \
 	do                               \
 	  make -C $$PKG dist || exit $?; \
@@ -74,8 +76,6 @@
 	  echo -e "==\n" >> stage/ChangeLog.horde;      \
 	  cat $$PKG/ChangeLog >> stage/ChangeLog.horde; \
 	done
-	cp README.webclient stage/README
-	cp obmtool-webclient.conf stage/obmtool.conf
 
 .PHONY: files
 files: stage

Index: obmtool-webclient.conf
===================================================================
RCS file: /kolabrepository/server/obmtool-webclient.conf,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- obmtool-webclient.conf	1 Jun 2007 15:16:32 -0000	1.5
+++ obmtool-webclient.conf	20 Jul 2007 16:29:45 -0000	1.5.2.1
@@ -163,7 +163,8 @@
     @install ${altloc}kolab-horde-fbview-2.1.0-20070420 --define kolab_version=$kolab_version
     @forcein ${altloc}PEAR-Console_Getopt-1.2.1-1
     @forcein ${altloc}PEAR-Archive_Tar-1.3.2-1
-    @forcein ${altloc}PEAR-PEAR-1.4.11-1
+    @forcein ${altloc}PEAR-Structures_Graph-1.0.2-1
+    @forcein ${altloc}PEAR-PEAR-1.6.1-1
     @install ${altloc}PEAR-Auth_SASL-1.0.2-1
     @install ${altloc}PEAR-Date-1.4.7-1
     @install ${altloc}PEAR-Log-1.9.9-1
@@ -171,15 +172,15 @@
     @install ${altloc}PEAR-Mail_Mime-1.3.1-1
     @install ${altloc}PEAR-Net_Sieve-1.1.5-1
     @install ${altloc}PEAR-Net_Socket-1.0.6-1
-    @install ${altloc}horde-framework-kolab-20070601-1
-    @install ${altloc}horde-kolab-20070601-1
-    @install ${altloc}horde-imp-kolab-20070601-1
-    @install ${altloc}horde-ingo-kolab-20070601-1
-    @install ${altloc}horde-kronolith-kolab-20070601-1
-    @install ${altloc}horde-mnemo-kolab-20070601-1
-    @install ${altloc}horde-nag-kolab-20070601-1
-    @install ${altloc}horde-passwd-kolab-20070601-1
-    @install ${altloc}horde-turba-kolab-20070601-1
+    @install ${altloc}horde-framework-kolab-20070719-1
+    @install ${altloc}horde-kolab-20070719-1
+    @install ${altloc}horde-imp-kolab-20070719-1
+    @install ${altloc}horde-ingo-kolab-20070719-1
+    @install ${altloc}horde-kronolith-kolab-20070719-1
+    @install ${altloc}horde-mnemo-kolab-20070719-1
+    @install ${altloc}horde-nag-kolab-20070719-1
+    @install ${altloc}horde-passwd-kolab-20070719-1
+    @install ${altloc}horde-turba-kolab-20070719-1
     @check
 
     if test ! -e "/usr/bin/kolab" ; then