CVS:dmake-deb/patches p01.diff,NONE,1.1 run-autogen-sh.diff,1.1.1.1,1.2 cflags-no-clobber.diff,1.1.1.1,NONE debversion-from-configure.diff,1.1.1.1,NONE dmakeroot-from-configure.diff,1.1.1.1,NONE intro-update.diff,1.1.1.1,NONE libtarget-fix.diff,1.1,NONE tempnam-isnt-anymore.diff,1.1,NONE

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/dmake-deb/patches
In directory gluck:/tmp/cvs-serv20314/patches

Modified Files:
	run-autogen-sh.diff 
Added Files:
	p01.diff 
Removed Files:
	cflags-no-clobber.diff debversion-from-configure.diff 
	dmakeroot-from-configure.diff intro-update.diff 
	libtarget-fix.diff tempnam-isnt-anymore.diff 
Log Message:
update to dmake 4.3

--- tempnam-isnt-anymore.diff DELETED ---

--- NEW FILE: p01.diff ---
Index: dag.c
===================================================================
RCS file: /cvs/tools/dmake/dag.c,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -u -r1.4 -r1.4.6.1
--- dag.c	8 Sep 2004 16:05:07 -0000	1.4
+++ dag.c	12 Nov 2004 03:45:08 -0000	1.4.6.1
@@ -279,12 +279,13 @@
       Warning( "Macro `%s' redefined after use", name );
 
    if( (value != NIL(char)) && (*value) ) {
-      /* strip out any \<nl> combinations where \ is the current CONTINUATION
-       * char */
 
+      /* Error out on \<nl> combinations where \ is the current
+       * CONTINUATION char. There should be none, they are already
+       * stripped while reading the input file. */
       for( p = value; (p = strchr(p, CONTINUATION_CHAR)) != NIL(char); )
[...1096 lines suppressed...]
 current directory in which make is executing.
+.IP \fBSPACECHAR\fP 1.6i
+Is permanently defined to contain one space character. This is useful
+when using space characters in function macros, e.g. subst, that
+otherwise would get deleted (leading/trailing spaces) or for using
+spaces in function macro parameters.
 .IP \fBTMPFILE\fP 1.6i
 Is set to the name of the most recent temporary file opened by \fBdmake\fP.
 Temporary files are used for text diversions and for group recipe processing.
@@ -1795,6 +1800,10 @@
 supports a full set of functional macros.  One of these, the $(mktmp ...)
 macro, is discussed in detail in the TEXT DIVERSION section and is not
 covered here.
+.PP
+Note that some of these macros take comma separated parameters
+but that these parameters must not contain literal whitespaces. Whitespaces
+in macros used in these parameters are allowed.
 .RS
 .sp
 .IP "$(\fBand\fP \fBmacroterm ...\fP)"

--- cflags-no-clobber.diff DELETED ---

--- libtarget-fix.diff DELETED ---

--- debversion-from-configure.diff DELETED ---

--- intro-update.diff DELETED ---

Index: run-autogen-sh.diff
===================================================================
RCS file: /cvs/debian-openoffice/dmake-deb/patches/run-autogen-sh.diff,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- run-autogen-sh.diff	13 Oct 2003 12:22:42 -0000	1.1.1.1
+++ run-autogen-sh.diff	17 Jan 2005 22:36:44 -0000	1.2
@@ -1,502 +1,751 @@
---- dmake-4.2+cvs20031009.orig/unix/Makefile.in
-+++ dmake-4.2+cvs20031009/unix/Makefile.in
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.7.2 from Makefile.am.
-+# Makefile.in generated by automake 1.7.7 from Makefile.am.
+Index: Makefile.in
+===================================================================
+RCS file: /cvs/tools/dmake/Makefile.in,v
+retrieving revision 1.10.18.1
+diff -u -u -r1.10.18.1 Makefile.in
+--- Makefile.in	12 Oct 2004 18:47:45 -0000	1.10.18.1
[...9895 lines suppressed...]
+ 	clean-noinstLIBRARIES ctags distclean distclean-compile \
+-	distclean-generic distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-info-am
++	distclean-generic distclean-tags distdir dvi dvi-am info \
++	info-am install install-am install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
++	ps ps-am tags uninstall uninstall-am uninstall-info-am
  
- mostlyclean: mostlyclean-recursive
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

--- dmakeroot-from-configure.diff DELETED ---