[SCM] cantor packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-30-g70354fb

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8b0c4d3305c7a6f84cc3fe07b2d880b95eeafd49
Merge: cbd6c19fb8bf434be7ba668a21d2c120c2e23ac7 b7016cac0c52482772a319160f9648310e1c0db4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Sep 6 16:20:45 2015 +0200

    Merge tag 'ubuntu/4%15.08.0-0ubuntu1'
    
    'cantor Ubuntu release 4:15.08.0-0ubuntu1'

 debian/cantor-backend-kalgebra.install           |   8 +-
 debian/cantor-backend-lua.install                |   6 +-
 debian/cantor-backend-maxima.install             |  12 +-
 debian/cantor-backend-octave.install             |  14 +--
 debian/cantor-backend-python2.install            |  10 +-
 debian/cantor-backend-python3.install            |   5 +
 debian/cantor-backend-qalculate.install          |  12 +-
 debian/cantor-backend-r.install                  |   8 +-
 debian/cantor-backend-sage.install               |  10 +-
 debian/cantor-backend-scilab.install             |   6 +-
 debian/cantor-dev.install                        |  18 +++
 debian/cantor.install                            | 139 +++++++++++------------
 debian/cantor.lintian-overrides                  |   7 +-
 debian/changelog                                 |  23 ++++
 debian/control                                   |  84 ++++++++++++--
 debian/libcantor-pythonbackend.install           |   2 +
 debian/libcantor-pythonbackend.lintian-overrides |   2 +
 debian/not-installed                             |  20 ----
 debian/rules                                     |   4 +-
 19 files changed, 242 insertions(+), 148 deletions(-)

diff --cc debian/changelog
index 4389492,bb49ea0..d2084cd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,26 +1,44 @@@
 +cantor (4:15.08.0-1~) UNRELEASED; 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>  Sat, 05 Sep 2015 22:18:46 +0200
 +
+ cantor (4:15.08.0-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 16:13:26 +0100
+ 
+ cantor (4:15.07.90-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+   * PPA build
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 08:57:01 +0100
+ 
+ cantor (4:15.04.2-0ubuntu1) wily; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+ 
+   [ Jonathan Riddell ]
+   * PPA build
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 18:22:28 +0200
+ 
 +cantor (4:14.12.3-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 29 Mar 2015 15:13:10 +0200
 +
  cantor (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index dab9431,cb3274a..b03f9ec
--- a/debian/control
+++ b/debian/control
@@@ -3,24 -3,53 +3,24 @@@ 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,
 +               extra-cmake-modules (>= 1.7.0~),
-                kde-sc-dev-latest (>= 4:4.12),
+                libanalitza-dev,
                 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,
 -               libkf5textwidgets-dev,
 -               libkf5unitconversion-dev,
 -               libkf5widgetsaddons-dev,
 -               libkf5windowsystem-dev,
 -               libkf5xmlgui-dev,
 -               libluajit-5.1-dev,
 +               liblapack3,
 +               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),
diff --cc debian/rules
index cc1be12,700cb54..f42cd73
--- a/debian/rules
+++ b/debian/rules
@@@ -1,12 -1,10 +1,12 @@@
  #!/usr/bin/make -f
  
- include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
  libpkgs_gen_strict_local_shlibs = cantor
- include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
+ include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
  
 -.PHONY: override_dh_auto_test
 +override_dh_auto_test:
 +	# Disable dh_auto_test at build time
 +	:
  
  override_dh_makeshlibs:
  	$(overridden_command) -V

-- 
cantor packaging