[SCM] cantor packaging branch, master, updated. debian/4.11.3-1-7-g048f022

Fri Jan 31 10:55:25 UTC 2014

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

The following commit has been merged in the master branch:
commit 52411cd4fc6901003fc9b2983e970503bddfec59
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jan 30 15:32:17 2014 +0100

    wrap-and-sort
---
 debian/cantor.install |  2 +-
 debian/control        | 56 ++++++++++++++++++++++++++++-----------------------
 debian/copyright      |  2 +-
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/debian/cantor.install b/debian/cantor.install
index 2006dcf..35fc2b1 100644
--- a/debian/cantor.install
+++ b/debian/cantor.install
@@ -33,6 +33,7 @@ usr/share/kde4/apps/cantor/cantor_eigenvalues_assistant.rc
 usr/share/kde4/apps/cantor/cantor_eigenvectors_assistant.rc
 usr/share/kde4/apps/cantor/cantor_integrate_assistant.rc
 usr/share/kde4/apps/cantor/cantor_invert_matrix_assistant.rc
+usr/share/kde4/apps/cantor/cantor_part.rc
 usr/share/kde4/apps/cantor/cantor_plot2d_assistant.rc
 usr/share/kde4/apps/cantor/cantor_plot3d_assistant.rc
 usr/share/kde4/apps/cantor/cantor_runscript_assistant.rc
@@ -40,7 +41,6 @@ usr/share/kde4/apps/cantor/cantor_scripteditor.rc
 usr/share/kde4/apps/cantor/cantor_shell.rc
 usr/share/kde4/apps/cantor/cantor_solve_assistant.rc
 usr/share/kde4/apps/cantor/xslt/latex.xsl
-usr/share/kde4/apps/cantor/cantor_part.rc
 usr/share/kde4/config.kcfg/cantor.kcfg
 usr/share/kde4/config.kcfg/cantor_libs.kcfg
 usr/share/kde4/config/cantor.knsrc
diff --git a/debian/control b/debian/control
index 6c54656..a0f7c29 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,20 @@ Source: cantor
 Section: kde
 Priority: optional
 Maintainer: Debian 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: kde-sc-dev-latest (>= 4:4.11),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.11), libanalitza-dev (>= 4:4.11),
- pkg-config,
- libspectre-dev,
- r-base-core,
- libblas3gf,
- liblapack3gf,
- libqalculate-dev, libglib2.0-dev
+Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.11),
+               kdelibs5-dev (>= 4:4.11),
+               libanalitza-dev (>= 4:4.11),
+               libblas3gf,
+               libglib2.0-dev,
+               liblapack3gf,
+               libqalculate-dev,
+               libspectre-dev,
+               pkg-config,
+               pkg-kde-tools (>= 0.12),
+               r-base-core
 Standards-Version: 3.9.5
 Homepage: http://edu.kde.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/cantor.git
@@ -21,11 +24,14 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/cantor.git
 Package: cantor
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: cantor-backend-kalgebra, texlive-latex-base, texlive-binaries
-Suggests: cantor-backend-maxima, cantor-backend-r, cantor-backend-sage,
- cantor-backend-octave, cantor-backend-qalculate,
- cantor-backend-scilab [i386 amd64]
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: cantor-backend-kalgebra, texlive-binaries, texlive-latex-base
+Suggests: cantor-backend-maxima,
+          cantor-backend-octave,
+          cantor-backend-qalculate,
+          cantor-backend-r,
+          cantor-backend-sage,
+          cantor-backend-scilab [i386 amd64]
 Description: interface for mathematical applications
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
@@ -47,7 +53,7 @@ Description: interface for mathematical applications
 Package: cantor-backend-kalgebra
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: KAlgebra backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
@@ -62,7 +68,7 @@ Description: KAlgebra backend for Cantor
 Package: cantor-backend-maxima
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}, maxima
+Depends: maxima, ${misc:Depends}, ${shlibs:Depends}
 Description: Maxima backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
@@ -77,7 +83,7 @@ Description: Maxima backend for Cantor
 Package: cantor-backend-octave
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}, octave
+Depends: octave, ${misc:Depends}, ${shlibs:Depends}
 Description: Octave backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
@@ -92,7 +98,7 @@ Description: Octave backend for Cantor
 Package: cantor-backend-qalculate
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qalculate! backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
@@ -107,7 +113,7 @@ Description: Qalculate! backend for Cantor
 Package: cantor-backend-r
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}, r-base-core
+Depends: r-base-core, ${misc:Depends}, ${shlibs:Depends}
 Suggests: r-base-html
 Description: R backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
@@ -123,7 +129,7 @@ Description: R backend for Cantor
 Package: cantor-backend-sage
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: sagemath
 Description: Sage backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
@@ -140,9 +146,9 @@ Description: Sage backend for Cantor
  This package is part of the KDE education module.
 
 Package: cantor-backend-scilab
-Architecture: i386 amd64
+Architecture: amd64 i386
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-cli
+Depends: scilab-cli, ${misc:Depends}, ${shlibs:Depends}
 Description: Scilab backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
@@ -158,7 +164,7 @@ Package: cantor-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${misc:Depends}, cantor (= ${binary:Version})
+Depends: cantor (= ${binary:Version}), ${misc:Depends}
 Breaks: kdeedu-dbg (<< 4:4.6.80)
 Replaces: kdeedu-dbg (<< 4:4.6.80)
 Description: debugging symbols for cantor
diff --git a/debian/copyright b/debian/copyright
index 42caf28..03877ea 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -95,7 +95,7 @@ License: BSD-3-clause
  2. Redistributions in binary form must reproduce the copyright
  notice, this list of conditions and the following disclaimer in the
  documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products 
+ 3. The name of the author may not be used to endorse or promote products
  derived from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

-- 
cantor packaging

