[Python-modules-commits] r3391 - in /packages/python-xlib/trunk/debian: ./ patches/

stew-guest at users.alioth.debian.org stew-guest at users.alioth.debian.org
Fri Oct 5 02:18:03 UTC 2007


Author: stew-guest
Date: Fri Oct  5 02:18:03 2007
New Revision: 3391

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3391
Log:
[svn-inject] Applying Debian modifications to trunk

Added:
    packages/python-xlib/trunk/debian/   (with props)
    packages/python-xlib/trunk/debian/changelog
    packages/python-xlib/trunk/debian/compat
    packages/python-xlib/trunk/debian/control
    packages/python-xlib/trunk/debian/copyright
    packages/python-xlib/trunk/debian/docs
    packages/python-xlib/trunk/debian/examples
    packages/python-xlib/trunk/debian/patches/
    packages/python-xlib/trunk/debian/patches/add-texinfo-dir-entry
    packages/python-xlib/trunk/debian/patches/add-texinfo-makefile
    packages/python-xlib/trunk/debian/patches/fix-ssh-tunnel-auth
    packages/python-xlib/trunk/debian/patches/fix-unix-socket-in-display
    packages/python-xlib/trunk/debian/patches/increase-receiving-buffer
    packages/python-xlib/trunk/debian/patches/series
    packages/python-xlib/trunk/debian/pycompat
    packages/python-xlib/trunk/debian/rules   (with props)
    packages/python-xlib/trunk/debian/watch

Propchange: packages/python-xlib/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Added: packages/python-xlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/changelog?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/changelog (added)
+++ packages/python-xlib/trunk/debian/changelog Fri Oct  5 02:18:03 2007
@@ -1,0 +1,125 @@
+python-xlib (0.14-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mike O'Connor <stew at vireo.org>  Thu, 04 Oct 2007 21:47:55 -0400
+
+python-xlib (0.13-1) unstable; urgency=low
+
+  * New maintainer
+  * New upstream version (Closes: #421594)
+  * moved source changes to quilt
+  * fixed short description (Closes: #420774)
+  * increased receiving buffer size (thanks John Eikenberry) (Closes: #357507)
+  * added patch for DISPLAY=unix:0.0 (thanks Corey Wright) (Closes: #324443)
+  * fixing debian/rules to remove build directory and run make -C info clean
+  * combine python-xlib-doc with python-xlib
+
+ -- Mike O'Connor <stew at vireo.org>  Fri, 08 Jun 2007 04:46:36 -0400
+
+python-xlib (0.12-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix old FSF address.
+  * Update package to new python policy (Closes: #373367).
+
+ -- Pierre Habouzit <madcoder at debian.org>  Fri, 30 Jun 2006 11:18:19 +0200
+
+python-xlib (0.12-5) unstable; urgency=low
+
+  * New maintainer (closes: #254793)
+  * Build for Python 2.4 (closes: #292560)
+  * Fall back to unix:0 for localhost:0, modelling what Xlib
+    does and sshd requires (closes: #249071)
+  * Import socket in protocols/display.py (closes: #196387)
+  * Remove python2.1-xlib and python2.2-xlib, as Python 2.1
+    and 2.2 are going to be removed in the near future.
+  * Move to DH_COMPAT=4, write it to debian/compat.
+  * Recommend info as a concrete alternative to info-browser.
+  * Update build process: remove build-stamp target, use debhelper where
+    possible, remove unnecessary dh commands.
+  * Add watch file.
+  * Add dirinfo into texi sources, regenerate info file into separate
+    directory.
+  * Let python2.[34] suggest python-xlib-doc.
+
+ -- Martin v. Löwis <martin at v.loewis.de>  Sat, 20 Aug 2005 17:25:20 +0200
+
+python-xlib (0.12-4) unstable; urgency=low
+
+  * QA Upload.
+  * Set maintainer to Debian QA Group <packages at qa.debian.org>.
+
+ -- Thomas Bushnell, BSG <tb at debian.org>  Sat,  7 Aug 2004 18:11:23 -0700
+
+python-xlib (0.12-3.2) unstable; urgency=low
+
+  * NMU
+  * Move section to python (closes: #208179).
+  * Remove .pyc's in clean target.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 12 Sep 2003 13:00:42 +0200
+
+python-xlib (0.12-3.1) unstable; urgency=low
+
+  * NMU
+  * Move to section python, and doc for the doc package.
+  * Build a python2.3 version.
+  * Use dh_python, build-depend accordingly.
+  * Correct boilerplate in copyright.
+  * Remove postinst/prerm stuff, it is now autogenerated.
+  * Link to system GPL in copyright.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 29 Aug 2003 00:24:50 +0200
+
+python-xlib (0.12-3) unstable; urgency=low
+
+  * Set PV in python2.2-xlib (Closes: #159671)
+  * Oops, info-browser, not info-reader (Closes: #159758)
+
+ -- Moshe Zadka <moshez at debian.org>  Sat,  7 Sep 2002 16:50:11 +0300
+
+python-xlib (0.12-2) unstable; urgency=low
+
+  * Building support for python 2.1 and 2.2 
+  * Switching to 2.2 as default Python version
+
+ -- Moshe Zadka <moshez at debian.org>  Thu, 23 May 2002 20:27:30 +0300
+
+python-xlib (0.12-1) unstable; urgency=low
+
+  * New upstream version.
+  * Maintainer upload, to mark bugs as closed (closes: #118242) 
+  * Special thanks to Gregor, for all the NMUs.
+
+ -- Moshe Zadka <moshez at debian.org>  Sat, 30 Mar 2002 12:42:28 +0300
+
+python-xlib (0.11-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream version.
+
+ -- Gregor Hoffleit <flight at debian.org>  Thu,  7 Mar 2002 22:08:41 +0100
+
+python-xlib (0.10-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream version.
+
+ -- Gregor Hoffleit <flight at debian.org>  Tue, 18 Dec 2001 18:23:54 +0100
+
+python-xlib (0.8-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Modify the package to use the new default Debian Python version 2.1:
+    add correct dependency, and install in /usr/lib/python2.1
+    (closes: #118242).
+  * Provide postinst/prerm scripts in order to byte-compile .py files.
+
+ -- Gregor Hoffleit <flight at debian.org>  Thu, 13 Dec 2001 13:23:11 +0100
+
+python-xlib (0.8-1) unstable; urgency=low
+
+  * Initial Release. (Closes: #105388)
+
+ -- Moshe Zadka <moshez at debian.org>  Sun, 15 Jul 2001 13:12:01 +0300

Added: packages/python-xlib/trunk/debian/compat
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/compat?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/compat (added)
+++ packages/python-xlib/trunk/debian/compat Fri Oct  5 02:18:03 2007
@@ -1,0 +1,1 @@
+4

Added: packages/python-xlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/control?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/control (added)
+++ packages/python-xlib/trunk/debian/control Fri Oct  5 02:18:03 2007
@@ -1,0 +1,24 @@
+Source: python-xlib
+Section: python
+Priority: extra
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Mike O'Connor <stew at vireo.org>
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), quilt
+Build-Depends-Indep: python-support (>= 0.3), texinfo
+Standards-Version: 3.7.2
+Homepage: http://python-xlib.sourceforge.net/
+XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-xlib/trunk/
+XS-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/?op=log
+
+Package: python-xlib
+Architecture: all
+Depends: ${python:Depends}
+Provides: ${python:Provides}
+Replaces: python2.3-xlib (<< 0.12-5.1), python2.4-xlib (<< 0.12-5.1), python-xlib-doc
+Conflicts: python2.3-xlib (<< 0.12-5.1), python2.4-xlib (<< 0.12-5.1), 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.
+

Added: packages/python-xlib/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/copyright?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/copyright (added)
+++ packages/python-xlib/trunk/debian/copyright Fri Oct  5 02:18:03 2007
@@ -1,0 +1,29 @@
+This package was debianized by Moshe Zadka <moshez at debian.org> on
+sun, 15 Jul 2001 13:03:04 +0300.
+
+It was downloaded from http://python-xlib.sf.net
+
+Upstream Author: Peter Liljenberg
+
+Copyright (C) 2000-2002  Peter Liljenberg
+
+The Debian packaging is
+Copyright (C) 2001-2002 Moshe Zadka
+              2005 Martin v. Loewis
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+ 
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+ 
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.

Added: packages/python-xlib/trunk/debian/docs
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/docs?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/docs (added)
+++ packages/python-xlib/trunk/debian/docs Fri Oct  5 02:18:03 2007
@@ -1,0 +1,3 @@
+README
+NEWS
+TODO

Added: packages/python-xlib/trunk/debian/examples
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/examples?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/examples (added)
+++ packages/python-xlib/trunk/debian/examples Fri Oct  5 02:18:03 2007
@@ -1,0 +1,1 @@
+examples/*.py

Added: packages/python-xlib/trunk/debian/patches/add-texinfo-dir-entry
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/patches/add-texinfo-dir-entry?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/patches/add-texinfo-dir-entry (added)
+++ packages/python-xlib/trunk/debian/patches/add-texinfo-dir-entry Fri Oct  5 02:18:03 2007
@@ -1,0 +1,18 @@
+Index: python-xlib-0.13/doc/src/python-xlib.texi
+===================================================================
+--- python-xlib-0.13.orig/doc/src/python-xlib.texi	2007-06-08 03:10:44.000000000 -0400
++++ python-xlib-0.13/doc/src/python-xlib.texi	2007-06-08 03:12:44.000000000 -0400
+@@ -41,6 +41,13 @@
+ translation approved by the Free Software Foundation.
+ @end ifinfo
+ 
++ at ifinfo
++ at dircategory Python
++ at direntry
++* python-xlib: (python-xlib).		Interface for Python to the X11 Protocol 
++ at end direntry
++ at end ifinfo
++
+ @titlepage
+ @title The Python X Library
+ @author Peter Liljenberg

Added: packages/python-xlib/trunk/debian/patches/add-texinfo-makefile
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/patches/add-texinfo-makefile?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/patches/add-texinfo-makefile (added)
+++ packages/python-xlib/trunk/debian/patches/add-texinfo-makefile Fri Oct  5 02:18:03 2007
@@ -1,0 +1,39 @@
+Index: python-xlib-0.13/doc/info.deb/Makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ python-xlib-0.13/doc/info.deb/Makefile	2007-06-08 03:16:09.000000000 -0400
+@@ -0,0 +1,11 @@
++# Make info documentation for Python Xlib
++# Debian package version; avoids overwriting
++# distributed info version
++
++include ../src/defs
++
++python-xlib.info: $(SRCS)
++	makeinfo --force -P $(SRCDIR) $(TOPSRC)
++
++clean:
++	rm -f python-xlib.info
+Index: python-xlib-0.13/doc/src/defs
+===================================================================
+--- python-xlib-0.13.orig/doc/src/defs	2007-06-08 03:15:38.000000000 -0400
++++ python-xlib-0.13/doc/src/defs	2007-06-08 03:16:09.000000000 -0400
+@@ -10,5 +10,17 @@
+      $(SRCDIR)/concepts.texi $(SRCDIR)/package.texi \
+      $(SRCDIR)/connect.texi $(SRCDIR)/errors.texi \
+      $(SRCDIR)/events.texi $(SRCDIR)/objects.texi
++# Definitions for documentation makefiles
++#
++# $Id: defs,v 1.2 2001/11/30 10:38:06 petli Exp $
++
++SRCDIR = ../src
++
++TOPSRC = $(SRCDIR)/python-xlib.texi
++
++SRCS = $(TOPSRC) \
++     $(SRCDIR)/concepts.texi $(SRCDIR)/package.texi \
++     $(SRCDIR)/connect.texi $(SRCDIR)/errors.texi \
++     $(SRCDIR)/events.texi $(SRCDIR)/objects.texi
+ 
+      
+\ No newline at end of file

Added: packages/python-xlib/trunk/debian/patches/fix-ssh-tunnel-auth
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/patches/fix-ssh-tunnel-auth?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/patches/fix-ssh-tunnel-auth (added)
+++ packages/python-xlib/trunk/debian/patches/fix-ssh-tunnel-auth Fri Oct  5 02:18:03 2007
@@ -1,0 +1,17 @@
+--- python-xlib-0.14.orig/Xlib/support/unix_connect.py
++++ python-xlib-0.14/Xlib/support/unix_connect.py
+@@ -146,6 +146,14 @@
+     except os.error:
+         pass
+ 
++    if not auth_data and host=='localhost':
++	# 127.0.0.1 counts as FamilyLocal, not FamilyInternet
++	# See Xtransutil.c:ConvertAddress.
++	# There might be more ways to spell 127.0.0.1 but
++	# 'localhost', yet this code fixes a the case of
++	# OpenSSH tunneling X.
++	return get_auth('unix:%d' % dno, 'unix', dno)
++
+     return auth_name, auth_data
+ 
+ get_auth = new_get_auth

Added: packages/python-xlib/trunk/debian/patches/fix-unix-socket-in-display
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/patches/fix-unix-socket-in-display?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/patches/fix-unix-socket-in-display (added)
+++ packages/python-xlib/trunk/debian/patches/fix-unix-socket-in-display Fri Oct  5 02:18:03 2007
@@ -1,0 +1,13 @@
+Index: python-xlib-0.13/Xlib/support/unix_connect.py
+===================================================================
+--- python-xlib-0.13.orig/Xlib/support/unix_connect.py	2007-06-08 03:38:11.000000000 -0400
++++ python-xlib-0.13/Xlib/support/unix_connect.py	2007-06-08 03:39:37.000000000 -0400
+@@ -54,6 +54,8 @@
+ 
+     name = display
+     host = m.group(1)
++    if host == 'unix':
++        host = ''
+     dno = int(m.group(2))
+     screen = m.group(4)
+     if screen:

Added: packages/python-xlib/trunk/debian/patches/increase-receiving-buffer
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/patches/increase-receiving-buffer?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/patches/increase-receiving-buffer (added)
+++ packages/python-xlib/trunk/debian/patches/increase-receiving-buffer Fri Oct  5 02:18:03 2007
@@ -1,0 +1,11 @@
+--- python-xlib-0.14.orig/Xlib/protocol/display.py
++++ python-xlib-0.14/Xlib/protocol/display.py
+@@ -534,7 +534,7 @@
+                 # We're the recieving thread, parse the data
+                 if recieving:
+                     try:
+-                        bytes_recv = self.socket.recv(2048)
++                        bytes_recv = self.socket.recv(4096)
+                     except socket.error, err:
+                         self.close_internal('server: %s' % err[1])
+                         raise self.socket_error

Added: packages/python-xlib/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/patches/series?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/patches/series (added)
+++ packages/python-xlib/trunk/debian/patches/series Fri Oct  5 02:18:03 2007
@@ -1,0 +1,5 @@
+fix-unix-socket-in-display
+increase-receiving-buffer
+add-texinfo-dir-entry
+add-texinfo-makefile
+fix-ssh-tunnel-auth

Added: packages/python-xlib/trunk/debian/pycompat
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/pycompat?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/pycompat (added)
+++ packages/python-xlib/trunk/debian/pycompat Fri Oct  5 02:18:03 2007
@@ -1,0 +1,1 @@
+2

Added: packages/python-xlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/rules?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/rules (added)
+++ packages/python-xlib/trunk/debian/rules Fri Oct  5 02:18:03 2007
@@ -1,0 +1,73 @@
+#!/usr/bin/make -f
+#-*- makefile -*-
+# Made with the aid of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Some lines taken from debmake, by Christoph Lameter.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
+
+PYVERS:=$(shell pyversions -r)
+
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
+	dh_testdir
+	set -e; \
+	for py in $(PYVERS); do  \
+	    $$py setup.py build; \
+	done
+	make -C doc/info.deb
+	touch $@
+
+_clean: $(QUILT_STAMPFN) 
+	dh_testdir
+	dh_testroot
+	-for py in $(PYVERS); 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.deb clean
+	make -C doc/info clean
+
+clean: _clean unpatch
+	dh_clean 
+
+install: install-stamp
+install-stamp:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	set -e; \
+	for py in $(PYVERS); do  \
+	    $$py setup.py install --root=debian/python-xlib; \
+	done
+	dh_installdocs -A
+	# installdocs doesn't copy the symbolic link
+	dh_install doc/html/*.html usr/share/doc/tmp/html
+	dh_installexamples
+	dh_installinfo doc/info.deb/*.info
+
+	touch install-stamp
+
+binary-arch: build install
+# We have nothing to do by default.
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_compress -X.py
+	dh_fixperms
+	dh_pysupport
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

Propchange: packages/python-xlib/trunk/debian/rules
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/python-xlib/trunk/debian/watch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-xlib/trunk/debian/watch?rev=3391&op=file
==============================================================================
--- packages/python-xlib/trunk/debian/watch (added)
+++ packages/python-xlib/trunk/debian/watch Fri Oct  5 02:18:03 2007
@@ -1,0 +1,3 @@
+version=3
+http://prdownloads.sourceforge.net/python-xlib/python-xlib-([\d\.]+)\.tar\.gz
+




More information about the Python-modules-commits mailing list