[Phpgroupware-cvs] CVS: bookmarks/setup setup.inc.php,1.7.2.2,1.7.2.2.2.1 tables_current.inc.php,1.5,1.5.4.1

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/bookmarks/setup
In directory subversions:/tmp/cvs-serv2342/setup

Modified Files:
      Tag: Version-0_9_16-branch
        setup.inc.php tables_current.inc.php 
Log Message:
syncing as far as possible 0.9.16 and HEAD


Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/setup/setup.inc.php,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.2.2.1
diff -C2 -r1.7.2.2 -r1.7.2.2.2.1
*** setup.inc.php       27 Apr 2002 15:34:18 -0000      1.7.2.2
--- setup.inc.php       25 Mar 2003 22:55:28 -0000      1.7.2.2.2.1
***************
*** 16,21 ****
        /* Basic information about this app */
        $setup_info['bookmarks']['name']      = 'bookmarks';
!       $setup_info['bookmarks']['title']     = 'Bookmarks';
!       $setup_info['bookmarks']['version']   = '0.8.1';
        $setup_info['bookmarks']['app_order'] = '20';
        $setup_info['bookmarks']['enable']    = 1;
--- 16,20 ----
        /* Basic information about this app */
        $setup_info['bookmarks']['name']      = 'bookmarks';
!       $setup_info['bookmarks']['version']   = '0.8.2';
        $setup_info['bookmarks']['app_order'] = '20';
        $setup_info['bookmarks']['enable']    = 1;
***************
*** 40,44 ****
        $setup_info['bookmarks']['depends'][] = array(
                'appname'  => 'phpgwapi',
!               'versions' => Array('0.9.11','0.9.12','0.9.13','0.9.14')
        );
  ?>
--- 39,43 ----
        $setup_info['bookmarks']['depends'][] = array(
                'appname'  => 'phpgwapi',
!               'versions' => Array('0.9.13','0.9.14','0.9.15')
        );
  ?>

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/setup/tables_current.inc.php,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -r1.5 -r1.5.4.1
*** tables_current.inc.php      14 Jul 2001 01:41:50 -0000      1.5
--- tables_current.inc.php      25 Mar 2003 22:55:28 -0000      1.5.4.1
***************
*** 20,24 ****
                        'fd' => array(
                                'bm_id' => array('type' => 'auto','nullable' => 
False),
!                               'bm_owner' => array('type' => 'int', 
'precision' => 8,'nullable' => True),
                                'bm_access' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
                                'bm_url' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
--- 20,24 ----
                        'fd' => array(
                                'bm_id' => array('type' => 'auto','nullable' => 
False),
!                               'bm_owner' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
                                'bm_access' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
                                'bm_url' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
***************
*** 26,34 ****
                                'bm_desc' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
                                'bm_keywords' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
!                               'bm_category' => array('type' => 'int', 
'precision' => 8,'nullable' => True),
!                               'bm_subcategory' => array('type' => 'int', 
'precision' => 8,'nullable' => True),
!                               'bm_rating' => array('type' => 'int', 
'precision' => 8,'nullable' => True),
                                'bm_info' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
!                               'bm_visits' => array('type' => 'int', 
'precision' => 8,'nullable' => True)
                        ),
                        'pk' => array('bm_id'),
--- 26,34 ----
                                'bm_desc' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
                                'bm_keywords' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
!                               'bm_category' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
!                               'bm_subcategory' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
!                               'bm_rating' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
                                'bm_info' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
!                               'bm_visits' => array('type' => 'int', 
'precision' => 4,'nullable' => True)
                        ),
                        'pk' => array('bm_id'),