[SCM] marble packaging branch, master, updated. debian/15.08.3-1-21-gd333372

Maximiliano Curia maxy at moszumanska.debian.org
Mon Feb 1 10:14:43 UTC 2016


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

The following commit has been merged in the master branch:
commit dad68d6efe2dab8b687849824e7a3d62438b22e3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Jan 31 21:19:17 2016 +0100

    Automatic update with ddeb_migration.py
---
 debian/control | 18 ++----------------
 debian/rules   |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index ce31a87..1562563 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends: cmake (>= 2.8.12~),
                kio-dev,
                libgps-dev (>= 2.90),
                libkf5config-dev,
-               libkf5crash-dev,
                libkf5coreaddons-dev,
+               libkf5crash-dev,
                libkf5i18n-dev,
                libkf5newstuff-dev,
                libkf5parts-dev,
@@ -24,6 +24,7 @@ Build-Depends: cmake (>= 2.8.12~),
                libphonon4qt5-dev,
                libprotobuf-dev,
                libqt5opengl5-dev,
+               libqt5serialport5-dev,
                libqt5svg5-dev (>= 5.4),
                libqt5webkit5-dev (>= 5.4),
                libquazip5-dev,
@@ -34,7 +35,6 @@ Build-Depends: cmake (>= 2.8.12~),
                qtbase5-dev (>= 5.4),
                qtdeclarative5-dev (>= 5.4),
                qtlocation5-dev,
-               libqt5serialport5-dev,
                qtmultimedia5-dev,
                qtpositioning5-dev,
                qtscript5-dev (>= 5.4),
@@ -189,17 +189,3 @@ Description: development files for the Marble astrononmy library
  Marble astronomy library
  .
  This package is part of the KDE education module.
-
-Package: marble-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: marble (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for the KDE education module
- Marble is a generic geographical map widget and framework for KDE
- applications. The Marble widget shows the earth as a sphere but does not
- require hardware acceleration.  A minimal set of geographical data is
- included, so it can be used without an internet connection.
- .
- This package contains debugging files used to investigate problems with
- binaries included in the KDE education module.
diff --git a/debian/rules b/debian/rules
index 27ffcbb..3ac91e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_auto_configure:
 				 $(conf_args)
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=marble-dbg
+	$(overridden_command) --ddeb-migration='marble-dbg (<= 4:15.12.1-1~~)'
 
 override_dh_auto_test:
 	# Disable the auto tests at build time

-- 
marble packaging



More information about the pkg-kde-commits mailing list