[SCM] rocs packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-25-g7e5465f

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/rocs.git;a=commitdiff;h=7e5465f

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 7e5465f990873da6eeb4194b0fa014528eb0ea9c
Merge: 0a61a90347d78fe54ada892e32d5867471746be8 efd80160b8f50d0464e466220ad3efa5051e40c7
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Feb 8 17:05:29 2016 +0000

    Merged with Debian and New upstream release

 debian/changelog     |  47 ++++-
 debian/control       |  32 ++--
 debian/copyright     | 475 +++++++++++++++++++++++++++++++++++++++++++++++----
 debian/not-installed |  24 +--
 debian/rocs.install  |  12 +-
 5 files changed, 517 insertions(+), 73 deletions(-)

diff --cc debian/changelog
index cd724d0,32f7983..68ad3a1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,39 +1,65 @@@
- rocs (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++rocs (4:15.12.1-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Merged with Debian 
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:43:28 +0000
++ -- Clive Johnston <clivejo at aol.com>  Mon, 08 Feb 2016 17:02:58 +0000
++
+ rocs (4:15.12.1-1) experimental; urgency=medium
+ 
+   * New upstream release (15.12.0).
+   * New upstream release (15.12.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:22:36 +0100
+ 
+ rocs (4:15.08.3-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Dec 2015 12:38:48 +0100
+ 
+ rocs (4:15.08.2-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 16 Oct 2015 08:07:09 +0200
  
 +rocs (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 13:06:58 +0100
 +
 +rocs (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:46:50 +0100
 +
+ rocs (4:15.08.1-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 02:44:52 +0200
+ 
+ rocs (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.1).
+   * New upstream release (15.04.2).
+   * Update copyright information.
+   * New upstream release (15.04.3).
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 10 Sep 2015 18:15:26 +0200
+ 
 +rocs (4:15.08.0-0ubuntu2) wily; urgency=medium
 +
 +  * Add back kubuntu_test-user-new-graph-format.diff
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 01 Sep 2015 13:51:38 +0100
 +
  rocs (4:15.08.0-0ubuntu1) wily; urgency=medium
  
    * New upstream release

-- 
rocs packaging