[SCM] dolphin-plugins packaging branch, master, updated. debian/4.13.3-1-20-gfd0a171

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/dolphin-plugins.git;a=commitdiff;h=72872e2

The following commit has been merged in the master branch:
commit 72872e23773ee5719b8a61117e888d2d6563c7b1
Merge: 8dda31fc4a065f96ab964fc6013908972f9cc8c6 335e857ba883dca762db41117d3fac2d964d6b76
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 16:23:24 2015 +0100

    Merge commit '335e857ba883dca762db41117d3fac2d964d6b76'
    
    Conflicts:
    	debian/control
    	debian/watch

 debian/changelog | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   |  9 +++----
 2 files changed, 81 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index f20358a,e25403c..10bb4aa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,80 +1,87 @@@
 +dolphin-plugins (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:39:28 +0100
 +
+ dolphin-plugins (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:17:49 -0700
+ 
+ dolphin-plugins (4:14.12.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 09:12:14 -0800
+ 
+ dolphin-plugins (4:14.12.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * Remove kdelibs5-dev depend version as there was not a new release.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 16:54:54 +0100
+ 
+ dolphin-plugins (4:14.11.97-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 02 Dec 2014 09:59:19 -0800
+ 
+ dolphin-plugins (4:14.11.95-0ubuntu2) vivid; urgency=medium
+ 
 -  * Fix Watch file applications locations 
 -  * Fix VCS for new kde-applications location 
++  * Fix Watch file applications locations
++  * Fix VCS for new kde-applications location
+   * Remove X-Ubuntu entries no longer applicable from control file.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 24 Nov 2014 08:33:41 -0800
+ 
+ dolphin-plugins (4:14.11.95-0ubuntu1) vivid; urgency=medium
+ 
 -  * Initial release for KDE applications 14.12 series 
++  * Initial release for KDE applications 14.12 series
+    - Change maintainer to Debian/Kubuntu
 -  * Debian merge, no remaining changes. 
++  * Debian merge, no remaining changes.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Sat, 22 Nov 2014 08:18:34 +0000
+ 
+ dolphin-plugins (4:4.14.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Oct 2014 03:44:39 -0700
+ 
+ dolphin-plugins (4:4.14.1-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Mon, 22 Sep 2014 16:24:02 +0200
+ 
+ dolphin-plugins (4:4.14.0-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 20 Aug 2014 12:28:56 +0200
+ 
+ dolphin-plugins (4:4.13.97-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream beta release RC
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Fri, 01 Aug 2014 16:08:22 +0200
+ 
+ dolphin-plugins (4:4.13.95-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Wed, 30 Jul 2014 17:22:36 +0200
+ 
+ dolphin-plugins (4:4.13.90-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 24 Jul 2014 17:22:58 +0200
+ 
  dolphin-plugins (4:4.13.3-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index deb6191,2472ac3..6f7c799
--- a/debian/control
+++ b/debian/control
@@@ -8,18 -7,16 +7,16 @@@ Uploaders: Sune Vuorela <sune at debian.or
             Modestas Vainius <modax at debian.org>,
             George Kiagiadakis <kiagiadakis.george at gmail.com>,
             Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 +Build-Depends: cmake (>= 2.6~),
                 debhelper (>= 9),
                 kde-sc-dev-latest (>= 4:4.12),
 -               kdelibs5-dev,
 +               kdelibs5-dev (>= 4:4.11),
                 libkonq5-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/dolphin-plugins.git
- Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/dolphin-plugins.git
- X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/dolphin-plugins
- X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/dolphin-plugins
 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/dolphin-plugins.git/
 -Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/dolphin-plugins.git
++Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/dolphin-plugins.git
++Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/dolphin-plugins.git
  
  Package: kdesdk-dolphin-plugins
  Architecture: any

-- 
dolphin-plugins packaging