[SCM] marble packaging branch, master, updated. debian/4.11.5+dfsg-1

Thu Jan 30 10:02:08 UTC 2014

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

The following commit has been merged in the master branch:
commit 295e66a354a6d562117451654e9871b8ec903315
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jan 29 14:45:02 2014 +0100

    wrap-and-sort
---
 debian/control                | 51 +++++++++++++++++++++++--------------------
 debian/copyright              |  6 ++---
 debian/marble-data.install    |  8 +++----
 debian/marble-plugins.install |  2 +-
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index d4dad3c..1f87cfc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,22 +2,21 @@ Source: marble
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Sune Vuorela <sune at debian.org>,
-           Maximiliano Curia <maxy at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.11),
- cmake,
- debhelper (>= 9),
- pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.11),
- pkg-config,
- libgps-dev (>= 2.90),
- libx11-dev,
- libqtwebkit-dev,
- libshp-dev,
- libqextserialport-dev,
- qtmobility-dev [linux-any],
- libquazip-dev,
- shared-mime-info
+Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.11),
+               kdelibs5-dev (>= 4:4.11),
+               libgps-dev (>= 2.90),
+               libqextserialport-dev,
+               libqtwebkit-dev,
+               libquazip-dev,
+               libshp-dev,
+               libx11-dev,
+               pkg-config,
+               pkg-kde-tools (>= 0.12),
+               qtmobility-dev [linux-any],
+               shared-mime-info
 Standards-Version: 3.9.5
 Homepage: http://edu.kde.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/marble.git
@@ -26,9 +25,11 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/marble.git
 Package: marble
 Architecture: any
 Section: misc
-Depends: ${shlibs:Depends}, ${misc:Depends}, marble-data (>= ${source:Version}),
- marble-plugins (= ${binary:Version})
-Suggests: libqt4-sql-sqlite, monav-routing-daemon, routino, gosmore
+Depends: marble-data (>= ${source:Version}),
+         marble-plugins (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Suggests: gosmore, libqt4-sql-sqlite, monav-routing-daemon, routino
 Description: globe and map widget
  Marble is a generic geographical map widget and framework for KDE
  applications. The Marble widget shows the earth as a sphere but does not
@@ -55,7 +56,7 @@ Description: data files for Marble
 Package: marble-plugins
 Architecture: any
 Section: misc
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libmarble4
 Breaks: libmarble4
 Description: plugins for Marble
@@ -72,7 +73,7 @@ Description: plugins for Marble
 Package: libmarblewidget16
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, marble-data (>= ${source:Version})
+Depends: marble-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Recommends: marble-plugins (= ${binary:Version})
 Description: Marble globe widget library
  Marble is a generic geographical map widget and framework for KDE
@@ -87,8 +88,10 @@ Description: Marble globe widget library
 Package: libmarble-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmarblewidget16 (= ${binary:Version}),
- ${sameVersionDep:libqt4-dev:libmarblewidget16}
+Depends: libmarblewidget16 (= ${binary:Version}),
+         ${misc:Depends},
+         ${sameVersionDep:libqt4-dev:libmarblewidget16},
+         ${shlibs:Depends}
 Description: development files for the Marble globe widget library
  Marble is a generic geographical map widget and framework for KDE
  applications. The Marble widget shows the earth as a sphere but does not
@@ -104,7 +107,7 @@ Package: marble-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${misc:Depends}, marble (= ${binary:Version})
+Depends: marble (= ${binary:Version}), ${misc:Depends}
 Breaks: kdeedu-dbg (<< 4:4.6.80)
 Replaces: kdeedu-dbg (<< 4:4.6.80)
 Description: debugging symbols for the KDE education module
diff --git a/debian/copyright b/debian/copyright
index bcb63c2..edd911d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -116,7 +116,7 @@ License: BSD-3-clause
  2. Redistributions in binary form must reproduce the copyright
  notice, this list of conditions and the following disclaimer in the
  documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products 
+ 3. The name of the author may not be used to endorse or promote products
  derived from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -145,7 +145,7 @@ License: GPL-2+
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  .
- On Debian systems, the full text of the GNU General Public License 
+ On Debian systems, the full text of the GNU General Public License
  version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
@@ -163,7 +163,7 @@ License: GPL-3+
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the full text of the GNU General Public License 
+ On Debian systems, the full text of the GNU General Public License
  version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 
diff --git a/debian/marble-data.install b/debian/marble-data.install
index 2663021..df1b522 100644
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@ -5,6 +5,9 @@ usr/share/icons/hicolor/22x22/apps/marble.png
 usr/share/icons/hicolor/32x32/apps/marble.png
 usr/share/icons/hicolor/48x48/apps/marble.png
 usr/share/icons/hicolor/64x64/apps/marble.png
+usr/share/kde4/apps/marble/data/*.css
+usr/share/kde4/apps/marble/data/*.html
+usr/share/kde4/apps/marble/data/*.leg
 usr/share/kde4/apps/marble/data/audio/
 usr/share/kde4/apps/marble/data/bitmaps/
 usr/share/kde4/apps/marble/data/flags/
@@ -15,10 +18,7 @@ usr/share/kde4/apps/marble/data/placemarks/
 usr/share/kde4/apps/marble/data/stars/
 usr/share/kde4/apps/marble/data/svg/
 usr/share/kde4/apps/marble/data/weather/
-usr/share/kde4/apps/marble/data/*.html
-usr/share/kde4/apps/marble/data/*.css
-usr/share/kde4/apps/marble/data/*.leg
 usr/share/kde4/apps/marble/marble.knsrc
-usr/share/kde4/apps/marble/marbleui.rc
 usr/share/kde4/apps/marble/marble_part.rc
+usr/share/kde4/apps/marble/marbleui.rc
 usr/share/kde4/config.kcfg/marble.kcfg
diff --git a/debian/marble-plugins.install b/debian/marble-plugins.install
index c362816..7115ddf 100644
--- a/debian/marble-plugins.install
+++ b/debian/marble-plugins.install
@@ -1,4 +1,4 @@
-usr/lib/*/qt4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
 usr/lib/*/qt4/imports/org/kde/edu/marble/MarbleSettings.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
 usr/lib/*/qt4/imports/org/kde/edu/marble/qmldir
 usr/lib/kde4/plugins/marble/

-- 
marble packaging

