Commit baa4e947 authored by Nicolas Boulenguez's avatar Nicolas Boulenguez

* Debhelper 10. Drop explicit targets confusing dh.

* Standards-Version: 4.0.1. HTTPS copyright format URL.
* Drop X-Python, satisfied in Debian and confusing debcheck.
* Update appdata format and install directory.
* Run each img2py in xvfb, but not in parallel.
* Uscan version 4 allows a more readable watch file.

[ Chris Lamb <lamby@debian.org> ]
* reproducible_build.diff: sort directory listing . Closes: #862592.
parent e26746ed
taskcoach (1.4.3-3) unstable; urgency=medium
* Debhelper 10. Drop explicit targets confusing dh.
* Standards-Version: 4.0.1. HTTPS copyright format URL.
* Drop X-Python, satisfied in Debian and confusing debcheck.
* Update appdata format and install directory.
* Run each img2py in xvfb, but not in parallel.
* Uscan version 4 allows a more readable watch file.
[ Chris Lamb <lamby@debian.org> ]
* reproducible_build.diff: sort directory listing . Closes: #862592.
-- Nicolas Boulenguez <nicolas@debian.org> Sat, 12 Aug 2017 22:31:41 +0200
taskcoach (1.4.3-2) unstable; urgency=medium
* missing-import-in-openfile.diff closes: 835898.
......
......@@ -2,8 +2,7 @@ Source: taskcoach
Section: utils
Priority: optional
Maintainer: Nicolas Boulenguez <nicolas@debian.org>
Build-Depends-Indep: debhelper (>= 9),
# This should be repeated as X-Python-Version below.
Build-Depends-Indep: debhelper (>= 10),
# 2.6.6-3~: https://wiki.debian.org/Python/TransitionToDHPython2
python (>= 2.6.6-3~),
# See debian/rules:
......@@ -24,9 +23,8 @@ Build-Depends-Indep: debhelper (>= 9),
# See tests/control.
hicolor-icon-theme, locales-all, x11-utils, xauth, xvfb
# Also see patches/run_img2py_inside_xvfb.diff.
Standards-Version: 3.9.8
Standards-Version: 4.0.1
Homepage: http://www.taskcoach.org
X-Python-Version: >= 2.6
VCS-Git: https://anonscm.debian.org/git/collab-maint/taskcoach.git
VCS-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/taskcoach.git
......
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: taskcoach
Upstream-Contact: Task Coach developers <developers@taskcoach.org>
Files-Excluded:
......@@ -119,7 +119,7 @@ License: CC0-1.0
Files: debian/*
Copyright: 2009 Alejandro Garrido Mota <garridomota@gmail.com>
2012-2016 Nicolas Boulenguez <nicolas@debian.org>
2012-2017 Nicolas Boulenguez <nicolas@debian.org>
License: GPL-3+
Files: icons.in/nuvola.zip
......
......@@ -2,11 +2,23 @@ Description: improve appdata.xml
Correct a typo in First paragraph of description.
.
Install appdata.xml in Debian as in Ubuntu.
.
Update appstream standard and installation directory.
Author: Nicolas Boulenguez <nicolas@debian.org>
--- a/build.in/debian/taskcoach.appdata.xml
+++ b/build.in/debian/taskcoach.appdata.xml
@@ -9,7 +9,7 @@
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2013 Task Coach developers <developers@taskcoach.org> -->
-<application>
- <id type="desktop">taskcoach.desktop</id>
+<component type="desktop-application">
+ <id>org.taskcoach.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<name>Task Coach</name>
@@ -9,15 +9,27 @@
<summary>Your Friendly Task Manager</summary>
<summary xml:lang="fr">Your Friendly Task Manager</summary>
<description>
......@@ -15,10 +27,21 @@ Author: Nicolas Boulenguez <nicolas@debian.org>
<p>Your database may be synchronized across these platforms. If espeak is installed, reminders can be spoken.</p>
<p xml:lang="fr">Task Coach est un gestionnaire de tâches libre pour gérer vos tâches et listes de choses à faire. Il supporte les tâches composites, càd les tâches faisant partie d'une autre. De plus, Task Coach vous permet de catégoriser vos tâches, suivre le temps passé par rapport à un budget associé à chaque tâche, et bien plus. Task Coach est disponible pour Windows, Mac OS X, BSD, Linux, iPhone et iPad.</p>
<p xml:lang="fr">Votre base de données peut être synchronisée à travers toutes ces plate-formes. Si espeak est installé, les rappels peuvent être énoncés.</p>
@@ -19,5 +19,12 @@
<screenshot width="1280" height="748">http://www.taskcoach.org/screenshots/Appdata-02.png</screenshot>
</description>
+ <launchable type="desktop-id">taskcoach.desktop</launchable>
<screenshots>
- <screenshot type="default" width="1280" height="748">http://www.taskcoach.org/screenshots/Appdata-01.png</screenshot>
- <screenshot width="1280" height="748">http://www.taskcoach.org/screenshots/Appdata-02.png</screenshot>
+ <screenshot type="default">
+ <image width="1280" height="748">http://www.taskcoach.org/screenshots/Appdata-01.png</image>
+ </screenshot>
+ <screenshot>
+ <image width="1280" height="748">http://www.taskcoach.org/screenshots/Appdata-02.png</image>
+ </screenshot>
</screenshots>
<url type="homepage">http://www.taskcoach.org/</url>
- <updatecontact>developers@taskcoach.org</updatecontact>
-</application>
+ <url type="bugtracker">http://sourceforge.net/p/taskcoach/bugs</url>
+ <url type="faq">https://answers.launchpad.net/taskcoach/+faqs</url>
+ <url type="help">http://taskcoach.wikispaces.com/Task+Coach+Manual</url>
......@@ -26,15 +49,15 @@ Author: Nicolas Boulenguez <nicolas@debian.org>
+ <provides>
+ <binary>taskcoach.py</binary>
+ </provides>
<updatecontact>developers@taskcoach.org</updatecontact>
</application>
+ <update_contact>developers@taskcoach.org</update_contact>
+</component>
--- a/setup.py
+++ b/setup.py
@@ -80,9 +80,8 @@
current_dist = [dist.lower() for dist in platform.dist()]
if 'debian' in current_dist or 'ubuntu' in current_dist:
setupOptions['data_files'] = [('share/applications', ['build.in/linux_common/taskcoach.desktop']),
+ ('share/appdata', ['build.in/debian/taskcoach.appdata.xml']),
+ ('share/metainfo', ['build.in/debian/taskcoach.appdata.xml']),
('share/pixmaps', ['icons.in/taskcoach.png'])]
- if 'ubuntu' in current_dist:
- setupOptions['data_files'].append(('share/appdata', ['build.in/debian/taskcoach.appdata.xml']))
......
Description: Make the build reproducible
Author: Chris Lamb <lamby@debian.org>
Bug-Debian: https://bugs.debian.org/862592
Last-Update: 2017-05-14
--- a/templates.in/make.py
+++ b/templates.in/make.py
@@ -42,7 +42,7 @@
fd.write('def getDefaultTemplates():\n')
fd.write(' templates = []\n')
- for name in os.listdir(path):
+ for name in sorted(os.listdir(path)):
dumpTemplate(os.path.join(path, name), fd)
fd.write('\n return templates\n')
Description: img2py needs an X display to convert images.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,7 @@
$(PYTHON) fixinit.py
taskcoachlib/gui/icons.py: icons.in/iconmap.py icons.in/nuvola.zip icons.in/splash.png
- cd icons.in; $(PYTHON) make.py
+ cd icons.in; xvfb-run $(PYTHON) make.py
taskcoachlib/persistence/xml/templates.py:
cd templates.in; $(PYTHON) make.py
......@@ -22,5 +22,5 @@ official_chardet.diff
official_combotreebox.diff
disable_failing_test.diff
run_img2py_inside_xvfb.diff
missing-import-in-openfile.diff
reproducible_build.diff
#!/usr/bin/make -f
# export DH_VERBOSE := 1
POLICY_TARGETS := binary binary-arch binary-indep build build-arch \
build-indep clean
.PHONY: $(POLICY_TARGETS)
$(POLICY_TARGETS):
%:
dh $@ --with python2
# Tell each dh_auto_* tool which buildsystem is needed.
override_dh_auto_clean:: override_%:
$* --buildsystem=makefile -- reallyclean
override_dh_auto_build: override_%:
$* --buildsystem=makefile -- prepare
# img2py needs an X display to convert images.
# Do not mix xvfb-run and parallelism.
xvfb-run $* --no-parallel --buildsystem=makefile -- prepare
$* --buildsystem=python_distutils
override_dh_auto_install:: override_%:
$* --buildsystem=python_distutils
......@@ -64,7 +61,7 @@ override_dh_auto_clean::
# Upstream provides the main executable with a .py suffix.
EXE_DIR := debian/taskcoach/usr/bin
DESKTOP := debian/taskcoach/usr/share/applications/taskcoach.desktop
APPDATA := debian/taskcoach/usr/share/appdata/taskcoach.appdata.xml
APPDATA := debian/taskcoach/usr/share/metainfo/taskcoach.appdata.xml
override_dh_auto_install::
cd $(EXE_DIR) && mv taskcoach.py taskcoach
sed --in-place 's/Exec=taskcoach\.py/Exec=taskcoach/' $(DESKTOP)
......
version=3
# qa.debian.org runs a redirector which allows a simpler form of URL
# for SourceForge based projects. The format below will automatically
# be rewritten to use the redirector.
# This may induce a delay between sourceforge publishing a file and
# uscan knowing about it. Last line of
# http://qa.debian.org/watch/sf.php/taskcoach mentions the date of the
# last database update.
opts=dversionmangle=s/\+dfsg$// \
version=4
opts=\
dversionmangle=s/\+dfsg$//,\
repack,\
compression=xz \
http://sf.net/taskcoach/TaskCoach-(.+)-raw\.tgz
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment