[SCM] kuser packaging branch, master, updated. debian/4.12.2-2-18-g100986c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kuser.git;a=commitdiff;h=100986c

The following commit has been merged in the master branch:
commit 100986c430618a988643b4780dd09343da76a703
Merge: 312e88a69c49c8e174ad598e9069b8ed0d2efdcb bc5a126b1aa4138b513907dfde510ca1bbed5bc3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 20:36:59 2015 +0100

    Merge commit 'bc5a126b1aa4138b513907dfde510ca1bbed5bc3'
    
    Conflicts:
    	debian/control

 debian/changelog | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   |  11 ++--
 2 files changed, 195 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index bfbca6e,2bc8c04..4b61c36
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,80 +1,87 @@@
 +kuser (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +  * Bump Standards-Version to 3.9.6.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 12:33:48 +0100
 +
+ kuser (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:32:10 -0700
+ 
+ kuser (4:14.12.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * Remove unstable from watch file, uscan fails with 
+     remote site does not even have current version
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 09:35:29 -0800
+ 
+ kuser (4:14.12.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * Remove kdelibs5-dev depend version as there was not a new release.
+   * Remove kdepimlibs5-dev depend version as there was not a new release.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 12 Dec 2014 11:34:09 -0800
+ 
+ kuser (4:14.11.97-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream RC release
+   * Merge with Debian, remaining changes:
+    - Remove unused nepomuk-core-dev build-dep
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 01 Dec 2014 18:03:48 +0100
+ 
+ kuser (4:4.14.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Oct 2014 06:18:38 -0700
+ 
+ kuser (4:4.14.1-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Mon, 22 Sep 2014 17:42:18 +0200
+ 
+ kuser (4:4.14.0-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 20 Aug 2014 13:28:57 +0200
+ 
+ kuser (4:4.13.97-0ubuntu1) utopic; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream beta release RC
+ 
+   [ Jonathan Riddell ]
+   * Remove unused nepomuk-core-dev build-dep
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Fri, 01 Aug 2014 17:17:22 +0200
+ 
+ kuser (4:4.13.95-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Wed, 30 Jul 2014 18:41:54 +0200
+ 
+ kuser (4:4.13.90-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 24 Jul 2014 23:33:04 +0200
+ 
+ kuser (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+   * Merge with Debian, no changes
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Jun 2014 10:42:01 +0100
+ 
  kuser (4:4.12.2-2) unstable; urgency=medium
  
    * Release to unstable
diff --cc debian/control
index c4ef7a1,0188e0d..a2c238d
--- a/debian/control
+++ b/debian/control
@@@ -12,13 -12,12 +12,12 @@@ Build-Depends: cmake
                 debhelper (>= 9),
                 docbook-to-man,
                 kde-sc-dev-latest (>= 4:4.12),
-                kdepimlibs5-dev (>= 4:4.11),
-                nepomuk-core-dev (>= 4:4.11),
+                kdepimlibs5-dev,
                 pkg-kde-tools (>= 0.12)
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
  Homepage: http://www.kde.org/
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-sc/kuser.git
- Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kuser.git
 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/kuser.git/
 -Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/kuser.git
++Vcs-Browser: http://anonscm.debian.org/cgit/kde/kde-applications/kuser.git
++Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/kuser.git
  
  Package: kuser
  Section: admin

-- 
kuser packaging