[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.4+dfsg1-3-6-gf62b814

José Manuel Santamar?==?UTF-8?Q?ía Lema panfaust at gmail.com
Tue Jan 22 02:42:38 UTC 2013


The following commit has been merged in the master branch:
commit cc800ed2f8661c1b5abd4a6bd3c8c5f0910344ce
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Jan 22 02:49:14 2013 +0100

    Remove portable-method-for-escaping-symbol-gawk.diff.

diff --git a/debian/changelog b/debian/changelog
index 133c33a..68ddd4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 virtuoso-opensource (6.1.6+dfsg1-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Update patches:
+    - remove portable-method-for-escaping-symbol-gawk.diff, applied upstream.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Tue, 22 Jan 2013 02:46:26 +0100
 
diff --git a/debian/patches/portable-method-for-escaping-symbol-gawk.diff b/debian/patches/portable-method-for-escaping-symbol-gawk.diff
deleted file mode 100644
index ed3ae37..0000000
--- a/debian/patches/portable-method-for-escaping-symbol-gawk.diff
+++ /dev/null
@@ -1,94 +0,0 @@
-From b01c641b917485d0e23beb98787e43cb40baae8a Mon Sep 17 00:00:00 2001
-From: VOS Maintainer <vos.admin at openlinksw.com>
-Date: Thu, 8 Mar 2012 13:52:41 +0000
-Subject: [PATCH] * Fixed use portable method for escaping symbol for gawk 3
- and 4
-
----
- binsrc/cached_resources/res_to_c.awk |    8 +-------
- binsrc/hosting/perl/pl_to_c.awk      |    2 +-
- binsrc/hosting/python/py_to_c.awk    |    2 +-
- binsrc/ws/wsrm/xsd2sql.awk           |    2 +-
- libsrc/Wi/sql_to_c.awk               |    8 +-------
- 5 files changed, 5 insertions(+), 17 deletions(-)
-
-diff --git a/binsrc/cached_resources/res_to_c.awk b/binsrc/cached_resources/res_to_c.awk
-index 8c6ddbc..f7f4989 100644
---- a/binsrc/cached_resources/res_to_c.awk
-+++ b/binsrc/cached_resources/res_to_c.awk
-@@ -30,13 +30,7 @@ BEGIN   {
- 	}
- 	{
- 	  fun = $0
--	  # was: gsub ( /\\/, "\\\\", fun)
--	  q = "\\\\"
--	  if (PROCINFO["version"] ~ /^4/)
--	    gsub ( q, q q, fun)
--	  else
--	    gsub ( q, q, fun)
--
-+          gsub ( "\\\\", "&&", fun)
- 	  gsub ( /"/, "\\\"", fun)
- 	  gsub ( /\$/, "\\044", fun)
- 	  gsub ( /.*/, "\"&\\n\",", fun)
-diff --git a/binsrc/hosting/perl/pl_to_c.awk b/binsrc/hosting/perl/pl_to_c.awk
-index 9422a4c..eb4a07d 100644
---- a/binsrc/hosting/perl/pl_to_c.awk
-+++ b/binsrc/hosting/perl/pl_to_c.awk
-@@ -42,7 +42,7 @@ END {
-     }
- 
-   x = $0
--  gsub (/\\/, "\\\\", x)
-+  gsub ( "\\\\", "&&", x)
-   gsub (/\"/, "\\\"", x)
-   print "\"" x "\\n\""
- }
-diff --git a/binsrc/hosting/python/py_to_c.awk b/binsrc/hosting/python/py_to_c.awk
-index 7c5b529..6ce5ff4 100644
---- a/binsrc/hosting/python/py_to_c.awk
-+++ b/binsrc/hosting/python/py_to_c.awk
-@@ -48,7 +48,7 @@ END {
-     }
- 
-   x = $0
--  gsub (/\\/, "\\\\", x)
-+  gsub ( "\\\\", "&&", x)
-   gsub (/\"/, "\\\"", x)
-   print "\"" x "\\n\""
- }
-diff --git a/binsrc/ws/wsrm/xsd2sql.awk b/binsrc/ws/wsrm/xsd2sql.awk
-index a97aba6..4bba030 100644
---- a/binsrc/ws/wsrm/xsd2sql.awk
-+++ b/binsrc/ws/wsrm/xsd2sql.awk
-@@ -54,7 +54,7 @@ BEGIN {
-       print "  ses := string_output ();"
-     }
-   str = $0
--  gsub ( /\\/, "\\\\", str)
-+  gsub ( "\\\\", "&&", str)
-   gsub ( /'/, "\\'", str)
- 
-   #
-diff --git a/libsrc/Wi/sql_to_c.awk b/libsrc/Wi/sql_to_c.awk
-index 01c5add..57ef36b 100644
---- a/libsrc/Wi/sql_to_c.awk
-+++ b/libsrc/Wi/sql_to_c.awk
-@@ -343,13 +343,7 @@ BEGIN   {
- 
-                 # does escape the symbols
- 		fun = $0
--		q = "\\\\"
--		if (PROCINFO["version"] ~ /^4/)
--		    gsub ( q, q q, fun)
--		else
--		    gsub ( q, q, fun)
--
--	        #WAS: gsub ( /\\/, "\\\\", fun)
-+		gsub ("\\\\", "&&", fun)
- 
- 		# remove whitespace except when there is just a semicolon
- 		if ((in_xsl_mode == 0) && (in_xsd_mode == 0))
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 60405a0..3578aef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-portable-method-for-escaping-symbol-gawk.diff
 use-debian-default-csharp-compiler.patch
 config-debian-paths.patch
 config-universal-variables.patch

-- 
Git repository for pkg-virtuoso



More information about the Pkg-virtuoso-commits mailing list