[xpa] 01/04: Remove conf.h include from xpa.h. Closes: #764406

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository xpa.

commit ca7e2a05dbda1cc02558478d031a4007bde16d05
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Oct 8 16:46:02 2014 +0200

    Remove conf.h include from xpa.h. Closes: #764406
---
 debian/changelog               |  3 ++-
 debian/patches/fix_xpa_h.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e281c5c..6877e55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xpa (2.1.15-4) UNRELEASED; urgency=low
+xpa (2.1.15-4) unstable; urgency=low
 
   * Update maintainers e-mail address
   * Update standards version to 3.9.6. No changes needed.
   * Change VCS location to debian-astro
+  * Remove conf.h include from xpa.h. Closes: #764406
 
  -- Ole Streicher <olebole at debian.org>  Thu, 25 Sep 2014 12:21:34 +0200
 
diff --git a/debian/patches/fix_xpa_h.patch b/debian/patches/fix_xpa_h.patch
new file mode 100644
index 0000000..4e1be8c
--- /dev/null
+++ b/debian/patches/fix_xpa_h.patch
@@ -0,0 +1,31 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Remove conf.h include from xpa.h. 
+ The missing file is included by a preprocessor switch.
+Bug: https://bugs.debian.org/764406
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -122,9 +122,9 @@
+ 
+ CC =		@CC@
+ 
+-CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} ${AC_FLAGS}
++CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} ${AC_FLAGS} -include conf.h
+ 
+-DEPEND_SWITCHES = -I. ${CFLAGS} ${PKG_CFLAGS} ${AC_FLAGS}
++DEPEND_SWITCHES = -I. ${CFLAGS} ${PKG_CFLAGS} ${AC_FLAGS} -include conf.h
+ 
+ SRCS =		xpa.c xpaio.c command.c acl.c remote.c clipboard.c port.c \
+ 		tcp.c client.c word.c xalloc.c find.c xlaunch.c timedconn.c \
+--- a/xpa.h
++++ b/xpa.h
+@@ -11,10 +11,6 @@
+ #ifndef	__xpa_h
+ #define	__xpa_h
+ 
+-#if HAVE_CONFIG_H
+-#include <conf.h>
+-#endif
+-
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <prsetup.h>
diff --git a/debian/patches/series b/debian/patches/series
index 32b16bc..4600dba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_paths.patch
 fix_manpages.patch
 install_tclxpa.patch
 hardening.patch
+fix_xpa_h.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/xpa.git