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

[Thomas Weber]

The following commit has been merged in the master branch:
commit 79bb79f8e87148eb4eacf14b6d04f393cef33d68
Author: Thomas Weber <tweber at debian.org>
Date:   Sun Jun 6 09:24:52 2010 +0200

    Adapt patch use_octave_htmldoc

diff --git a/debian/changelog b/debian/changelog
index b0662e6..41193c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
     - use_cstdio_header (applied upstream)
     - move_doc_under_doc (applied upstream)
   * Adapt patch build-out-of-source, part of it was applied upstream
+  * Adapt patch use_octave_htmldoc for new release
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 23:01:38 +0100
 
diff --git a/debian/patches/use_octave_htmldoc b/debian/patches/use_octave_htmldoc
index 66aa8fb..4272f40 100644
--- a/debian/patches/use_octave_htmldoc
+++ b/debian/patches/use_octave_htmldoc
@@ -3,14 +3,14 @@ upstream.
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 03 Oct 2009 15:32:16 +0200
 
---- a/qtoctave/configure.h
-+++ b/qtoctave/configure.h
+--- a/qtoctave/src/configure.h.in
++++ b/qtoctave/src/configure.h.in
 @@ -2,7 +2,7 @@
  #ifndef __CONFIGURE_H__
  #define __CONFIGURE_H__
  #define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
--#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/octave_doc/index.html"
+-#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-html/octave_doc/index.html"
 +#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"

-- 
qtoctave