[Oval-commits] r401 - branches/ovaldi-mergewithupstream/debian/patches

[Pavel Vinogradov]

Author: blaze-guest
Date: 2009-08-11 18:38:32 +0000 (Tue, 11 Aug 2009)
New Revision: 401

Modified:
   branches/ovaldi-mergewithupstream/debian/patches/debian.xsddir.patch
Log:
Update xsddir patch for new ovaldi release

Modified: branches/ovaldi-mergewithupstream/debian/patches/debian.xsddir.patch
===================================================================
--- branches/ovaldi-mergewithupstream/debian/patches/debian.xsddir.patch	2009-08-11 18:14:48 UTC (rev 400)
+++ branches/ovaldi-mergewithupstream/debian/patches/debian.xsddir.patch	2009-08-11 18:38:32 UTC (rev 401)
@@ -1,18 +1,12 @@
-diff -urN ovaldi.mitre/src/Common.cpp ovaldi.debian/src/Common.cpp
---- ovaldi.mitre/src/Common.cpp	2008-10-11 02:36:46.000000000 +0500
-+++ ovaldi.debian/src/Common.cpp	2009-05-02 16:43:16.000000000 +0500
-@@ -52,12 +52,12 @@
- string	Common::startTime			  = "";
- 
- bool    Common::noXsl                 = false;
--string  Common::xslFile			      = "results_to_html.xsl";
-+string  Common::xslFile			      = "/usr/share/ovaldi/xml/results_to_html.xsl";
- string  Common::xslOutputFile		  = "results.html";
- 
- 
- bool    Common::doDefinitionSchematron   = false;
--string  Common::definitionSchematronPath = "oval-definitions-schematron.xsl";
-+string  Common::definitionSchematronPath = "/usr/share/ovaldi/xml/oval-definitions-schematron.xsl";
- 
- bool    Common::generateMD5			  = false;
- bool    Common::useProvidedData		  = false;
+diff -urN ovaldi-5.5.23-orig/src/Common.cpp ovaldi-5.5.23-debian/src/Common.cpp
+--- ovaldi-5.5.23-orig/src/Common.cpp	2009-06-18 06:54:39.000000000 +0500
++++ ovaldi-5.5.23-debian/src/Common.cpp	2009-08-11 23:36:06.000000000 +0500
+@@ -45,7 +45,7 @@
+ // Initialize static variables.
+ string	Common::dataFile			  = "system-characteristics.xml";
+ string	Common::xmlfile				  = "definitions.xml";
+-string	Common::schemapath			  = "xml";
++string	Common::schemapath			  = "/usr/share/ovaldi/xml";
+ string	Common::outputFilename	      = "results.xml";
+ string	Common::externalVariablesFile = "external-variables.xml";
+ string	Common::xmlfileMD5			  = "";