[SCM] libkgeomap packaging branch, master, updated. d4e57e7e3823065ce0a488e5775db221317acffc
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 27 19:56:48 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkgeomap.git;a=commitdiff;h=25b6080
The following commit has been merged in the master branch:
commit 25b60809682c8a911c56b10aa590206d53579794
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Jan 27 20:04:36 2016 +0100
Follow upstream library rename.
---
debian/changelog | 2 +-
debian/control | 28 ++++++----------------
debian/libkf5kgeomap-data.install | 1 +
debian/libkf5kgeomap-data.links | 1 +
...libkgeomap2.acc.in => libkf5kgeomap-dev.acc.in} | 7 +++---
debian/libkf5kgeomap-dev.install | 4 ++++
debian/libkf5kgeomap10.0.0.install | 2 ++
debian/libkgeomap-data.install | 1 -
debian/libkgeomap-data.links | 1 -
debian/libkgeomap-dev.install | 4 ----
debian/libkgeomap2.install | 2 --
debian/rules | 3 ---
12 files changed, 20 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ec9f03f..b0d0400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libkgeomap (15.12.0-1~) UNRELEASED; urgency=medium
+libkf5kgeomap (15.12.0-1~) UNRELEASED; urgency=medium
* Initial release (15.04.0).
* New patch: test_data_dir.patch
diff --git a/debian/control b/debian/control
index 3fb4928..aaabc7b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libkgeomap
+Source: libkf5kgeomap
Section: libs
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -6,13 +6,11 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12~),
debhelper (>= 9),
extra-cmake-modules (>= 1.1.0~),
- kdelibs5-dev,
kio-dev (>= 5.0.0~),
libkf5config-dev (>= 5.0.0~),
libkf5i18n-dev (>= 5.0.0~),
libkf5textwidgets-dev (>= 5.0.0~),
- libmarble-dev (>= 4:14),
- libqt4-dev (>= 4.6.0~),
+ libmarble-dev (>= 4:15),
libqt5webkit5-dev (>= 5.2.0~),
pkg-config,
pkg-kde-tools (>= 0.15.16),
@@ -22,9 +20,9 @@ Homepage: https://projects.kde.org/projects/kde/kdegraphics/libs/libkgeomap
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/libkgeomap.git
Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/libkgeomap.git
-Package: libkgeomap2
+Package: libkf5kgeomap10.0.0
Architecture: any
-Depends: libkgeomap-data (= ${source:Version}),
+Depends: libkf5geomap-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Description: World-Map Library interface for KDE - shared library
@@ -33,7 +31,7 @@ Description: World-Map Library interface for KDE - shared library
.
This package contains the shared library.
-Package: libkgeomap-data
+Package: libkf5kgeomap-data
Architecture: all
Depends: libjs-openlayers, ${misc:Depends}
Description: World-Map Library interface for KDE - data files
@@ -42,24 +40,12 @@ Description: World-Map Library interface for KDE - data files
.
This package contains the data files.
-Package: libkgeomap-dev
+Package: libkf5kgeomap-dev
Section: libdevel
Architecture: any
-Depends: kdelibs5-dev, libkgeomap2 (= ${binary:Version}), ${misc:Depends}
+Depends: libkf5kgeomap10.0.0 (= ${binary:Version}), ${misc:Depends}
Description: World-Map Library interface for KDE - development files
Libkgeomap is a wrapper around different world-map components, to browse and
arrange photos over a map.
.
This package contains the development files.
-
-Package: libkgeomap-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libkgeomap2 (= ${binary:Version}), ${misc:Depends}
-Description: World-Map Library interface for KDE - debugging symbols
- Libkgeomap is a wrapper around different world-map components, to browse and
- arrange photos over a map.
- .
- This package contains debugging files used to investigate problems with
- binaries included in the library.
diff --git a/debian/libkf5kgeomap-data.install b/debian/libkf5kgeomap-data.install
new file mode 100644
index 0000000..8bc6981
--- /dev/null
+++ b/debian/libkf5kgeomap-data.install
@@ -0,0 +1 @@
+usr/share/libkgeomap/
diff --git a/debian/libkf5kgeomap-data.links b/debian/libkf5kgeomap-data.links
new file mode 100644
index 0000000..c49d84f
--- /dev/null
+++ b/debian/libkf5kgeomap-data.links
@@ -0,0 +1 @@
+/usr/share/javascript/OpenLayers.js usr/share/libkgeomap/OpenLayers.js
diff --git a/debian/libkgeomap2.acc.in b/debian/libkf5kgeomap-dev.acc.in
similarity index 55%
rename from debian/libkgeomap2.acc.in
rename to debian/libkf5kgeomap-dev.acc.in
index 9cb2023..3324489 100644
--- a/debian/libkgeomap2.acc.in
+++ b/debian/libkf5kgeomap-dev.acc.in
@@ -2,15 +2,16 @@
<descriptor>
<version>
- 15.04.0
+ 15.12.0
</version>
<headers>
- /usr/include/libkgeomap
+ /usr/include/KF5/KGeoMap
+ /usr/include/KF5/libkgeomap_version.h
</headers>
<libs>
- /usr/lib/libkgeomap.so
+ /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5KGeoMap.so
</libs>
<gcc_options>
diff --git a/debian/libkf5kgeomap-dev.install b/debian/libkf5kgeomap-dev.install
new file mode 100644
index 0000000..6011962
--- /dev/null
+++ b/debian/libkf5kgeomap-dev.install
@@ -0,0 +1,4 @@
+usr/include/KF5/KGeoMap/
+usr/include/KF5/libkgeomap_version.h
+usr/lib/*/libKF5KGeoMap.so
+usr/lib/*/cmake/KF5KGeoMap/
diff --git a/debian/libkf5kgeomap10.0.0.install b/debian/libkf5kgeomap10.0.0.install
new file mode 100644
index 0000000..4451809
--- /dev/null
+++ b/debian/libkf5kgeomap10.0.0.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5KGeoMap.so.10.0.0
+usr/lib/*/libKF5KGeoMap.so.5.*
diff --git a/debian/libkgeomap-data.install b/debian/libkgeomap-data.install
deleted file mode 100644
index c391823..0000000
--- a/debian/libkgeomap-data.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/kde4/apps/libkgeomap/
diff --git a/debian/libkgeomap-data.links b/debian/libkgeomap-data.links
deleted file mode 100644
index 3a8aa5a..0000000
--- a/debian/libkgeomap-data.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/javascript/OpenLayers.js usr/share/kde4/apps/libkgeomap/OpenLayers.js
diff --git a/debian/libkgeomap-dev.install b/debian/libkgeomap-dev.install
deleted file mode 100644
index 43fb2f1..0000000
--- a/debian/libkgeomap-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/libkgeomap/
-usr/lib/libkgeomap.so
-usr/lib/pkgconfig/libkgeomap.pc
-usr/share/kde4/apps/cmake/modules/FindKGeoMap.cmake
diff --git a/debian/libkgeomap2.install b/debian/libkgeomap2.install
deleted file mode 100644
index ada012f..0000000
--- a/debian/libkgeomap2.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libkgeomap.so.2
-usr/lib/libkgeomap.so.2.*
diff --git a/debian/rules b/debian/rules
index 5897226..7a4b381 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,6 @@
include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-override_dh_strip:
- $(overridden_command) --dbg-package=libkgeomap-dbg
-
override_dh_auto_test:
# Disable unit test at build time
:
--
libkgeomap packaging
More information about the pkg-kde-commits
mailing list