[SCM] marble packaging branch, master, updated. debian/15.12.1-1-30-ga2bdd80

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 22bd6535f5ca9ea12d5a1b71ec94560cd4614c52
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon May 16 14:10:30 2016 +0200

    Add missing Breaks/Replaces
    
    marble-data conflicts with the kde4 version of marble
    marble: /usr/share/mime/packages/geo.xml
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 70fc221..fb470a7 100644
--- a/debian/control
+++ b/debian/control
@@ -100,6 +100,8 @@ Package: marble-data
 Architecture: all
 Section: misc
 Depends: ${misc:Depends}
+Breaks: marble (<= 4:15.08.0+dfsg-1)
+Replaces: marble (<= 4:15.08.0+dfsg-1)
 Description: data files for Marble
  Marble is a generic geographical map widget and framework for KDE
  applications. The Marble widget shows the earth as a sphere but does not

-- 
marble packaging