[Pkg-octave-commit] [SCM] qtoctave branch, master, updated. 1dfa0c6d8de06026de751df9134d37eb77a84e7b

[Thomas Weber]

The following commit has been merged in the master branch:
commit 32e7ed0160d4934ad40eee4c816c8beb0208e05a
Author: Thomas Weber <tweber at debian.org>
Date:   Sun Jun 6 09:01:31 2010 +0200

    Adapt patch build-out-of-source for new upstream

diff --git a/debian/changelog b/debian/changelog
index 633ea27..0b495be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
     - dont_include_simple_rcs (we install the simplercs command)
     - use_cstdio_header (applied upstream)
     - move_doc_under_doc (applied upstream)
+  * Adapt patch build-out-of-source, part of it was applied upstream
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 23:01:38 +0100
 
diff --git a/debian/patches/build-out-of-source b/debian/patches/build-out-of-source
index 9f3279e..0393ee3 100644
--- a/debian/patches/build-out-of-source
+++ b/debian/patches/build-out-of-source
@@ -1,51 +1,20 @@
-Enable out-of-source builds for CMake, by addinge some include paths
-to the cmake include directories.
+From: Thomas Weber <tweber at debian.org>
+Description: Remove configure.h to enable correct out-of-source builds
+ The file is included in the upstream tarball due to the way the release
+ tarball is generated.
+Forwarded: not-needed
 
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 22 Apr 2008 09:03:38 +0200
-
-This patch was forwarded upstream. 
-
- -- Thomas Weber <thomas.weber.mail at gmail.com> Sun, 04 Oct 2009 15:13:35 +0200
-
---- a/easy_plot/src/CMakeLists.txt
-+++ b/easy_plot/src/CMakeLists.txt
-@@ -7,6 +7,7 @@
- 
- 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 @@
- 
- 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 "/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 CONFIG_PATH "/opt/qtoctave-0.8.2/share/qtoctave"
+-#define HELP_PATH "/opt/qtoctave-0.8.2/share/doc/octave-html/octave_doc/index.html"
+-#define ICON_PATH "/opt/qtoctave-0.8.2/share/qtoctave/images"
+-#define LANG_PATH "/opt/qtoctave-0.8.2/share/qtoctave/lang"
+-#define QTOCTAVE_HELP_PATH "/opt/qtoctave-0.8.2/share/doc/qtoctave/qtoctave_doc/index.html"
 -
--#define PKG_CMD_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/pkg-commands.list"
+-#define PKG_CMD_PATH "/opt/qtoctave-0.8.2/share/qtoctave/pkg-commands.list"
 -#endif

-- 
qtoctave