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

[Thomas Weber]

The following commit has been merged in the master branch:
commit 396b3f89e1ff2e9945391e829db1a858ac9d6541
Author: Thomas Weber <tweber at debian.org>
Date:   Sun May 23 00:40:42 2010 +0200

    Drop patch install_easyplot_as_target

diff --git a/debian/changelog b/debian/changelog
index 964c9e3..fd3f9d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
   * Dropped patches:
     - add_missing_includes (partly superseded by code changes, partly applied)
     - font-option-in-png-export (applied upstream)
+    - install_easyplot_as_target (applied upstream)
 
   [ Thomas Weber ]
   * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571914)
diff --git a/debian/patches/install_easyplot_as_target b/debian/patches/install_easyplot_as_target
deleted file mode 100644
index 0205dd1..0000000
--- a/debian/patches/install_easyplot_as_target
+++ /dev/null
@@ -1,19 +0,0 @@
-Use a different signature of the INSTALL command, so installation works also
-for an out-out-source build
-
-This patch was forwarded upstream.
-
- -- Thomas Weber <thomas.weber.mail at gmail.com> Sun, 04 Oct 2009 15:13:35 +0200
-
---- a/easy_plot/src/CMakeLists.txt
-+++ b/easy_plot/src/CMakeLists.txt
-@@ -42,6 +42,7 @@
- TARGET_LINK_LIBRARIES(easy_plot ${Qt4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTSVG_LIBRARY})
- 
- install	(
--		PROGRAMS easy_plot
-+		TARGETS easy_plot
-+		RUNTIME
- 		DESTINATION bin
- 	)
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index bd552c9..8be2680 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 dont_include_simple_rcs
 use_octave_htmldoc
 move_doc_under_doc
-install_easyplot_as_target
 build-out-of-source
 use_cstdio_header

-- 
qtoctave