[SCM] marble packaging branch, master, updated. debian/16.04.1-3-19-g38ac766

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 10 16:58:27 UTC 2016


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

The following commit has been merged in the master branch:
commit 6e3e90d48b73ef165458647f75d966103e8bde04
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Aug 31 13:36:19 2016 +0200

    Update install files
---
 debian/copyright             | 8 ++++----
 debian/libastro-dev.install  | 2 +-
 debian/libmarble-dev.install | 2 +-
 debian/marble-data.install   | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 29c08ef..5722582 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2800,8 +2800,8 @@ Files: tools/osm-addresses/pbf/fileformat.proto
 Copyright: 2010, Scott A. Crosby <scott at sacrosby.com>
 License: LGPL-3+
  This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as 
- published by the Free Software Foundation, either version 3 of the 
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation, either version 3 of the
  License, or (at your option) any later version.
  .
  This program is distributed in the hope that it will be useful,
@@ -2816,8 +2816,8 @@ Files: data/mwdbii/MWDBPOLY.TXT
        data/mwdbii/contents.txt
 Copyright: no copyright claimed
 License: public-domain
- The MICRO WORLD DATA BANK II Database was was produced and placed in the 
- Public Domain by Fred Pospeschil and Antonio Rivera. 
+ The MICRO WORLD DATA BANK II Database was was produced and placed in the
+ Public Domain by Fred Pospeschil and Antonio Rivera.
 
 Files: data/maps/earth/openstreetmap/tour.kml
        data/placemarks/COPYRIGHT
diff --git a/debian/libastro-dev.install b/debian/libastro-dev.install
index 0aedf72..0ecd7dd 100644
--- a/debian/libastro-dev.install
+++ b/debian/libastro-dev.install
@@ -5,5 +5,5 @@ usr/include/astro/attlib.h
 usr/include/astro/eclsolar.h
 usr/include/astro/planetarySats.h
 usr/include/astro/solarsystem.h
-usr/lib/*/libastro.so
 usr/lib/*/cmake/Astro/
+usr/lib/*/libastro.so
diff --git a/debian/libmarble-dev.install b/debian/libmarble-dev.install
index 72b75fa..1c8c295 100644
--- a/debian/libmarble-dev.install
+++ b/debian/libmarble-dev.install
@@ -1,6 +1,6 @@
 usr/include/marble/
+usr/lib/*/cmake/Marble/
 usr/lib/*/libmarblewidget-qt5.so
 usr/lib/*/plugins/designer/libLatLonEditPlugin.so
 usr/lib/*/plugins/designer/libMarbleNavigatorPlugin.so
 usr/lib/*/plugins/designer/libMarbleWidgetPlugin.so
-usr/lib/*/cmake/Marble/
diff --git a/debian/marble-data.install b/debian/marble-data.install
index d34eb00..73457d3 100644
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@ -1,7 +1,9 @@
 usr/share/appdata/marble.appdata.xml
+usr/share/applications/marble_geojson.desktop
 usr/share/config.kcfg/marble.kcfg
 usr/share/doc/HTML/en/marble/
 usr/share/icons/hicolor/*/apps/marble.png
+usr/share/kservices5/marble_thumbnail_geojson.desktop
 usr/share/kservices5/marble_thumbnail_gpx.desktop
 usr/share/kservices5/marble_thumbnail_kml.desktop
 usr/share/kservices5/marble_thumbnail_osm.desktop

-- 
marble packaging



More information about the pkg-kde-commits mailing list