Commit 3c46c76b authored by Nicolas Boulenguez's avatar Nicolas Boulenguez

* New upstream release. Copyright update.

  Depend: python-twisted >= 12.1, xdg-utils. Drop menu file.
  Upstream stops patching python-lockfile. Closes:#788974.
  VCS-*: https instead of git and http.
parent b0cec9a4
taskcoach (1.4.3-1) unstable; urgency=medium
* New upstream release. Copyright update.
Depend: python-twisted >= 12.1, xdg-utils. Drop menu file.
Upstream stops patching python-lockfile. Closes:#788974.
-- Nicolas Boulenguez <nicolas@debian.org> Sun, 31 Jan 2016 22:04:22 +0100
taskcoach (1.4.2-1) unstable; urgency=medium taskcoach (1.4.2-1) unstable; urgency=medium
* New upstream release. Closes: #764763. * New upstream release. Closes: #764763.
......
...@@ -18,7 +18,7 @@ Build-Depends-Indep: debhelper (>= 9), ...@@ -18,7 +18,7 @@ Build-Depends-Indep: debhelper (>= 9),
python-xdg (>= 0.25), python-xdg (>= 0.25),
python-wxgtk3.0 (>= 3.0.1.1+dfsg-2~), python-wxgtk3.0 (>= 3.0.1.1+dfsg-2~),
python-wxversion, python-wxversion,
python-twisted-core (>= 10.0), python-twisted-core (>= 12.1),
libxss1, libxss1,
fonts-dejavu, fonts-dejavu,
# See tests/control. # See tests/control.
...@@ -27,8 +27,8 @@ Build-Depends-Indep: debhelper (>= 9), ...@@ -27,8 +27,8 @@ Build-Depends-Indep: debhelper (>= 9),
Standards-Version: 3.9.6 Standards-Version: 3.9.6
Homepage: http://www.taskcoach.org Homepage: http://www.taskcoach.org
X-Python-Version: >= 2.6 X-Python-Version: >= 2.6
VCS-Git: git://anonscm.debian.org/collab-maint/taskcoach.git VCS-Git: https://anonscm.debian.org/git/collab-maint/taskcoach.git
VCS-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/taskcoach.git VCS-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/taskcoach.git
Package: taskcoach Package: taskcoach
Architecture: all Architecture: all
...@@ -46,9 +46,10 @@ Depends: ${misc:Depends}, ${python:Depends}, ...@@ -46,9 +46,10 @@ Depends: ${misc:Depends}, ${python:Depends},
# See buildlib/bdist_deb.py and #762413 # See buildlib/bdist_deb.py and #762413
python-wxgtk3.0 (>= 3.0.1.1+dfsg-2~), python-wxgtk3.0 (>= 3.0.1.1+dfsg-2~),
python-wxversion, python-wxversion,
python-twisted-core (>= 10.0), python-twisted-core (>= 12.1),
libxss1, libxss1,
fonts-dejavu fonts-dejavu,
xdg-utils
Recommends: python-notify, libgnome-2-0, libavahi-compat-libdnssd1 Recommends: python-notify, libgnome-2-0, libavahi-compat-libdnssd1
Suggests: espeak, python-kde4 Suggests: espeak, python-kde4
Description: friendly task manager Description: friendly task manager
......
...@@ -91,7 +91,7 @@ Source: http://www.taskcoach.org ...@@ -91,7 +91,7 @@ Source: http://www.taskcoach.org
a patch does the rest. a patch does the rest.
Files: * Files: *
Copyright: 2004-2015 Task Coach developers <developers@taskcoach.org> Copyright: 2004-2016 Task Coach developers <developers@taskcoach.org>
2014 Joseph Wang https://sourceforge.net/u/drjoe/profile 2014 Joseph Wang https://sourceforge.net/u/drjoe/profile
2014 Tom Monaco http://www.thomasmonaco.com 2014 Tom Monaco http://www.thomasmonaco.com
2013 Ivan Romanov <https://sourceforge.net/u/ivanromanov/> 2013 Ivan Romanov <https://sourceforge.net/u/ivanromanov/>
...@@ -110,6 +110,7 @@ Copyright: 2004-2015 Task Coach developers <developers@taskcoach.org> ...@@ -110,6 +110,7 @@ Copyright: 2004-2015 Task Coach developers <developers@taskcoach.org>
2011 Tobias Gradl <https://sourceforge.net/users/greentomato> 2011 Tobias Gradl <https://sourceforge.net/users/greentomato>
2005-2013 Rosetta Contributors and Canonical Ltd 2005-2013 Rosetta Contributors and Canonical Ltd
2014 Manab Chetia <manab.chetia@outlook.com> 2014 Manab Chetia <manab.chetia@outlook.com>
2015 Nicola https://sourceforge.net/u/swisscarbon/profile
License: GPL-3+ License: GPL-3+
Files: build.in/debian/taskcoach.appdata.xml Files: build.in/debian/taskcoach.appdata.xml
...@@ -118,7 +119,7 @@ License: CC0-1.0 ...@@ -118,7 +119,7 @@ License: CC0-1.0
Files: debian/* Files: debian/*
Copyright: 2009 Alejandro Garrido Mota <garridomota@gmail.com> Copyright: 2009 Alejandro Garrido Mota <garridomota@gmail.com>
2012-2015 Nicolas Boulenguez <nicolas@debian.org> 2012-2016 Nicolas Boulenguez <nicolas@debian.org>
License: GPL-3+ License: GPL-3+
Files: icons.in/nuvola.zip Files: icons.in/nuvola.zip
......
...@@ -8,7 +8,7 @@ Forwarded: not-needed ...@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -205,8 +205,8 @@ @@ -210,8 +210,8 @@
cd thirdparty; tar xzf pyparsing-1.5.5.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty pyparsing-1.5.5/pyparsing_py2.py 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 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 cd thirdparty; tar xzf pybonjour-1.1.1.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty pybonjour-1.1.1/pybonjour.py
...@@ -17,8 +17,8 @@ Forwarded: not-needed ...@@ -17,8 +17,8 @@ Forwarded: not-needed
+ cp /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/agw/customtreectrl.py taskcoachlib/thirdparty + cp /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/agw/customtreectrl.py taskcoachlib/thirdparty
+ cp /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/agw/hypertreelist.py taskcoachlib/thirdparty + cp /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/agw/hypertreelist.py taskcoachlib/thirdparty
cd thirdparty; tar xzf gntp-d639fa2e981fe41196a5115ad64320b5061f004b.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty gntp/gntp cd thirdparty; tar xzf gntp-d639fa2e981fe41196a5115ad64320b5061f004b.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty gntp/gntp
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/lockfile.diff
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/customtreectrl.diff cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/customtreectrl.diff
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/hypertreelist-headers.diff
--- a/thirdparty/patches/hypertreelist.diff --- a/thirdparty/patches/hypertreelist.diff
+++ b/thirdparty/patches/hypertreelist.diff +++ b/thirdparty/patches/hypertreelist.diff
@@ -16,17 +16,6 @@ @@ -16,17 +16,6 @@
......
...@@ -71,7 +71,7 @@ Forwarded: not-needed ...@@ -71,7 +71,7 @@ Forwarded: not-needed
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -200,7 +200,6 @@ @@ -205,7 +205,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 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 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 wxScheduler-r151.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty wxScheduler/wxScheduler
......
...@@ -16,23 +16,22 @@ Forwarded: not-needed ...@@ -16,23 +16,22 @@ Forwarded: not-needed
import tempfile import tempfile
--- a/taskcoachlib/mailer/__init__.py --- a/taskcoachlib/mailer/__init__.py
+++ b/taskcoachlib/mailer/__init__.py +++ b/taskcoachlib/mailer/__init__.py
@@ -17,7 +17,8 @@ @@ -17,7 +17,7 @@
''' '''
import wx, os, re, tempfile, urllib, email, email.header import wx, os, re, tempfile, urllib, email, email.header
-from taskcoachlib.thirdparty import desktop, chardet -from taskcoachlib.thirdparty import chardet
+from taskcoachlib.thirdparty import desktop
+import chardet +import chardet
from taskcoachlib.tools import openfile
from taskcoachlib.mailer.macmail import getSubjectOfMail from taskcoachlib.mailer.macmail import getSubjectOfMail
from taskcoachlib.i18n import _ from taskcoachlib.i18n import _
from taskcoachlib import operating_system
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -191,7 +191,6 @@ @@ -196,7 +196,6 @@
templates: taskcoachlib/persistence/xml/templates.py templates: taskcoachlib/persistence/xml/templates.py
thirdpartymodules: thirdpartymodules:
- 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 chardet-2.1.1.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty chardet-2.1.1/chardet
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 desktop-0.4.2.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty desktop-0.4.2/desktop
cp /usr/share/pyshared/lockfile.py taskcoachlib/thirdparty
cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm 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
...@@ -16,11 +16,11 @@ Forwarded: not-needed ...@@ -16,11 +16,11 @@ Forwarded: not-needed
import StringIO import StringIO
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -192,7 +192,6 @@ @@ -197,7 +197,6 @@
thirdpartymodules: thirdpartymodules:
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 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 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 desktop-0.4.2.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty desktop-0.4.2/desktop
cp /usr/share/pyshared/lockfile.py taskcoachlib/thirdparty
cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm 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
...@@ -34,11 +34,11 @@ Forwarded: not-needed ...@@ -34,11 +34,11 @@ Forwarded: not-needed
return _GetCachedPassword(domain, username, reset) return _GetCachedPassword(domain, username, reset)
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -194,7 +194,6 @@ @@ -199,7 +199,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 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 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 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 keyring-3.7.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty keyring-3.7/keyring
cp /usr/share/pyshared/lockfile.py taskcoachlib/thirdparty
cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm 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 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
...@@ -8,12 +8,55 @@ Forwarded: not-needed ...@@ -8,12 +8,55 @@ Forwarded: not-needed
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -195,7 +195,7 @@ @@ -200,7 +200,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 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 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 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 lockfile-0.12.2.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty lockfile-0.12.2/lockfile
+ cp /usr/share/pyshared/lockfile.py taskcoachlib/thirdparty
cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm 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 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 cd thirdparty; tar xzf WMI-1.4.9.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty WMI-1.4.9/wmi.py
--- a/taskcoachlib/gui/iocontroller.py
+++ b/taskcoachlib/gui/iocontroller.py
@@ -20,7 +20,7 @@
from taskcoachlib import meta, persistence, patterns, operating_system
from taskcoachlib.i18n import _
-from taskcoachlib.thirdparty import lockfile
+import lockfile
from taskcoachlib.widgets import GetPassword
from taskcoachlib.workarounds import ExceptionAsUnicode
from taskcoachlib.gui.dialog import BackupManagerDialog
--- a/taskcoachlib/persistence/taskfile.py
+++ b/taskcoachlib/persistence/taskfile.py
@@ -22,7 +22,7 @@
from taskcoachlib.domain import base, task, category, note, effort, attachment
from taskcoachlib.syncml.config import createDefaultSyncConfig
from taskcoachlib.thirdparty.guid import generate
-from taskcoachlib.thirdparty import lockfile
+import lockfile
from taskcoachlib.changes import ChangeMonitor, ChangeSynchronizer
from taskcoachlib.filesystem import FilesystemNotifier, FilesystemPollerNotifier
from wx.lib.pubsub import pub
--- a/tests/unittests/guiTests/IOControllerTest.py
+++ b/tests/unittests/guiTests/IOControllerTest.py
@@ -18,7 +18,7 @@
from taskcoachlib import gui, config, persistence
from taskcoachlib.domain import task, note, category
-from taskcoachlib.thirdparty import lockfile
+import lockfile
from unittests import dummy
import os
import shutil
--- a/tests/unittests/thirdPartySoftwareTests/LockFileTest.py
+++ b/tests/unittests/thirdPartySoftwareTests/LockFileTest.py
@@ -18,7 +18,7 @@
from __future__ import with_statement
import test, tempfile
-from taskcoachlib.thirdparty import lockfile
+import lockfile
class LockFileTest(test.TestCase):
...@@ -7,15 +7,15 @@ Forwarded: not-needed ...@@ -7,15 +7,15 @@ Forwarded: not-needed
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -196,7 +196,6 @@ @@ -201,7 +201,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 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 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 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 - cd thirdparty; tar xzf PyPubSub-3.3.0.tar.gz --strip-components=2 -C ../taskcoachlib/thirdparty PyPubSub-3.3.0/src/pubsub
cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm 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 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 cd thirdparty; tar xzf WMI-1.4.9.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty WMI-1.4.9/wmi.py
@@ -208,7 +207,6 @@ @@ -212,7 +211,6 @@
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/customtreectrl.diff 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-headers.diff
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/hypertreelist.diff cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/hypertreelist.diff
...@@ -61,7 +61,7 @@ Forwarded: not-needed ...@@ -61,7 +61,7 @@ Forwarded: not-needed
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
from taskcoachlib import patterns, mailer from taskcoachlib import patterns, mailer
from taskcoachlib.domain import base from taskcoachlib.domain import base
from taskcoachlib.thirdparty import desktop from taskcoachlib.tools import openfile
-from taskcoachlib.thirdparty.pubsub import pub -from taskcoachlib.thirdparty.pubsub import pub
+from wx.lib.pubsub import pub +from wx.lib.pubsub import pub
from taskcoachlib.domain.note.noteowner import NoteOwner from taskcoachlib.domain.note.noteowner import NoteOwner
...@@ -294,12 +294,12 @@ Forwarded: not-needed ...@@ -294,12 +294,12 @@ Forwarded: not-needed
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
from taskcoachlib.i18n import _ from taskcoachlib.i18n import _
from taskcoachlib.mailer import sendMail from taskcoachlib.mailer import sendMail
from taskcoachlib.thirdparty import desktop, hypertreelist from taskcoachlib.thirdparty import hypertreelist
-from taskcoachlib.thirdparty.pubsub import pub -from taskcoachlib.thirdparty.pubsub import pub
+from wx.lib.pubsub import pub +from wx.lib.pubsub import pub
from taskcoachlib.thirdparty.wxScheduler import wxSCHEDULER_NEXT, \ from taskcoachlib.thirdparty.wxScheduler import wxSCHEDULER_NEXT, \
wxSCHEDULER_PREV, wxSCHEDULER_TODAY wxSCHEDULER_PREV, wxSCHEDULER_TODAY
from taskcoachlib.tools import anonymize from taskcoachlib.tools import anonymize, openfile
--- a/taskcoachlib/gui/viewer/base.py --- a/taskcoachlib/gui/viewer/base.py
+++ b/taskcoachlib/gui/viewer/base.py +++ b/taskcoachlib/gui/viewer/base.py
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
......
...@@ -10,7 +10,7 @@ Forwarded: yes ...@@ -10,7 +10,7 @@ Forwarded: yes
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -240,7 +240,7 @@ @@ -244,7 +244,7 @@
cd i18n.in; $(PYTHON) make.py cd i18n.in; $(PYTHON) make.py
i18n.in/messages.pot: $(shell find taskcoachlib -name '*.py' | grep -v i18n) i18n.in/messages.pot: $(shell find taskcoachlib -name '*.py' | grep -v i18n)
......
...@@ -9,7 +9,7 @@ Forwarded: not-needed ...@@ -9,7 +9,7 @@ Forwarded: not-needed
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -202,8 +202,6 @@ @@ -207,8 +207,6 @@
cd thirdparty; tar xzf wxScheduler-r151.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty wxScheduler/wxScheduler 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 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 cd thirdparty; tar xzf WMI-1.4.9.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty WMI-1.4.9/wmi.py
......
...@@ -24,9 +24,9 @@ Forwarded: not-needed ...@@ -24,9 +24,9 @@ Forwarded: not-needed
class SquareMap(tooltip.ToolTipMixin, squaremap.SquareMap): class SquareMap(tooltip.ToolTipMixin, squaremap.SquareMap):
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -197,7 +197,6 @@ @@ -202,7 +202,6 @@
cd thirdparty; tar xzf keyring-3.7.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty keyring-3.7/keyring 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 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 cd thirdparty; tar xzf PyPubSub-3.3.0.tar.gz --strip-components=2 -C ../taskcoachlib/thirdparty PyPubSub-3.3.0/src/pubsub
- 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 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 python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm
......
...@@ -25,11 +25,11 @@ Forwarded: not-needed ...@@ -25,11 +25,11 @@ Forwarded: not-needed
import Carbon.Folder, Carbon.Folders, Carbon.File import Carbon.Folder, Carbon.Folders, Carbon.File
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -208,7 +208,6 @@ @@ -213,7 +213,6 @@
cd thirdparty; tar xzf agw-r70845.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty agw/customtreectrl.py 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 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 cd thirdparty; tar xzf gntp-d639fa2e981fe41196a5115ad64320b5061f004b.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty gntp/gntp
- cd thirdparty; tar xzf pyxdg-0.25.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty pyxdg-0.25/xdg - cd thirdparty; tar xzf pyxdg-0.25.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty pyxdg-0.25/xdg
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/lockfile.diff
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/customtreectrl.diff 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-headers.diff
cd taskcoachlib/thirdparty; patch -p1 < ../../thirdparty/patches/hypertreelist.diff
...@@ -4,7 +4,7 @@ Forwarded: not-needed ...@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -207,7 +207,7 @@ @@ -210,7 +210,7 @@
$(PYTHON) fixinit.py $(PYTHON) fixinit.py
taskcoachlib/gui/icons.py: icons.in/iconmap.py icons.in/nuvola.zip icons.in/splash.png taskcoachlib/gui/icons.py: icons.in/iconmap.py icons.in/nuvola.zip icons.in/splash.png
......
...@@ -42,7 +42,6 @@ override_dh_auto_clean:: ...@@ -42,7 +42,6 @@ override_dh_auto_clean::
rm -f -r taskcoachlib/thirdparty/desktop rm -f -r taskcoachlib/thirdparty/desktop
rm -f -r taskcoachlib/thirdparty/gntp rm -f -r taskcoachlib/thirdparty/gntp
rm -f taskcoachlib/thirdparty/hypertreelist.py rm -f taskcoachlib/thirdparty/hypertreelist.py
rm -f taskcoachlib/thirdparty/lockfile.py
rm -f -r taskcoachlib/thirdparty/ntlm rm -f -r taskcoachlib/thirdparty/ntlm
rm -f taskcoachlib/thirdparty/pybonjour.py rm -f taskcoachlib/thirdparty/pybonjour.py
rm -f taskcoachlib/thirdparty/wmi.py rm -f taskcoachlib/thirdparty/wmi.py
......
?package(taskcoach): \
needs="X11" \
section="Applications/Project Management" \
title="Task Coach" \
command="/usr/bin/taskcoach" \
icon="/usr/share/pixmaps/taskcoach.xpm"
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