[SCM] analitza packaging branch, master, updated. debian/4.11.5-1

Tue Jan 28 20:13:29 UTC 2014

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/analitza.git;a=commitdiff;h=3a2ac96

The following commit has been merged in the master branch:
commit 3a2ac96297cdbf33beba89a27580ff1a8a4e333f
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jan 28 19:34:08 2014 +0100

    wrap-and-sort
---
 debian/control                 | 41 +++++++++++++++++++++++------------------
 debian/copyright               |  5 ++---
 debian/kalgebra-common.install | 16 ++++++++--------
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index f2a7ec2..4bdee12 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: analitza
 Section: libs
 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),
- libreadline-dev,
- pkg-config,
- libqt4-opengl-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),
+               libqt4-opengl-dev,
+               libreadline-dev,
+               pkg-config,
+               pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.4
 XS-Testsuite: autopkgtest
 Homepage: http://edu.kde.org/
@@ -21,7 +22,7 @@ Architecture: any
 Section: kde
 Breaks: kalgebra-common (<< 4:4.8)
 Replaces: kalgebra-common (<< 4:4.8)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: console interface for KAlgebra
  KAlgebra is an algebraic graphing calculator with support for 3D graphing and
  MathML markup language. This package contains the non graphical console
@@ -33,8 +34,10 @@ Package: libanalitza-dev
 Architecture: any
 Section: libdevel
 Conflicts: kalgebra-dev
-Depends: ${misc:Depends}, libanalitza5 (= ${binary:Version}),
- libanalitzagui5 (= ${binary:Version}), libanalitzaplot5 (= ${binary:Version})
+Depends: libanalitza5 (= ${binary:Version}),
+         libanalitzagui5 (= ${binary:Version}),
+         libanalitzaplot5 (= ${binary:Version}),
+         ${misc:Depends}
 Description: development files for analitza
  Analitza is a library to parse and work with mathematical expresssions. This
  library is being used by KAlgebra and Cantor and may be used in other
@@ -56,7 +59,7 @@ Description: common files for analitza
 
 Package: libanalitza5
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: kalgebra (<< 4:4.7.2)
 Replaces: kalgebra (<< 4:4.7.2)
 Description: library to  work with mathematical expressions
@@ -67,7 +70,7 @@ Description: library to  work with mathematical expressions
 
 Package: libanalitzagui5
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: kalgebra (<< 4:4.7.2)
 Replaces: kalgebra (<< 4:4.7.2)
 Description: library to  work with mathematical expressions - GUI routines
@@ -79,7 +82,7 @@ Description: library to  work with mathematical expressions - GUI routines
 
 Package: libanalitzaplot5
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, analitza-common
+Depends: analitza-common, ${misc:Depends}, ${shlibs:Depends}
 Breaks: kalgebra (<< 4:4.7.2)
 Replaces: kalgebra (<< 4:4.7.2)
 Description: library to  work with mathematical expressions - plotting bits
@@ -93,10 +96,12 @@ Package: libanalitza-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${misc:Depends},
- libanalitza5 (= ${binary:Version}), libanalitzagui5 (= ${binary:Version}), libanalitzaplot5 (= ${binary:Version})
-Breaks: kdeedu-dbg (<< 4:4.6.80), kalgebra-dbg (<< 4:4.8)
-Replaces: kdeedu-dbg (<< 4:4.6.80), kalgebra-dbg (<< 4:4.8)
+Depends: libanalitza5 (= ${binary:Version}),
+         libanalitzagui5 (= ${binary:Version}),
+         libanalitzaplot5 (= ${binary:Version}),
+         ${misc:Depends}
+Breaks: kalgebra-dbg (<< 4:4.8), kdeedu-dbg (<< 4:4.6.80)
+Replaces: kalgebra-dbg (<< 4:4.8), kdeedu-dbg (<< 4:4.6.80)
 Description: debugging symbols for the KDE education module
  This package contains debugging files used to investigate problems with
  binaries included in kalgebra.
diff --git a/debian/copyright b/debian/copyright
index 359aa9e..39e795d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -36,7 +36,7 @@ License: GPL-2+
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  .
- On Debian systems, the full text of the GNU General Public License 
+ On Debian systems, the full text of the GNU General Public License
  version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
@@ -69,7 +69,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
@@ -82,4 +82,3 @@ License: BSD-3-clause
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/debian/kalgebra-common.install b/debian/kalgebra-common.install
index 23624a6..bb6f094 100644
--- a/debian/kalgebra-common.install
+++ b/debian/kalgebra-common.install
@@ -6,14 +6,14 @@ usr/share/icons/hicolor/16x16/apps/kalgebra.png
 usr/share/icons/hicolor/32x32/apps/kalgebra.png
 usr/share/icons/hicolor/48x48/apps/kalgebra.png
 usr/share/icons/hicolor/64x64/apps/kalgebra.png
-usr/share/kde4/apps/katepart/syntax/kalgebra.xml
-usr/share/kde4/services/kalgebraplasmoid.desktop
-usr/share/kde4/apps/kalgebra/scripts/tables/tables.js
-usr/share/kde4/apps/kalgebra/scripts/plot2d/plot2d.js
 usr/share/kde4/apps/kalgebra/scripts/console/console.js
-usr/share/kde4/apps/kalgebra/scripts/variables/variables.js
-usr/share/kde4/servicetypes/kalgebrascript.desktop
-usr/share/kde4/apps/kalgebra/scripts/tables/kalgebratables.desktop
-usr/share/kde4/apps/kalgebra/scripts/plot2d/kalgebraplot2d.desktop
 usr/share/kde4/apps/kalgebra/scripts/console/kalgebraconsole.desktop
+usr/share/kde4/apps/kalgebra/scripts/plot2d/kalgebraplot2d.desktop
+usr/share/kde4/apps/kalgebra/scripts/plot2d/plot2d.js
+usr/share/kde4/apps/kalgebra/scripts/tables/kalgebratables.desktop
+usr/share/kde4/apps/kalgebra/scripts/tables/tables.js
 usr/share/kde4/apps/kalgebra/scripts/variables/kalgebravariables.desktop
+usr/share/kde4/apps/kalgebra/scripts/variables/variables.js
+usr/share/kde4/apps/katepart/syntax/kalgebra.xml
+usr/share/kde4/services/kalgebraplasmoid.desktop
+usr/share/kde4/servicetypes/kalgebrascript.desktop

-- 
analitza packaging

