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

Pavel Vinogradov blaze-guest at alioth.debian.org
Sun Jan 10 06:06:00 UTC 2010


Author: blaze-guest
Date: 2010-01-10 06:05:59 +0000 (Sun, 10 Jan 2010)
New Revision: 427

Removed:
   trunk/ovaldi/debian/patches/debian.manpage.hyphen.patch
   trunk/ovaldi/debian/patches/debian.spelling.patch
Modified:
   trunk/ovaldi/debian/changelog
   trunk/ovaldi/debian/patches/series
Log:
Delete patches applien in upstream

Modified: trunk/ovaldi/debian/changelog
===================================================================
--- trunk/ovaldi/debian/changelog	2010-01-10 05:56:08 UTC (rev 426)
+++ trunk/ovaldi/debian/changelog	2010-01-10 06:05:59 UTC (rev 427)
@@ -1,6 +1,8 @@
 oval-interpreter (5.6.4-1) unstable; urgency=low
 
   * New upstream release
+  * Delete debian.manpage.hyphen, debian.spelling patches (already applied 
+  in upstream) 
 
  -- Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>  Sun, 10 Jan 2010 00:43:38 +0400
 

Deleted: trunk/ovaldi/debian/patches/debian.manpage.hyphen.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.manpage.hyphen.patch	2010-01-10 05:56:08 UTC (rev 426)
+++ trunk/ovaldi/debian/patches/debian.manpage.hyphen.patch	2010-01-10 06:05:59 UTC (rev 427)
@@ -1,17 +0,0 @@
-#Description: Fix lintian warning hyphen-used-as-minus-sign
-#  Patch already applied in upstream and will included in next release
-#Forwarded: https://sourceforge.net/tracker/?func=detail&atid=1033794&aid=2859068&group_id=215469
-#Author: Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
-#Last-Update: 2009-09-16
-diff -urN ovaldi-2.6.1-original/docs/ovaldi.1 ovaldi-2.6.1-debian/docs/ovaldi.1
---- ovaldi-2.6.1-original/docs/ovaldi.1	2009-09-14 08:22:18.000000000 +0500
-+++ ovaldi-2.6.1-debian/docs/ovaldi.1	2009-09-15 09:01:17.000000000 +0500
-@@ -91,7 +91,7 @@
- .TP
- .B \-z
- Calculates and prints to the screen the MD5 checksum of the current data
--file (definitions.xml by default, or as specified by the -o option).  This
-+file (definitions.xml by default, or as specified by the \-o option).  This
- can be used to manually compare the current file with the trusted checksum
- available from the OVAL Web site.
- .SH EXAMPLES

Deleted: trunk/ovaldi/debian/patches/debian.spelling.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.spelling.patch	2010-01-10 05:56:08 UTC (rev 426)
+++ trunk/ovaldi/debian/patches/debian.spelling.patch	2010-01-10 06:05:59 UTC (rev 427)
@@ -1,374 +0,0 @@
-#Description: Fix lintian warning spelling-error-in-binary
-#  Fix spelling errors in source header files.
-# 
-#  Patch already applied in upstream and will included in next release
-#Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=2858387&group_id=215469&atid=1033794
-#Author: Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
-#Last-Update: 2009-09-16
-diff -urN ovaldi-2.6.1-original/src/AbsProbe.h ovaldi-2.6.1-debian/src/AbsProbe.h
---- ovaldi-2.6.1-original/src/AbsProbe.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/AbsProbe.h	2009-09-14 08:44:42.000000000 +0500
-@@ -120,7 +120,7 @@
- 		Return true if the specified value matches the specified pattern.
- 		This function uses the isRegex parameter to determine how to apply the pattern.
- 		@param pattern a string that specifies the pattern to compare against.
--		@param value a string that specifed that value to compare against.
-+		@param value a string that specified that value to compare against.
- 		@param isRegex a bool that dictates how to apply the pattern. If true apply the pattern as a regular expression otherwise use a string compare for not equals. 
- 		@return The result of the comparison betweent eh two string values.
- 	*/
-diff -urN ovaldi-2.6.1-original/src/AbsVariable.h ovaldi-2.6.1-debian/src/AbsVariable.h
---- ovaldi-2.6.1-original/src/AbsVariable.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/AbsVariable.h	2009-09-14 08:43:48.000000000 +0500
-@@ -116,7 +116,7 @@
- 	/** Create a string listing of all messages. */
- 	string ListMessages();
- 
--	/** Search the cache of variables for the specifed variable. 
-+	/** Search the cache of variables for the specified variable. 
- 		return NULL if not found.
- 	*/
- 	static AbsVariable* SearchCache(string id);
-diff -urN ovaldi-2.6.1-original/src/Common.cpp ovaldi-2.6.1-debian/src/Common.cpp
---- ovaldi-2.6.1-original/src/Common.cpp	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/Common.cpp	2009-09-14 08:44:30.000000000 +0500
-@@ -310,10 +310,10 @@
- 	REGEX* regex = new REGEX();
- 	if(!regex->IsMatch(Common::DEFINITION_ID_LIST.c_str(), definitionIdsString.c_str())) {
- 		delete regex;
--		throw Exception("Error: Invalid parameter format. Expected a comma seperated list of definition ids. No spaces are allowed.");
-+		throw Exception("Error: Invalid parameter format. Expected a comma separated list of definition ids. No spaces are allowed.");
- 	}
- 
--	// break the comma seperated string into definition ids.
-+	// break the comma separated string into definition ids.
- 	StringVector* definitionIds = new StringVector();
- 	const char delm = ',';
- 
-@@ -341,7 +341,7 @@
- 				}	
- 				delete definitionIds;
- 				delete regex;
--				throw Exception("Error: Invalid parameter format. Expected a comma seperated list of definition ids. No spaces are allowed. Found invalid definition id");
-+				throw Exception("Error: Invalid parameter format. Expected a comma separated list of definition ids. No spaces are allowed. Found invalid definition id");
- 			}
- 
- 			// add it to the vector
-diff -urN ovaldi-2.6.1-original/src/ComponentFactory.h ovaldi-2.6.1-debian/src/ComponentFactory.h
---- ovaldi-2.6.1-original/src/ComponentFactory.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/ComponentFactory.h	2009-09-14 08:43:17.000000000 +0500
-@@ -55,7 +55,7 @@
- class ComponentFactory {
- 
- public:
--	/** Return the appropriate component based on the specifed component element.*/
-+	/** Return the appropriate component based on the specified component element.*/
- 	static AbsComponent* GetComponent(DOMElement* componentElm);
- };
- 
-diff -urN ovaldi-2.6.1-original/src/Definition.h ovaldi-2.6.1-debian/src/Definition.h
---- ovaldi-2.6.1-original/src/Definition.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/Definition.h	2009-09-14 08:44:45.000000000 +0500
-@@ -139,7 +139,7 @@
- 	void SetAnalyzed(bool analyzed);
- 
- 	/** 
--		Search the cache of definitions for the specifed definition. 
-+		Search the cache of definitions for the specified definition. 
- 		@return Returns the cached Definition or NULL if not found.
- 	*/
- 	static Definition* SearchCache(string id);
-diff -urN ovaldi-2.6.1-original/src/DocumentManager.cpp ovaldi-2.6.1-debian/src/DocumentManager.cpp
---- ovaldi-2.6.1-original/src/DocumentManager.cpp	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/DocumentManager.cpp	2009-09-14 08:44:22.000000000 +0500
-@@ -71,8 +71,8 @@
- 				throw Exception("An unknown error occured while parsing external variable file: " + Common::GetExternalVariableFile());
- 			}
- 		} else {
--			Log::Debug("The external variable file does not exist! The definitions being evaluated rely on external variables for proper evaluation. Values for external variables must be specifed in an external variables file. " + varFile);
--			throw Exception("The external variable file does not exist! The definitions being evaluated rely on external variables for proper evaluation. Values for external variables must be specifed in an external variables file. " + varFile);
-+			Log::Debug("The external variable file does not exist! The definitions being evaluated rely on external variables for proper evaluation. Values for external variables must be specified in an external variables file. " + varFile);
-+			throw Exception("The external variable file does not exist! The definitions being evaluated rely on external variables for proper evaluation. Values for external variables must be specified in an external variables file. " + varFile);
- 		}
- 	}
- 
-diff -urN ovaldi-2.6.1-original/src/Filter.h ovaldi-2.6.1-debian/src/Filter.h
---- ovaldi-2.6.1-original/src/Filter.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/Filter.h	2009-09-14 08:44:13.000000000 +0500
-@@ -80,7 +80,7 @@
- 	/** Cache the specified filter. */
- 	static void Cache(Filter* filter);
- 
--	/** Search the cache of Filters for the specifed filter. 
-+	/** Search the cache of Filters for the specified filter. 
- 		@return Returns a filter object with the specified id or NULL if not found
- 	*/
- 	static Filter* SearchCache(string id);
-diff -urN ovaldi-2.6.1-original/src/Item.h ovaldi-2.6.1-debian/src/Item.h
---- ovaldi-2.6.1-original/src/Item.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/Item.h	2009-09-14 08:44:18.000000000 +0500
-@@ -228,7 +228,7 @@
- 	/** Cache the specified item. */
- 	static void Cache(Item* item);
- 
--	/** Search the cache of Items for the specifed Item.
-+	/** Search the cache of Items for the specified Item.
-         @param id The id of the item to retrieve from the cache.
- 		@return Returns the item with the specified id or NULL if not found.
- 	*/
-diff -urN ovaldi-2.6.1-original/src/linux/ProbeFactory.h ovaldi-2.6.1-debian/src/linux/ProbeFactory.h
---- ovaldi-2.6.1-original/src/linux/ProbeFactory.h	2009-09-14 08:22:12.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/linux/ProbeFactory.h	2009-09-14 08:44:27.000000000 +0500
-@@ -82,9 +82,9 @@
- 
- public:
- 	/**
--		Factory method. Based on the specifed object name return the appropriate probe.
-+		Factory method. Based on the specified object name return the appropriate probe.
- 		@param objectName a string taht corresponds to the name of an object in the oval definition schema.
--		@return The probe for the specifed object or NULL.
-+		@return The probe for the specified object or NULL.
- 	*/
- 	static AbsProbe* GetProbe(string objectName);
- 
-diff -urN ovaldi-2.6.1-original/src/Object.h ovaldi-2.6.1-debian/src/Object.h
---- ovaldi-2.6.1-original/src/Object.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/Object.h	2009-09-14 08:43:41.000000000 +0500
-@@ -111,7 +111,7 @@
-     /** Cache the specified Object. */
- 	static void Cache(Object* object);
- 
--	/** Search the cache of Objects for the specifed Object. 
-+	/** Search the cache of Objects for the specified Object. 
- 		@return Returns the object with the specified id or NULL if not found.
- 	*/
- 	static Object* SearchCache(string id);
-diff -urN ovaldi-2.6.1-original/src/probes/linux/DPKGInfoProbe.h ovaldi-2.6.1-debian/src/probes/linux/DPKGInfoProbe.h
---- ovaldi-2.6.1-original/src/probes/linux/DPKGInfoProbe.h	2009-09-14 08:22:01.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/probes/linux/DPKGInfoProbe.h	2009-09-14 08:43:54.000000000 +0500
-@@ -81,7 +81,7 @@
- 	/**
- 		Get all deb names on the system that match the specified pattern.
- 		@param pattern a string used that deb names are compared against.
--		@param isRegex a bool that is indicates how system deb names should be compared against the specifed pattern
-+		@param isRegex a bool that is indicates how system deb names should be compared against the specified pattern
- 		@return The set of matching names.
- 	*/
- 	StringVector* GetMatchingDPKGNames(string pattern, bool isRegex);
-@@ -89,7 +89,7 @@
- 	/**
- 		Return true if the specifeid deb exists on the system.
- 		@param name a string that hold the name of the deb to check for.
--		@result The result of checking for the specifed deb on the system.
-+		@result The result of checking for the specified deb on the system.
- 	*/
- 	bool DPKGExists(string name);
- 
-diff -urN ovaldi-2.6.1-original/src/probes/linux/InetListeningServersProbe.h ovaldi-2.6.1-debian/src/probes/linux/InetListeningServersProbe.h
---- ovaldi-2.6.1-original/src/probes/linux/InetListeningServersProbe.h	2009-09-14 08:22:01.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/probes/linux/InetListeningServersProbe.h	2009-09-14 08:43:58.000000000 +0500
-@@ -144,7 +144,7 @@
- 	/**
- 		Get all protocols on the system that match the specified pattern.
- 		@param pattern a string used that protocols are compared against.
--		@param isRegex a bool that is indicates how system protocols should be compared against the specifed pattern
-+		@param isRegex a bool that is indicates how system protocols should be compared against the specified pattern
- 		@return The set of matching protocols.
- 	*/
- 	StringVector* GetMatchingProtocols(string pattern, bool isRegex);
-diff -urN ovaldi-2.6.1-original/src/probes/linux/RPMInfoProbe.h ovaldi-2.6.1-debian/src/probes/linux/RPMInfoProbe.h
---- ovaldi-2.6.1-original/src/probes/linux/RPMInfoProbe.h	2009-09-14 08:22:01.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/probes/linux/RPMInfoProbe.h	2009-09-14 08:44:02.000000000 +0500
-@@ -82,7 +82,7 @@
- 	/**
- 		Get all rpm names on the system that match the specified pattern.
- 		@param pattern a string used that rpm names are compared against.
--		@param isRegex a bool that is indicates how system rpm names should be compared against the specifed pattern
-+		@param isRegex a bool that is indicates how system rpm names should be compared against the specified pattern
- 		@return The set of matching names.
- 	*/
- 	StringVector* GetMatchingRPMNames(string pattern, bool isRegex);
-@@ -90,7 +90,7 @@
- 	/**
- 		Return true if the specifeid rpm exists on the system.
- 		@param name a string that hold the name of the rpm to check for.
--		@result The result of checking for the specifed rpm on the system.
-+		@result The result of checking for the specified rpm on the system.
- 	*/
- 	bool RPMExists(string name);
- 
-diff -urN ovaldi-2.6.1-original/src/probes/unix/ProcessProbe.h ovaldi-2.6.1-debian/src/probes/unix/ProcessProbe.h
---- ovaldi-2.6.1-original/src/probes/unix/ProcessProbe.h	2009-09-14 08:22:01.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/probes/unix/ProcessProbe.h	2009-09-14 08:44:06.000000000 +0500
-@@ -82,7 +82,7 @@
- 	/**
- 		Get all commands on the system that match the specified pattern.
- 		@param pattern a string used that commands are compared against.
--		@param isRegex a bool that is indicates how system commands should be compared against the specifed pattern
-+		@param isRegex a bool that is indicates how system commands should be compared against the specified pattern
- 		@return The set of matching commands.
- 	*/
- 	StringVector* GetMatchingCommands(string pattern, bool isRegex);
-@@ -90,7 +90,7 @@
- 	/**
- 		Return true if the specifeid command exists on the system.
- 		@param command a string that hold the name of the rpm to check for.
--		@result The result of checking for the specifed rpm on the system.
-+		@result The result of checking for the specified rpm on the system.
- 	*/
- 	bool CommandExists(string command);
- 
-diff -urN ovaldi-2.6.1-original/src/REGEX.cpp ovaldi-2.6.1-debian/src/REGEX.cpp
---- ovaldi-2.6.1-original/src/REGEX.cpp	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/REGEX.cpp	2009-09-14 08:44:24.000000000 +0500
-@@ -305,7 +305,7 @@
- 	//	Check for compile errors
- 	if(compiledPattern == NULL)
- 	{
--		string errMsg = "Error: Failed to compile the specifed regular expression pattern.\n\tPattern: ";
-+		string errMsg = "Error: Failed to compile the specified regular expression pattern.\n\tPattern: ";
- 		errMsg.append(patternIn);
- 		errMsg.append("\n\tOffset: ");
- 		
-@@ -374,7 +374,7 @@
- 	//	Check for compile errors
- 	if(compiledPattern == NULL) {
- 
--		string errMsg = "Error: Failed to compile the specifed regular expression pattern.\n\tPattern: ";
-+		string errMsg = "Error: Failed to compile the specified regular expression pattern.\n\tPattern: ";
- 		errMsg.append(patternIn);
- 		errMsg.append("\n\tOffset: ");
- 		
-diff -urN ovaldi-2.6.1-original/src/REGEX.h ovaldi-2.6.1-debian/src/REGEX.h
---- ovaldi-2.6.1-original/src/REGEX.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/REGEX.h	2009-09-14 08:44:39.000000000 +0500
-@@ -108,7 +108,7 @@
- 	*/
- 	void GetConstantPortion(string patternIn, string delimIn, string *patternOut, string *constOut);
- 	
--	/**	Return true if the searchString matches the specifed pattern.
-+	/**	Return true if the searchString matches the specified pattern.
- 
- 		Regular expression support is provided by the REGEX library package,
- 		which is open source software, written by Philip Hazel, and copyright
-@@ -118,7 +118,7 @@
- 	*/
- 	bool IsMatch(const char *patternIn, const char *searchStringIn);
- 
--	/**	Return true if the searchString matches the specifed pattern including the set of matched substrings.
-+	/**	Return true if the searchString matches the specified pattern including the set of matched substrings.
- 		If the input regex identifies any subexpressions the matching substrings for those subexpressions
- 		are pushed onto the substrings input parameter.
- 
-diff -urN ovaldi-2.6.1-original/src/solaris/ProbeFactory.h ovaldi-2.6.1-debian/src/solaris/ProbeFactory.h
---- ovaldi-2.6.1-original/src/solaris/ProbeFactory.h	2009-09-14 08:22:09.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/solaris/ProbeFactory.h	2009-09-14 08:44:15.000000000 +0500
-@@ -75,9 +75,9 @@
- 
- public:
- 	/**
--		Factory method. Based on the specifed object name return the appropriate probe.
-+		Factory method. Based on the specified object name return the appropriate probe.
- 		@param objectName a string taht corresponds to the name of an object in the oval definition schema.
--		@return The probe for the specifed object or NULL.
-+		@return The probe for the specified object or NULL.
- 	*/
- 	static AbsProbe* GetProbe(string objectName);
- 
-diff -urN ovaldi-2.6.1-original/src/State.h ovaldi-2.6.1-debian/src/State.h
---- ovaldi-2.6.1-original/src/State.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/State.h	2009-09-14 08:44:10.000000000 +0500
-@@ -64,7 +64,7 @@
- 	/** Parse the provided state element from a oval definition file into a State object. */
- 	void Parse(DOMElement* stateElm);
- 
--	/** Sarch the cache of States for the specifed State. 
-+	/** Sarch the cache of States for the specified State. 
- 		Return NULL if not found
- 	*/
- 	static State* SearchCache(string id);
-diff -urN ovaldi-2.6.1-original/src/Test.h ovaldi-2.6.1-debian/src/Test.h
---- ovaldi-2.6.1-original/src/Test.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/Test.h	2009-09-14 08:43:37.000000000 +0500
-@@ -173,7 +173,7 @@
- 	TestedItemVector* GetTestedItems();
- 	/** Set the testedItems field's value. */
- 	void SetTestedItems(TestedItemVector* testedItems);
--	/** Add the specifed TestedItem to the set of tested Items. */
-+	/** Add the specified TestedItem to the set of tested Items. */
- 	void AppendTestedItem(TestedItem* testedItem);
- 
- 	/** Return the testedVariables field's value **/
-@@ -212,7 +212,7 @@
- 	*/
- 	void Parse(DOMElement* testElm);
- 
--	/** Search the cache of Tests for the specifed Test. 
-+	/** Search the cache of Tests for the specified Test. 
- 	    Return NULL if not found 
- 	*/
- 	static Test* SearchCache(string id);
-diff -urN ovaldi-2.6.1-original/src/windows/ProbeFactory.h ovaldi-2.6.1-debian/src/windows/ProbeFactory.h
---- ovaldi-2.6.1-original/src/windows/ProbeFactory.h	2009-09-14 08:21:59.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/windows/ProbeFactory.h	2009-09-14 08:43:22.000000000 +0500
-@@ -94,9 +94,9 @@
- 
- public:
- 	/** \callgraph
--		Factory method. Based on the specifed object name return the appropriate probe.
-+		Factory method. Based on the specified object name return the appropriate probe.
- 		@param objectName a string taht corresponds to the name of an object in the oval definition schema.
--		@return The probe for the specifed object or NULL.
-+		@return The probe for the specified object or NULL.
- 	*/
- 	static AbsProbe* GetProbe(string objectName);
- 
-diff -urN ovaldi-2.6.1-original/src/windows/RegistryFinder.h ovaldi-2.6.1-debian/src/windows/RegistryFinder.h
---- ovaldi-2.6.1-original/src/windows/RegistryFinder.h	2009-09-14 08:21:59.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/windows/RegistryFinder.h	2009-09-14 08:43:28.000000000 +0500
-@@ -114,7 +114,7 @@
-          *  @param keyEntity A ObjectEntity that represents the key entity in an Object as defined in the OVAL Definition Schema.
-          *  @param nameEntity A ObjectEntity that represents the name entity in an Object as defined in the OVAL Definition Schema.
-          *  @param behaviors A BehaviorVector that represents the behaviors that should be applied to the registry keys.
--         *  @return A RegKeyVector that contains all of the registry key items that match the specifed criteria.
-+         *  @return A RegKeyVector that contains all of the registry key items that match the specified criteria.
-         */
-         RegKeyVector* SearchRegistries ( ObjectEntity* hiveEntity, ObjectEntity* keyEntity, ObjectEntity* nameEntity, BehaviorVector* behaviors );
- 
-diff -urN ovaldi-2.6.1-original/src/windows/WindowsCommon.h ovaldi-2.6.1-debian/src/windows/WindowsCommon.h
---- ovaldi-2.6.1-original/src/windows/WindowsCommon.h	2009-09-14 08:21:59.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/windows/WindowsCommon.h	2009-09-14 08:43:33.000000000 +0500
-@@ -274,10 +274,10 @@
- 	/** Return the access mask for the Windows object for the specified SID. */
- 	static void GetEffectiveRightsForWindowsObject(SE_OBJECT_TYPE objectType, PSID pSid, string* objectNameStr, PACCESS_MASK pAccessRights);
- 
--	/** Return the access mask for the Windows object for the specifed SID. */
-+	/** Return the access mask for the Windows object for the specified SID. */
- 	static void GetEffectiveRightsForWindowsObjectAcl(SE_OBJECT_TYPE objectType, PSID pSid, string* objectNameStr, PACCESS_MASK pAccessRights);
- 
--	/** Return the access mask for the Windows object for the specifed SID. */
-+	/** Return the access mask for the Windows object for the specified SID. */
- 	static void GetEffectiveRightsForWindowsObjectAuthz(SE_OBJECT_TYPE objectType, PSID pSid, string* objectNameStr, PACCESS_MASK pAccessRights);
- 
- 	/** Get the string representation of a SE_OBJECT_TYPE.
-diff -urN ovaldi-2.6.1-original/src/XmlCommon.h ovaldi-2.6.1-debian/src/XmlCommon.h
---- ovaldi-2.6.1-original/src/XmlCommon.h	2009-09-14 08:22:17.000000000 +0500
-+++ ovaldi-2.6.1-debian/src/XmlCommon.h	2009-09-14 08:43:46.000000000 +0500
-@@ -136,7 +136,7 @@
- 	static void RemovetAttributeByName(DOMElement*, string);
- 	/** Convert the XMLCh* to a string and handle memory allocation. */
- 	static string ToString(const XMLCh*);
--	/** Add the specifed namespace to the root element in the specified document. */
-+	/** Add the specified namespace to the root element in the specified document. */
- 	static void AddXmlns(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, string newXmlnsUri, string newXmlnsAlias = "");
- 	/** Add the specified schema location to the document. 
- 		Ensures that schema locations are unique. 
-@@ -152,7 +152,7 @@
- 	*/
- 	static void CopyNamespaces(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument* source, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument* dest); 
- 	
--	/** Return the namespace of the specifed element or null if no namespace is present. */
-+	/** Return the namespace of the specified element or null if no namespace is present. */
- 	static string GetNamespace(DOMElement*);
- };
- 

Modified: trunk/ovaldi/debian/patches/series
===================================================================
--- trunk/ovaldi/debian/patches/series	2010-01-10 05:56:08 UTC (rev 426)
+++ trunk/ovaldi/debian/patches/series	2010-01-10 06:05:59 UTC (rev 427)
@@ -1,5 +1,3 @@
 debian.manpage.patch
-debian.manpage.hyphen.patch
 debian.xsddir.patch
 debian.makefile.patch
-debian.spelling.patch
\ No newline at end of file




More information about the Oval-commits mailing list