[xml/sgml-commit] r591 - in packages/libxslt: . trunk/debian trunk/xsltproc

[Mike Hommey]

Author: glandium
Date: 2006-10-04 15:21:43 +0000 (Wed, 04 Oct 2006)
New Revision: 591

Modified:
   packages/libxslt/
   packages/libxslt/trunk/debian/changelog
   packages/libxslt/trunk/xsltproc/xsltproc.c
Log:
 r1137 at namakemono:  mh | 2006-10-04 17:06:59 +0200
 * xsltproc/xsltproc.c: Reverted patch to allow xsltproc to do XInclude
   processing. Closes: #389694. Reopens: #383408.



Property changes on: packages/libxslt
___________________________________________________________________
Name: svk:merge
   - 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1113
   + 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1137

Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog	2006-10-04 15:19:17 UTC (rev 590)
+++ packages/libxslt/trunk/debian/changelog	2006-10-04 15:21:43 UTC (rev 591)
@@ -1,3 +1,10 @@
+libxslt (1.1.17-5) unstable; urgency=low
+
+  * xsltproc/xsltproc.c: Reverted patch to allow xsltproc to do XInclude
+    processing. Closes: #389694. Reopens: #383408.
+
+ -- Mike Hommey <glandium at debian.org>  Wed,  4 Oct 2006 16:57:08 +0200
+
 libxslt (1.1.17-4) unstable; urgency=low
 
   * xsltproc/xsltproc.c: Return an error code 11 if there was an error while

Modified: packages/libxslt/trunk/xsltproc/xsltproc.c
===================================================================
--- packages/libxslt/trunk/xsltproc/xsltproc.c	2006-10-04 15:19:17 UTC (rev 590)
+++ packages/libxslt/trunk/xsltproc/xsltproc.c	2006-10-04 15:21:43 UTC (rev 591)
@@ -780,18 +780,6 @@
 	    style = xmlReadFile((const char *) argv[i], NULL, options);
             if (timing) 
 		endTimer("Parsing stylesheet %s", argv[i]);
-            if (style != NULL) {
-		if (timing)
-		    startTimer();
-#if LIBXML_VERSION >= 20603
-		xmlXIncludeProcessFlags(style, XSLT_PARSE_OPTIONS);
-#else
-		xmlXIncludeProcess(style);
-#endif
-		if (timing) {
-		    endTimer("XInclude processing %s", argv[i]);
-		}
-	    }
 	    if (style == NULL) {
 		fprintf(stderr,  "cannot parse %s\n", argv[i]);
 		cur = NULL;