[SCM] cantor packaging branch, master, updated. debian/4.12.4-1-8-g9c8794f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/cantor.git;a=commitdiff;h=9a42a7c

The following commit has been merged in the master branch:
commit 9a42a7c8e87e388e10088349a3d609072916dd74
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon May 19 15:01:57 2014 +0200

    Refresh patches, remove applied upstream ones.
---
 debian/changelog                                   |  3 +++
 debian/patches/maxima_backend_ps_file              | 22 -----------------
 debian/patches/no_install_rpath_use_link_path.diff | 28 ----------------------
 debian/patches/octave_force_use_of_gnuplot         | 10 ++++----
 debian/patches/series                              |  2 --
 5 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eeefff4..764f987 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ cantor (4:4.13.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update analitza build-dep.
+  * Remove upstream applied patch: no_install_rpath_use_link_path.diff
+  * Remove upstream applied patch: maxima_backend_ps_file
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 19 May 2014 14:11:18 +0200
 
diff --git a/debian/patches/maxima_backend_ps_file b/debian/patches/maxima_backend_ps_file
deleted file mode 100644
index 42e53fa..0000000
--- a/debian/patches/maxima_backend_ps_file
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cantor/src/backends/maxima/maximaexpression.cpp
-===================================================================
---- cantor.orig/src/backends/maxima/maximaexpression.cpp	2014-01-30 15:27:56.309485431 +0100
-+++ cantor/src/backends/maxima/maximaexpression.cpp	2014-01-30 17:40:42.097674621 +0100
-@@ -68,7 +68,7 @@
-     if(command().startsWith('?')||command().startsWith(QLatin1String("describe("))||command().startsWith(QLatin1String("example(")))
-         m_isHelpRequest=true;
- 
--    if(command().contains(QRegExp("(?:plot2d|plot3d)\s*\([^\)]")) && MaximaSettings::self()->integratePlots() && !command().contains("psfile"))
-+    if(command().contains(QRegExp("(?:plot2d|plot3d)\s*\([^\)]")) && MaximaSettings::self()->integratePlots() && !command().contains("ps_file"))
-     {
-         m_isPlot=true;
-         m_tempFile=new KTemporaryFile();
-@@ -160,7 +160,7 @@
- 
- #ifdef WITH_EPS
-         const QString psParam="[gnuplot_ps_term_command, \"set size 1.0,  1.0; set term postscript eps color solid \"]";
--        const QString plotParameters = "[psfile, \""+ fileName+"\"],"+psParam;
-+        const QString plotParameters = "[ps_file, \""+ fileName+"\"],"+psParam;
- #else
-         const QString plotParameters = "[gnuplot_term, \"png size 500,340\"], [gnuplot_out_file, \""+fileName+"\"]";
- 
diff --git a/debian/patches/no_install_rpath_use_link_path.diff b/debian/patches/no_install_rpath_use_link_path.diff
deleted file mode 100644
index 23f5547..0000000
--- a/debian/patches/no_install_rpath_use_link_path.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: disable INSTALL_RPATH_USE_LINK_PATH where it triggers useless RPATH
- .
- cantor-backend-r: lintian output: 'binary-or-shlib-defines-rpath ./usr/bin/cantor_rserver /usr/lib64/R/lib', automatically rejected package.
- cantor-backend-r: lintian output: 'binary-or-shlib-defines-rpath ./usr/lib/kde4/cantor_rbackend.so /usr/lib64/R/lib', automatically rejected package.
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2010-07-27
---- a/src/backends/R/rserver/CMakeLists.txt
-+++ b/src/backends/R/rserver/CMakeLists.txt
-@@ -17,6 +17,7 @@ add_custom_target(renvvars COMMAND ${R_E
- add_custom_target(rautoloads COMMAND ${R_EXECUTABLE} --slave --file=${CMAKE_CURRENT_SOURCE_DIR}/tools/autoloads.r > ${CMAKE_CURRENT_BINARY_DIR}/rautoloads.h )
- 
- kde4_add_executable( cantor_rserver ${RServer_SRCS} )
-+set_target_properties( cantor_rserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
- target_link_libraries( cantor_rserver ${KDE4_KDEUI_LIBS} cantorlibs ${R_LIBRARIES} ${KDE4_KIO_LIBS})
- add_dependencies(cantor_rserver renvvars rautoloads)
- 
---- a/src/backends/R/CMakeLists.txt
-+++ b/src/backends/R/CMakeLists.txt
-@@ -21,6 +21,7 @@ QT4_ADD_DBUS_INTERFACE(RBackend_SRCS ${n
- kde4_add_ui_files(RBackend_SRCS settings.ui)
- 
- kde4_add_plugin( cantor_rbackend ${RBackend_SRCS} )
-+set_target_properties( cantor_rbackend PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
- target_link_libraries( cantor_rbackend ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} cantorlibs ${R_USED_LIBS})
- 
- install( FILES rbackend.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/cantor)
diff --git a/debian/patches/octave_force_use_of_gnuplot b/debian/patches/octave_force_use_of_gnuplot
index cc67647..61ffd10 100644
--- a/debian/patches/octave_force_use_of_gnuplot
+++ b/debian/patches/octave_force_use_of_gnuplot
@@ -1,10 +1,10 @@
 Index: cantor/src/backends/octave/octavesession.cpp
 ===================================================================
---- cantor.orig/src/backends/octave/octavesession.cpp	2014-02-28 23:22:52.744066658 +0100
-+++ cantor/src/backends/octave/octavesession.cpp	2014-03-01 21:44:52.763907526 +0100
-@@ -70,6 +70,8 @@
-     {
-         // Do not show the popup when plotting, rather only print to a file
+--- cantor.orig/src/backends/octave/octavesession.cpp	2014-05-19 14:59:17.167265414 +0200
++++ cantor/src/backends/octave/octavesession.cpp	2014-05-19 14:59:17.163265572 +0200
+@@ -72,6 +72,8 @@
+         args << "--eval";
+         args << "graphics_toolkit gnuplot;";
          args << "--eval";
 +        args << "graphics_toolkit gnuplot;";
 +        args << "--eval";
diff --git a/debian/patches/series b/debian/patches/series
index b9a5656..8431829 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 octave_force_use_of_gnuplot
-no_install_rpath_use_link_path.diff
-maxima_backend_ps_file
 testmaxima_inforeq_test

-- 
cantor packaging