[Oval-commits] r402 - in trunk/ovaldi: . debian/patches

Pavel Vinogradov blaze-guest at alioth.debian.org
Tue Aug 11 19:13:28 UTC 2009


Author: blaze-guest
Date: 2009-08-11 19:13:28 +0000 (Tue, 11 Aug 2009)
New Revision: 402

Removed:
   trunk/ovaldi/docs/
   trunk/ovaldi/doxygen/
   trunk/ovaldi/project/
   trunk/ovaldi/rpm/
   trunk/ovaldi/src/
   trunk/ovaldi/xml/
Modified:
   trunk/ovaldi/debian/patches/debian.makefile.patch
   trunk/ovaldi/debian/patches/debian.xsddir.patch
Log:
Merge changes from branch branches/ovaldi-mergewithupstream

Modified: trunk/ovaldi/debian/patches/debian.makefile.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.makefile.patch	2009-08-11 18:38:32 UTC (rev 401)
+++ trunk/ovaldi/debian/patches/debian.makefile.patch	2009-08-11 19:13:28 UTC (rev 402)
@@ -19,9 +19,9 @@
  endif
  
  # What object code are we expecting?
-@@ -163,11 +164,12 @@
- 	FileHashProbe.obj \
+@@ -164,11 +165,12 @@
  	VariableProbe.obj \
+ 	RunLevelProbe.obj \
  
 +ifneq (${PACKAGE_DPKG}, )
 +	OBJS += DPKGInfoProbe.obj
@@ -34,9 +34,9 @@
  endif
  
  REL_OBJS = \
-@@ -257,11 +259,12 @@
- 	$(BUILDDIR)/FileHashProbe.obj \
+@@ -259,11 +261,12 @@
  	$(BUILDDIR)/VariableProbe.obj \
+ 	$(BUILDDIR)/RunLevelProbe.obj \
  
 +ifneq (${PACKAGE_DPKG}, )
 +	REL_OBJS += $(BUILDDIR)/DPKGInfoProbe.obj

Modified: trunk/ovaldi/debian/patches/debian.xsddir.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.xsddir.patch	2009-08-11 18:38:32 UTC (rev 401)
+++ trunk/ovaldi/debian/patches/debian.xsddir.patch	2009-08-11 19:13:28 UTC (rev 402)
@@ -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
-@@ -86,12 +86,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			  = "";




More information about the Oval-commits mailing list