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

[Thomas Weber]

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

    New patch: install-supplementary-docs

diff --git a/debian/changelog b/debian/changelog
index 733dd95..b0662e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
   * debian/docs: removed news.txt and LICENSE_GPL.txt
   * New patches:
     + generate_qm_files: ensure that l10n files get built
+    + install-supplementary-docs: install more docs, mostly for qtoctave-utils
 
   [ Thomas Weber ]
   * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571914)
diff --git a/debian/patches/install-supplementary-docs b/debian/patches/install-supplementary-docs
new file mode 100644
index 0000000..7e9433d
--- /dev/null
+++ b/debian/patches/install-supplementary-docs
@@ -0,0 +1,46 @@
+From: Pedro Luis Lucas Rosado <acisif at mixmail.com>
+Subject: install more docs, mostly for qtoctave-utils, taken from upstream revision 254
+Origin: upstream, https://forja.rediris.es/plugins/scmsvn/viewcvs.php?root=csl-qtoctave&diff_format=h&view=rev&rev=254
+--- a/qtjs/CMakeLists.txt
++++ b/qtjs/CMakeLists.txt
+@@ -1,2 +1,11 @@
+ add_subdirectory (src)
+ 
++install(
++  DIRECTORY doc
++  DESTINATION share/doc/qtoctave-utils/qtjs
++)
++
++install(
++  FILES "instalar.txt" "install.txt"
++  DESTINATION share/doc/qtoctave-utils/qtjs
++)
+\ No newline at end of file
+--- a/simple_rcs/CMakeLists.txt
++++ b/simple_rcs/CMakeLists.txt
+@@ -14,3 +14,9 @@
+ #ADD_DEFINITIONS(-DUSER_CONFIG)
+ 
+ add_subdirectory (src)
++
++install(
++  DIRECTORY design
++  DESTINATION share/doc/qtoctave-utils/simple_rcs
++  PATTERN ".svn" EXCLUDE
++)
+\ No newline at end of file
+--- /dev/null
++++ b/xmlwidget/CMakeLists.txt
+@@ -0,0 +1,11 @@
++add_subdirectory(qt4)
++
++install(
++  DIRECTORY doc
++  DESTINATION share/doc/qtoctave-utils/xmlwidget
++)
++
++install(
++  DIRECTORY examples
++  DESTINATION share/doc/qtoctave-utils/xmlwidget
++)
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 0551598..e5fc328 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use_octave_htmldoc
 build-out-of-source
 generate_qm_files
+install-supplementary-docs

-- 
qtoctave