summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0001-xsd_xsdcxx-rename.patch89
-rw-r--r--debian/patches/0002-bigendian.patch32
-rw-r--r--debian/patches/series1
3 files changed, 56 insertions, 66 deletions
diff --git a/debian/patches/0001-xsd_xsdcxx-rename.patch b/debian/patches/0001-xsd_xsdcxx-rename.patch
index fd4200b..c810ec9 100644
--- a/debian/patches/0001-xsd_xsdcxx-rename.patch
+++ b/debian/patches/0001-xsd_xsdcxx-rename.patch
@@ -1,19 +1,19 @@
Description: change docu from xsd to xsdcxx
Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
Reviewed-by:
-Last-Update: 2014-04-13
+Last-Update: 2014-07-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: work/xsd/documentation/xsd.1
+Index: trunk/xsd/doc/xsd.1
===================================================================
---- work.orig/xsd/documentation/xsd.1 2010-04-22 13:28:43.000000000 +0200
-+++ work/xsd/documentation/xsd.1 2010-11-19 10:15:53.824581814 +0100
+--- trunk.orig/xsd/doc/xsd.1 2014-07-21 08:38:41.000000000 +0200
++++ trunk/xsd/doc/xsd.1 2014-07-21 23:27:00.928980158 +0200
@@ -1,16 +1,16 @@
.\" Process this file with
.\" groff -man -Tascii xsd.1
.\"
--.TH XSD 1 "April 2010" "XSD 3.3.0"
-+.TH XSDCXX 1 "April 2010" "XSD 3.3.0"
+-.TH XSD 1 "July 2014" "XSD 4.0.0"
++.TH XSDCXX 1 "July 2014" "XSDCXX 4.0.0"
.SH NAME
-xsd \- W3C XML Schema to C++ Compiler
+xsdcxx \- W3C XML Schema to C++ Compiler
@@ -60,16 +60,20 @@ Index: work/xsd/documentation/xsd.1
.I command
.RE
.PP
-@@ -203,7 +203,7 @@
- with namespace
- .B http://example.com/hello
- and you run
--.B xsd
-+.B xsdcxx
- on this file, then the string in question will be:
+@@ -133,9 +133,9 @@
- .B hello.xsd. http://example.com/hello
-@@ -1877,7 +1877,7 @@
+ When the C++11 mode is selected, you normally don't need to perform any
+ extra steps other than enable C++11 in your C++ compiler, if required\. The
+-XSD compiler will automatically add the necessary macro defines to the
+-generated header files that will switch the header-only XSD runtime library
+-(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSD
++XSDCXX compiler will automatically add the necessary macro defines to the
++generated header files that will switch the header-only XSDCXX runtime library
++(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSDCXX
+ runtime headers directly in your application (normally you just include the
+ generated headers), then you will need to define the \fBXSD_CXX11\fP macro
+ for your entire project\.
+@@ -1632,7 +1632,7 @@
.\"
.SH DIAGNOSTICS
If the input file is not a valid W3C XML Schema definition,
@@ -78,10 +82,24 @@ Index: work/xsd/documentation/xsd.1
will issue diagnostic messages to
.B STDERR
and exit with non-zero exit code.
-Index: work/xsd-srcdir/xsd/documentation/xsd.xhtml
+Index: trunk/xsd/doc/xsd.xhtml
===================================================================
---- work.orig/xsd/documentation/xsd.xhtml 2010-02-22 13:38:06.000000000 +0100
-+++ work/xsd/documentation/xsd.xhtml 2010-11-19 10:15:11.900404798 +0100
+--- trunk.orig/xsd/doc/xsd.xhtml 2014-07-21 08:38:41.000000000 +0200
++++ trunk/xsd/doc/xsd.xhtml 2014-07-21 23:29:32.796093697 +0200
+@@ -3,11 +3,11 @@
+ <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+
+ <head>
+- <title>XSD 4.0.0 Compiler Command Line Manual</title>
++ <title>XSDCXX 4.0.0 Compiler Command Line Manual</title>
+
+ <meta name="copyright" content="&copy; 2005-2014 Code Synthesis Tools CC"/>
+ <meta name="keywords" content="xsd,xml,schema,c++,mapping,data,binding,code,generator,manual,man,page"/>
+- <meta name="description" content="XSD Compiler Command Line Manual"/>
++ <meta name="description" content="XSDCXX Compiler Command Line Manual"/>
+
+ <link rel="stylesheet" type="text/css" href="default.css" />
+
@@ -50,19 +50,19 @@
<h1>NAME</h1>
@@ -107,25 +125,30 @@ Index: work/xsd-srcdir/xsd/documentation/xsd.xhtml
C++ mapping from W3C XML Schema definitions. Particular mapping to
produce is selected by a <code><i>command</i></code>. Each mapping has
a number of mapping-specific <code><i>options</i></code> that should
-@@ -104,7 +104,7 @@
+@@ -138,10 +138,10 @@
- <dt><code><b>help</b></code></dt>
- <dd>Print usage information and exit. Use
-- <p><code><b>xsd help</b> <i>command</i></code></p>
-+ <p><code><b>xsdcxx help</b> <i>command</i></code></p>
- for command-specific help.
- </dd>
+ <p>When the C++11 mode is selected, you normally don't need to perform any
+ extra steps other than enable C++11 in your C++ compiler, if required. The
+- XSD compiler will automatically add the necessary macro defines to the
+- generated header files that will switch the header-only XSD runtime library
++ XSDCXX compiler will automatically add the necessary macro defines to the
++ generated header files that will switch the header-only XSDCXX runtime library
+ (<code><b>libxsd</b></code>) to the C++11 mode. However, if you include any
+- of the XSD runtime headers directly in your application (normally you just
++ of the XSDCXX runtime headers directly in your application (normally you just
+ include the generated headers), then you will need to define the
+ <code><b>XSD_CXX11</b></code> macro for your entire project.</p></dd>
-@@ -174,7 +174,7 @@
+@@ -219,7 +219,7 @@
- <p>For example, if you have file <code><b>hello.xsd</b></code>
- with namespace <code><b>http://example.com/hello</b></code> and you run
-- <code><b>xsd</b></code> on this file, then the string in question
-+ <code><b>xsdcxx</b></code> on this file, then the string in question
- will be:</p>
+ <p>For example, if you have file <code><b>hello.xsd</b></code> with
+ namespace <code><b>http://example.com/hello</b></code> and you run
+- <code><b>xsd</b></code> on this file, then the string in question will
++ <code><b>xsdcxx</b></code> on this file, then the string in question will
+ be:</p>
- <p><code><b>hello.xsd. http://example.com/hello</b></code></p>
-@@ -1575,7 +1575,7 @@
+ <p><code><b>hello.xsd. http://example.com/hello</b></code></p>
+@@ -1530,7 +1530,7 @@
<h1>DIAGNOSTICS</h1>
<p>If the input file is not a valid W3C XML Schema definition,
diff --git a/debian/patches/0002-bigendian.patch b/debian/patches/0002-bigendian.patch
deleted file mode 100644
index dcd1900..0000000
--- a/debian/patches/0002-bigendian.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: prevent build-error for big-endian systems
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Reviewed-by:
-Last-Update: 2014-05-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx
-===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx 2010-04-28 08:58:09.000000000 +0200
-+++ trunk/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx 2014-05-18 12:03:06.243944878 +0200
-@@ -57,7 +57,7 @@
- xml_schema::namespace_infomap map;
- map["t"].name = "test";
-
-- root (std::cout, *r, map, "UCS-4LE");
-+ root (std::cout, *r, map, "ASCII");
- }
- catch (xml_schema::exception const& e)
- {
-Index: trunk/xsd/tests/cxx/tree/encoding/wchar/driver.cxx
-===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/wchar/driver.cxx 2010-04-28 08:58:09.000000000 +0200
-+++ trunk/xsd/tests/cxx/tree/encoding/wchar/driver.cxx 2014-05-18 12:03:33.164482484 +0200
-@@ -47,7 +47,7 @@
- xml_schema::namespace_infomap map;
- map[L"t"].name = L"test";
-
-- root (std::cout, *r, map, L"UCS-4LE");
-+ root (std::cout, *r, map, L"ASCII");
- }
- catch (xml_schema::exception const& e)
- {
diff --git a/debian/patches/series b/debian/patches/series
index ba3bd82..8ac7078 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0002-bigendian.patch
0001-xsd_xsdcxx-rename.patch