[Oval-commits] r319 - trunk/ovalint/debian/patches

[Pavel Vinogradov]

Author: blaze-guest
Date: 2008-01-23 20:15:59 +0000 (Wed, 23 Jan 2008)
New Revision: 319

Removed:
   trunk/ovalint/debian/patches/oval.probefactory.patch
Modified:
   trunk/ovalint/debian/patches/series
Log:
Remove probefactory patch. Included upstream

Deleted: trunk/ovalint/debian/patches/oval.probefactory.patch
===================================================================
--- trunk/ovalint/debian/patches/oval.probefactory.patch	2008-01-23 20:11:57 UTC (rev 318)
+++ trunk/ovalint/debian/patches/oval.probefactory.patch	2008-01-23 20:15:59 UTC (rev 319)
@@ -1,52 +0,0 @@
-diff -ur oval-def/src/linux/ProbeFactory.cpp oval-debian/src/linux/ProbeFactory.cpp
---- oval-def/src/linux/ProbeFactory.cpp	2007-08-07 22:52:56.000000000 +0200
-+++ oval-debian/src/linux/ProbeFactory.cpp	2007-07-25 10:14:21.000000000 +0200
-@@ -81,12 +81,16 @@
- 		probe = UnameProbe::Instance();
- 
- // here are the objects defined in the linux schema
-+#ifdef DEBIAN
- 	} else if(objectName.compare("dpkginfo_object") == 0) {
- 		probe = DPKGInfoProbe::Instance();
-+#endif
- 	} else if(objectName.compare("inetlisteningservers_object") == 0) {
- 		probe = InetListeningServersProbe::Instance();
-+#ifdef REDHAT
- 	} else if(objectName.compare("rpminfo_object") == 0) {
- 		probe = RPMInfoProbe::Instance();
-+#endif
- 	}
- 
- 	return probe;
-@@ -107,11 +111,15 @@
- 	probe = UnameProbe::Instance();
- 	delete probe;
- 
-+#ifdef REDHAT
- 	probe = RPMInfoProbe::Instance();
- 	delete probe;
-+#endif
- 	
-+#ifdef DEBIAN
- 	probe = DPKGInfoProbe::Instance();
- 	delete probe;
-+#endif
- 	
- 	probe = ProcessProbe::Instance();
- 	delete probe;
-diff -ur oval-def/src/linux/ProbeFactory.h oval-debian/src/linux/ProbeFactory.h
---- oval-def/src/linux/ProbeFactory.h	2007-08-07 22:52:56.000000000 +0200
-+++ oval-debian/src/linux/ProbeFactory.h	2007-07-16 20:23:10.000000000 +0200
-@@ -46,8 +46,12 @@
- #include "FileHashProbe.h"
- #include "FamilyProbe.h"
- #include "UnameProbe.h"
-+#ifdef REDHAT
- #include "RPMInfoProbe.h"
-+#endif
-+#ifdef DEBIAN
- #include "DPKGInfoProbe.h"
-+#endif
- #include "InetListeningServersProbe.h"
- #include "ProcessProbe.h"
- //#include "ShadowProbe.h"

Modified: trunk/ovalint/debian/patches/series
===================================================================
--- trunk/ovalint/debian/patches/series	2008-01-23 20:11:57 UTC (rev 318)
+++ trunk/ovalint/debian/patches/series	2008-01-23 20:15:59 UTC (rev 319)
@@ -1,6 +1,5 @@
 oval.misc.patch
 oval.textfilecontent.patch
 oval.dpkg.patch
-oval.probefactory.patch
 debian.manpage.patch
 debian.xsddir.patch