SOURCES: egroupware-ttfdir.patch, egroupware-setup.patch - updated...

[glen]

Author: glen                         Date: Sun Feb  5 17:43:00 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 1.2RC6

---- Files affected:
SOURCES:
   egroupware-ttfdir.patch (1.1 -> 1.2) , egroupware-setup.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/egroupware-ttfdir.patch
diff -u SOURCES/egroupware-ttfdir.patch:1.1 SOURCES/egroupware-ttfdir.patch:1.2
--- SOURCES/egroupware-ttfdir.patch:1.1	Sun Sep 11 15:32:20 2005
+++ SOURCES/egroupware-ttfdir.patch	Sun Feb  5 18:42:55 2006
@@ -1,21 +1,22 @@
---- ./projects/inc/class.bostatistics.inc.php	2004-11-06 14:15:28.000000000 +0200
-+++ /tmp/class.bostatistics.inc.php	2005-09-11 16:21:20.000000000 +0300
-@@ -142,7 +142,7 @@
- 			if(!function_exists('imagecopyresampled')) 
- 				return false;
- 			
--			DEFINE("TTF_DIR",PHPGW_SERVER_ROOT."/projects/ttf-bitstream-vera-1.10/");
-+			DEFINE("TTF_DIR","/usr/share/fonts/TTF/");
- 			if(file_exists(PHPGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'))
- 			{
- 				include(PHPGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php');
---- ./projects/inc/jpgraph-1.5.2/src/jpgraph_dir.php	2004-06-01 13:38:37.000000000 +0300
-+++ /tmp/jpgraph_dir.php	2005-09-11 16:21:20.000000000 +0300
-@@ -26,6 +26,6 @@
+--- egroupware/projectmanager/inc/class.ganttchart.inc.php~	2006-02-05 17:49:46.000000000 +0200
++++ egroupware/projectmanager/inc/class.ganttchart.inc.php	2006-02-05 19:34:02.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ include_once(EGW_INCLUDE_ROOT.'/projectmanager/inc/class.boprojectelements.inc.php');
+ 
+-define('TTF_DIR',EGW_SERVER_ROOT.'/projectmanager/inc/ttf-bitstream-vera-1.10/');
++define('TTF_DIR', '/usr/share/fonts/TTF/');
+ if(file_exists(EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'))
+ {
+ 	include(EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php');
+--- egroupware/projectmanager/inc/jpgraph-1.5.2/src/jpgraph_dir.php~	2006-02-05 17:49:46.000000000 +0200
++++ egroupware/projectmanager/inc/jpgraph-1.5.2/src/jpgraph_dir.php	2006-02-05 19:34:55.000000000 +0200
+@@ -25,7 +25,6 @@
+ DEFINE("APACHE_CACHE_DIR","/jpgraph_cache/");
  
  // Directory for TTF fonts. Must end with '/'
- #DEFINE("TTF_DIR","/usr/local/fonts/ttf/");
+-#DEFINE("TTF_DIR","/usr/local/fonts/ttf/");
 -DEFINE("TTF_DIR",PHPGW_SERVER_ROOT."/projects/ttf-bitstream-vera-1.10/");
-+DEFINE("TTF_DIR","/usr/share/fonts/TTF/");
++define('TTF_DIR', '/usr/share/fonts/TTF/');
  
  ?>

================================================================
Index: SOURCES/egroupware-setup.patch
diff -u SOURCES/egroupware-setup.patch:1.1 SOURCES/egroupware-setup.patch:1.2
--- SOURCES/egroupware-setup.patch:1.1	Sun Sep 11 15:11:59 2005
+++ SOURCES/egroupware-setup.patch	Sun Feb  5 18:42:55 2006
@@ -28,13 +28,13 @@
  
  				while(list($k,$v) = each($supported_db))
 --- ./setup/index.php	2004-11-17 14:48:22.000000000 +0200
-+++ /tmp/index.php	2005-09-11 16:07:11.000000000 +0300
-@@ -177,7 +177,7 @@
++++ /home/builder/rpm/BUILD/egroupware/setup/index.php	2006-02-05 19:31:35.000000000 +0200
+@@ -201,7 +201,7 @@
  					$setup_tpl->set_var('instr',
- 						lang("Instructions for creating the database in %1:",'MySql')
- 						. '<br>'.lang('Login to mysql -')
--						. '<br><i>[user at server user]# mysql -u root -p</i><br>'
-+						. '<br><i>[user at server user]# mysql -u mysql -p</i><br>'
+ 						'<b>'.lang("Instructions for creating the database in %1:",'MySql').'</b>'
+ 						. '<br />'.lang('Login to mysql -')
+-						. '<br /><i>[user at server user]# <b>mysql -u root -p</b></i><br />'
++						. '<br /><i>[user at server user]# <b>mysql -u mysql -p</b></i><br />'
  						. lang('Create the empty database and grant user permissions -')
- 						. "<br><i>mysql> create database $info[db_name];</i>"
- 						. "<br><i>mysql> grant all on " . $info['db_name']
+ 						. "<br /><i>mysql> <b>CREATE DATABASE $info[db_name]$set_charset;</b></i>"
+ 						. "<br /><i>mysql> <b>GRANT ALL ON " . $info['db_name']
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/egroupware-ttfdir.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/egroupware-setup.patch?r1=1.1&r2=1.2&f=u