[Pkg-octave-commit] [SCM] Debian packaging for qtoctave branch, master, updated. 73e9377560af1f88bc4b9a1d8f0510d73e593497

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit fd32b1292d4d6c59188f7b7542f6a57fa0fb7711
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Sun Mar 11 16:43:18 2012 +0100

    debian/patches/use_octave_htmldoc: update patch

diff --git a/debian/patches/use_octave_htmldoc b/debian/patches/use_octave_htmldoc
index 4272f40..8c654ee 100644
--- a/debian/patches/use_octave_htmldoc
+++ b/debian/patches/use_octave_htmldoc
@@ -1,8 +1,9 @@
-Use octave3.2's htmldoc, instead of the stripped HTML files from
-upstream.
-
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 03 Oct 2009 15:32:16 +0200
-
+Description: Update Octave's HTML doc path to use octave-htmldoc
+ Also, avoid failure on nonexistent path to upstream stripped HTML files.
+Author: Thomas Weber <tweber at debian.org>
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+Last-Update: 2012-03-11
+Forwarded: not-needed
 --- a/qtoctave/src/configure.h.in
 +++ b/qtoctave/src/configure.h.in
 @@ -2,7 +2,7 @@
@@ -10,7 +11,24 @@ upstream.
  #define __CONFIGURE_H__
  #define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
 -#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 HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-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/doc/qtoctave/qtoctave_doc/index.html"
+--- a/qtoctave/src/CMakeLists.txt
++++ b/qtoctave/src/CMakeLists.txt
+@@ -64,14 +64,6 @@
+   DESTINATION share/qtoctave/lang
+ )
+ 
+-
+-
+-install (
+-	DIRECTORY octave_doc
+-	DESTINATION share/doc/octave-html
+-	PATTERN ".svn" EXCLUDE
+-	)
+-
+ install (
+ 	DIRECTORY qtoctave_doc
+ 	DESTINATION share/doc/qtoctave

-- 
Debian packaging for qtoctave