[SCM] kfilemetadata packaging branch, master, updated. debian/4.13.1-1-17-gc5df8bb

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kfilemetadata.git;a=commitdiff;h=5279c0f

The following commit has been merged in the master branch:
commit 5279c0f7e725dc1ecf5069a04e6d46a1a1862e4e
Merge: 552c44d86b7172ece8b173fe3fa25a5063db27c5 dc1f91f8e9ff99a5f6d8a1c1db3e8d1a32d01e0f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jul 29 09:43:33 2014 +0200

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

 debian/changelog | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   |  5 ++++-
 debian/copyright |  2 +-
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 8575d4c,c220916..47b8442
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,71 +1,71 @@@
 +kfilemetadata (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * Improve copyright information, thanks to Scott Kitterman.
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 12:53:37 +0200
 +
+ kfilemetadata (4:4.13.95-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Fri, 25 Jul 2014 07:32:17 -0700
+ 
+ kfilemetadata (4:4.13.90-0ubuntu2) utopic; urgency=medium
+ 
+   * Add build-dep on pkg-config
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Jul 2014 17:29:27 +0200
+ 
+ kfilemetadata (4:4.13.90-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 17 Jul 2014 15:04:01 -0700
+ 
+ kfilemetadata (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:55:46 +0100
+ 
+ kfilemetadata (4:4.13.1-2ubuntu1) utopic; urgency=medium
+ 
+   * Merge with debian, no remaining changes
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 13 Jun 2014 15:45:13 +0200
+ 
 -kfilemetadata (4:4.13.1-2) UNRELEASED; urgency=medium
 -
 -  * Improve copyright information, thanks to Scott Kitterman.
 -
 - -- Maximiliano Curia <maxy at debian.org>  Mon, 19 May 2014 14:17:12 +0200
 -
  kfilemetadata (4:4.13.1-1) unstable; urgency=medium
  
    * Initial release, based on the kubuntu packages.
    * Add autopkgtests.
  
   -- Maximiliano Curia <maxy at debian.org>  Fri, 16 May 2014 20:27:37 +0200
+ 
+ kfilemetadata (4:4.13.0-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream KDE Software Compilation release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 10 Apr 2014 22:01:18 +0100
+ 
+ kfilemetadata (4:4.12.97-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:24:50 +0200
+ 
+ kfilemetadata (4:4.12.95-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 12:26:46 +0100
+ 
+ kfilemetadata (4:4.12.90-0ubuntu1) trusty; urgency=low
+ 
+   [ Rohan Garg ]
+   * Initial release
+ 
+   [ Jonathan Riddell ]
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:55:44 +0000
 -
diff --cc debian/control
index cabe7c5,d64a395..2733f5e
--- a/debian/control
+++ b/debian/control
@@@ -20,8 -22,10 +21,10 @@@ Standards-Version: 3.9.
  Section: libs
  XS-Testsuite: autopkgtest
  Homepage: http://projects.kde.org/kfilemetadata
 -Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kfilemetadata
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kfilemetadata
 -X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kfilemetadata.git
 -X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kfilemetadata.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kfilemetadata.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kfilemetadata.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kfilemetadata
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kfilemetadata
  
  Package: libkfilemetadata-dev
  Section: libdevel

-- 
kfilemetadata packaging