summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-29 23:26:09 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-29 23:26:09 +0200
commit0314e0860f45dd28beb94733d07a43bb3ee7355a (patch)
treec0b24644d117e076ce4130c66e36579f474d8721
parent3ab30697edac0b02e14783229914c6a76faec366 (diff)
merge 4.0.0-2 into 4.0.0-1debian/4.0.0-1
-rw-r--r--debian/changelog25
-rw-r--r--debian/patches/0100-C++Parser_Expat_support.patch2
-rwxr-xr-xdebian/rules6
3 files changed, 13 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index f0b0360..43ebf22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,17 @@
-xsd (4.0.0-2) unstable; urgency=medium
-
- * Add debian/patches/0100-C++Parser_Expat_support.patch
- - Fix bug in C++/Parser Expat support.
-
- -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 26 Jul 2014 21:39:47 +0200
-
xsd (4.0.0-1) unstable; urgency=medium
- * New upstream release.
+ * New upstream release:
+ - Remove debian/patch/0002-bigendian.patch.
+ - Remove directory debian/bigendian.
+ - Refresh patches.
* debian/watch
- - change regex.
- * refresh patches.
- * remove debian/patch/0002-bigendian.patch.
+ - Change regex to find all releases.
* rewrite debian/rules.
- * debian/control
- - Build-Depends
- - remove hardenning-wrapper.
- * remove debian/bigendian
+ * debian/control:
+ - Build-Depends:
+ + Remove obsolete hardenning-wrapper.
+ * Add debian/patches/0100-C++Parser_Expat_support.patch
+ - Fix bug in C++/Parser Expat support.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 21 Jul 2014 22:19:27 +0200
diff --git a/debian/patches/0100-C++Parser_Expat_support.patch b/debian/patches/0100-C++Parser_Expat_support.patch
index 1caeb5b..d3cc86c 100644
--- a/debian/patches/0100-C++Parser_Expat_support.patch
+++ b/debian/patches/0100-C++Parser_Expat_support.patch
@@ -1,6 +1,6 @@
Description: Fix bug in C++/Parser Expat support.
Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Reviewed-by:
+Origin: http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commit;h=94cba986108a0e0f42295572ca42c356d59328d7
Last-Update: 2014-07-26
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/rules b/debian/rules
index 7c5d89a..60d5392 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,12 +10,12 @@
#export DH_VERBOSE=1
export DH_OPTIONS
-derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no")
-
#
# Hardening
#
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
%:
@@ -36,7 +36,5 @@ override_dh_auto_install:
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