Commit 88069fe3 authored by Nicolas Boulenguez's avatar Nicolas Boulenguez

* New upstream release. Closes: #764763.

parent 5419a072
taskcoach (1.4.2-1) unstable; urgency=medium
* New upstream release. Closes: #764763.
-- Nicolas Boulenguez <nicolas@debian.org> Tue, 28 Apr 2015 19:02:52 +0200
taskcoach (1.4.1-4) unstable; urgency=medium
* Depend on python-wxgtk3.0 >=3.0.1.1+dfsg-2:
......
......@@ -91,7 +91,7 @@ Source: http://www.taskcoach.org
a patch does the rest.
Files: *
Copyright: 2004-2014 Task Coach developers <developers@taskcoach.org>
Copyright: 2004-2015 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/>
......@@ -118,7 +118,7 @@ License: CC0-1.0
Files: debian/*
Copyright: 2009 Alejandro Garrido Mota <garridomota@gmail.com>
2012-2014 Nicolas Boulenguez <nicolas@debian.org>
2012-2015 Nicolas Boulenguez <nicolas@debian.org>
License: GPL-3+
Files: icons.in/nuvola.zip
......
......@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -192,8 +192,8 @@
@@ -205,8 +205,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
@@ -187,7 +187,6 @@
@@ -200,7 +200,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
......
......@@ -28,7 +28,7 @@ Forwarded: not-needed
from taskcoachlib import operating_system
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,6 @@
@@ -191,7 +191,6 @@
templates: taskcoachlib/persistence/xml/templates.py
thirdpartymodules:
......
......@@ -16,7 +16,7 @@ Forwarded: not-needed
import StringIO
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,6 @@
@@ -192,7 +192,6 @@
thirdpartymodules:
cd thirdparty; tar xzf chardet-2.1.1.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty chardet-2.1.1/chardet
......
......@@ -34,7 +34,7 @@ Forwarded: not-needed
return _GetCachedPassword(domain, username, reset)
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,6 @@
@@ -194,7 +194,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
@@ -182,7 +182,7 @@
@@ -195,7 +195,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
......
......@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,6 @@
@@ -196,7 +196,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.8.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty lockfile-0.8/lockfile.py
......@@ -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
@@ -195,7 +194,6 @@
@@ -208,7 +207,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
......@@ -420,7 +420,7 @@ Forwarded: not-needed
+from wx.lib.pubsub import pub
def _isDropbox(path):
def _isCloud(path):
--- a/taskcoachlib/persistence/templatelist.py
+++ b/taskcoachlib/persistence/templatelist.py
@@ -17,7 +17,7 @@
......
......@@ -10,7 +10,7 @@ Forwarded: yes
--- a/Makefile
+++ b/Makefile
@@ -227,7 +227,7 @@
@@ -240,7 +240,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
@@ -189,8 +189,6 @@
@@ -202,8 +202,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
@@ -184,7 +184,6 @@
@@ -197,7 +197,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
......
......@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/taskcoachlib/config/settings.py
+++ b/taskcoachlib/config/settings.py
@@ -344,7 +344,7 @@
@@ -348,7 +348,7 @@
def pathToConfigDir(self, environ):
try:
if operating_system.isGTK():
......@@ -14,7 +14,7 @@ Forwarded: not-needed
path = BaseDirectory.save_config_path(meta.name)
elif operating_system.isMac():
import Carbon.Folder, Carbon.Folders, Carbon.File
@@ -363,7 +363,7 @@
@@ -367,7 +367,7 @@
def _pathToDataDir(self, *args, **kwargs):
forceGlobal = kwargs.pop('forceGlobal', False)
if operating_system.isGTK():
......@@ -25,7 +25,7 @@ Forwarded: not-needed
import Carbon.Folder, Carbon.Folders, Carbon.File
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,6 @@
@@ -208,7 +208,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
......
......@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -194,7 +194,7 @@
@@ -207,7 +207,7 @@
$(PYTHON) fixinit.py
taskcoachlib/gui/icons.py: icons.in/iconmap.py icons.in/nuvola.zip icons.in/splash.png
......
......@@ -19,17 +19,6 @@ Bug-Debian: https://bugs.debian.org/764570
if operating_system.isWindows():
self.Bind(wx.EVT_QUERY_END_SESSION, self.onQueryEndSession)
--- a/taskcoachlib/gui/dialog/backupmanager.py
+++ b/taskcoachlib/gui/dialog/backupmanager.py
@@ -111,7 +111,7 @@
dlg = wx.FileDialog(self, _('Choose the restoration destination'),
defaultDir=os.path.dirname(filename),
defaultFile=os.path.split(filename)[-1],
- wildcard='*.tsk', style=wx.FD_SAVE|wx.OVERWRITE_PROMPT)
+ wildcard='*.tsk', style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
try:
if dlg.ShowModal() == wx.ID_OK:
self.__filename = dlg.GetPath()
--- a/taskcoachlib/thirdparty/timeline/timeline.py
+++ b/taskcoachlib/thirdparty/timeline/timeline.py
@@ -385,7 +385,6 @@
......@@ -40,38 +29,6 @@ Bug-Debian: https://bugs.debian.org/764570
self.frame = wx.Frame(None)
self.frame.CreateStatusBar()
model = self.get_model(self.size)
--- a/taskcoachlib/widgets/dialog.py
+++ b/taskcoachlib/widgets/dialog.py
@@ -164,6 +164,6 @@
kwargs = {'message': _('Add attachment'),
'default_path': os.getcwd(),
'wildcard': _('All files (*.*)|*'),
- 'flags': wx.OPEN}
+ 'flags': wx.FD_OPEN}
kwargs.update(callerKeywordArguments)
return wx.FileSelector(**kwargs) # pylint: disable=W0142
--- a/taskcoachlib/widgets/hcalendar.py
+++ b/taskcoachlib/widgets/hcalendar.py
@@ -163,7 +163,7 @@
return self.__drawNow
def SetTodayColor(self, (r, g, b)):
- super(HierarchicalCalendar, self).SetTodayColor(wx.Color(r, g, b))
+ super(HierarchicalCalendar, self).SetTodayColor(wx.Colour(r, g, b))
def TodayColor(self):
color = super(HierarchicalCalendar, self).TodayColor()
--- a/taskcoachlib/workarounds/display.py
+++ b/taskcoachlib/workarounds/display.py
@@ -43,7 +43,7 @@
@staticmethod
def GetFromWindow(window):
- if window.GetWindowStyle() & wx.THICK_FRAME:
+ if window.GetWindowStyle() & wx.RESIZE_BORDER:
margin = wx.SystemSettings.GetMetric(wx.SYS_FRAMESIZE_X)
else:
margin = 0
--- a/tests/test.py
+++ b/tests/test.py
@@ -19,7 +19,7 @@
......
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