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

[Thomas Weber]

The following commit has been merged in the master branch:
commit d21d08f7ec4121e586a560df1762643b4e498082
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sat Oct 3 15:46:55 2009 +0200

    Adapt move_doc_under_doc for qtoctave 0.8.2

diff --git a/debian/patches/move_doc_under_doc b/debian/patches/move_doc_under_doc
index f46bd8d..017409b 100644
--- a/debian/patches/move_doc_under_doc
+++ b/debian/patches/move_doc_under_doc
@@ -3,27 +3,25 @@ Move the qtoctave_doc/ directory from /usr/share/qtoctave to
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 22 Apr 2008 09:03:38 +0200
 
-Index: qtoctave-0.8.1+dfsg/src/configure.h.in
-===================================================================
---- qtoctave-0.8.1+dfsg.orig/src/configure.h.in	2008-11-27 00:44:58.000000000 -0600
-+++ qtoctave-0.8.1+dfsg/src/configure.h.in	2008-11-27 00:47:40.000000000 -0600
-@@ -5,5 +5,5 @@
- #define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave3.0-htmldoc/interpreter/index.html"
+--- a/qtoctave/configure.h
++++ b/qtoctave/configure.h
+@@ -5,7 +5,7 @@
+ #define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave3.2-htmldoc/interpreter/index.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 QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/qtoctave/qtoctave_doc/index.html"
+ 
+ #define PKG_CMD_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/pkg-commands.list"
  #endif
-Index: qtoctave-0.8.1+dfsg/src/CMakeLists.txt
-===================================================================
---- qtoctave-0.8.1+dfsg.orig/src/CMakeLists.txt	2008-11-27 00:44:35.000000000 -0600
-+++ qtoctave-0.8.1+dfsg/src/CMakeLists.txt	2008-11-27 00:48:32.000000000 -0600
-@@ -44,11 +44,13 @@
+--- a/qtoctave/src/CMakeLists.txt
++++ b/qtoctave/src/CMakeLists.txt
+@@ -37,11 +37,13 @@
  TARGET_LINK_LIBRARIES(qtoctave ${Qt4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY})
  
  install (
--	DIRECTORY images octave_doc qtoctave_doc menus scripts lang
-+	DIRECTORY images menus scripts lang
+-	DIRECTORY images octave_doc qtoctave_doc menus scripts scripts_octave lang
++	DIRECTORY images menus scripts scripts_octave lang
  	DESTINATION share/qtoctave
  	PATTERN ".svn" EXCLUDE
          )

-- 
qtoctave