[SCM] baloo-widgets packaging branch, master, updated. debian/15.08.0-2-2-gff86c2e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/baloo-widgets.git;a=commitdiff;h=688853f

The following commit has been merged in the master branch:
commit 688853f8f5aecb1878998d4ff317f742e1f10de5
Merge: e1e5c181de17eb449bc376efac8dcfdf691c8b00 0fe4637a6b807274a3b6a1fcb31d45f0a0335cc7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Aug 24 04:29:28 2014 +0200

    Merge remote-tracking branch 'ubuntu/master'
    
    Conflicts:
    	debian/control

 debian/changelog | 28 ++++++++++++++++++++++++++++
 debian/control   |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 3e3f6ab,7cdca02..ce3127a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,31 +1,51 @@@
 +baloo-widgets (4:4.14.0-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Update install file.
 +  * Update symbols file.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 24 Aug 2014 01:19:14 +0200
 +
+ baloo-widgets (4:4.14.0-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 20 Aug 2014 12:26:36 +0200
+ 
+ baloo-widgets (4:4.13.97-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream beta release RC
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Fri, 01 Aug 2014 16:04:03 +0200
+ 
+ baloo-widgets (4:4.13.95-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Wed, 30 Jul 2014 17:20:17 +0200
+ 
+ baloo-widgets (4:4.13.90-0ubuntu1) utopic; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream beta release
+ 
+   [ Jonathan Riddell ]
+   * Add missing build-dep libx11-dev
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 24 Jul 2014 17:20:55 +0200
+ 
 +baloo-widgets (4:4.13.3-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 31 Jul 2014 14:19:49 +0200
 +
 +baloo-widgets (4:4.13.2-1) experimental; urgency=medium
 +
 +  * Initial release for debian, packaged merged with the kubuntu version.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Jun 2014 11:18:43 +0200
 +
  baloo-widgets (4:4.13.2-0ubuntu1) utopic; urgency=medium
  
    * new upstream release
diff --cc debian/control
index 4759179,2b96bf7..82183fd
--- a/debian/control
+++ b/debian/control
@@@ -1,20 -1,16 +1,20 @@@
  Source: baloo-widgets
  Section: kde
  Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -Maintainer: Rohan Garg <rohangarg at kubuntu.org>
 -Build-Depends: debhelper (>= 9.0.0), cmake,
 - pkg-kde-tools,
 - kdelibs5-dev (>= 4:4.14.0),
 - baloo-dev (>= 4:4.14.0),
 - libkfilemetadata-dev (>= 4:4.14.0),
 - libphonon-dev,
 - libx11-dev
++Maintainer: Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 +Uploaders: Rohan Garg <rohangarg at kubuntu.org>,
 +           Maximiliano Curia <maxy at debian.org>
 +Build-Depends: baloo-dev,
 +               cmake,
 +               debhelper (>= 9),
 +               kdelibs5-dev (>= 4:4.10),
 +               libkfilemetadata-dev,
 +               libphonon-dev,
 +               pkg-kde-tools
  Standards-Version: 3.9.5
 -Homepage: http://projects.kde.org/baloo
 +Homepage: http://projects.kde.org/baloo-widgets
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/baloo-widgets.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/baloo-widgets.git
  
  Package: libbaloowidgets4
  Architecture: any

-- 
baloo-widgets packaging