[SCM] print-manager packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-26-gf2e30a0

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/print-manager.git;a=commitdiff;h=c3c8629

The following commit has been merged in the kubuntu_vivid_archive branch:
commit c3c8629657fe36b229c327a5aeeaaf0e59c9f1a1
Merge: 7b578f2029d61a1cb7b8db119aa5edbe57a7a428 5db657750f9f1047d01fc7e643e63201eff7bfeb
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jan 19 13:55:17 2015 +0100

    Merge branch 'kubuntu_vivid_archive' into kubuntu_unstable
    
    Conflicts:
    	debian/control
    	debian/patches/series
    	debian/print-manager.install

 debian/.gitattributes                              |   1 -
 debian/changelog                                   | 309 +++++++++++++++++++++
 debian/control                                     |   6 +-
 .../patches/kubuntu_ignore_scp_dbus_failures.diff  |  32 +++
 debian/watch                                       |   4 +-
 5 files changed, 347 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 9daaa7e,b7bc655..f5fe1af
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,48 +1,54 @@@
+ print-manager (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:59:16 +0100
+ 
+ print-manager (4:14.11.97-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 02 Dec 2014 09:32:45 -0800
+ 
+ print-manager (4:14.11.95-0ubuntu2) vivid; urgency=medium
+ 
+   * Fix Watch file applications locations 
+   * Fix VCS for new kde-applications location
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 24 Nov 2014 07:28:04 -0800
+ 
+ print-manager (4:14.11.95-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+    - Fix kubuntu patch to be DEP3 compliant.
+    - Change maintainer to Debian/Kubuntu.
+   * Merge with debian: remaining changes:
+    - Recommends: cups, system-config-printer, system-config-printer-udev
+    - ignore_scp_dbus_failures.diff for LP: #902762
+    - In print-manager.install do not install 02-add-print-manager.js, handled by
+      01-kubuntu-10.04.js in kubuntu-settings-desktop
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 21 Nov 2014 15:43:58 +0000
+ 
 +print-manager (4:4.50.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * KDE Frameworks 5 port
 +
 + -- Harald Sitter <apachelogger at kubuntu.org>  Mon, 01 Dec 2014 13:25:04 +0100
 +
+ print-manager (4:4.14.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Oct 2014 06:49:31 -0700
+ 
+ print-manager (4:4.14.1-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Mon, 22 Sep 2014 18:01:33 +0200
+ 
  print-manager (4:4.14.0-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index bfd733f,accbc57..52437b1
--- a/debian/control
+++ b/debian/control
@@@ -5,29 -5,15 +5,29 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake,
                 debhelper (>= 9),
 -               kde-sc-dev-latest (>= 4:4.12),
 -               kdelibs5-dev,
 +               extra-cmake-modules,
 +               kio-dev,
                 libcups2-dev (>= 1.5),
 +               libkf5config-dev,
 +               libkf5configwidgets-dev,
 +               libkf5dbusaddons-dev,
 +               libkf5i18n-dev,
 +               libkf5iconthemes-dev,
 +               libkf5itemviews-dev,
 +               libkf5kcmutils-dev,
 +               libkf5notifications-dev,
 +               libkf5widgetsaddons-dev,
 +               libkf5windowsystem-dev,
                 pkg-config,
 -               pkg-kde-tools (>= 0.12)
 +               pkg-kde-tools (>= 0.12),
 +               plasma-framework-dev,
 +               qtbase5-dev,
 +               qtdeclarative5-dev,
 +               qttools5-dev
  Standards-Version: 3.9.5
  Homepage: http://www.kde.org/
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/print-manager.git
- Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/print-manager.git
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/print-manager.git/
+ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/print-manager.git
  
  Package: print-manager
  Architecture: any

-- 
print-manager packaging