[SCM] kalgebra packaging branch, master, updated. debian/4.13.1-1-141-g7e86982

Tue Jul 29 10:18:06 UTC 2014

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kalgebra.git;a=commitdiff;h=7d43404

The following commit has been merged in the master branch:
commit 7d434043c7a2f7071bed2a94709f63fcd528ffff
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Wed May 21 11:34:50 2014 +0100

    * Merge with Debian, no changes
---
 debian/changelog | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/compat    |  2 +-
 debian/control   | 32 +++++++++++++++++++++-----------
 debian/copyright |  4 ++--
 debian/rules     |  2 --
 5 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2be634a..62d1287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kalgebra (4:4.13.0-0ubuntu2) utopic; urgency=medium
+
+  * Merge with Debian, no changes 
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 20 May 2014 12:19:59 +0000
+
 kalgebra (4:4.13.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream KDE Software Compilation release
@@ -32,12 +38,28 @@ kalgebra (4:4.12.90-0ubuntu1) trusty; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:36:26 +0000
 
+kalgebra (4:4.12.4-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 28 Apr 2014 12:24:57 +0200
+
 kalgebra (4:4.12.3-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 20:29:07 +0100
 
+kalgebra (4:4.12.2-1) experimental; urgency=medium
+
+  * Do not disable an empty test set.
+  * Bump Standards-Version to 3.9.5, no changes needed.
+  * New upstream release.
+  * Add new build dependencies.
+  * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:32:12 +0100
+
 kalgebra (4:4.12.2-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
@@ -75,6 +97,20 @@ kalgebra (4:4.11.80-0ubuntu1) trusty; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:27:22 +0100
 
+kalgebra (4:4.11.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 08 Nov 2013 15:23:50 +0100
+
+kalgebra (4:4.11.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update build-dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org>  Wed, 09 Oct 2013 15:23:53 +0200
+
 kalgebra (4:4.11.2-0ubuntu1) saucy; urgency=low
 
   * New upstream bugfix release
@@ -126,6 +162,22 @@ kalgebra (4:4.10.80-0ubuntu1) saucy; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 21 Jun 2013 00:46:54 +0100
 
+kalgebra (4:4.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jul 2013 17:52:26 +0200
+
+kalgebra (4:4.10.4-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump debhelper build-dep and compat to 9.
+  * Bump Standards-Version to 3.9.4.
+  * Update vcs fields.
+  * Add myself to uploaders.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 14:31:11 +0200
+
 kalgebra (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
 
   * New upstream bugfix release
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index dcc9bef..9755eec 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,18 @@ Section: kde
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Sune Vuorela <sune at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.10),
- cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), pkg-config,
- kdelibs5-dev (>= 4:4.13.0), libkdeedu-dev (>= 4:4.13.0), libanalitza-dev (>= 4:4.13.0),
- libqt4-opengl-dev, libqtwebkit-dev
-Standards-Version: 3.9.3
+Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.12),
+               kdelibs5-dev (>= 4:4.11),
+               libanalitza-dev (>= 4:4.11),
+               libkdeedu-dev (>= 4:4.11),
+               libqt4-opengl-dev,
+               libqtwebkit-dev,
+               pkg-config,
+               pkg-kde-tools (>= 0.12)
+Standards-Version: 3.9.5
 Homepage: http://edu.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kalgebra
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kalgebra
@@ -18,7 +24,9 @@ X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kalgebra.git
 Package: kalgebra
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}, kalgebra-common (= ${binary:Version})
+Depends: kalgebra-common (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: kalgebramobile (<< 4:4.7.2)
 Description: algebraic graphing calculator
  KAlgebra is a algebraic graphing calculator with support for 3D graphing and
@@ -29,7 +37,9 @@ Description: algebraic graphing calculator
 Package: kalgebramobile
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends},  kalgebra-common (= ${binary:Version})
+Depends: kalgebra-common (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: algebraic graphing calculator for small touch based interfaces
  KAlgebra is a algebraic graphing calculator with support for 3D graphing and
  MathML markup language. This is the version for small touch based interfaces
@@ -41,7 +51,7 @@ Architecture: any
 Section: math
 Breaks: kalgebra (<< 4:4.7.2)
 Replaces: kalgebra (<< 4:4.7.2)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: contains files common for kalgebra and kalgebramobile
  KAlgebra is a algebraic graphing calculator with support for 3D graphing and
  MathML markup language and it contains files needed for both full and mobile
@@ -53,8 +63,8 @@ Package: kalgebra-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${misc:Depends},
- kalgebra (= ${binary:Version}) | kalgebramobile (= ${binary:Version}),
+Depends: kalgebra (= ${binary:Version}) | kalgebramobile (= ${binary:Version}),
+         ${misc:Depends}
 Recommends: libanalitza-dbg
 Breaks: kdeedu-dbg (<< 4:4.6.80)
 Replaces: kdeedu-dbg (<< 4:4.6.80)
diff --git a/debian/copyright b/debian/copyright
index 2bb2985..05cbc88 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'.
 
@@ -62,7 +62,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
diff --git a/debian/rules b/debian/rules
index 62d4871..3c140ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,5 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-.PHONY: override_dh_auto_test
-
 override_dh_strip:
 	$(overridden_command) --dbg-package=kalgebra-dbg

-- 
kalgebra packaging

