Commit 9aaa300b authored by Nicolas Boulenguez's avatar Nicolas Boulenguez

Prepare upload of 1.4.5-1 to experimental (because of the freeze).

  * New upstream release.
  * Debhelper 12. Call setup.py directly.
  * Standards-Version: 4.3.0.
  * Update the appdata patch, increase the icon size to 64x64.
parent 6050825f
taskcoach (1.4.5-1) experimental; urgency=medium
* New upstream release.
* Debhelper 12. Call setup.py directly.
* Standards-Version: 4.3.0.
* Update the appdata patch, increase the icon size to 64x64.
-- Nicolas Boulenguez <nicolas@debian.org> Tue, 23 Apr 2019 14:55:04 +0200
taskcoach (1.4.4-1) unstable; urgency=medium
* New upstream release.
......
......@@ -2,7 +2,8 @@ Source: taskcoach
Section: utils
Priority: optional
Maintainer: Nicolas Boulenguez <nicolas@debian.org>
Build-Depends-Indep: debhelper (>= 11),
Build-Depends:
debhelper-compat (= 12),
# 2.6.6-3~: https://wiki.debian.org/Python/TransitionToDHPython2
python,
dh-python,
......@@ -25,7 +26,7 @@ Build-Depends-Indep: debhelper (>= 11),
# See tests/control.
hicolor-icon-theme, locales-all, x11-utils, xauth, xvfb
# Also see patches/run_img2py_inside_xvfb.diff.
Standards-Version: 4.2.1
Standards-Version: 4.3.0
Rules-Requires-Root: no
Homepage: https://www.taskcoach.org
Vcs-Browser: https://salsa.debian.org/debian/taskcoach
......
......@@ -51,8 +51,6 @@ Files-Excluded:
thirdparty/pyparsing-*.tar.gz
thirdparty/python-dateutil-*.tar.gz
thirdparty/pyxdg-*.tar.gz
tools/img2img.py
tools/img2py.py
tools/pygettext.py
tools/webchecker.py
website.in
......@@ -106,7 +104,6 @@ Source: https://www.taskcoach.org
combotreebox (1.1 from python-wxgtk, instead of embedded 1.2)
customtreectrl.py and hypertreelist.py (from agw in python-wxgtk)
dateutil
img2img.py img2py.py (from python-wxgtk)
keyring
lockfile
pubsub (from python-wxgtk)
......@@ -122,7 +119,7 @@ Source: https://www.taskcoach.org
a patch does the rest.
Files: *
Copyright: 2004-2018 Task Coach developers <developers@taskcoach.org>
Copyright: 2004-2019 Task Coach developers <developers@taskcoach.org>
2014 Joseph Wang https://sourceforge.net/u/drjoe/profile
2014 Tom Monaco http://www.thomasmonaco.com
2013 Ivan Romanov <https://sourceforge.net/u/ivanromanov/>
......@@ -152,7 +149,7 @@ License: CC0-1.0
Files: debian/*
Copyright: 2009 Alejandro Garrido Mota <garridomota@gmail.com>
2012-2018 Nicolas Boulenguez <nicolas@debian.org>
2012-2019 Nicolas Boulenguez <nicolas@debian.org>
License: GPL-3+
Files: icons.in/nuvola.zip
......
......@@ -4,6 +4,7 @@ Description: improve appdata.xml
Install appdata.xml in Debian as in Ubuntu.
.
Update appstream standard and installation directory.
Forwarded: https://sourceforge.net/p/taskcoach/patches/17/
Author: Nicolas Boulenguez <nicolas@debian.org>
--- a/build.in/debian/taskcoach.appdata.xml
......@@ -18,7 +19,7 @@ Author: Nicolas Boulenguez <nicolas@debian.org>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<name>Task Coach</name>
@@ -14,9 +14,14 @@
@@ -14,17 +14,41 @@
<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>
</description>
......@@ -27,18 +28,45 @@ Author: Nicolas Boulenguez <nicolas@debian.org>
- <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>
+ <image width="760" height="222">https://www.taskcoach.org/images/banner.png</image>
+ </screenshot>
+ <screenshot>
+ <image width="1280" height="748">http://www.taskcoach.org/screenshots/Appdata-02.png</image>
+ <image width="984" height="322">https://www.taskcoach.org/screenshots/Linux/0.71.2-Ubuntu-Effort_viewer_with_weekly_report.png</image>
+ </screenshot>
+ <screenshot>
+ <image width="770" height="580">https://www.taskcoach.org/screenshots/Linux/0.71.2-Ubuntu-Preferences_dialog.png</image>
+ </screenshot>
+ <screenshot>
+ <image width="760" height="729">https://www.taskcoach.org/screenshots/Linux/0.71.2-Ubuntu-Print_preview.png</image>
+ </screenshot>
+ <screenshot>
+ <image width="949" height="697">https://www.taskcoach.org/screenshots/Linux/0.71.2-Ubuntu-Task_categories_and_notes.png</image>
+ </screenshot>
+ <screenshot>
+ <image width="864" height="571">https://www.taskcoach.org/screenshots/Linux/0.71.2-Ubuntu-Task_editor.png</image>
+ </screenshot>
+ <screenshot>
+ <image width="949" height="697">https://www.taskcoach.org/screenshots/Linux/0.71.2-Ubuntu-Tasks_categories_and_effort.png</image>
+ </screenshot>
+ <screenshot>
+ <image width="866" height="435">https://www.taskcoach.org/screenshots/Linux/0.72.0-Ubuntu-Task_square_map_showing_budget.png</image>
+ </screenshot>
</screenshots>
<url type="homepage">http://www.taskcoach.org/</url>
<url type="bugtracker">http://sourceforge.net/p/taskcoach/bugs</url>
@@ -27,4 +32,4 @@
- <url type="homepage">http://www.taskcoach.org/</url>
- <url type="bugtracker">http://sourceforge.net/p/taskcoach/bugs</url>
+ <url type="homepage">https://www.taskcoach.org/</url>
+ <url type="bugtracker">https://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>
- <url type="donation">http://www.taskcoach.org/givesupport.html</url>
+ <url type="help">https://www.taskcoach.org/getsupport.html</url>
+ <url type="donation">https://www.taskcoach.org/givesupport.html</url>
+ <url type="translate">https://www.taskcoach.org/i18n.html</url>
+ <url type="contact">mailto://developers@taskcoach.org</url>
<provides>
<binary>taskcoach.py</binary>
</provides>
<updatecontact>developers@taskcoach.org</updatecontact>
- <updatecontact>developers@taskcoach.org</updatecontact>
-</application>
+</component>
--- a/setup.py
......
......@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -238,8 +238,8 @@
@@ -342,8 +342,8 @@
cd thirdparty; tar xzf pyparsing-1.5.5.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty pyparsing-1.5.5/pyparsing_py2.py
mv taskcoachlib/thirdparty/pyparsing_py2.py taskcoachlib/thirdparty/pyparsing.py
cd thirdparty; tar xzf pybonjour-1.1.1.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty pybonjour-1.1.1/pybonjour.py
......
......@@ -71,7 +71,7 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -233,7 +233,6 @@
@@ -337,7 +337,6 @@
cd thirdparty; tar xzf SquareMap-1.0.3.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty SquareMap-1.0.3/squaremap
cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm
cd thirdparty; tar xzf wxScheduler-r151.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty wxScheduler/wxScheduler
......
......@@ -27,7 +27,7 @@ Forwarded: not-needed
from taskcoachlib.i18n import _
--- a/Makefile
+++ b/Makefile
@@ -224,7 +224,6 @@
@@ -328,7 +328,6 @@
templates: taskcoachlib/persistence/xml/templates.py
thirdpartymodules:
......
......@@ -16,7 +16,7 @@ Forwarded: not-needed
import StringIO
--- a/Makefile
+++ b/Makefile
@@ -225,7 +225,6 @@
@@ -329,7 +329,6 @@
thirdpartymodules:
cd thirdparty; tar xzf chardet-2.1.1.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty chardet-2.1.1/chardet
......
Description: use img2py.py and img2img.py from python-wxgtk2.8.
Both tools are provided by wx in the tools subdirectory.
.
Upstream considers that this change is not worth the while (manual
checks on every architecture).
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: not-needed
--- a/icons.in/make.py
+++ b/icons.in/make.py
@@ -20,9 +20,9 @@
import wxversion, sys
wxversion.ensureMinimal("2.8")
-sys.path.append('../tools')
-import os, img2py
+import os
+from wx.tools import img2py
def extractIcon(iconZipFile, pngFilename, pngZipped):
pngFile = file(pngFilename, 'wb')
......@@ -34,7 +34,7 @@ Forwarded: not-needed
return _GetCachedPassword(domain, username, reset)
--- a/Makefile
+++ b/Makefile
@@ -227,7 +227,6 @@
@@ -331,7 +331,6 @@
cd thirdparty; tar xzf chardet-2.1.1.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty chardet-2.1.1/chardet
cd thirdparty; tar xzf python-dateutil-1.5.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-dateutil-1.5/dateutil
cd thirdparty; tar xzf desktop-0.4.2.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty desktop-0.4.2/desktop
......
......@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -228,7 +228,6 @@
@@ -332,7 +332,6 @@
cd thirdparty; tar xzf python-dateutil-1.5.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-dateutil-1.5/dateutil
cd thirdparty; tar xzf desktop-0.4.2.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty desktop-0.4.2/desktop
cd thirdparty; tar xzf keyring-3.7.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty keyring-3.7/keyring
......
......@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -229,7 +229,6 @@
@@ -333,7 +333,6 @@
cd thirdparty; tar xzf desktop-0.4.2.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty desktop-0.4.2/desktop
cd thirdparty; tar xzf keyring-3.7.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty keyring-3.7/keyring
cd thirdparty; tar xzf lockfile-0.12.2.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty lockfile-0.12.2/lockfile
......@@ -15,7 +15,7 @@ Forwarded: not-needed
cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm
cd thirdparty; tar xzf wxScheduler-r151.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty wxScheduler/wxScheduler
cd thirdparty; tar xzf WMI-1.4.9.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty WMI-1.4.9/wmi.py
@@ -240,7 +239,6 @@
@@ -344,7 +343,6 @@
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/customtreectrl.diff
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/hypertreelist-headers.diff
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/hypertreelist.diff
......
......@@ -10,7 +10,7 @@ Forwarded: yes
--- a/Makefile
+++ b/Makefile
@@ -272,7 +272,7 @@
@@ -376,7 +376,7 @@
cd i18n.in; $(PYTHON) make.py
i18n.in/messages.pot: $(shell find taskcoachlib -name '*.py' | grep -v i18n)
......
......@@ -9,7 +9,7 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -235,8 +235,6 @@
@@ -339,8 +339,6 @@
cd thirdparty; tar xzf wxScheduler-r151.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty wxScheduler/wxScheduler
cd thirdparty; tar xzf aui-r72315.tar.gz -C ../taskcoachlib/thirdparty
cd thirdparty; tar xzf WMI-1.4.9.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty WMI-1.4.9/wmi.py
......
......@@ -24,7 +24,7 @@ Forwarded: not-needed
class SquareMap(tooltip.ToolTipMixin, squaremap.SquareMap):
--- a/Makefile
+++ b/Makefile
@@ -230,7 +230,6 @@
@@ -334,7 +334,6 @@
cd thirdparty; tar xzf keyring-3.7.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty keyring-3.7/keyring
cd thirdparty; tar xzf lockfile-0.12.2.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty lockfile-0.12.2/lockfile
cd thirdparty; tar xzf PyPubSub-3.3.0.tar.gz --strip-components=2 -C ../taskcoachlib/thirdparty PyPubSub-3.3.0/src/pubsub
......
......@@ -25,7 +25,7 @@ Forwarded: not-needed
import Carbon.Folder, Carbon.Folders, Carbon.File
--- a/Makefile
+++ b/Makefile
@@ -241,7 +241,6 @@
@@ -345,7 +345,6 @@
cd thirdparty; tar xzf agw-r70845.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty agw/customtreectrl.py
cd thirdparty; tar xzf agw-r70819.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty agw/hypertreelist.py
cd thirdparty; tar xzf gntp-d639fa2e981fe41196a5115ad64320b5061f004b.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty gntp/gntp
......
Description: Make the build reproducible
Author: Chris Lamb <lamby@debian.org>
Bug-Debian: https://bugs.debian.org/862592
Forwarded: https://sourceforge.net/p/taskcoach/patches/17/
Last-Update: 2017-05-14
--- a/templates.in/make.py
......
......@@ -4,8 +4,6 @@ wxpy3.0-compat.patch
appdata_xml.diff
do_not_install_buildlib.diff
official_img2py.diff
# Modify Makefile from tail to head to limit interferences.
official_pygettext.diff
official_xdg.diff
......
Description: assume twisted major version is an integer, not other components
Bug-Debian: https://bugs.debian.org/877029
Forwarded: https://sourceforge.net/p/taskcoach/patches/17/
Author: Nicolas Boulenguez <nicolas@debian.org>
--- a/taskcoachlib/application/application.py
......
......@@ -3,8 +3,7 @@ Description: Update for wxPython 3.0
Origin: vendor, http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree
Author: Olly Betts <olly@survex.com>
Author: Peter Gervai <grin@grin.hu>
Forwarded: private mail on 2014/10/11
Last-Update: 2014-10-11
Forwarded: https://sourceforge.net/p/taskcoach/patches/17/
Bug-Debian: https://bugs.debian.org/764570
--- a/taskcoachlib/application/application.py
......
......@@ -6,13 +6,13 @@
override_dh_auto_clean::
# clean and reallyclean cannot run in parallel.
$(MAKE) reallyclean
override_dh_auto_build: override_%:
override_dh_auto_build:
# img2py needs an X display to convert images.
# Do not mix xvfb-run and parallelism.
xvfb-run $(MAKE) -j1 prepare
$* --buildsystem=python_distutils
override_dh_auto_install:: override_%:
$* --buildsystem=python_distutils
python setup.py build
override_dh_auto_install::
python setup.py install --root=debian/taskcoach --install-layout=deb
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
......@@ -51,7 +51,7 @@ override_dh_auto_clean::
# Provide an icon for the menu file.
XPM_ICON := icons.in/taskcoach.xpm
$(XPM_ICON): %.xpm: %.png
gm convert -resize 32x32 $< $@
gm convert -resize 64x64 $< $@
override_dh_auto_build: $(XPM_ICON)
override_dh_auto_install::
dh_install $(XPM_ICON) usr/share/pixmaps
......
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