gunnar: server/patches/horde-webmail/1.2.0 Makefile, NONE, 1.1 README, NONE, 1.1 horde-webmail-1.2.0_kolab_openpkg.patch, 1.22, 1.23

cvs at kolab.org cvs at kolab.org
Fri Feb 6 00:27:23 CET 2009


Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv22215

Modified Files:
	horde-webmail-1.2.0_kolab_openpkg.patch 
Added Files:
	Makefile README 
Log Message:
Add the full patch queue for the kolab web client as distinct patches. This should give additional transparency on how the kolab web client gets generated. The upstream patch repository lies at http://github.com/wrobel/horde-release/tree/t/KOLAB.

--- NEW FILE: Makefile ---
HORDE=horde-webmail-1.2.0_kolab_openpkg.patch

make patch:
	touch $(HORDE).1
	for PATCH in `cat tg/series | sed -e 's/-p1//' `; \
	do                                                \
	  cat tg/$$PATCH >> $(HORDE).1;                   \
	done
	cp $(HORDE).1 $(HORDE)
	rm $(HORDE).1

--- NEW FILE: README ---
The patch series within the directory 'tg' originates from the
following topgit-controlled patch repository:

 http://github.com/wrobel/horde-release/tree/t/KOLAB

Patches are exported from that branch into the tg directory using:

 tg export --quilt --flatten /CVS/server/patches/horde-webmail/1.2.0/tg

Further details can be found in the README file within the repository
linked above.

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- horde-webmail-1.2.0_kolab_openpkg.patch	8 Jan 2009 21:10:05 -0000	1.22
+++ horde-webmail-1.2.0_kolab_openpkg.patch	5 Feb 2009 23:27:20 -0000	1.23
@@ -1,1599 +1,293 @@
-diff -r 9da66837e009 config/conf.php
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Thu Jan 08 22:06:32 2009 +0100
-@@ -0,0 +1,119 @@
-+<?php
-+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-+// $Horde: horde/config/conf.xml,v 1.74.2.78 2008/09/12 10:01:41 jan Exp $
-+$conf['vhosts'] = false;
-+$conf['debug_level'] = E_ALL;
-+$conf['max_exec_time'] = 0;
-+$conf['compress_pages'] = true;
[...18452 lines suppressed...]
      {
--        $this->_vfsInit();
-+        $result = $this->_vfsInit();
-+        if (is_a($result, 'PEAR_Error')) {
-+            return $result;
-+        }
+-        return ($this->_showunsub ||
+-                ($this->isSubscribed($elt) && !$this->isContainer($elt)) ||
+-                $this->hasChildren($elt));
++        return (!$this->isInvisible($elt) &&
++                ($this->_showunsub || 
++                 ($this->isSubscribed($elt) && !$this->isContainer($elt)) ||
++                 $this->hasChildren($elt)));
+     }
  
-         $dir = TURBA_VFS_PATH . '/' . $this->getValue('__uid');
-         $file = $info['name'];
+     /**
+-- 
+tg: (c56a73f..) t/imp/HideGroupwareFolders (depends on: master)





More information about the commits mailing list