Commit b66629a5 authored by Nicolas Boulenguez's avatar Nicolas Boulenguez

Depend on python-wxgtk3.0 >=3.0.1.1+dfsg-2:

  New pubsub includes a taskcoach patch (Closes: #762413),
  no need to build-depend on cpio (Closes: #765677)
  or dh-linktree (removes a lintian false positive).
  Img2py requires an X server: patches/run_img2py_inside_xvfb.diff.
parent f100a465
taskcoach (1.4.1-4) unstable; urgency=medium
* Depend on python-wxgtk3.0 >=3.0.1.1+dfsg-2:
New pubsub includes a taskcoach patch (Closes: #762413),
no need to build-depend on cpio (Closes: #765677)
or dh-linktree (removes a lintian false positive).
Img2py requires an X server: patches/run_img2py_inside_xvfb.diff.
-- Nicolas Boulenguez <nicolas@debian.org> Tue, 28 Oct 2014 02:59:32 +0100
taskcoach (1.4.1-3) unstable; urgency=medium
* Standards-Version: 3.9.6, no changes.
......
......@@ -3,8 +3,6 @@ Section: utils
Priority: optional
Maintainer: Nicolas Boulenguez <nicolas@debian.org>
Build-Depends-Indep: debhelper (>= 9),
# Explained in copyright.
dh-linktree,
# This should be repeated as X-Python-Version below.
# 2.6.6-3~: https://wiki.debian.org/Python/TransitionToDHPython2
python (>= 2.6.6-3~),
......@@ -18,13 +16,14 @@ Build-Depends-Indep: debhelper (>= 9),
python-pyparsing (>= 1.5.5),
python-squaremap (>= 1.0.3),
python-xdg (>= 0.25),
python-wxgtk3.0,
python-wxgtk3.0 (>= 3.0.1.1+dfsg-2~),
python-wxversion,
python-twisted-core (>= 10.0),
libxss1,
fonts-dejavu,
# See tests/control.
hicolor-icon-theme, locales-all, x11-utils, xauth, xvfb
# Also see patches/run_img2py_inside_xvfb.diff.
Standards-Version: 3.9.6
Homepage: http://www.taskcoach.org
X-Python-Version: >= 2.6
......@@ -44,8 +43,8 @@ Depends: ${misc:Depends}, ${python:Depends},
python-pyparsing (>= 1.5.5),
python-squaremap (>= 1.0.3),
python-xdg (>= 0.25),
# See buildlib/bdist_deb.py:
python-wxgtk3.0,
# See buildlib/bdist_deb.py and #762413
python-wxgtk3.0 (>= 3.0.1.1+dfsg-2~),
python-wxversion,
python-twisted-core (>= 10.0),
libxss1,
......
......@@ -89,11 +89,6 @@ 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>
......
......@@ -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 /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/pubsub taskcoachlib/thirdparty; \
cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm
......@@ -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 /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/pubsub taskcoachlib/thirdparty; \
cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm
......@@ -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 /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/pubsub taskcoachlib/thirdparty; \
find . \! -name "*.pyc" -print0 \
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
......@@ -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 /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
This diff is collapsed.
Description: img2py needs an X display to convert images.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -194,7 +194,7 @@
$(PYTHON) fixinit.py
taskcoachlib/gui/icons.py: icons.in/iconmap.py icons.in/nuvola.zip icons.in/splash.png
- cd icons.in; $(PYTHON) make.py
+ cd icons.in; xvfb-run $(PYTHON) make.py
taskcoachlib/persistence/xml/templates.py:
cd templates.in; $(PYTHON) make.py
......@@ -22,3 +22,4 @@ official_chardet.diff
official_combotreebox.diff
disable_failing_test.diff
run_img2py_inside_xvfb.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 --with linktree
dh $@ --with python2
# Tell each dh_auto_* tool which buildsystem is needed.
override_dh_auto_clean:: override_%:
......@@ -44,7 +44,6 @@ override_dh_auto_clean::
rm -f taskcoachlib/thirdparty/hypertreelist.py
rm -f taskcoachlib/thirdparty/lockfile.py
rm -f -r taskcoachlib/thirdparty/ntlm
rm -f -r taskcoachlib/thirdparty/pubsub
rm -f taskcoachlib/thirdparty/pybonjour.py
rm -f taskcoachlib/thirdparty/wmi.py
rm -f -r taskcoachlib/thirdparty/wxScheduler
......
# See debian/copyright.
deduplicate usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/pubsub usr/lib/python2.7/dist-packages/taskcoachlib/thirdparty/pubsub
# These symlinks are created by dh_linktree, with a dependency to the
# exact version of python-wxgtk3.0.
package-contains-broken-symlink usr/lib/python2.7/dist-packages/taskcoachlib/thirdparty/pubsub/*.py *../../../wx-3.0-gtk2/wx/lib/pubsub/*.py
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