gunnar: server/patches/horde-webmail/1.2.0 Makefile, 1.1, 1.2 README, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Makefile README 
Log Message:
Provide a merges directory for additional patches not yet available from github.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	5 Feb 2009 23:27:20 -0000	1.1
+++ Makefile	20 Feb 2009 10:19:09 -0000	1.2
@@ -6,5 +6,9 @@
 	do                                                \
 	  cat tg/$$PATCH >> $(HORDE).1;                   \
 	done
+	for PATCH in `cat merges/series`;                 \
+	do                                                \
+	  cat merges/$$PATCH >> $(HORDE).1;               \
+	done
 	cp $(HORDE).1 $(HORDE)
 	rm $(HORDE).1

Index: README
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README	5 Feb 2009 23:27:20 -0000	1.1
+++ README	20 Feb 2009 10:19:09 -0000	1.2
@@ -9,3 +9,16 @@
 
 Further details can be found in the README file within the repository
 linked above.
+
+HOW TO ADD PATCHES
+------------------
+
+As the "tg" directory is created automatically you should add new
+patches into the "merges" directory. This way they won't get
+overwritten. In addition a merge issue should be opened in the Kolab
+issue tracker to indicate that the patch still needs to be merged
+upstream.
+
+If possible you should provide a unit test for the changes introduced
+in the patch. This will speed up upstream integration.
+