patches: Removed include_config_h.dpatch -- included upstream.

diff --git a/debian/changelog b/debian/changelog
index 928e55e0a79191affafada4ce54ccbafdbb29f0a..51752214ef1a32feefdef9ff8059852f24d17369 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ncmpc (0.16.1-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - Removed include_config_h.dpatch -- included upstream.
 
- -- Sebastian Harl <tokkee@debian.org>  Tue, 19 Jan 2010 19:14:13 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 19 Jan 2010 21:20:19 +0100
 
 ncmpc (0.16-1) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 8193c42099a0af53919436144c1ca28b25884b76..830779dc697cbe19c96a1b6876ba4e10ea582a89 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,2 @@
-include_config_h.dpatch
 manpage_typos.dpatch
 

diff --git a/debian/patches/include_config_h.dpatch b/debian/patches/include_config_h.dpatch
deleted file mode 100644 (file)
index e10057b..0000000
--- a/debian/patches/include_config_h.dpatch
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## include_config_h.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: include "config.h" in all files using HAVE_* defines
-
-@DPATCH@
-
-diff a/src/hscroll.h b/src/hscroll.h
---- a/src/hscroll.h
-+++ b/src/hscroll.h
-@@ -20,6 +20,8 @@
- #ifndef HSCROLL_H
- #define HSCROLL_H
- 
-+#include "config.h"
-+
- #include <glib.h>
- 
- #ifdef HAVE_NCURSESW_NCURSES_H
-diff a/src/resolver.c b/src/resolver.c
---- a/src/resolver.c
-+++ b/src/resolver.c
-@@ -30,6 +30,7 @@
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- 
-+#include "config.h"
- #include "resolver.h"
- 
- #include <netdb.h>
-diff a/src/screen_browser.c b/src/screen_browser.c
---- a/src/screen_browser.c
-+++ b/src/screen_browser.c
-@@ -17,6 +17,7 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
- 
-+#include "config.h"
- #include "screen_browser.h"
- #include "screen_file.h"
- #include "screen_song.h"
-diff a/src/screen_interface.h b/src/screen_interface.h
---- a/src/screen_interface.h
-+++ b/src/screen_interface.h
-@@ -20,6 +20,7 @@
- #ifndef NCMPC_SCREEN_INTERFACE_H
- #define NCMPC_SCREEN_INTERFACE_H
- 
-+#include "config.h"
- #include "command.h"
- 
- #include <stdbool.h>
-diff a/src/song_paint.h b/src/song_paint.h
---- a/src/song_paint.h
-+++ b/src/song_paint.h
-@@ -20,6 +20,8 @@
- #ifndef NCMPC_SONG_PAINT_H
- #define NCMPC_SONG_PAINT_H
- 
-+#include "config.h"
-+
- #include <stdbool.h>
- 
- #ifdef HAVE_NCURSESW_NCURSES_H
-diff a/src/window.h b/src/window.h
---- a/src/window.h
-+++ b/src/window.h
-@@ -20,6 +20,8 @@
- #ifndef NCMPC_WINDOW_H
- #define NCMPC_WINDOW_H
- 
-+#include "config.h"
-+
- #ifdef HAVE_NCURSESW_NCURSES_H
- #include <ncursesw/ncurses.h>
- #else