[Pkg-privacy-commits] [irssi-plugin-otr] 27/267: irssi headers moved to fe-text.

[Ximin Luo]

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

infinity0 pushed a commit to branch debian
in repository irssi-plugin-otr.

commit 38fa55bf00647a3e96f14428b61bc6cd55446b0f
Author: Uli Meis <a.sporto+bee at gmail.com>
Date:   Sun Jul 13 15:46:46 2008 +0200

    irssi headers moved to fe-text.
---
 CMakeLists.txt    | 6 +++---
 otr.h             | 2 +-
 privheaders.patch | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7638a19..9163af8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,7 +129,7 @@ CHECK_INCLUDE_FILE(glib/gregex.h HAVE_GREGEX_H)
 
 # irssi private headers
 
-CHECK_INCLUDE_FILES("glib.h;common.h;statusbar.h" HAVE_IRSSIPRIV_H)
+CHECK_INCLUDE_FILES("glib.h;common.h;fe-text/statusbar.h" HAVE_IRSSIPRIV_H)
 
 # Bad hack
 
@@ -139,14 +139,14 @@ IF (NOT HAVE_IRSSIPRIV_H)
   IF (NOT WGET_EXECUTABLE)
     FIND_PACKAGE(Wget REQUIRED)
   ENDIF (NOT WGET_EXECUTABLE)
-  EXECUTE_PROCESS(COMMAND "mkdir" irssi-private-headers)
+  EXECUTE_PROCESS(COMMAND "mkdir" -p irssi-private-headers/fe-text)
   EXECUTE_PROCESS(COMMAND "bash" "-c"
     "${WGET_EXECUTABLE} '--post-data=revision=4806&root=irssi' \\
     'http://svn.irssi.org/cgi-bin/viewvc.cgi/irssi/trunk/src/fe-text/mainwindows.h' \\
     'http://svn.irssi.org/cgi-bin/viewvc.cgi/irssi/trunk/src/fe-text/term.h' \\
     'http://svn.irssi.org/cgi-bin/viewvc.cgi/irssi/trunk/src/fe-text/statusbar.h' || exit 1
     patch -p0 mainwindows.h < \"$0/privheaders.patch\" || exit 1" 
-    ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY irssi-private-headers
+    ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY irssi-private-headers/fe-text
     RESULT_VARIABLE IIPRIV_RET)
   IF(NOT IIPRIV_RET EQUAL 0)
     MESSAGE(FATAL_ERROR "Couldn't check out irssi private headers from SVN")
diff --git a/otr.h b/otr.h
index cb4e2a4..fd88e18 100644
--- a/otr.h
+++ b/otr.h
@@ -41,7 +41,7 @@
 #include <core/modules.h>
 
 /* copied over, see FS#535 */
-#include <statusbar.h>
+#include <fe-text/statusbar.h>
 
 /* glib */
 
diff --git a/privheaders.patch b/privheaders.patch
index fca77ab..dfc6352 100644
--- a/privheaders.patch
+++ b/privheaders.patch
@@ -7,6 +7,6 @@
 -#include "fe-windows.h"
 -#include "term.h"
 +#include <fe-common/core/fe-windows.h>
-+#include <term.h>
++#include <fe-text/term.h>
 
  #define WINDOW_MIN_SIZE 2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git