[SCM] libksysguard packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.3-0ubuntu1-39-ga3ad2f8

Scarlett Clark sgclark-guest at moszumanska.debian.org
Tue Jan 12 22:11:29 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libksysguard.git;a=commitdiff;h=a3ad2f8

The following commit has been merged in the kubuntu_unstable branch:
commit a3ad2f80c06d0dfe7cf8dfb8a1e7f519e7c9db6d
Merge: b9e94cd49d87ebe4fcd1889df7bca860745c8c67 27b8808f1fe3b81950a4d5efe99c30a08c98d0f7
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Jan 12 14:11:19 2016 -0800

     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:46:08 +0100 * New upstream release (5.4.2). * Update symbols files from buildds logs (4:5.4.1-1).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:52:26 +0200 * New upstream release (5.4.1).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:45 +0200 * New upstream release (5.4.0). * Update symbols files.
    -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 17:37:13 +0200 * Add the missing Breaks/Replaces. (Closes: #790920, #790802)
    -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 14:07:56 +0200 * New upstream release (5.3.2). * Update copyright information.
    -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 23:15:57 +0200
    
     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:46:08 +0100
     * New upstream release (5.4.2).
     * Update symbols files from buildds logs (4:5.4.1-1).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:52:26 +0200
     * New upstream release (5.4.1).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:45 +0200
     * New upstream release (5.4.0).
     * Update symbols files.
    -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 17:37:13 +0200
     * Add the missing Breaks/Replaces. (Closes: #790920, #790802)
    -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 14:07:56 +0200
     * New upstream release (5.3.2).
     * Update copyright information.
    -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 23:15:57 +0200

 debian/changelog             | 50 +++++++++++++++++++++++++++--
 debian/control               | 11 ++++---
 debian/copyright             | 75 +++++++++++++++++++++++++++++++-------------
 debian/libksgrd7.symbols     |  2 +-
 debian/libprocessui7.symbols |  4 +--
 debian/rules                 |  3 ++
 6 files changed, 114 insertions(+), 31 deletions(-)

diff --cc debian/changelog
index ccaa8e2,173f269..368b932
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,95 -1,42 +1,137 @@@
 +libksysguard (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Revert package version bump. Stable should *NOT* be
 +    the same version as master. 
 +  * New upstream release Xenial
 +
 +  [ Clive Johnston ]
 +  * new upstream release
 +  * New upstream release
 +
++  [ Scarlett Clark ]
++  * Debian merge, No remaining changes. 
++
 + -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 17:58:16 +0000
 +
+ libksysguard (4:5.4.3-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:46:08 +0100
+ 
 +libksysguard (4:5.4.3-0ubuntu1) xenial; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream bugfix release
 +
 +  [ Philip Muškovac ]
 +  * New upstream bugfix release (LP: #1518598)
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:37:00 +0100
 +
+ libksysguard (4:5.4.2-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.2).
+   * Update symbols files from buildds logs (4:5.4.1-1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:52:26 +0200
+ 
 +libksysguard (4:5.4.2-0ubuntu3) xenial; urgency=medium
 +
 +  * Fix autopackagetests by adding allow-stderr to the requirements.
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:53 +0100
 +
 +libksysguard (4:5.4.2-0ubuntu2) wily; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * Annotate symbol correctly to fix dpkg-gensymbols build failure
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Bump libkf5sysguard-bin Breaks/Replaces against libkf5sysguard5 to
 +    (<< 4:5.4.2) previous version was 4:5.2.0, however there is a
 +    libkf5sysguard5 4:5.2.2 in vivid still providing a file which was moved
 +    later to libkf5sysguard-bin.
 +
 + -- Harald Sitter <sitter at kde.org>  Wed, 07 Oct 2015 06:38:47 +0200
 +
 +libksysguard (4:5.4.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Vivid backport
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 05 Oct 2015 11:49:42 -0700
 +
 +libksysguard (4:5.4.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 15:58:02 +0100
 +
+ libksysguard (4:5.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:45 +0200
+ 
 +libksysguard (4:5.4.1-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Sep 2015 10:20:53 +0100
 +
+ libksysguard (4:5.4.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.0).
+   * Update symbols files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 17:37:13 +0200
+ 
 +libksysguard (4:5.4.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 31 Aug 2015 15:53:20 +0100
 +
 +libksysguard (4:5.3.95-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 23:17:39 +0200
 +
+ libksysguard (4:5.3.2-2) unstable; urgency=medium
+ 
+   * Add the missing Breaks/Replaces. (Closes: #790920, #790802)
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 14:07:56 +0200
+ 
+ libksysguard (4:5.3.2-1) unstable; urgency=medium
+ 
+   * New upstream release (5.3.2).
+   * Update copyright information.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 23:15:57 +0200
+ 
 +libksysguard (4:5.3.2-0ubuntu2) wily; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Update symbols files: mark as optional the symbols gone after
 +    building with GCC 5
 +
 + -- José Manuel Santamaría Lema <panfaust at gmail.com>  Wed, 22 Jul 2015 20:05:10 +0200
 +
 +libksysguard (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Vivid backport
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 02 Jul 2015 11:42:32 -0700
 +
 +libksysguard (4:5.3.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:32:17 +0000
 +
  libksysguard (4:5.3.1-0ubuntu1) wily; urgency=medium
  
    [ Jonathan Riddell ]
@@@ -105,7 -52,7 +147,11 @@@
  
   -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:36:19 +0200
  
++<<<<<<<
 +libksysguard (4:5.3.1-1~) wily; urgency=medium
++=======
+ libksysguard (4:5.3.1-1) unstable; urgency=medium
++>>>>>>>
  
    * New upstream release (5.3.0).
    * New upstream release (5.3.1).

-- 
libksysguard packaging



More information about the pkg-kde-commits mailing list