[SCM] libkgeomap packaging branch, kubuntu_vivid_backports, updated. 9bf9eb28610a5064db2430f29a97cae48a112024
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Wed Apr 29 12:28:04 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkgeomap.git;a=commitdiff;h=9bf9eb2
The following commit has been merged in the kubuntu_vivid_backports branch:
commit 9bf9eb28610a5064db2430f29a97cae48a112024
Author: Jonathan Riddell <jr at jriddell.org>
Date: Wed Apr 29 14:27:38 2015 +0200
update
---
debian/.gitattributes | 1 -
debian/changelog | 13 +++----------
debian/control | 12 ++++--------
debian/libkgeomap-data.install | 1 +
debian/libkgeomap-dev.install | 5 +++--
debian/libkgeomap0.install | 2 --
debian/{libkgeomap0.acc.in => libkgeomap2.acc.in} | 0
debian/libkgeomap2.install | 2 ++
debian/patches/kubuntu_skip-test.diff | 20 ++++++++++++++++++++
debian/patches/series | 1 +
debian/tests/acc | 14 --------------
debian/tests/control | 10 ++++------
debian/tests/testsuite | 9 ++++++++-
debian/tests/testsuite.xsession | 9 +++++++++
14 files changed, 55 insertions(+), 44 deletions(-)
diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 300cf34..91c1825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,6 @@
-libkgeomap (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
-
- * Add dependencies.
- * Prepare kubuntu_vivid_backports branch.
- * Fix comma in control
-
- -- Scarlett Clark <sgclark at kubuntu.org> Tue, 28 Apr 2015 17:03:16 -0700
-
-libkgeomap (15.04.0-1~) UNRELEASED; urgency=medium
+libkgeomap (15.04.0-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
* Initial release (15.04.0).
+ * PPA build
- -- Maximiliano Curia <maxy at debian.org> Thu, 23 Apr 2015 16:28:26 +0200
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 29 Apr 2015 00:56:08 +0200
diff --git a/debian/control b/debian/control
index 103b558..132d7e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,14 @@ Section: libs
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake,
- debhelper (>= 9),
- kdelibs5-dev,
- pkg-kde-tools (>= 0.15.16),
- kde-sc-dev-latest (>= 4:4.11)
+Build-Depends: cmake, debhelper (>= 9), pkg-kde-tools (>= 0.15.16)
Standards-Version: 3.9.6
XS-Testsuite: autopkgtest
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: libkgeomap0
+Package: libkgeomap2
Architecture: any
Depends: libkgeomap-data (>= ${source:Version}),
${misc:Depends},
@@ -37,7 +33,7 @@ Description: World-Map Library interface for KDE - data files
Package: libkgeomap-dev
Section: libdevel
Architecture: any
-Depends: libkgeomap0 (= ${binary:Version}), ${misc:Depends}
+Depends: libkgeomap2 (= ${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.
@@ -48,7 +44,7 @@ Package: libkgeomap-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: libkgeomap0 (= ${binary:Version}), ${misc:Depends}
+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.
diff --git a/debian/libkgeomap-data.install b/debian/libkgeomap-data.install
new file mode 100644
index 0000000..c391823
--- /dev/null
+++ b/debian/libkgeomap-data.install
@@ -0,0 +1 @@
+usr/share/kde4/apps/libkgeomap/
diff --git a/debian/libkgeomap-dev.install b/debian/libkgeomap-dev.install
index 4f8b2ad..43fb2f1 100644
--- a/debian/libkgeomap-dev.install
+++ b/debian/libkgeomap-dev.install
@@ -1,3 +1,4 @@
usr/include/libkgeomap/
-usr/lib/*/libkgeomap.so
-usr/lib/cmake/KGeoMap/
+usr/lib/libkgeomap.so
+usr/lib/pkgconfig/libkgeomap.pc
+usr/share/kde4/apps/cmake/modules/FindKGeoMap.cmake
diff --git a/debian/libkgeomap0.install b/debian/libkgeomap0.install
deleted file mode 100644
index edd6df5..0000000
--- a/debian/libkgeomap0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libkgeomap.so.0
-usr/lib/*/libkgeomap.so.0.*
diff --git a/debian/libkgeomap0.acc.in b/debian/libkgeomap2.acc.in
similarity index 100%
rename from debian/libkgeomap0.acc.in
rename to debian/libkgeomap2.acc.in
diff --git a/debian/libkgeomap2.install b/debian/libkgeomap2.install
new file mode 100644
index 0000000..ada012f
--- /dev/null
+++ b/debian/libkgeomap2.install
@@ -0,0 +1,2 @@
+usr/lib/libkgeomap.so.2
+usr/lib/libkgeomap.so.2.*
diff --git a/debian/patches/kubuntu_skip-test.diff b/debian/patches/kubuntu_skip-test.diff
new file mode 100644
index 0000000..c18e361
--- /dev/null
+++ b/debian/patches/kubuntu_skip-test.diff
@@ -0,0 +1,20 @@
+Index: libkgeomap-15.04.0/tests/CMakeLists.txt
+===================================================================
+--- libkgeomap-15.04.0.orig/tests/CMakeLists.txt
++++ libkgeomap-15.04.0/tests/CMakeLists.txt
+@@ -51,7 +51,6 @@ if(KDE4_BUILD_TESTS)
+ )
+ KDE4_ADD_EXECUTABLE(kgeomap_test_itemmarkertiler ${test_itemmarkertiler_sources})
+ target_link_libraries(kgeomap_test_itemmarkertiler kgeomap ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS})
+- add_test(kgeomap_test_itemmarkertiler ${EXECUTABLE_OUTPUT_PATH}/kgeomap_test_itemmarkertiler)
+ endif()
+
+ # test the track management classes
+@@ -60,7 +59,6 @@ if(KDE4_BUILD_TESTS)
+ )
+ KDE4_ADD_EXECUTABLE(kgeomap_test_tracks ${test_tracks_sources})
+ target_link_libraries(kgeomap_test_tracks kgeomap ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS})
+- add_test(kgeomap_test_tracks ${EXECUTABLE_OUTPUT_PATH}/kgeomap_test_tracks)
+
+ # track loading application for timing tests
+ set(loadtrack_sources
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..79f2492
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_skip-test.diff
diff --git a/debian/tests/acc b/debian/tests/acc
deleted file mode 100755
index 85b5b21..0000000
--- a/debian/tests/acc
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-for in_file in debian/*.acc.in; do
- if ! [ -e "$in_file" ]; then
- continue
- fi
- out_file=${in_file%.in}
- sed 's/@@DEB_HOST_MULTIARCH@@/'"${DEB_HOST_MULTIARCH}"'/' \
- "${in_file}" > "${out_file}"
-done
-
-dh_acc
diff --git a/debian/tests/control b/debian/tests/control
index d9b40f1..e7fde3c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,4 @@
-# Tests: testsuite
-# Depends: @, @builddeps@, build-essential
-# Restrictions: build-needed
-
-Tests: acc
-Depends: @, dh-acc, exuberant-ctags
+Tests: testsuite
+Depends: @builddeps@, build-essential,
+ xvfb, xauth, dbus-x11, openbox
+Restrictions: rw-build-tree
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index dabe645..00220b9 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,10 @@
#!/bin/sh
-dh_auto_test
+if [ -d /usr/lib/ccache ]; then
+ export PATH="/usr/lib/ccache:$PATH"
+fi
+debian/rules clean 2>&1
+dpkg-source --before-build .
+debian/rules build 2>&1
+xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
+ dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..2e3085c
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,9 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+[ -e debian/tests.home ] || mkdir debian/tests.home
+HOME=debian/tests.home openbox &
+sleep 5
+HOME=debian/tests.home dh_auto_test
+rm -rf debian/home/tests.home
+
--
libkgeomap packaging
More information about the pkg-kde-commits
mailing list