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

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jul 29 10:18:07 UTC 2014


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

The following commit has been merged in the master branch:
commit 875e2de3b12cf94d5f57256bd93e304703ade7ae
Merge: 362e88fdd5daecaf6da109d7df1ec5703f6c30c3 432cdc25e40f5ab44556262fc3e5513e11549f69
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 29 11:11:04 2014 +0200

    Merge commit '432cdc25e40f5ab44556262fc3e5513e11549f69'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

 debian/changelog | 375 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 debian/control   |   3 +
 2 files changed, 377 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 1a80c6e,bf292e9..74113a8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,49 +1,62 @@@
 +kalgebra (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:18:33 +0200
 +
+ kalgebra (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:42:41 +0100
+ 
 +kalgebra (4:4.13.1-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Update build-dependencies.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 20 May 2014 11:07:09 +0200
 +
+ kalgebra (4:4.13.0-0ubuntu2) utopic; urgency=medium
+ 
 -  * Merge with Debian, no changes 
++  * 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
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 10 Apr 2014 21:38:10 +0100
+ 
+ kalgebra (4:4.12.97-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:09:47 +0200
+ 
+ kalgebra (4:4.12.95-0ubuntu1) trusty; urgency=medium
+ 
+   [ Rohan Garg ]
+   * New upstream beta release
+ 
+   [ Philip Muškovac ]
+   * Drop upstream_don-t-require-qtmathml-anymore.diff, applied upstream
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 11:56:18 +0100
+ 
+ kalgebra (4:4.12.90-0ubuntu1) trusty; urgency=medium
+ 
+   [ Jonathan Riddell ]
+   * New upstream beta release
+ 
+   [ Philip Muškovac ]
+   * Cherry pick fb5fd9a83e0e648736d0f7d8c4a99dce6da4a78b as
+     upstream_don-t-require-qtmathml-anymore.diff to make kalgebra
+     build again
+ 
+  -- 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.
@@@ -66,6 -207,100 +220,100 @@@ kalgebra (4:4.10.2-1) experimental; urg
  
   -- Sune Vuorela <sune at debian.org>  Sat, 06 Apr 2013 10:41:43 +0000
  
+ kalgebra (4:4.10.2-0ubuntu1) raring; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:36:42 +0200
+ 
+ kalgebra (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream bugfix release
 -  * Rewrite copyright file for current copyright information 
++  * Rewrite copyright file for current copyright information
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 05 Mar 2013 15:13:22 +0000
+ 
+ kalgebra (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 11:31:20 +0000
+ 
+ kalgebra (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 14:57:04 +0000
+ 
+ kalgebra (4:4.9.97-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:24:30 +0100
+ 
+ kalgebra (4:4.9.95-0ubuntu1) raring; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:16:19 +0000
+ 
+ kalgebra (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:36:32 +0000
+ 
+ kalgebra (4:4.9.80-0ubuntu2) raring; urgency=low
+ 
+   * Set minimum build-depends verion on analitza-dev to 4:4.9.80 as it needs
+     the newer version of the library
+ 
+  -- Scott Kitterman <scott at kitterman.com>  Thu, 22 Nov 2012 11:38:25 -0500
+ 
+ kalgebra (4:4.9.80-0ubuntu1) raring; urgency=low
+ 
+   * New upstream beta release
+   * Update .install files
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 19 Nov 2012 15:43:47 +0000
+ 
+ kalgebra (4:4.9.3-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release (LP: #1074747)
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 06 Nov 2012 22:22:21 +0100
+ 
+ kalgebra (4:4.9.2-0ubuntu1) quantal-proposed; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 02 Oct 2012 15:10:50 +0100
+ 
+ kalgebra (4:4.9.1-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <apachelogger at ubuntu.com>  Mon, 10 Sep 2012 18:16:11 +0530
+ 
+ kalgebra (4:4.9.0-0ubuntu1) quantal; urgency=low
+ 
+   * Use direct build-depends versions rather than kde-sc-dev-latest
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 26 Jul 2012 17:00:57 +0100
+ 
+ kalgebra (4:4.8.90-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream beta release.
+ 
+  -- Felix Geyer <debfx at ubuntu.com>  Mon, 11 Jun 2012 22:03:33 +0200
+ 
+ kalgebra (4:4.8.80-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 06 Jun 2012 13:38:31 +0100
+ 
  kalgebra (4:4.8.4-1) unstable; urgency=low
  
    * New upstream release.
@@@ -79,7 -314,7 +327,7 @@@
      - don't pass -DINSTALL_ANALITZA_HEADERS=TRUE to cmake.
      - don't pass -c0 to dh_shlibdeps.
      - remove override_dh_shlibdeps, no longer needed.
--    - remove calgebra from kalgebra-common, now provided by src:analitza. 
++    - remove calgebra from kalgebra-common, now provided by src:analitza.
      - drop libreadline-dev and libncurses-dev, only used by analitza.
    * Bump build dependencies for KDE SC 4.8.4:
      - kde-sc-dev-latest to 4:4.8.4.
@@@ -95,6 -330,58 +343,58 @@@
  
   -- Sune Vuorela <sune at debian.org>  Fri, 22 Jun 2012 09:43:31 +0200
  
+ kalgebra (4:4.8.3-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+     - Bump Standards-Version to 3.9.3 (no change needed)
+     - Add build-dep on libssl-dev
+ 
+  -- Jonathan Kolberg <bulldog98 at kubuntu.org>  Wed, 02 May 2012 10:08:53 +0200
+ 
+ kalgebra (4:4.8.2-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 01 Apr 2012 21:13:54 +0200
+ 
+ kalgebra (4:4.8.1-0ubuntu1) precise; urgency=low
+ 
 -  * New upstream release 
++  * New upstream release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 04 Mar 2012 19:37:48 +0100
+ 
+ kalgebra (4:4.8.0-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Jan 2012 12:10:25 +0000
+ 
+ kalgebra (4:4.7.97-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release candidate
+   * Add build-dep on kdelibs5-experimental-dev
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 05 Jan 2012 12:18:23 +0000
+ 
+ kalgebra (4:4.7.95-0ubuntu1) precise; urgency=low
+ 
+   [ Philip Muškovac ]
+   * New upstream release candidate
+     - update kalgebra-common.install
+ 
+   [ Felix Geyer ]
+   * Drop libanalitza4 and libanalitzagui4 from kalgebra-dbg dependencies.
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sat, 24 Dec 2011 18:52:18 +0100
+ 
+ kalgebra (4:4.7.90-0ubuntu3) precise; urgency=low
+ 
+   * new upstream beta release
+   * Remove enable_debianabimanager.diff now in analitza
+   * Add analitza-dev build-dep
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 15 Dec 2011 14:17:54 +0000
+ 
  kalgebra (4:4.7.4-2) unstable; urgency=low
  
    * Team upload. Upload to unstable.
@@@ -123,3 -421,66 +434,65 @@@ kalgebra (4:4.7.2-1) experimental; urge
    * Initial release. Start from the Ubuntu packaging, thanks!
  
   -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2011 10:44:03 -0300
+ 
+ kalgebra (4:4.7.2-0r7) raring; urgency=low
+ 
+   * Initial release. Start from the Ubuntu packaging, thanks!
+ 
+  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Tue, 18 Oct 2011 01:12:28 +0200
+ 
+ kalgebra (4:4.7.3-0ubuntu1) raring; urgency=low
+ 
+   [ Philip Muškovac ]
+   * New upstream release
+     - Move libanalitza and libanalitzagui into seperate packages
+     - Add symbol files for libanaliza and libanalitzagui
 -    - Add enable_debianabimanager.diff to enable the 
++    - Add enable_debianabimanager.diff to enable the
+       Debian ABI Manager for libanalitza and libanalitzagui
 -    - libanalitza4 and libanalitzagui4 break/replace 
++    - libanalitza4 and libanalitzagui4 break/replace
+       kalgebra-common << 4:4.7.3
+     - build with -DINSTALL_ANALITZA_HEADERS=TRUE
+     - Add kalgebra-dev with analitza headers, needed by cantor
+     - add libncurses-dev to build-deps
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Mon, 03 Oct 2011 22:52:33 +0200
+ 
+ kalgebra (4:4.7.2-0ubuntu1) oneiric-proposed; urgency=low
+ 
+   * New upstream release (LP: #872506)
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Mon, 03 Oct 2011 22:52:33 +0200
+ 
+ kalgebra (4:4.7.1-0ubuntu2) oneiric; urgency=low
+ 
+   * No-change rebuild so translations aren't stripped from .desktop
+     files anymore.
+ 
+  -- Felix Geyer <debfx-pkg at fobos.de>  Thu, 15 Sep 2011 22:52:37 +0200
+ 
+ kalgebra (4:4.7.1-0ubuntu1) oneiric; urgency=low
+ 
+   [ Jonathan Kolberg ]
+   * New upstream release
+ 
+   [ Scott Kitterman ]
+   * Make the mobile package descriptions not identical to the regular ones
+   * Improve kalgebra-dbg long descriptions
+   * Fix kalgebra-dbg depends
+ 
+  -- Scott Kitterman <scott at kitterman.com>  Thu, 08 Sep 2011 09:54:16 -0400
+ 
+ kalgebra (4:4.7.0-0ubuntu1) oneiric; urgency=low
+ 
+   * New upstream release
+   * Bump breaks/replaces for kalgebramobile to catch natty 4.6.5 packages
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 22 Jul 2011 23:52:02 +0200
+ 
+ kalgebra (4:4.6.90+repack1-0ubuntu1) oneiric; urgency=low
+ 
+   * New upstream relase candidate
+   * Update packaging for split tarball
+   * Repack source to include COPYING files
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 08 Jul 2011 20:10:34 +0200
 -
diff --cc debian/control
index 331a006,51dacc6..22a7257
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: kalgebra
  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>
 +Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++X-Ubuntu-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
  Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake,
                 debhelper (>= 9),
@@@ -14,8 -16,10 +15,10 @@@
                 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
 -X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kalgebra.git
 -X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kalgebra.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kalgebra.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kalgebra.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kalgebra
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kalgebra
  
  Package: kalgebra
  Architecture: any

-- 
kalgebra packaging



More information about the pkg-kde-commits mailing list