[SCM] kactivities packaging branch, master, updated. debian/4.13.1-1-128-gfafc380

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 31 14:31:13 UTC 2014 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kactivities.git;a=commitdiff;h=31d60e7

The following commit has been merged in the master branch:
commit 31d60e7e866d7125e6b98a3fda7d65a47dd7a570
Merge: 583833efca13f291d638adb911787d9aab7951e2 1ec62375aaab9257aacd32eeb520f68c9e067b0b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jul 31 15:42:34 2014 +0200

    Merge commit '1ec62375aaab9257aacd32eeb520f68c9e067b0b'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/libkactivities-models1.symbols
    	debian/libkactivities6.symbols
    	debian/watch

 debian/changelog | 326 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   |   5 +-
 2 files changed, 330 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index c9f7134,3b52876..b9cf8d9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
 +kactivities (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:33:43 +0200
 +
+ kactivities (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   [ Rohan Garg ]
+   * Merge with debian, no remaining changes
+ 
+   [ Jonathan Riddell ]
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:42:14 +0100
+ 
  kactivities (4:4.13.1-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -60,6 -130,65 +136,65 @@@ kactivities (4:4.11.2-1) experimental; 
  
   -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Oct 2013 20:32:23 +0200
  
+ kactivities (4:4.11.2-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 30 Sep 2013 13:57:29 +0100
+ 
+ kactivities (4:4.11.1-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bugfix release.
+ 
+  -- Howard Chan <smartboyhw at gmail.com>  Fri, 06 Sep 2013 22:05:28 +0100
+ 
+ kactivities (4:4.11.0-0ubuntu1) saucy; urgency=low
+ 
+   [ Howard Chan ]
+   * New upstream release
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 13 Aug 2013 23:57:36 +0100
+ 
+ kactivities (4:4.10.97-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream RC 2 release
+   * New upstream RC 2 release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 26 Jul 2013 19:05:03 +0100
+ 
+ kactivities (4:4.10.95-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 19 Jul 2013 12:31:48 +0000
+ 
+ kactivities (4:4.10.90-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bet release
+ 
+  -- Michał Zając <quintasan at kubuntu.org>  Fri, 28 Jun 2013 17:59:05 +0100
+ 
+ kactivities (4:4.10.80-0ubuntu1) saucy; urgency=low
+ 
+   [ Rohan Garg ]
+   * New upstream release
+ 
+   [ Howard Chan ]
+   * Fix the symbols files
+   * Update libkactivities-bin.install
+ 
+   [ Philip Muškovac ]
 -  * Update install files 
++  * Update install files
+   * Add new symbols to libkactivities6.symbols
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 21 Jun 2013 00:46:20 +0100
+ 
  kactivities (4:4.10.5-1) unstable; urgency=low
  
    * New upstream release.
@@@ -139,3 -394,69 +400,68 @@@ kactivities (4:4.8.3-1) experimental; u
    * Bump kde-sc-dev-latest build dependency to 4:4.8.3.
  
   -- Modestas Vainius <modax at debian.org>  Sat, 26 May 2012 20:37:00 +0300
+ 
+ kactivities (4:4.8.3-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+     - add activitymanager_plugin_globalshortcuts to libkactivities-bin.install
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 13 May 2012 19:02:42 +0200
+ 
+ kactivities (4:4.8.3-0r1) raring; urgency=low
+ 
+   [ Eshat Cakar ]
+   * New upstream release, start from kubuntu packaging, thanks!
+   * Bump kdelibs5-dev depends to 4.8.
+ 
+   [ José Manuel Santamaría Lema ]
+   * Bump kde-sc-dev-latest build dependency to 4:4.8.3.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Mar 2012 21:11:33 +0100
+ 
+ kactivities (4:4.8.2-0ubuntu2) precise-proposed; urgency=low
+ 
+   * Rebuild for .pot generation
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Apr 2012 16:31:59 +0100
+ 
+ kactivities (4:4.8.2-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 30 Mar 2012 20:00:33 +0200
+ 
+ kactivities (4:4.8.1-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+   * libkactivities-bin breaks/replaces kde-runtime << 4:4.8.0
+   * libkactivities-bin breaks/replaces kde-runtime-data << 4:4.8.0
+   * libkactivities-dbg breaks/replaces kde-runtime-dbg << 4:4.8.0
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 07 Mar 2012 14:42:53 +0100
+ 
+ kactivities (4:4.8.0-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 19 Jan 2012 12:01:22 +0000
+ 
+ kactivities (4:4.7.97-0ubuntu1) precise; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 04 Jan 2012 13:14:56 +0000
+ 
+ kactivities (4:4.7.95-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release candidate
+     - update libkactivities-dev.install
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 23 Dec 2011 23:39:41 +0100
+ 
+ kactivities (4:4.7.90-0ubuntu1) precise; urgency=low
+ 
+   * Initial package
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 13 Dec 2011 11:53:27 +0000
 -
diff --cc debian/control
index 2cf4be0,c2a7fad..dcb6258
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: kactivities
  Section: kde
  Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -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/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++X-Ubuntu-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
  Uploaders: Eshat Cakar <info at eshat.de>,
             Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
             Sune Vuorela <sune at debian.org>,
@@@ -19,8 -20,10 +20,10 @@@ Build-Depends: cmake
  Standards-Version: 3.9.5
  XS-Testsuite: autopkgtest
  Homepage: http://www.kde.org/
 -Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivities
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivities
 -X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kactivities.git
 -X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kactivities.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kactivities.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kactivities.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivities
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivities
  
  Package: libkactivities-bin
  Architecture: any

-- 
kactivities packaging

More information about the pkg-kde-commits mailing list