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

[Thomas Weber]

The following commit has been merged in the master branch:
commit 47dfca18c77e8f8da0b2bf600cd76815ee97b028
Author: Thomas Weber <tweber at debian.org>
Date:   Sun May 23 16:03:32 2010 +0200

    Drop patch dont_include_simple_rcs

diff --git a/debian/changelog b/debian/changelog
index 129c6e9..8a45592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
   * Switch to dpkg-source 3.0 (quilt) format
   * No longer uuencode icons.tar file (dpkg-source 3.0 format allows binary
     files in the diff)
+  * Dropped patches:
+    - dont_include_simple_rcs (we install the simplercs command)
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 23:01:38 +0100
 
diff --git a/debian/patches/dont_include_simple_rcs b/debian/patches/dont_include_simple_rcs
deleted file mode 100644
index 50e333f..0000000
--- a/debian/patches/dont_include_simple_rcs
+++ /dev/null
@@ -1,15 +0,0 @@
-We strip the simple_rcs directory from the upstream tarball (see
-README.sources), so remove it from the build system as well.
-
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 03 Oct 2009 13:20:57 +0200
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -41,7 +41,6 @@
- add_subdirectory (qtoctave_pkg/src)
- add_subdirectory (xmlwidget/qt4)
- add_subdirectory (easy_plot)
--add_subdirectory (simple_rcs)
- add_subdirectory (qtjs)
- add_subdirectory (qtoctave)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 8be2680..8ab888e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-dont_include_simple_rcs
 use_octave_htmldoc
 move_doc_under_doc
 build-out-of-source

-- 
qtoctave