[SCM] purpose packaging branch, master, updated. e2185d27b201118c03149cca147f685d2ad42d2c
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jun 2 17:53:31 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/purpose.git;a=commitdiff;h=aecb67b
The following commit has been merged in the master branch:
commit aecb67baef72798b80d2ac53c29790c8c61a753d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Thu Jun 2 18:49:04 2016 +0200
Initial tweaking
---
debian/changelog | 2 +-
debian/control | 19 ++++---------------
debian/copyright | 40 ++++++++++++++++++++++------------------
debian/rules | 7 +++----
debian/tests/control | 4 ++--
debian/tests/testsuite | 15 ++++++++-------
debian/tests/testsuite.xsession | 19 ++++++++++++-------
debian/watch | 3 +--
8 files changed, 53 insertions(+), 56 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3ed231d..25aac46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-purpose (5.9.0+git20150427-0ubuntu1) UNRELEASED; urgency=medium
+purpose (1.1-1~) UNRELEASED; urgency=medium
* Initial Package
diff --git a/debian/control b/debian/control
index 4b78307..0348264 100644
--- a/debian/control
+++ b/debian/control
@@ -19,9 +19,9 @@ Build-Depends: cmake,
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev
Standards-Version: 3.9.6
-Homepage: https://projects.kde.org/projects/playground/libs/purpose
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/purpose.git
-Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/purpose.git
+Homepage: https://quickgit.kde.org/?p=purpose.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/kde-extras/purpose.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/purpose.git
Package: libkf5purpose-dev
Section: libdevel
@@ -40,7 +40,7 @@ Recommends: qml-modules-org-kde-purpose (= ${binary:Version})
Description: library for abstractions to get the developer's purposes fulfilled
Framework for providing abstractions to get the developer's purposes fulfilled.
.
- Contains development files for Purpose.
+ Contains the Purpose library.
Package: qml-modules-org-kde-purpose
Architecture: any
@@ -50,14 +50,3 @@ Description: library for abstractions to get the developer's purposes fulfilled
Framework for providing abstractions to get the developer's purposes fulfilled.
.
Contains the Qt Quick QML bindings for Purpose.
-
-Package: libkf5purpose5-dbg
-Priority: extra
-Section: debug
-Architecture: any
-Multi-Arch: same
-Depends: libkf5purpose5 (= ${binary:Version}), ${misc:Depends}
-Description: debug symbols for Purpose
- Framework for providing abstractions to get the developer's purposes fulfilled.
- .
- Contains debug symbols for Purpose.
diff --git a/debian/copyright b/debian/copyright
index a25163e..baf2772 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,25 +3,8 @@ Upstream-Name: purpose
Source: https://projects.kde.org/projects/playground/libs/purpose
Files: *
- debian/*
-Copyright: 2015 Jonathan Riddell <jriddell at ubuntu.com>
- 2014 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+Copyright: 2014 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
License: LGPL-2+
- This library 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 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General Public License
- version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
Files: src/plugins/imgur/mpform.cpp
src/plugins/imgur/mpform.h
@@ -44,3 +27,24 @@ License: LGPL-2+
.
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in "/usr/share/common-licenses/GPL-2.1".
+
+Files: debian/*
+Copyright: 2015 Jonathan Riddell <jriddell at ubuntu.com>
+License: LGPL-2+
+
+License: LGPL-2+
+ This library 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 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
diff --git a/debian/rules b/debian/rules
index 25d05bf..759f1ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-override_dh_strip:
- $(overridden_command) --dbg-package=libkf5purpose5-dbg
-
-.PHONY: override_dh_auto_test
+override_dh_auto_test:
+ # Disable auto_tests at build time
+ :
diff --git a/debian/tests/control b/debian/tests/control
index e7fde3c..8947f26 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
Tests: testsuite
-Depends: @builddeps@, build-essential,
+Depends: @, @builddeps@, build-essential,
xvfb, xauth, dbus-x11, openbox
-Restrictions: rw-build-tree
+Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 00220b9..de940ea 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,10 +1,11 @@
#!/bin/sh
-
-if [ -d /usr/lib/ccache ]; then
- export PATH="/usr/lib/ccache:$PATH"
+if [ -z "$HOME" ] || [ ! -d "$HOME" ]; then
+ [ -e debian/tests.home ] || mkdir debian/tests.home
+ export HOME="$(pwd)/debian/tests.home"
+ trap "rm -rf debian/tests.home" EXIT
fi
-debian/rules clean 2>&1
-dpkg-source --before-build .
-debian/rules build 2>&1
-xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
+mkdir -p "$HOME"/.config || true
+mkdir -p "$HOME"/.kde-unit-test || true
+
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 3a00834..f4c2f0a 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,10 +1,15 @@
#!/bin/sh
-#!/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
-
+export XDG_CACHE_HOME="$HOME"
+export XDG_DATA_HOME="${HOME}/.qttest/share"
+export XDG_RUNTIME_DIR="${HOME}/runtime"
+mkdir -p ${XDG_DATA_HOME} || true
+mkdir -p ${XDG_RUNTIME_DIR} || true
+export XDG_DATA_DIRS="$XDG_DATA_HOME:${HOME}/.local/share:/usr/share"
+openbox & WMPID=$!
+cleanup () {
+ if [ -n "$WMPID" ]; then kill "$WMPID"; fi
+}
+trap cleanup EXIT
+dh_auto_test
diff --git a/debian/watch b/debian/watch
index 609ee7e..3067d6d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
version=3
-http://download.kde.org/unstable/frameworks/([\d\.]*)/purpose-(.*)\.tar\.xz
-http://download.kde.org/stable/frameworks/([\d\.]*)/purpose-(.*)\.tar\.xz
+http://download.kde.org/stable/purpose/purpose-(.*)\.tar\.xz
--
purpose packaging
More information about the pkg-kde-commits
mailing list