[SCM] marble packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-3-g0ac2fa7

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/marble.git;a=commitdiff;h=847e3d1

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 847e3d1ecbaa5b7a23ceeb97400132ab08827deb
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 5 16:34:56 2014 +0100

    update to 14.11.97
---
 debian/.gitattributes | 1 -
 debian/changelog      | 5 +++--
 debian/control        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 11f6f2f..9bc7a4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-marble (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+marble (4:14.11.97-0ubuntu1~ubuntu15.04~ppa3) vivid; urgency=medium
 
   * New upstream RC release
   * Merge with Debian, remaining changes:
@@ -7,8 +7,9 @@ marble (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
    - marble-plugins depends on libwlocate0, runtime dependency
    - fix syntax in debian/copyright
   * libmarblewidget19 now libmarblewidget20
+  * PPA build
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 01 Dec 2014 18:03:51 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Dec 2014 17:51:20 +0100
 
 marble (4:4.14.2-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index e29768a..47a6c3d 100644
--- a/debian/control
+++ b/debian/control
@@ -152,10 +152,10 @@ Description: Marble astronomy library
 Package: libmarble-dev
 Architecture: any
 Section: libdevel
-Depends: libmarblewidget19 (= ${binary:Version}),
+Depends: libmarblewidget20 (= ${binary:Version}),
          libastro-dev (= ${binary:Version}),
          ${misc:Depends},
-         ${sameVersionDep:libqt4-dev:libmarblewidget19},
+         ${sameVersionDep:libqt4-dev:libmarblewidget20},
          ${shlibs:Depends}
 Description: development files for the Marble globe widget library
  Marble is a generic geographical map widget and framework for KDE

-- 
marble packaging