[neon/extras/ktimetracker/Neon/release] debian: merge salsa manually
Jonathan Esk-Riddell
null at kde.org
Thu Sep 8 16:40:17 BST 2022
Git commit 7ec543f1bebf91779b4bfdaa076f5669b533b047 by Jonathan Esk-Riddell.
Committed on 08/09/2022 at 15:40.
Pushed by jriddell into branch 'Neon/release'.
merge salsa manually
A +1 -0 debian/.gitattributes
M +19 -3 debian/changelog
D +0 -1 debian/compat
M +32 -29 debian/control
M +60 -39 debian/copyright
A +1 -0 debian/patches/series
A +33 -0 debian/patches/upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch
M +4 -4 debian/rules
A +7 -0 debian/salsa-ci.yml
A +3 -0 debian/tests/control
A +8 -0 debian/tests/run-python-test
A +3 -0 debian/upstream/metadata
M +1 -3 debian/watch [INFRASTRUCTURE]
https://invent.kde.org/neon/extras/ktimetracker/commit/7ec543f1bebf91779b4bfdaa076f5669b533b047
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 1e716b9..412056f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,21 @@
-ktimetracker (4:5.0.1-0neon) bionic; urgency=medium
+ktimetracker (4:5.0.1-3) unstable; urgency=medium
- * New release
+ * Disable the fixfilepath reproducibility feature, as it breaks
+ QFINDTESTDATA. (Closes: #980681)
+ * Bump Standards-Version to 4.5.1, no changes required.
- -- Neon CI <neon at kde.org> Fri, 12 May 2017 15:40:10 +0000
+ -- Pino Toscano <pino at debian.org> Thu, 21 Jan 2021 11:59:34 +0100
+
+ktimetracker (4:5.0.1-2) unstable; urgency=medium
+
+ * Backport upstream commit 310c0fee25f142c6f6a0e7a0b4445af2e8785c79 to fix
+ formatTime() on 32bit architectures; patch
+ upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch.
+
+ -- Pino Toscano <pino at debian.org> Wed, 21 Oct 2020 11:11:09 +0200
+
+ktimetracker (4:5.0.1-1) unstable; urgency=medium
+
+ * Initial release as independent application.
+
+ -- Pino Toscano <pino at debian.org> Tue, 20 Oct 2020 10:56:01 +0200
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 0dcce32..8c2b496 100644
--- a/debian/control
+++ b/debian/control
@@ -1,36 +1,39 @@
Source: ktimetracker
Section: kde
Priority: optional
-Maintainer: KDE neon <neon at kde.org>
-Build-Depends: cmake,
- debhelper (>= 9),
- extra-cmake-modules,
- libkf5calendarcore-dev,
- libkf5config-dev,
- libkf5configwidgets-dev,
- libkf5dbusaddons-dev,
- libkf5doctools-dev,
- libkf5i18n-dev,
- libkf5idletime-dev,
- libkf5jobwidgets-dev,
- libkf5kio-dev,
- libkf5notifications-dev,
- libkf5textwidgets-dev,
- libkf5windowsystem-dev,
- libkf5xmlgui-dev,
- pkg-kde-tools,
- qtbase5-dev
-Standards-Version: 3.9.7
-Vcs-git: https://packaging.neon.kde.org/neon-packaging/ktimetracker.git
-Vcs-browser: https://packaging.neon.kde.org/neon-packaging/ktimetracker.git
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Pino Toscano <pino at debian.org>,
+Build-Depends: cmake (>= 3.5~),
+ debhelper-compat (= 13),
+ extra-cmake-modules (>= 5.54.0~),
+ gettext,
+ libkf5calendarcore-dev (>= 5:5.63.0~),
+ libkf5config-dev (>= 5.54.0~),
+ libkf5configwidgets-dev (>= 5.54.0~),
+ libkf5dbusaddons-dev (>= 5.54.0~),
+ libkf5doctools-dev (>= 5.54.0~),
+ libkf5i18n-dev (>= 5.54.0~),
+ libkf5idletime-dev (>= 5.54.0~),
+ libkf5jobwidgets-dev (>= 5.54.0~),
+ libkf5kio-dev (>= 5.54.0~),
+ libkf5notifications-dev (>= 5.54.0~),
+ libkf5textwidgets-dev (>= 5.54.0~),
+ libkf5windowsystem-dev (>= 5.54.0~),
+ libkf5xmlgui-dev (>= 5.54.0~),
+ pkg-kde-tools (>= 0.15.16),
+ qtbase5-dev (>= 5.10.0~),
+ xauth,
+ xvfb,
+Standards-Version: 4.5.1
+Rules-Requires-Root: no
+Homepage: https://userbase.kde.org/KTimeTracker
+Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/ktimetracker.git
+Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/ktimetracker
Package: ktimetracker
+Section: utils
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Todo management and time tracker
- KTimeTracker helps you track your personal time spent on various
- tasks and projects.
- .
- With KTimeTracker, you can organize a broken-down project as subtasks
- with unlimited nesting. The standard keyboard and mouse shortcuts are
- simple and make the tool really comfortable and intuitive to use.
+Description: time tracker tool
+ KTimetracker is a time tracker for busy people who need to keep track
+ of the amount of time they spend on various tasks.
diff --git a/debian/copyright b/debian/copyright
index bb0baa1..270c98a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,54 +1,75 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ktimetracker
-Source: http://download.kde.org/
Files: *
-Copyright: 1997 Stephan Kulow <coolo at kde.org>
- 2019 Alexander Potashev <aspotashev at gmail.com>
-License: GPL-2-or-later
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program 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 General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in "/usr/share/common-licenses/GPL-2".
+Copyright: 1997, Stephan Kulow <coolo at kde.org>
+ 2003-2004, Mark Bucciarelli <mark at hubcapconsulting.com>
+ 2003, Scott Monachello <smonach at cox.net>
+ 2003, Tomas Pospisek <tpo at sourcepole.ch>
+ 2004, 2007, 2009, Thorsten Staerk <dev at staerk.de>
+ 2007, 2009, Mathias Soeken <msoeken at tzi.de>
+ 2007, René Mérou <ochominutosdearco at gmail.com>
+ 2009, Laurent Montel <montel at kde.org>
+ 2012, Sérgio Martins <iamsergio at gmail.com>
+ 2019, Alexander Potashev <aspotashev at gmail.com>
+License: GPL-2+ or GPL-2-or-GPL-3-or-GPL-KDE-eV-approved
+
+Files: org.kde.ktimetracker.appdata.xml
+Copyright: 2019, Alexander Potashev <aspotashev at gmail.com>
+License: CC0-1.0
Files: doc/*
-Copyright: 2000-2004 Jonathan Singer
-License: GFDL-1.2-or-later
+Copyright: 2000-2004, Jonathan Singer <jsinger at leeta.net>
+ 2000-2004, Sirtaj Singh Kang <taj at kde.org>
+License: GFDL-1.2-without-invariant
+
+Files: debian/*
+Copyright: 2020, Pino Toscano <pino at debian.org>
+License: GPL-2+
+
+License: CC0-1.0
+ On Debian systems, the complete text of the CC0 1.0 License can be found in
+ `/usr/share/common-licenses/CC0-1.0'.
+
+License: GFDL-1.2-without-invariant
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2
or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
- A copy of the license is included in the section entitled "GNU
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+ Texts. A copy of the license is included in the section entitled "GNU
Free Documentation License".
.
- On Debian systems, the complete text of the GNU Free Documentation
- License version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2".
+ On Debian systems, the complete text of the GNU Free Documentation License
+ version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2"
-Files: debian/*
-Copyright: 2019 Jonathan Riddell <jr at jriddell.org>
-License: LGPL-2.1+3+KDEeV
- 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) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published,
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ ․
+ This program 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 General Public License for more details.
+ ․
+ On Debian systems, the complete text of the GNU General Public
+ License Version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-2-or-GPL-3-or-GPL-KDE-eV-approved
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License or (at your option) version 3 or any later version
+ accepted by the membership of KDE e.V. (or its successor approved
+ by the membership of KDE e.V.), which shall act as a proxy
+ defined in Section 14 of version 3 of the license.
.
- This library is distributed in the hope that it will be useful,
+ This program 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
.
- 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", likewise,
- the complete text of the GNU Lesser General Public License version 3 can be
- found in "/usr/share/common-licenses/LGPL-3".
+ On Debian systems, the complete texts of the GNU General Public Licenses
+ version 2 and 3 can be found in "/usr/share/common-licenses/GPL-2" and
+ "/usr/share/common-licenses/GPL-3".
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b2fb03e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch
diff --git a/debian/patches/upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch b/debian/patches/upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch
new file mode 100644
index 0000000..27f80bf
--- /dev/null
+++ b/debian/patches/upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch
@@ -0,0 +1,33 @@
+From 310c0fee25f142c6f6a0e7a0b4445af2e8785c79 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Wed, 21 Oct 2020 10:49:20 +0200
+Subject: [PATCH] Fix formatTime() in non-decimal mode on 32bit archs
+
+int64_t is not long int on 32bit architectures but long long int, thus
+the "%ld" printf modifer gets truncated/wrong values.
+
+As solution, do not use int64_t but long long int, so the "%lld" can be
+always used.
+---
+ src/ktimetrackerutility.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ktimetrackerutility.cpp b/src/ktimetrackerutility.cpp
+index aca00e8..fe449ba 100644
+--- a/src/ktimetrackerutility.cpp
++++ b/src/ktimetrackerutility.cpp
+@@ -33,9 +33,9 @@ QString formatTime(double minutes, bool decimal)
+ time.sprintf("%.2f", minutes / 60.0);
+ time.replace('.', QLocale().decimalPoint());
+ } else {
+- const auto absMinutes = static_cast<int64_t>(std::round(std::fabs(minutes)));
++ const auto absMinutes = static_cast<long long int>(std::round(std::fabs(minutes)));
+ time.sprintf(
+- "%s%ld:%02ld",
++ "%s%lld:%02lld",
+ minutes < 0 ? QString(QLocale().negativeSign()).toUtf8().data() : "",
+ absMinutes / 60, absMinutes % 60);
+ }
+--
+2.28.0
+
diff --git a/debian/rules b/debian/rules
index c45eac1..e0d2608 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,10 @@
#!/usr/bin/make -f
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+# Disable fixfilepath, as it triggers build failures.
+export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath
%:
- dh $@
+ dh $@ --with kf5
override_dh_auto_test:
- # Disable dh_auto_test at build time
- :
+ xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 0000000..f71bdf3
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,7 @@
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+variables:
+ SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
+ SALSA_CI_DISABLE_RC_BUGS: 'no'
+ SALSA_CI_REPROTEST_ARGS: '--variations=-build-path'
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..e6c3728
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: run-python-test
+Depends: @, dbus-x11, psmisc, python3, python3-pytest, pytest-benchmark, python3-pydbus, python3-webdav, xauth, xvfb
+Restrictions: rw-build-tree
diff --git a/debian/tests/run-python-test b/debian/tests/run-python-test
new file mode 100755
index 0000000..2f8ed25
--- /dev/null
+++ b/debian/tests/run-python-test
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+cd test
+# TODO file watching seems broken
+rm test_refresh_on_change.py
+xvfb-run -a pytest-3 -v
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..0fa01d4
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,3 @@
+---
+Repository: https://invent.kde.org/pim/ktimetracker.git
+Repository-Browse: https://invent.kde.org/pim/ktimetracker
diff --git a/debian/watch b/debian/watch
index fdb4562..58d0106 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
version=4
-
-opts=pgpsigurlmangle=s/$/.sig/ \
- http://download.kde.org/stable/@PACKAGE@/([\d.]+)/src/@PACKAGE at -([\d.]+).tar.xz
+opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/ktimetracker/([\d\.]+)/src/ktimetracker-([\d\.]+)\.tar\.xz
More information about the Neon-commits
mailing list