Commit 65318745 authored by Andrej Shadura's avatar Andrej Shadura

Merge Ubuntu changes.

parents 63e685fb 5942e478
python-xlib (0.14+20091101-1.1) UNRELEASED; urgency=low
[ Mike O'Connor ]
* Non-maintainer upload.
* NOT RELEASED YET
python-xlib (0.14+20091101-2) UNRELEASED; urgency=low
[ Marc Deslauriers ]
* debian/patches/lp1432889.patch: properly decode the xauthority file
into strings instead of byte arrays in Xlib/xauth.py. (LP: #1432889)
* debian/patches/python3: updated to fix a couple of porting errors
resulting in get_full_property() throwing an exception. (LP: #1231453)
[ Martin Pitt ]
* Drop obsolete python-support, move to dh_python2.
* Reduce texlive build dependency to texlive-latex-base, which is much less
heavyweight.
* Add debian/patches/python3: Port code to work with Python 3.
(http://sourceforge.net/p/python-xlib/patches/5)
* Build a python3-xlib package.
* debian/rules: Add missing dh_clean for clean target. (Closes: #671157)
* debian/rules: Clean doc/ directory, too.
[ Luke Faraone ]
* Change priority to 'optional' from 'extra'. (closes: #563199)
......@@ -11,7 +23,7 @@ python-xlib (0.14+20091101-1.1) UNRELEASED; urgency=low
* Use canonical URIs for Vcs-* fields.
* Remove obsolete Conflicts/Replaces with python2.3-xlib and python2.4-xlib.
-- Jakub Wilk <jwilk@debian.org> Sat, 08 Jun 2013 18:14:16 +0200
-- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 17 Mar 2015 11:17:02 -0400
python-xlib (0.14+20091101-1) unstable; urgency=low
......
......@@ -2,21 +2,28 @@ Source: python-xlib
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), quilt
Build-Depends-Indep: python-support (>= 0.3), texlive, texinfo
Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.3.5-11), python3-all, quilt
Build-Depends-Indep: texlive-latex-base, texinfo
Standards-Version: 3.8.3
Homepage: http://python-xlib.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-xlib/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-xlib/trunk/
X-Python-Version: >= 2.5
X-Python3-Version: >= 3.1
Package: python-xlib
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info
Replaces: python-xlib-doc
Conflicts: python-xlib-doc
XB-Python-Version: ${python:Versions}
Description: Interface for Python to the X11 Protocol
python-xlib is a 100% pure Python implementation of the X11
protocol. It currently implements client-side X11R6 fully, supports
the resource database, ICCM, and the Shape extension.
Package: python3-xlib
Architecture: all
Depends: ${python3:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info
Description: Interface for Python 3 to the X11 Protocol
python-xlib is a 100% pure Python 3 implementation of the X11
protocol. It currently implements client-side X11R6 fully, supports
the resource database, ICCM, and the Shape extension.
Description: properly decode the xauthority file into strings instead of
byte arrays in Xlib/xauth.py
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-xlib/+bug/1432889
Author: Marc Deslauriers <marc.deslauriers@canonical.com>
Index: python-xlib-0.14+20091101/Xlib/xauth.py
===================================================================
--- python-xlib-0.14+20091101.orig/Xlib/xauth.py 2015-03-17 11:15:24.108766995 -0400
+++ python-xlib-0.14+20091101/Xlib/xauth.py 2015-03-17 11:16:20.333272353 -0400
@@ -81,7 +81,8 @@
if len(data) != length:
break
- self.entries.append((family, addr, num, name, data))
+ self.entries.append((family, addr.decode('UTF-8'),
+ num.decode('UTF-8'), name.decode('UTF-8'), data))
except struct.error as e:
print ("Xlib.xauth: warning, failed to parse part of xauthority file (%s), aborting all further parsing" % filename)
#pass
This diff is collapsed.
......@@ -3,3 +3,5 @@ increase-receiving-buffer
add-texinfo-dir-entry
fix-ssh-tunnel-auth
fix-rhomboid-examples
python3
lp1432889.patch
......@@ -10,12 +10,13 @@
include /usr/share/quilt/quilt.make
PYVERS:=$(shell pyversions -r)
PY3VERS:=$(shell py3versions -r)
build: build-stamp
build-stamp: patch
dh_testdir
set -e; \
for py in $(PYVERS); do \
for py in $(PYVERS) $(PY3VERS); do \
$$py setup.py build; \
done
make -C doc
......@@ -24,13 +25,14 @@ build-stamp: patch
clean: unpatch
dh_testdir
dh_testroot
-for py in $(PYVERS); do \
dh_clean
-for py in $(PYVERS) $(PY3VERS); do \
$$py setup.py clean; \
done
rm -f install-stamp build-stamp
find Xlib -name \*.pyc | xargs rm -f
rm -rf build
make -C doc/info clean
make -C doc clean
install: install-stamp
install-stamp:
......@@ -42,8 +44,13 @@ install-stamp:
for py in $(PYVERS); do \
$$py setup.py install --root=debian/python-xlib; \
done
for py in $(PY3VERS); do \
$$py setup.py install --root=debian/python3-xlib; \
done
dh_installdocs -A
dh_installexamples
dh_installexamples -A examples/*.py
# adjust python3 examples hashbang
sed -i '1 s/python$$/python3/' debian/python3-xlib/usr/share/doc/*/examples/*.py
dh_installinfo doc/info/*.info
touch install-stamp
......@@ -57,7 +64,8 @@ binary-indep: build install
dh_installchangelogs NEWS
dh_compress -X.py
dh_fixperms
dh_pysupport
dh_python2
dh_python3
dh_installdeb
dh_gencontrol
dh_md5sums
......
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