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

[Thomas Weber]

The following commit has been merged in the master branch:
commit 94616fceed1edb28e95f71a1361656bbad353443
Author: Thomas Weber <tweber at debian.org>
Date:   Sat Jun 12 23:40:38 2010 +0200

    Drop patch: install-supplementary-docs

diff --git a/debian/changelog b/debian/changelog
index 4987f9e..5e9083d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtoctave (0.9.2+svn255-1) UNRELEASED; urgency=low
     qtoctave-info-reader (closes: #584858)
   * Dropped patches (applied upstream)
     - generate_qm_files
+    - install-supplementary-docs
 
  -- Thomas Weber <tweber at debian.org>  Sat, 12 Jun 2010 22:16:49 +0200
 
diff --git a/debian/patches/install-supplementary-docs b/debian/patches/install-supplementary-docs
deleted file mode 100644
index 7e9433d..0000000
--- a/debian/patches/install-supplementary-docs
+++ /dev/null
@@ -1,46 +0,0 @@
-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 a635829..eaf77e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 use_octave_htmldoc
 build-out-of-source
-install-supplementary-docs
 build-widgetserver

-- 
qtoctave