[Oval-commits] r437 - trunk/ovaldi/debian/patches

[Pavel Vinogradov]

Author: blaze-guest
Date: 2010-08-08 18:10:22 +0000 (Sun, 08 Aug 2010)
New Revision: 437

Modified:
   trunk/ovaldi/debian/patches/debian.manpage.patch
   trunk/ovaldi/debian/patches/debian.xsddir.patch
Log:
Update Debian patches for 5.7.2 release

Modified: trunk/ovaldi/debian/patches/debian.manpage.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.manpage.patch	2010-08-08 17:41:09 UTC (rev 436)
+++ trunk/ovaldi/debian/patches/debian.manpage.patch	2010-08-08 18:10:22 UTC (rev 437)
@@ -26,7 +26,7 @@
  .TP
  .B \-a dir name
  Specifies the pathname of the directory that contains the OVAL Language Schema
-@@ -74,7 +75,7 @@
+@@ -79,7 +80,7 @@
  Specifies the pathname of the file to which analysis results are to be saved.
  This data is stored according to the format defined by the OVAL Results Schema.
  If none is specified than the OVAL Interpreter will default to "results.xml" in
@@ -35,7 +35,7 @@
  .TP
  .B \-s
  If set do not apply the XSL to the OVAL Results xml.
-@@ -82,12 +83,12 @@
+@@ -87,12 +88,12 @@
  .B \-t filename
  Specifies the pathname of the XSL file which should be used to transform the 
  OVAL Results document. If none is specified then the OVAL Interpreter will 
@@ -50,7 +50,7 @@
  .TP
  .B \-l <integer>
  Logging level.  Log messages at the specified level. 
-@@ -107,15 +108,17 @@
+@@ -112,15 +113,17 @@
  from the OVAL Web site.
  .SH EXAMPLES
  .TP

Modified: trunk/ovaldi/debian/patches/debian.xsddir.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.xsddir.patch	2010-08-08 17:41:09 UTC (rev 436)
+++ trunk/ovaldi/debian/patches/debian.xsddir.patch	2010-08-08 18:10:22 UTC (rev 437)
@@ -2,19 +2,19 @@
 #  By default ovadi search current directory for required xsd files, 
 #  but in Debian package this files was moved to /usr/share/ovaldi/xml dir.
 #  .
-#  Patch was rewrited for 5.5.25 due to chenges in xsd handling.
+#  Patch was rewrited for 5.7.2 due to chenges in xsd handling.
 #Forwarded: no
 #Author: Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
-#Last-Update: 2009-09-16
-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			  = "";
+#Last-Update: 2010-08-08
+diff -urN ovaldi-5.7.2-orig/src/Common.cpp ovaldi-5.7.2-debian/src/Common.cpp
+--- ovaldi-5.7.2-orig/src/Common.cpp	2010-08-08 22:06:34.000000000 +0400
++++ ovaldi-5.7.2-debian/src/Common.cpp	2010-08-08 22:06:53.000000000 +0400
+@@ -50,7 +50,7 @@
+ #ifdef WIN32
+ string	Common::schemapath			  = "xml";
+ #else
+-string	Common::schemapath			  = "/usr/share/ovaldi";
++string	Common::schemapath			  = "/usr/share/ovaldi/xml";
+ #endif
+ string	Common::outputFilename	      = "results.xml";
+ string	Common::externalVariablesFile = "external-variables.xml";