[SCM] din/master: Point configure.ac and include/bot.h to libircclient.h's new location.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Oct 11 12:46:35 UTC 2014


The following commit has been merged in the master branch:
commit c1bae0763c495a4849740c2f3e4f8c21f469153a
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Oct 11 13:45:06 2014 +0100

    Point configure.ac and include/bot.h to libircclient.h's new location.
    
    Closes: #759893

diff --git a/debian/patches/fix-libircclient-headers.patch b/debian/patches/fix-libircclient-headers.patch
new file mode 100644
index 0000000..84fe14a
--- /dev/null
+++ b/debian/patches/fix-libircclient-headers.patch
@@ -0,0 +1,27 @@
+---
+ configure.ac  |    2 +-
+ include/bot.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- din.orig/configure.ac
++++ din/configure.ac
+@@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([configure.ac])
+ AC_PROG_CXX
+ AC_CHECK_HEADERS([GL/gl.h],AC_MSG_NOTICE([+++ Found OpenGL +++]),[AC_MSG_ERROR([!!! Please install OpenGL !!!])])
+ AC_CHECK_HEADERS([tcl.h] [tcl8.5/tcl.h],AC_MSG_NOTICE([+++ Found Tcl 8.5 +++]),[AC_MSG_WARN([!!! Is Tcl 8.5 installed? !!!])])
+-AC_CHECK_HEADERS([libircclient/libircclient.h],,[AC_MSG_ERROR([!!! Please install libircclient !!!])])
++AC_CHECK_HEADERS([libircclient.h],,[AC_MSG_ERROR([!!! Please install libircclient !!!])])
+ PKG_CHECK_MODULES([liblo], [liblo])
+ PKG_CHECK_MODULES([jack], [jack])
+ PKG_CHECK_MODULES([fftw3f], [fftw3f])
+--- din.orig/include/bot.h
++++ din/include/bot.h
+@@ -29,7 +29,7 @@
+ #ifndef __BOT
+ #define __BOT
+ 
+-#include <libircclient/libircclient.h>
++#include <libircclient.h>
+ #include <cstring>
+ #include "command.h"
+ #include "globals.h"
diff --git a/debian/patches/series b/debian/patches/series
index 0388331..0cca6d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 checkdotdin-fix.patch
 fix-data-Makefile.patch
+fix-libircclient-headers.patch

-- 
din packaging



More information about the pkg-multimedia-commits mailing list