patches: Added include_config_h.dpatch.

This patch adds some missing includes.

Also, build-depend on (and use ;-)) dpatch.

diff --git a/debian/changelog b/debian/changelog
index 2fc35d043e55c04c85207dd1ecf3f7357b70a455..21d07dfac0a94a9413598b8d05db83cfa1b51fd3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,14 @@ ncmpc (0.16-1) unstable; urgency=low
   * New upstream release.
   * debian/control:
     - Build-depend on libmpdclient-dev, required by the new upstream release.
+    - Build-depend on dpatch.
   * debian/rules:
     - Run 'make check' unless the nocheck option has been specified in
       DEB_BUILD_OPTIONS.
+  * debian/patches:
+    - Added include_config_h.dpatch -- this patch adds some missing includes.
 
- -- Sebastian Harl <tokkee@debian.org>  Sun, 27 Dec 2009 18:58:55 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 27 Dec 2009 22:41:22 +0100
 
 ncmpc (0.15-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 680859348952abcc14b3d59ad1aa613b3d9b9378..98d7667dd730980fc11d61f4053878c879e45ad0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ncmpc
 Section: sound
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.14.6), autotools-dev, libncursesw5-dev, libglib2.0-dev, liblircclient-dev, libmpdclient-dev
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.14.6), dpatch, autotools-dev, libncursesw5-dev, libglib2.0-dev, liblircclient-dev, libmpdclient-dev
 Standards-Version: 3.8.3
 Homepage: http://mpd.wikia.com/wiki/Client:Ncmpc
 Vcs-Git: git://git.tokkee.org/pkg-ncmpc.git

diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644 (file)
index 0000000..0c8b206
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,2 @@
+include_config_h.dpatch
+

diff --git a/debian/patches/include_config_h.dpatch b/debian/patches/include_config_h.dpatch
new file mode 100644 (file)
index 0000000..e10057b
--- /dev/null
+++ b/debian/patches/include_config_h.dpatch
@@ -0,0 +1,76 @@
+#! /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

diff --git a/debian/rules b/debian/rules
index c77ceda48e3681e47e6e3cd5dec861ec315b9672..23f2f13399c4778f22902595cfdfe005f872efea 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,9 @@ ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
        CHECK =
 endif
 
-config.status: configure
+include /usr/share/dpatch/dpatch.make
+
+config.status: configure $(DPATCH_STAMPFN)
        dh_testdir
        ./configure --host=$(DEB_HOST_GNU_TYPE) \
                        --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
@@ -58,7 +60,7 @@ build-stamp: config.status
        
        touch build-stamp
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp