[SCM] kstars packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-3-g517e916
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Mon Mar 9 14:28:13 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kstars.git;a=commitdiff;h=394bbe6
The following commit has been merged in the kubuntu_vivid_archive branch:
commit 394bbe60f70e349464dcd001f55f079633ab5e6e
Author: Harald Sitter <sitter at kde.org>
Date: Mon Mar 2 13:34:06 2015 +0100
kde frameworks 5 port
---
debian/control | 24 +++++++++++++++++++-----
debian/kstars-data.install | 16 ++++++----------
debian/kstars.install | 2 +-
debian/not-installed | 3 ++-
debian/rules | 2 +-
5 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/debian/control b/debian/control
index cc6bb3f..702f29b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,18 +6,32 @@ Uploaders: Pino Toscano <pino at debian.org>, Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper (>= 9),
dpkg-dev (>= 1.15.5),
- kde-sc-dev-latest (>= 4:4.12),
- kdelibs5-dev,
+ extra-cmake-modules (>= 1.3.0),
+ kdoctools-dev,
+ kinit-dev,
+ kio-dev,
libcfitsio3-dev (>= 3.040),
libeigen3-dev (>> 2.0.3),
libglu1-mesa-dev [!armhf],
libindi-dev (>= 0.9.8),
+ libkf5config-dev,
+ libkf5dbusaddons-dev,
+ libkf5guiaddons-dev,
+ libkf5i18n-dev,
+ libkf5iconthemes-dev,
+ libkf5jobwidgets-dev,
+ libkf5newstuff-dev,
+ libkf5texteditor-dev,
+ libkf5widgetsaddons-dev,
+ libkf5windowsystem-dev,
+ libkf5xmlgui-dev,
libnova-dev,
- libqjson-dev,
- libqt4-opengl-dev [!armhf],
+ libqt5opengl5-dev (>= 5.2),
+ libqt5svg5-dev (>= 5.2),
pkg-config,
pkg-kde-tools (>= 0.12),
- python-kde4-dev (>= 4:4.13),
+ qtdeclarative5-dev (>= 5.2),
+ qtmultimedia5-dev (>= 5.2),
wcslib-dev,
xplanet (>= 1.0),
zlib1g-dev
diff --git a/debian/kstars-data.install b/debian/kstars-data.install
index bd150bc..1d3a6cc 100644
--- a/debian/kstars-data.install
+++ b/debian/kstars-data.install
@@ -1,11 +1,7 @@
+etc/xdg/*
usr/share/appdata/kstars.appdata.xml
-usr/share/doc/kde/HTML/en/kstars/
-usr/share/icons/hicolor/128x128/apps/kstars.png
-usr/share/icons/hicolor/16x16/apps/kstars.png
-usr/share/icons/hicolor/32x32/apps/kstars.png
-usr/share/icons/hicolor/48x48/apps/kstars.png
-usr/share/icons/hicolor/64x64/apps/kstars.png
-usr/share/icons/hicolor/scalable/apps/kstars.svgz
-usr/share/kde4/apps/kstars/
-usr/share/kde4/config.kcfg/kstars.kcfg
-usr/share/kde4/config/kstars.knsrc
+usr/share/config.kcfg/*
+usr/share/doc/*
+usr/share/icons/*
+usr/share/kstars/*
+usr/share/kxmlgui5/*
diff --git a/debian/kstars.install b/debian/kstars.install
index 6c9ad97..5dff105 100644
--- a/debian/kstars.install
+++ b/debian/kstars.install
@@ -1,2 +1,2 @@
usr/bin/kstars
-usr/share/applications/kde4/kstars.desktop
+usr/share/applications/org.kde.kstars.desktop
diff --git a/debian/not-installed b/debian/not-installed
index a2b7b87..19129bf 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,3 @@
# We don't support static linking
-./usr/lib/libhtmesh.a
+./usr/lib/x86_64-linux-gnu/libhtmesh.a
+./usr/lib/i386-linux-gnu/libhtmesh.a
diff --git a/debian/rules b/debian/rules
index a0c7fe7..4bc691c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
override_dh_strip:
dh_strip --dbg-package=kstars-dbg
--
kstars packaging
More information about the pkg-kde-commits
mailing list