summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-04-10 03:12:27 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-04-10 03:12:27 +0200
commit0de8fea01f3471292fef0904db059ba4047b3c76 (patch)
treeb72cf98d84f5b56bf55147130226bd8980c60f16
parentdd5be9cde0b7ad7a98a0fb6fbc3805779b0604ff (diff)
Add upstream commit to d/p/0100-C++Parser_Expat_support.patch; Bump Standards-Version to 3.9.7
-rw-r--r--debian/changelog9
-rw-r--r--debian/control2
-rw-r--r--debian/patches/0100-C++Parser_Expat_support.patch22
3 files changed, 24 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 041a6ac..fedd959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xsd (4.0.0-5) UNRELEASED; urgency=medium
+
+ * debian/patches/0100-C++Parser_Expat_support.patch:
+ - Add upstream commit (LP: #1560565).
+ * debian/control:
+ - Bump Standards-Version to 3.9.7 (no changes required).
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 10 Apr 2016 02:33:58 +0200
+
xsd (4.0.0-4) unstable; urgency=medium
* debian/rules:
diff --git a/debian/control b/debian/control
index cb772d4..3ff9580 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
libboost-regex-dev,
libxerces-c-dev (>= 3),
m4
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
Homepage: http://codesynthesis.com
Vcs-Git: git://anonscm.debian.org/collab-maint/xsd.git
Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xsd.git
diff --git a/debian/patches/0100-C++Parser_Expat_support.patch b/debian/patches/0100-C++Parser_Expat_support.patch
index d3cc86c..4f98d00 100644
--- a/debian/patches/0100-C++Parser_Expat_support.patch
+++ b/debian/patches/0100-C++Parser_Expat_support.patch
@@ -1,14 +1,15 @@
Description: Fix bug in C++/Parser Expat support.
Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
Origin: http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commit;h=94cba986108a0e0f42295572ca42c356d59328d7
-Last-Update: 2014-07-26
+ http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commit;h=0e5fab0664fb36c6253dfd7bb86d8985d1b349ef
+Last-Update: 2016-04-10
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx
===================================================================
---- trunk.orig/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx 2014-07-21 08:36:38.000000000 +0200
-+++ trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx 2014-07-26 21:50:06.000000000 +0200
-@@ -51,7 +51,9 @@
+--- trunk.orig/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx
++++ trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx
+@@ -51,7 +51,9 @@ namespace xsd
}
};
@@ -21,9 +22,14 @@ Index: trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx
//
Index: trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.txx
===================================================================
---- trunk.orig/xsd/libxsd/xsd/cxx/parser/expat/elements.txx 2014-07-21 08:36:38.000000000 +0200
-+++ trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.txx 2014-07-26 21:55:23.000000000 +0200
-@@ -283,9 +283,10 @@
+--- trunk.orig/xsd/libxsd/xsd/cxx/parser/expat/elements.txx
++++ trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.txx
+@@ -279,13 +279,14 @@ namespace xsd
+ {
+ parser_auto_ptr parser (XML_ParserCreateNS (0, XML_Char (' ')));
+
+- if (parser == 0)
++ if (parser.get () == 0)
throw std::bad_alloc ();
if (system_id || public_id)
@@ -36,7 +42,7 @@ Index: trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.txx
// Temporarily unset the exception failbit. Also clear the
// fail bit when we reset the old state if it was caused
-@@ -309,9 +310,10 @@
+@@ -309,9 +310,10 @@ namespace xsd
//
break;
}