[Debian-astro-commits] [xpa] 03/04: Remove fix_xpa_h.patch that is applied upstream

[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 83779bdb2d9d2dadca8dbf0faa634e9b69177803
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Oct 19 13:22:20 2015 +0200

    Remove fix_xpa_h.patch that is applied upstream
---
 debian/patches/fix_xpa_h.patch | 31 -------------------------------
 debian/patches/series          |  1 -
 2 files changed, 32 deletions(-)

diff --git a/debian/patches/fix_xpa_h.patch b/debian/patches/fix_xpa_h.patch
deleted file mode 100644
index 4e1be8c..0000000
--- a/debian/patches/fix_xpa_h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 4600dba..32b16bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ 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