[Pkg-octave-commit] [SCM] qtoctave branch, master, updated. 822be51be4ba9de3b813ce30561648d6c80d436a

[Thomas Weber]

The following commit has been merged in the master branch:
commit b66bfa3e4a9a2847669f785a51909c5cb186f06b
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sat Oct 3 16:30:14 2009 +0200

    Adapt patch build-out-of-source for 0.8.2

diff --git a/debian/patches/build-out-of-source b/debian/patches/build-out-of-source
index 31e4141..29c8206 100644
--- a/debian/patches/build-out-of-source
+++ b/debian/patches/build-out-of-source
@@ -3,94 +3,45 @@ to the cmake include directories.
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 22 Apr 2008 09:03:38 +0200
 
-Index: qtoctave-0.8.1+dfsg/CMakeLists.txt
-===================================================================
---- qtoctave-0.8.1+dfsg.orig/CMakeLists.txt	2008-09-21 04:00:30.000000000 -0500
-+++ qtoctave-0.8.1+dfsg/CMakeLists.txt	2008-11-27 00:21:38.000000000 -0600
-@@ -15,8 +15,6 @@
- #Uncoment to Verbose mode
- #set(CMAKE_VERBOSE_MAKEFILE TRUE)
+--- a/easy_plot/src/CMakeLists.txt
++++ b/easy_plot/src/CMakeLists.txt
+@@ -7,6 +7,7 @@
  
--configure_file ( configure.h src/configure.h )
--
- ADD_DEFINITIONS(-DUSER_CONFIG)
+ include(UseQt4)
+ 
++INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
+ include_directories(${QT_INCLUDE_DIR})
+ include_directories(${QT_QT_INCLUDE_DIR})
+ include_directories(${QT_QTCORE_INCLUDE_DIR})
+@@ -45,4 +46,4 @@
+ 		TARGETS easy_plot
+ 		RUNTIME
+ 		DESTINATION bin
+-	)
+\ No newline at end of file
++	)
+--- a/qtoctave/src/CMakeLists.txt
++++ b/qtoctave/src/CMakeLists.txt
+@@ -6,6 +6,8 @@
  
- add_subdirectory (src)
-Index: qtoctave-0.8.1+dfsg/configure.h
-===================================================================
---- qtoctave-0.8.1+dfsg.orig/configure.h	2008-09-21 04:00:30.000000000 -0500
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,9 +0,0 @@
+ include(UseQt4)
+ 
++INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
++INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/projects )
+ include_directories(${QT_INCLUDE_DIR})
+ include_directories(${QT_QT_INCLUDE_DIR})
+ include_directories(${QT_QTCORE_INCLUDE_DIR})
+--- a/qtoctave/src/configure.h
++++ /dev/null
+@@ -1,11 +0,0 @@
 -
 -#ifndef __CONFIGURE_H__
 -#define __CONFIGURE_H__
--#define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
--#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/octave_doc/octave.html"
--#define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
--#define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang"
--#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/qtoctave_doc/index.html"
+-#define CONFIG_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave"
+-#define HELP_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/octave_doc/index.html"
+-#define ICON_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/images"
+-#define LANG_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/lang"
+-#define QTOCTAVE_HELP_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/qtoctave_doc/index.html"
+-
+-#define PKG_CMD_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/pkg-commands.list"
 -#endif
-\ No newline at end of file
-Index: qtoctave-0.8.1+dfsg/src/CMakeLists.txt
-===================================================================
---- qtoctave-0.8.1+dfsg.orig/src/CMakeLists.txt	2008-09-21 04:00:30.000000000 -0500
-+++ qtoctave-0.8.1+dfsg/src/CMakeLists.txt	2008-11-27 00:12:03.000000000 -0600
-@@ -1,3 +1,10 @@
-+
-+CONFIGURE_FILE(configure.h.in ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/projects)
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/projects)
-+
- FIND_PACKAGE(Qt4 REQUIRED)
- 
- MESSAGE (STATUS "Use file: ${QT_USE_FILE}")
-Index: qtoctave-0.8.1+dfsg/src/configure.h.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qtoctave-0.8.1+dfsg/src/configure.h.in	2008-11-27 00:16:56.000000000 -0600
-@@ -0,0 +1,9 @@
-+
-+#ifndef __CONFIGURE_H__
-+#define __CONFIGURE_H__
-+#define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
-+#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/octave_doc/octave.html"
-+#define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
-+#define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang"
-+#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/qtoctave_doc/index.html"
-+#endif
-Index: qtoctave-0.8.1+dfsg/src/operations/general_menu.h
-===================================================================
---- qtoctave-0.8.1+dfsg.orig/src/operations/general_menu.h	2008-09-21 04:00:30.000000000 -0500
-+++ qtoctave-0.8.1+dfsg/src/operations/general_menu.h	2008-11-27 00:12:03.000000000 -0600
-@@ -1,4 +1,4 @@
--#include "../ui_general_menu.h"
-+#include "ui_general_menu.h"
- #include "../config.h"
- #include <QFont>
- 
-Index: qtoctave-0.8.1+dfsg/src/projects/projects.h
-===================================================================
---- qtoctave-0.8.1+dfsg.orig/src/projects/projects.h	2008-09-21 04:00:29.000000000 -0500
-+++ qtoctave-0.8.1+dfsg/src/projects/projects.h	2008-11-27 00:12:03.000000000 -0600
-@@ -19,7 +19,7 @@
- #ifndef __PROJECTS_H__
- #define __PROJECTS_H__
- 
--#include "../ui_projects.h"
-+#include "ui_projects.h"
- #include "../config.h"
- 
- using namespace Ui;
-Index: qtoctave-0.8.1+dfsg/src/projects/projects.cpp
-===================================================================
---- qtoctave-0.8.1+dfsg.orig/src/projects/projects.cpp	2008-09-21 04:00:29.000000000 -0500
-+++ qtoctave-0.8.1+dfsg/src/projects/projects.cpp	2008-11-27 00:12:03.000000000 -0600
-@@ -1,5 +1,5 @@
- #include "projects.h"
--#include "../ui_newprojectdialog.h"
-+#include "ui_newprojectdialog.h"
- #include <QXmlStreamReader>
- #include <QXmlStreamWriter>
- #include <QDir>

-- 
qtoctave