From 216796e005489c3094e4de32de58cfd098f1970a Mon Sep 17 00:00:00 2001
From: openKylinBot <openKylinBot@openkylin.com>
Date: Sat, 14 May 2022 03:57:42 +0800
Subject: [PATCH] changed debian/source/format to native

---
 debian/patches/enforce-use-stl.patch | 24 ----------
 debian/patches/entity-encoding.patch | 68 ----------------------------
 debian/patches/series                |  2 -
 debian/source/format                 |  2 +-
 4 files changed, 1 insertion(+), 95 deletions(-)
 delete mode 100644 debian/patches/enforce-use-stl.patch
 delete mode 100644 debian/patches/entity-encoding.patch
 delete mode 100644 debian/patches/series

diff --git a/debian/patches/enforce-use-stl.patch b/debian/patches/enforce-use-stl.patch
deleted file mode 100644
index 8cf1777..0000000
--- a/debian/patches/enforce-use-stl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Felix Geyer <debfx-pkg@fobos.de>
-Date: Sat, 14 May 2022 03:57:42 +0800
-Subject: TinyXml is built with TIXML_USE_STL, so we have to
-
-enforce it when the library is used.
----
- tinyxml.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tinyxml.h b/tinyxml.h
-index a3589e5..12a7750 100644
---- a/tinyxml.h
-+++ b/tinyxml.h
-@@ -26,6 +26,10 @@ distribution.
- #ifndef TINYXML_INCLUDED
- #define TINYXML_INCLUDED
- 
-+#ifndef TIXML_USE_STL
-+	#define TIXML_USE_STL
-+#endif
-+
- #ifdef _MSC_VER
- #pragma warning( push )
- #pragma warning( disable : 4530 )
diff --git a/debian/patches/entity-encoding.patch b/debian/patches/entity-encoding.patch
deleted file mode 100644
index 15b1661..0000000
--- a/debian/patches/entity-encoding.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Felix Geyer <fgeyer@debian.org>
-Date: Sat, 14 May 2022 03:57:42 +0800
-Subject: TinyXML incorrectly encodes text element containing an ampersand
- followed by either x or #.
-
-Origin: http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
----
- tinyxml.cpp | 25 +------------------------
- xmltest.cpp | 10 ++++++++++
- 2 files changed, 11 insertions(+), 24 deletions(-)
-
-diff --git a/tinyxml.cpp b/tinyxml.cpp
-index 9c161df..fccd8dc 100644
---- a/tinyxml.cpp
-+++ b/tinyxml.cpp
-@@ -57,30 +57,7 @@ void TiXmlBase::EncodeString( const TIXML_STRING& str, TIXML_STRING* outString )
- 	{
- 		unsigned char c = (unsigned char) str[i];
- 
--		if (    c == '&' 
--		     && i < ( (int)str.length() - 2 )
--			 && str[i+1] == '#'
--			 && str[i+2] == 'x' )
--		{
--			// Hexadecimal character reference.
--			// Pass through unchanged.
--			// &#xA9;	-- copyright symbol, for example.
--			//
--			// The -1 is a bug fix from Rob Laveaux. It keeps
--			// an overflow from happening if there is no ';'.
--			// There are actually 2 ways to exit this loop -
--			// while fails (error case) and break (semicolon found).
--			// However, there is no mechanism (currently) for
--			// this function to return an error.
--			while ( i<(int)str.length()-1 )
--			{
--				outString->append( str.c_str() + i, 1 );
--				++i;
--				if ( str[i] == ';' )
--					break;
--			}
--		}
--		else if ( c == '&' )
-+		if ( c == '&' )
- 		{
- 			outString->append( entity[0].str, entity[0].strLength );
- 			++i;
-diff --git a/xmltest.cpp b/xmltest.cpp
-index 663c157..b38587f 100644
---- a/xmltest.cpp
-+++ b/xmltest.cpp
-@@ -1366,6 +1366,16 @@ int main()
- 		}*/
- 	}
- 
-+	#ifdef TIXML_USE_STL
-+	{
-+		TiXmlDocument xml;
-+		xml.Parse("<foo>foo&amp;#xa+bar</foo>");
-+		std::string str;
-+		str << xml;
-+		XmlTest( "Entity escaping", "<foo>foo&amp;#xa+bar</foo>", str.c_str() );
-+	}
-+	#endif
-+
- 	/*  1417717 experiment
- 	{
- 		TiXmlDocument xml;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 124b36f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-enforce-use-stl.patch
-entity-encoding.patch
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)