diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/bigendian/char/utf-8/test.std | 20 | ||||
-rw-r--r-- | debian/bigendian/wchar/test.std | 18 | ||||
-rw-r--r-- | debian/changelog | 31 | ||||
-rw-r--r-- | debian/control | 3 | ||||
-rw-r--r-- | debian/copyright | 4 | ||||
-rw-r--r-- | debian/patches/0001-xsd_xsdcxx-rename.patch | 89 | ||||
-rw-r--r-- | debian/patches/0002-bigendian.patch | 32 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rwxr-xr-x | debian/rules | 39 | ||||
-rw-r--r-- | debian/watch | 4 |
10 files changed, 103 insertions, 138 deletions
diff --git a/debian/bigendian/char/utf-8/test.std b/debian/bigendian/char/utf-8/test.std deleted file mode 100644 index 68ca51c..0000000 --- a/debian/bigendian/char/utf-8/test.std +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="ASCII" standalone="no" ?> -<t:root xmlns:t="test"> - - <a>abc</a> - - <a>Օ</a> - - <a>ꪪ</a> - - <a>򪪪</a> - - <b>abc</b> - - <b>aՕc</b> - - <b>ꪪbc</b> - - <b>ab򪪪</b> - -</t:root> diff --git a/debian/bigendian/wchar/test.std b/debian/bigendian/wchar/test.std deleted file mode 100644 index cdc3517..0000000 --- a/debian/bigendian/wchar/test.std +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="ASCII" standalone="no" ?> -<t:root xmlns:t="test"> - - <a>abc</a> - - <a>῿퟿</a> - - <a>𐀀􏿽</a> - - <b>abc</b> - - <b>a῿퟿c</b> - - <b>𐀀􏿽bc</b> - - <b>ab𐀀􏿽</b> - -</t:root> diff --git a/debian/changelog b/debian/changelog index b53cbbd..bc19a6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,34 @@ +xsd (4.0.0-1) unstable; urgency=medium + + * New upstream release. + * debian/watch + - change regex. + * refresh patches. + * remove debian/patch/0002-bigendian.patch. + * rewrite debian/rules. + * debian/control + - Build-Depends + - remove hardenning-wrapper. + * remove debian/bigendian + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 21 Jul 2014 22:19:27 +0200 + +xsd (3.3.0.2-3) unstable; urgency=medium + + * debian/rules + - add --with autotools-dev + to prevent build errors on ppc64el & arm64 + thanks to Dimitri John Ledkov + - add ubuntu apport hook + - change hardening to debhelper >= 9 + * debian/source + - add options + compression xz + * debian/ubuntu + -add apport-hook.py + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 24 May 2014 19:12:08 +0200 + xsd (3.3.0.2-2) unstable; urgency=medium * add patch to prevent builderrors on big-endian systems diff --git a/debian/control b/debian/control index 355646c..285c7cf 100644 --- a/debian/control +++ b/debian/control @@ -6,11 +6,10 @@ Build-Depends: autotools-dev, debhelper (>= 9), dpkg-dev (>= 1.15.4), - hardening-wrapper, libboost-date-time-dev, libboost-filesystem-dev, libboost-regex-dev, - libxerces-c-dev (>= 3.0.0), + libxerces-c-dev (>= 3), m4 Standards-Version: 3.9.5 Homepage: http://codesynthesis.com diff --git a/debian/copyright b/debian/copyright index 0c2f68c..357b0fc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: xsd-user Maillist <xsd-users@codesynthesis.com> Source: <http://www.codesynthesis.com/download/xsd/3.2/xsd-3.2.0.2+dep.tar.bz2> Files: * -Copyright: Copyright (©) 2005-2010 CODE SYNTHESIS TOOLS CC +Copyright: Copyright (©) 2005-2014 CODE SYNTHESIS TOOLS CC License: GPL-2+ and FLOSS This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -200,7 +200,7 @@ Files: xsd/documentation/cxx/tree/dbxml/index.xhtml libbackend-elements/documentation/index.xhtml libcult/documentation/*/index.xhtml libfrontend-elements/documentation/index.xhtml -Copyright: 2005-2010 CODE SYNTHESIS TOOLS CC +Copyright: 2005-2014 CODE SYNTHESIS TOOLS CC License: GFDL-1.2 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 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="© 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 diff --git a/debian/rules b/debian/rules index 8f52fc4..7c5d89a 100755 --- a/debian/rules +++ b/debian/rules @@ -10,44 +10,19 @@ #export DH_VERBOSE=1 export DH_OPTIONS - -# -# path for bigendian -# -ORGUTF:=$(CURDIR)/xsd/tests/cxx/tree/encoding/char/utf-8/test.std -NEWUTF:=$(CURDIR)/debian/bigendian/char/utf-8/test.std -ORGWCHAR:=$(CURDIR)/xsd/tests/cxx/tree/encoding/wchar/test.std -NEWWCHAR:=$(CURDIR)/debian/bigendian/wchar/test.std +derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no") # # Hardening # -export DEB_BUILD_HARDENING=1 - -include /usr/share/dpkg/buildflags.mk -CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ - -override_dh_auto_build: - rm -f $(ORGUTF).old - rm -f $(ORGWCHAR).old - mv $(ORGUTF) $(ORUTF).old - mv $(ORGWCHAR) $(ORGWCHAR).old - cp $(NEWUTF) $(ORGUTF) - cp $(NEWWCHAR) $(ORGWCHAR) - dh_auto_build + dh $@ --with autotools-dev override_dh_clean: rm -f $(CURDIR)/libcult/build/system/configuration-dynamic.make - if test -e "$(ORGUTF).old"; then rm -f $(ORGUTF); mv $(ORGUTF).old $(ORGUTF); fi - if test -e "$(ORGWCHAR).old"; then rm -f $(ORGWCHAR); mv $(ORGWCHAR).old $(ORGWCHAR); fi - rmdir --ignore-fail-on-non-empty $(CURDIR)/libcult/build/system dh_clean override_dh_auto_install: @@ -57,3 +32,11 @@ override_dh_auto_install: mv $(CURDIR)/debian/xsdcxx/usr/share/man/man1/xsd.1 $(CURDIR)/debian/xsdcxx/usr/share/man/man1/xsdcxx.1 rm -rf $(CURDIR)/debian/xsdcxx/usr/share/doc/libxsd find $(CURDIR)/debian/xsdcxx \( -name "COPYRIGHT*" -o -name "FLOSSE*" -o -name "LICENSE*" -o -name "GPL*" \) -exec rm -v {} \; + + +override_dh_install: + dh_install +ifeq ($(derives_from_ubuntu),yes) + install -D -m 644 debian/ubuntu/apport-hook.py $(CURDIR)/debian/xsdcxx/usr/share/apport/package-hooks/source_xsdcxx.py +endif + diff --git a/debian/watch b/debian/watch index c908dd6..6d2edd6 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,6 @@ # Compulsory line, this is a version 3 file version=3 - -http://codesynthesis.com/download/xsd/(\d+)\.(\d+)/xsd-(\d+)\.(\d+)\.(\d+)-(\d+)\+dep\.tar\.bz2 +opts=dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$// \ +http://codesynthesis.com/download/xsd/(\d+)\.(\d+)/xsd-(\d+)\.(\d+)\.(\d+)[-(\d+)]?\+dep\.tar\.bz2 |