Commit ecefda24 authored by Nicolas Boulenguez's avatar Nicolas Boulenguez

New upstream release (1 patch accepted).

parent f8b9a032
taskcoach (1.4.0-1) unstable; urgency=medium
* New upstream release (1 patch accepted).
-- Nicolas Boulenguez <nicolas@debian.org> Sun, 03 Aug 2014 23:14:05 +0200
taskcoach (1.3.41.0-1) unstable; urgency=medium
* New upstream release (The .0 suffix corrects a packaging mistake).
......
......@@ -85,7 +85,7 @@ Source: http://www.taskcoach.org
a patch does the rest.
Files: *
Copyright: 2004-2013 Task Coach developers <developers@taskcoach.org>
Copyright: 2004-2014 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/>
......@@ -112,7 +112,7 @@ License: CC0-1.0
Files: debian/*
Copyright: 2009 Alejandro Garrido Mota <garridomota@gmail.com>
2012-2013 Nicolas Boulenguez <nicolas@debian.org>
2012-2014 Nicolas Boulenguez <nicolas@debian.org>
License: GPL-3+
Files: icons.in/nuvola.zip
......
......@@ -2,104 +2,6 @@ Description: disable some tests that fail for wrong reasons.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: private mail to Jérôme Laheurte on 2014/08/02
--- a/tests/unittests/guiTests/ReminderControllerTest.py
+++ b/tests/unittests/guiTests/ReminderControllerTest.py
@@ -69,16 +69,6 @@
self.task.setReminder(self.reminderDateTime)
self.failUnless(date.Scheduler().get_jobs())
- @test.skipOnTwistedVersions('12.')
- def testAfterReminderJobIsRemovedFromScheduler(self):
- self.task.setReminder(date.Now() + date.TimeDelta(seconds=1))
- self.failUnless(date.Scheduler().get_jobs())
- t0 = time.time()
- from twisted.internet import reactor
- while time.time() - t0 < 1.1:
- reactor.iterate()
- self.failIf(date.Scheduler().get_jobs())
-
def testAddTaskWithReminderSchedulesJob(self):
taskWithReminder = task.Task('Task with reminder',
reminder=self.reminderDateTime)
--- a/tests/unittests/domainTests/SchedulerTest.py
+++ b/tests/unittests/domainTests/SchedulerTest.py
@@ -1,76 +0,0 @@
-'''
-Task Coach - Your friendly task manager
-Copyright (C) 2004-2014 Task Coach developers <developers@taskcoach.org>
-
-Task Coach 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 3 of the License, or
-(at your option) any later version.
-
-Task Coach 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.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import test, time
-from taskcoachlib.domain import date
-
-
-class SchedulerTest(test.TestCase):
- def setUp(self):
- super(SchedulerTest, self).setUp()
- self.scheduler = date.Scheduler()
- self.callCount = 0
-
- def callback(self):
- self.callCount += 1
-
- @test.skipOnTwistedVersions('12.')
- def testScheduleAtDateTime(self):
- futureDate = date.Now() + date.TimeDelta(seconds=1)
- self.scheduler.schedule(self.callback, futureDate)
- self.failUnless(self.scheduler.is_scheduled(self.callback))
- t0 = time.time()
- from twisted.internet import reactor
- while time.time() - t0 < 2.1:
- reactor.iterate()
- self.failIf(self.scheduler.is_scheduled(self.callback))
- self.assertEqual(self.callCount, 1)
-
- @test.skipOnTwistedVersions('12.')
- def testUnschedule(self):
- futureDate = date.Now() + date.TimeDelta(seconds=1)
- self.scheduler.schedule(self.callback, futureDate)
- self.scheduler.unschedule(self.callback)
- self.failIf(self.scheduler.is_scheduled(self.callback))
- t0 = time.time()
- from twisted.internet import reactor
- while time.time() - t0 < 1.2:
- reactor.iterate()
- self.assertEqual(self.callCount, 0)
-
- @test.skipOnTwistedVersions('12.')
- def testScheduleAtPastDateTime(self):
- pastDate = date.Now() - date.TimeDelta(seconds=1)
- self.scheduler.schedule(self.callback, pastDate)
- self.failIf(self.scheduler.is_scheduled(self.callback))
- from twisted.internet import reactor
- reactor.iterate()
- self.failIf(self.scheduler.is_scheduled(self.callback))
- self.assertEqual(self.callCount, 1)
-
- @test.skipOnTwistedVersions('12.')
- def testScheduleInterval(self):
- self.scheduler.schedule_interval(self.callback, seconds=1)
- try:
- t0 = time.time()
- from twisted.internet import reactor
- while time.time() - t0 < 2.1:
- reactor.iterate()
- self.assertEqual(self.callCount, 2)
- finally:
- self.scheduler.unschedule(self.callback)
--- a/tests/unittests/AppTest.py
+++ b/tests/unittests/AppTest.py
@@ -40,26 +40,6 @@
......@@ -131,55 +33,10 @@ Forwarded: private mail to Jérôme Laheurte on 2014/08/02
if locale:
--- a/tests/integrationtests/LoadTest.py
+++ b/tests/integrationtests/LoadTest.py
@@ -1,62 +0,0 @@
-'''
-Task Coach - Your friendly task manager
-Copyright (C) 2004-2014 Task Coach developers <developers@taskcoach.org>
-
-Task Coach 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 3 of the License, or
-(at your option) any later version.
-
-Task Coach 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.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import os, wx
-import test, mock
-
-
-class LoadTest(test.TestCase):
- def setUp(self):
- self.filename = 'LoadTest.tsk'
- taskfile = file(self.filename, 'w')
- taskfile.writelines(['Line 1\n', 'Line 2\n'])
- taskfile.close()
- self.errorDialogCalled = False
- self.mockApp = mock.App()
-
- # On MacOS, wx.Yield doesn't seem to be enough, so while
- # running the tests, just short-circuit this:
- self.oldCallAfter = wx.CallAfter
- # pylint: disable=W0142
- wx.CallAfter = lambda func, *args, **kwargs: func(*args, **kwargs)
-
- def tearDown(self):
- wx.CallAfter = self.oldCallAfter
- self.mockApp.quitApplication()
- if os.path.isfile(self.filename):
- os.remove(self.filename)
- mock.App.deleteInstance()
- super(LoadTest, self).tearDown()
-
- def mockErrorDialog(self, *args, **kwargs): # pylint: disable=W0613
- self.errorDialogCalled = True
-
@@ -46,14 +46,6 @@
def mockErrorDialog(self, *args, **kwargs): # pylint: disable=W0613
self.errorDialogCalled = True
- def testLoadInvalidFileDoesNotAffectFile(self):
- self.mockApp.iocontroller.open(self.filename, showerror=self.mockErrorDialog)
- lines = file(self.filename, 'r').readlines()
......@@ -188,9 +45,6 @@ Forwarded: private mail to Jérôme Laheurte on 2014/08/02
- self.assertEqual('Line 1\n', lines[0])
- self.assertEqual('Line 2\n', lines[1])
-
- def testLoadNonExistingFileGivesErrorMessage(self):
- self.mockApp.iocontroller.open("I don't exist.tsk",
- showerror=self.mockErrorDialog,
- fileExists=lambda filename: False)
- wx.GetApp().Yield() # io.open uses wx.CallAfter
- self.failUnless(self.errorDialogCalled)
def testLoadNonExistingFileGivesErrorMessage(self):
self.mockApp.iocontroller.open("I don't exist.tsk",
showerror=self.mockErrorDialog,
Description: correct non portable python interpreter name
This removes a lintian warning, without any other effect because
the script is never executed directly.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: not-needed
--- a/taskcoachlib/thirdparty/smartdatetimectrl.py
+++ b/taskcoachlib/thirdparty/smartdatetimectrl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python-32
+#!/usr/bin/env python
# This file is part of smartdatetimectrl.
......@@ -28,7 +28,7 @@ Forwarded: not-needed
from taskcoachlib import operating_system
--- a/Makefile
+++ b/Makefile
@@ -191,7 +191,6 @@
@@ -178,7 +178,6 @@
templates: taskcoachlib/persistence/xml/templates.py
thirdpartymodules:
......
......@@ -16,7 +16,7 @@ Forwarded: not-needed
import StringIO
--- a/Makefile
+++ b/Makefile
@@ -192,7 +192,6 @@
@@ -179,7 +179,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 has been contacted via private email circa 1.3.22.
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 @@
......
......@@ -34,7 +34,7 @@ Forwarded: not-needed
return _GetCachedPassword(domain, username, reset)
--- a/Makefile
+++ b/Makefile
@@ -194,7 +194,6 @@
@@ -181,7 +181,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
......
......@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,7 @@
@@ -182,7 +182,7 @@
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
......
Description: use pygettext from python debian package.
Current man page for pygettext, available on the net,
says that xgettext has made pygettext obsolete.
The right solution would be to use xgettext, since pygettext has been
obsoleted by xgettext for years.
.
May be related to http://bugs.python.org/issue8502
.
http://docs.python.org/release/2.6.8/library/gettext.html?highlight=pygettext#internationalizing-your-programs-and-modules
seems to show that pygettext is provided by the default python library.
Anyway, pygettext is now provided by the default python library.
.
Upstream has been contacted in a private mail circa 1.3.22.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: yes
--- a/Makefile
+++ b/Makefile
@@ -240,7 +240,7 @@
@@ -227,7 +227,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
@@ -202,8 +202,6 @@
@@ -189,8 +189,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
@@ -197,7 +197,6 @@
@@ -184,7 +184,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.8.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty lockfile-0.8/lockfile.py
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
@@ -208,7 +208,6 @@
@@ -195,7 +195,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
......
......@@ -18,5 +18,4 @@ official_chardet.diff
official_combotreebox.diff
interpreter_name_for_smartdatetimectrl.diff
disable_failing_test.diff
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