Commit 001dc900 authored by Nicolas Boulenguez's avatar Nicolas Boulenguez

Merge branch 'wxgtk3.0'

parents bc5a1737 98c3b9dc
When repackaging next upstream release:
use --compression=xz
copyright/Files-Excluded:
thirdparty/PyPubSub-*
thirdparty/agw-*
thirdparty/aui-*
copyright/Comments:
customtreectrl.py and hypertreelist.py (from agw in python-wxgtk)
aui (from python-wxgtk)
pubsub (from python-wxgtk)
copyright: remove these stanzas
Files: thirdparty/aui-*
Files: thirdparty/agw-*
Files: thirdparty/PyPubSub-*
License: BSD
Some tools in thirdparty/ desserve their own package. For example,
guid.py is embedded in many python packages.
......
......@@ -16,8 +16,8 @@ Build-Depends-Indep: debhelper (>= 9),
python-pyparsing (>= 1.5.5),
python-squaremap (>= 1.0.3),
python-xdg (>= 0.25),
python-wxgtk2.8 (>= 2.8.12.1+dfsg2),
python-wxversion (>= 2.8.12.1+dfsg2),
python-wxgtk3.0,
python-wxversion,
python-twisted-core (>= 10.0),
libxss1,
fonts-dejavu,
......@@ -43,11 +43,10 @@ Depends: ${misc:Depends}, ${python:Depends},
python-pyparsing (>= 1.5.5),
python-squaremap (>= 1.0.3),
python-xdg (>= 0.25),
dh-linktree,
# See buildlib/bdist_deb.py:
# patches/official_img2py.diff triggers #698198 patched by 2.8.12.1-13
# latest wxgtk for combotreebox (1.1 for now, instead of 1.2)
python-wxgtk2.8 (>= 2.8.12.1+dfsg2),
python-wxversion (>= 2.8.12.1+dfsg2),
python-wxgtk3.0,
python-wxversion,
python-twisted-core (>= 10.0),
libxss1,
fonts-dejavu
......
......@@ -68,9 +68,9 @@ Source: http://www.taskcoach.org
.
Some thirdparty dependencies are packaged in Debian:
chardet
combotreebox (from wxgtk)
combotreebox (1.1 from python-wxgtk, instead of embedded 1.2)
dateutil
img2img.py img2py.py (from python-wxgtk2.8)
img2img.py img2py.py (from python-wxgtk)
keyring
lockfile
pygettext.py (from python)
......@@ -83,6 +83,11 @@ Source: http://www.taskcoach.org
copyright/Files-Excluded removes a tarball,
control/Build-Depends and Depends require a minimal version,
a patch does the rest.
.
Upstream patches one file in PubSub, so we use dh_linktree to replace
all others. It has the inconvenient to generate a strict dependency
to an exact python-wxgtk version. Any suggestion is welcome, but should
work for both the build tests and the installed binary package.
Files: *
Copyright: 2004-2014 Task Coach developers <developers@taskcoach.org>
......@@ -167,21 +172,13 @@ Files: thirdparty/aui-*
Copyright: 2005-2012 Andrea Gavana <andrea.gavana@gmail.com>
License: wxwindows
Comment:
Provided by python-wxgtk2.8 but too old (__init__.py contains a date).
Taskcoach embeds revision 72315 which does not trigger bug 749643.
The patch should be restored once this revision enters Debian.
Makefile is patched to use wxgtk version instead of embedded one.
Files: thirdparty/agw-*
Copyright: 2000-2012 Andrea Gavana <andrea.gavana@gmail.com>
License: wxwindows
Comment:
Provided by python-wxgtk2.8, but taskcoach copies the sources because
it insists on patching customtreectrl.py and hypertreelist.py (see
Makefile).
.
customtreectrl: patch for 2.6, wxgtk 2.8.12.1 provides 2.4.
.
hypertreelist: patch for 1.3, wxgtk 2.8.12.1 provides 1.2.
Makefile is patched to patch wxgtk version instead of embedded one.
Files: thirdparty/wxScheduler-*
Copyright: 2009-2013 Esposti Daniele: expo --at-- expobrain -dot- net
......@@ -211,13 +208,8 @@ Files: thirdparty/PyPubSub-*
Copyright: 2006-2012 Oliver Schoenborn <oliver.schoenborn@gmail.com>
License: BSD
Comment:
See taskcoachlib/thirdparty/README.txt. Debian packages revision 249
(in wxgtk 2.8.12.1), taskcoach embeds version 3.3.0 and does patch it.
Moreover, the API has changed, so we extract the taskcoach version.
.
It may be tempting to use dh_linktree and at least avoid redundancy
for identical files, but each file has changed (copyright notices) and
this would generate a binary Depends with the exact version.
Makefile is patched to patch wxgtk version instead of embedded one.
As only file is patched, dh_linktree links the other ones.
Files: thirdparty/python-ntlm-*
Copyright: 2001-2011 Ben Dyer <ben.dyer@taguchimail.com>
......
......@@ -5,101 +5,14 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -205,8 +205,6 @@
@@ -192,8 +192,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
- 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
+ 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
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
--- a/taskcoachlib/gui/dialog/toolbar.py
+++ b/taskcoachlib/gui/dialog/toolbar.py
@@ -20,7 +20,7 @@
from taskcoachlib.help.balloontips import BalloonTipManager
from taskcoachlib.gui import uicommand
from taskcoachlib.i18n import _
-from taskcoachlib.thirdparty import hypertreelist as htl
+from wx.lib.agw import hypertreelist as htl
import wx
--- a/taskcoachlib/gui/uicommand/uicommand.py
+++ b/taskcoachlib/gui/uicommand/uicommand.py
@@ -27,7 +27,8 @@
from taskcoachlib.gui.wizard import CSVImportWizard
from taskcoachlib.i18n import _
from taskcoachlib.mailer import sendMail
-from taskcoachlib.thirdparty import desktop, hypertreelist
+from taskcoachlib.thirdparty import desktop
+form wx.lib.agw import hypertreelist
from taskcoachlib.thirdparty.pubsub import pub
from taskcoachlib.thirdparty.wxScheduler import wxSCHEDULER_NEXT, \
wxSCHEDULER_PREV, wxSCHEDULER_TODAY
--- a/taskcoachlib/gui/viewer/base.py
+++ b/taskcoachlib/gui/viewer/base.py
@@ -24,7 +24,7 @@
from taskcoachlib import patterns, widgets, command, render
from taskcoachlib.i18n import _
from taskcoachlib.gui import uicommand, toolbar, artprovider
-from taskcoachlib.thirdparty import hypertreelist
+from wx.lib.agw import hypertreelist
from taskcoachlib.thirdparty.pubsub import pub
from taskcoachlib.widgets import ToolTipMixin
import mixin
--- a/taskcoachlib/gui/viewer/inplace_editor.py
+++ b/taskcoachlib/gui/viewer/inplace_editor.py
@@ -21,7 +21,7 @@
''' # pylint: disable=W0105
import wx
-from taskcoachlib.thirdparty import hypertreelist
+from wx.lib.agw import hypertreelist
from taskcoachlib import widgets
from taskcoachlib.domain import date
--- a/taskcoachlib/widgets/autowidth.py
+++ b/taskcoachlib/widgets/autowidth.py
@@ -17,7 +17,7 @@
'''
import wx
-from taskcoachlib.thirdparty import hypertreelist
+from wx.lib.agw import hypertreelist
from taskcoachlib import operating_system
--- a/taskcoachlib/widgets/itemctrl.py
+++ b/taskcoachlib/widgets/itemctrl.py
@@ -21,7 +21,7 @@
import wx, draganddrop, autowidth, tooltip, inspect
-from taskcoachlib.thirdparty import hypertreelist
+from wx.lib.agw import hypertreelist
class _CtrlWithItemsMixin(object):
--- a/taskcoachlib/widgets/treectrl.py
+++ b/taskcoachlib/widgets/treectrl.py
@@ -17,7 +17,7 @@
'''
from taskcoachlib import operating_system
-from taskcoachlib.thirdparty import customtreectrl as customtree, hypertreelist
+from wx.lib.agw import customtreectrl as customtree, hypertreelist
from taskcoachlib.widgets import itemctrl, draganddrop
import wx
--- a/tests/unittests/guiTests/ViewerTest.py
+++ b/tests/unittests/guiTests/ViewerTest.py
@@ -19,7 +19,7 @@
import test
from taskcoachlib import gui, config, widgets, persistence
from taskcoachlib.domain import task, date
-from taskcoachlib.thirdparty import hypertreelist
+from wx.lib.agw import hypertreelist
class AuiManagedFrameWithDynamicCenterPane(widgets.AuiManagedFrameWithDynamicCenterPane):
......@@ -71,11 +71,11 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,6 @@
@@ -187,7 +187,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
- 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 pybonjour-1.1.1.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty pybonjour-1.1.1/pybonjour.py
cd thirdparty; tar xzf gntp-d639fa2e981fe41196a5115ad64320b5061f004b.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty gntp/gntp
cp /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/agw/customtreectrl.py taskcoachlib/thirdparty
......@@ -35,4 +35,4 @@ Forwarded: not-needed
- 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
cp /usr/share/pyshared/lockfile.py taskcoachlib/thirdparty
cd thirdparty; tar xzf PyPubSub-3.3.0.tar.gz --strip-components=2 -C ../taskcoachlib/thirdparty PyPubSub-3.3.0/src/pubsub
cd /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/pubsub taskcoachlib/thirdparty; \
......@@ -23,4 +23,4 @@ Forwarded: not-needed
- 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
cp /usr/share/pyshared/lockfile.py taskcoachlib/thirdparty
cd thirdparty; tar xzf PyPubSub-3.3.0.tar.gz --strip-components=2 -C ../taskcoachlib/thirdparty PyPubSub-3.3.0/src/pubsub
cd /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/pubsub taskcoachlib/thirdparty; \
......@@ -40,5 +40,5 @@ Forwarded: not-needed
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
cp /usr/share/pyshared/lockfile.py taskcoachlib/thirdparty
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 /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/pubsub taskcoachlib/thirdparty; \
find . \! -name "*.pyc" -print0 \
......@@ -14,6 +14,6 @@ Forwarded: not-needed
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
+ cp /usr/share/pyshared/lockfile.py taskcoachlib/thirdparty
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 wxScheduler-r151.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty wxScheduler/wxScheduler
cd /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/pubsub taskcoachlib/thirdparty; \
find . \! -name "*.pyc" -print0 \
| cpio -pmd0 $(CURDIR)/taskcoachlib/thirdparty/pubsub
Description: Patch installed pubsub instead of thirdparty/.
See debian/copyright.
.
Dh_linktree will replace all unmodified files.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,9 @@
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
- cd thirdparty; tar xzf PyPubSub-3.3.0.tar.gz --strip-components=2 -C ../taskcoachlib/thirdparty PyPubSub-3.3.0/src/pubsub
+ cd /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/pubsub taskcoachlib/thirdparty; \
+ find . \! -name "*.pyc" -print0 \
+ | cpio -pmd0 $(CURDIR)/taskcoachlib/thirdparty/pubsub
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
......@@ -16,5 +16,5 @@ Forwarded: not-needed
- 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
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
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
......@@ -31,4 +31,4 @@ Forwarded: not-needed
- 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
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
......@@ -9,10 +9,11 @@ official_img2py.diff
# Modify Makefile from tail to head to limit interferences.
official_pygettext.diff
official_xdg.diff
# official_agw.diff
official_agw.diff
official_pyparsing.diff
# official_aui.diff
official_aui.diff
official_squaremap.diff
official_pubsub.diff
official_lockfile.diff
official_keyring.diff
official_dateutil.diff
......
......@@ -6,7 +6,7 @@ POLICY_TARGETS := binary binary-arch binary-indep build build-arch \
build-indep clean
.PHONY: $(POLICY_TARGETS)
$(POLICY_TARGETS):
dh $@ --with python2
dh $@ --with python2 --with linktree
# Tell each dh_auto_* tool which buildsystem is needed.
override_dh_auto_clean:: override_%:
......
# See debian/copyright.
deduplicate usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/pubsub usr/share/pyshared/taskcoachlib/thirdparty/pubsub
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