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

[Thomas Weber]

The following commit has been merged in the master branch:
commit 597077d5f537ac9361f8cb03aa3b78e50a7ad6f0
Author: Thomas Weber <tweber at debian.org>
Date:   Sun May 30 18:51:06 2010 +0200

    Drop patch move_doc_under_doc

diff --git a/debian/changelog b/debian/changelog
index 17bf78a..633ea27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
   * Dropped patches:
     - dont_include_simple_rcs (we install the simplercs command)
     - use_cstdio_header (applied upstream)
+    - move_doc_under_doc (applied upstream)
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 23:01:38 +0100
 
diff --git a/debian/patches/move_doc_under_doc b/debian/patches/move_doc_under_doc
deleted file mode 100644
index 017409b..0000000
--- a/debian/patches/move_doc_under_doc
+++ /dev/null
@@ -1,33 +0,0 @@
-Move the qtoctave_doc/ directory from /usr/share/qtoctave to
-/usr/share/doc/qtoctave
-
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 22 Apr 2008 09:03:38 +0200
-
---- 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
---- 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 scripts_octave lang
-+	DIRECTORY images menus scripts scripts_octave lang
- 	DESTINATION share/qtoctave
- 	PATTERN ".svn" EXCLUDE
-         )
- 
-+INSTALL ( DIRECTORY qtoctave_doc DESTINATION share/doc/qtoctave )
-+
- install	(
- 	TARGETS qtoctave
- 	RUNTIME DESTINATION bin
diff --git a/debian/patches/series b/debian/patches/series
index 0aa7f52..58ca07d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use_octave_htmldoc
-move_doc_under_doc
 build-out-of-source

-- 
qtoctave