[SCM] cantor packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-39-gbb666fa

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/cantor.git;a=commitdiff;h=2f75598

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 2f755982458ff621f5fb1851d67c8acaf3274690
Merge: e31b744b30270f0c96c3a9df61f0c4a94945e872 881fcde1f9b21c3bf288e0373869b5ab85defa50
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Jan 12 23:00:15 2016 +0100

    Merge remote-tracking branch 'origin/master' into kubuntu_xenial_archive

 debian/.gitattributes                      |  1 +
 debian/changelog                           | 55 +++++++++++++++++++++++++----
 debian/control                             | 56 ++++++++++--------------------
 debian/patches/acceptable_answers          | 13 +++++++
 debian/patches/maxima_multiresults         | 18 ++++++++++
 debian/patches/maxima_waiting_the_carriage | 17 +++++++++
 debian/patches/series                      |  3 ++
 debian/rules                               |  4 ++-
 8 files changed, 122 insertions(+), 45 deletions(-)

diff --cc debian/changelog
index 02a2ed3,f23ad37..f50e085
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,27 +1,60 @@@
 +cantor (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Added worksheetaccess.h to cantor-dev.install  
 +  * New upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Sat, 12 Dec 2015 21:43:07 +0000
 +
+ cantor (4:15.08.3-1) experimental; urgency=medium
+ 
+   * New upstream release (15.08.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Dec 2015 12:39:55 +0100
+ 
 +cantor (4:15.08.2-0ubuntu2) wily; urgency=medium
 +
 +  * Start kdeinit5 rather than kdeinit4 in the autopkgtest testsuite
 +  * autopkgtest depends on python3-numpy to pass the python3 tests
 +  * Made octave backend depend on ghostscript as some of its scripts use the
 +    print instruction which requires it
 +  * Added kubuntu_by-default-use-octave-cli-rather-than-octave.patch to change
 +    the octave binary from 'octave' to 'octave-cli' as octave for unknown
 +    reasons decides to load the GUI when we really want the CLI. Also filed
 +    for review upstream
 +
 + -- Harald Sitter <sitter at kde.org>  Thu, 15 Oct 2015 15:26:27 +0200
 +
 +cantor (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 11:48:54 +0100
 +
+ cantor (4:15.08.1-1) experimental; urgency=medium
+ 
+   * New upstream release (15.08.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 03:16:19 +0200
+ 
 +cantor (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 16:05:58 +0100
 +
+ cantor (4:15.08.0-1) experimental; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.1).
+   * New upstream release (15.04.2).
+   * New upstream release (15.04.3).
+   * New upstream release (15.08.0).
+   * Update build dependencies.
+   * Refresh patches.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 07 Sep 2015 18:15:59 +0200
+ 
  cantor (4:15.08.0-0ubuntu1) wily; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 5181614,07b91ae..e686b9e
--- a/debian/control
+++ b/debian/control
@@@ -3,53 -3,24 +3,28 @@@ Section: kd
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
- Build-Depends: cmake,
+ Build-Depends: cmake (>= 2.8.12~),
                 debhelper (>= 9),
-                extra-cmake-modules,
-                gettext,
-                kdoctools-dev,
-                kgendesignerplugin,
-                kinit-dev,
-                kio-dev,
-                libanalitza-dev,
+                extra-cmake-modules (>= 1.7.0~),
+                libanalitza-dev (>> 4:15.08),
                 libglib2.0-dev,
                 libkf5archive-dev,
-                libkf5attica-dev,
-                libkf5auth-dev,
-                libkf5bookmarks-dev,
-                libkf5codecs-dev,
-                libkf5completion-dev,
                 libkf5config-dev,
-                libkf5configwidgets-dev,
                 libkf5coreaddons-dev,
-                libkf5crash-dev,
-                libkf5dbusaddons-dev,
-                libkf5emoticons-dev,
-                libkf5globalaccel-dev,
-                libkf5guiaddons-dev,
-                libkf5i18n-dev,
-                libkf5iconthemes-dev,
-                libkf5itemmodels-dev,
-                libkf5itemviews-dev,
-                libkf5jobwidgets-dev,
                 libkf5kdelibs4support-dev,
                 libkf5newstuff-dev,
-                libkf5notifications-dev,
                 libkf5parts-dev,
                 libkf5pty-dev,
-                libkf5service-dev,
-                libkf5solid-dev,
-                libkf5sonnet-dev,
                 libkf5texteditor-dev,
 -               liblapack3,
 -               libluajit-5.1-dev [i386 amd64],
 +               libkf5textwidgets-dev,
 +               libkf5unitconversion-dev,
 +               libkf5widgetsaddons-dev,
 +               libkf5windowsystem-dev,
 +               libkf5xmlgui-dev,
 +               libluajit-5.1-dev  [i386 amd64],
                 libqalculate-dev,
-                libqt5svg5-dev,
-                libqt5xmlpatterns5-dev,
+                libqt5svg5-dev (>= 5.4),
+                libqt5xmlpatterns5-dev (>= 5.4),
                 libspectre-dev,
                 pkg-config,
                 pkg-kde-tools (>> 0.15.15),

-- 
cantor packaging