[med-svn] [staden] 02/04: Apply patch for Ubuntu by Collin Watson

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository staden.

commit 67e23ed9223d07c03c9b1b1016375549b250bfc0
Author: Andreas Tille <tille at debian.org>
Date:   Mon Apr 25 23:42:43 2016 +0200

    Apply patch for Ubuntu by Collin Watson
---
 debian/changelog                    |  7 +++++++
 debian/patches/include_xalloc.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4d5ed75..4ed6666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+staden (2.0.0+b10-5) UNRELEASED; urgency=medium
+
+  * Apply patch for Ubuntu by Collin Watson
+    Closes: #822295
+
+ -- Andreas Tille <tille at debian.org>  Mon, 25 Apr 2016 23:41:49 +0200
+
 staden (2.0.0+b10-4) unstable; urgency=medium
 
   * Move packaging to git
diff --git a/debian/patches/include_xalloc.patch b/debian/patches/include_xalloc.patch
new file mode 100644
index 0000000..44935c3
--- /dev/null
+++ b/debian/patches/include_xalloc.patch
@@ -0,0 +1,31 @@
+Description: Include "xalloc.h" in a few more files that use xcalloc
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2016-01-05
+
+Index: b/hetins/hetins.c
+===================================================================
+--- a/hetins/hetins.c
++++ b/hetins/hetins.c
+@@ -9,6 +9,8 @@
+ #include <io_lib/Read.h>
+ #include <io_lib/traceType.h>
+ 
++#include "xalloc.h"
++
+ #define FULL_TEST 2
+ #define TEST 1
+ 
+Index: b/stops/stops.c
+===================================================================
+--- a/stops/stops.c
++++ b/stops/stops.c
+@@ -13,6 +13,8 @@
+ #include <io_lib/Read.h>
+ #include <io_lib/misc.h>
+ 
++#include "xalloc.h"
++
+ void do_nothing(void) {}
+ 
+ /* johnt 1/6/99 must explicitly import globals from DLLs with Visual C++*/
diff --git a/debian/patches/series b/debian/patches/series
index a7a9425..90f1b4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix_awk.patch
 enable_setting_stadenroot.patch
 spelling.patch
 cope_with_modern_windowmanager.patch
+include_xalloc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/staden.git