[Python-modules-commits] r10295 - in packages/python-xlib/trunk/debian (9 files)
stew at users.alioth.debian.org
stew at users.alioth.debian.org
Thu Nov 5 12:33:57 UTC 2009
Date: Thursday, November 5, 2009 @ 12:33:53
Author: stew
Revision: 10295
* new upstream version
* add-texinfo-makefile is no longer needed
- so we don't need patch before running clean target
* resync other patches
Modified:
packages/python-xlib/trunk/debian/changelog
packages/python-xlib/trunk/debian/patches/add-texinfo-dir-entry
packages/python-xlib/trunk/debian/patches/fix-rhomboid-examples
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/rules
Deleted:
packages/python-xlib/trunk/debian/patches/add-texinfo-makefile
Modified: packages/python-xlib/trunk/debian/changelog
===================================================================
--- packages/python-xlib/trunk/debian/changelog 2009-11-05 10:32:12 UTC (rev 10294)
+++ packages/python-xlib/trunk/debian/changelog 2009-11-05 12:33:53 UTC (rev 10295)
@@ -1,5 +1,9 @@
-python-xlib (0.14-3) UNRELEASED; urgency=low
+python-xlib (0.14+20091101-1) unstable; urgency=low
+ [ Mike O'Connor ]
+ * New upstream release
+ * add debian/README.source
+
[ Daniel Watkins ]
* Added patch to correct the mis-spelling of 'Rhomboid' in the examples.
* Fix old FSF address, as per lintian warning.
@@ -8,7 +12,7 @@
* debian/control
- switch Vcs-Browser field to viewsvn
- -- Daniel Watkins <daniel at daniel-watkins.co.uk> Thu, 16 Oct 2008 14:42:11 +0100
+ -- Mike O'Connor <stew at debian.org> Thu, 05 Nov 2009 05:57:09 -0500
python-xlib (0.14-2) unstable; urgency=low
Modified: packages/python-xlib/trunk/debian/patches/add-texinfo-dir-entry
===================================================================
--- packages/python-xlib/trunk/debian/patches/add-texinfo-dir-entry 2009-11-05 10:32:12 UTC (rev 10294)
+++ packages/python-xlib/trunk/debian/patches/add-texinfo-dir-entry 2009-11-05 12:33:53 UTC (rev 10295)
@@ -1,8 +1,8 @@
-Index: python-xlib-0.13/doc/src/python-xlib.texi
+Index: trunk/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 @@
+--- trunk.orig/doc/src/python-xlib.texi 2008-03-18 16:08:27.000000000 -0400
++++ trunk/doc/src/python-xlib.texi 2009-11-05 06:06:17.000000000 -0500
+@@ -39,6 +39,13 @@
translation approved by the Free Software Foundation.
@end ifinfo
Deleted: packages/python-xlib/trunk/debian/patches/add-texinfo-makefile
===================================================================
--- packages/python-xlib/trunk/debian/patches/add-texinfo-makefile 2009-11-05 10:32:12 UTC (rev 10294)
+++ packages/python-xlib/trunk/debian/patches/add-texinfo-makefile 2009-11-05 12:33:53 UTC (rev 10295)
@@ -1,39 +0,0 @@
-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
Modified: packages/python-xlib/trunk/debian/patches/fix-rhomboid-examples
===================================================================
--- packages/python-xlib/trunk/debian/patches/fix-rhomboid-examples 2009-11-05 10:32:12 UTC (rev 10294)
+++ packages/python-xlib/trunk/debian/patches/fix-rhomboid-examples 2009-11-05 12:33:53 UTC (rev 10295)
@@ -1,8 +1,8 @@
-Index: python-xlib-0.14/examples/draw.py
+Index: trunk/examples/draw.py
===================================================================
---- python-xlib-0.14.orig/examples/draw.py 2008-10-16 14:35:25.000000000 +0100
-+++ python-xlib-0.14/examples/draw.py 2008-10-16 14:36:35.000000000 +0100
-@@ -117,7 +117,7 @@
+--- trunk.orig/examples/draw.py 2009-04-11 19:18:15.000000000 -0400
++++ trunk/examples/draw.py 2009-11-05 06:06:25.000000000 -0500
+@@ -115,7 +115,7 @@
sys.exit(0)
# A drawed objects, consisting of either a single
@@ -11,7 +11,7 @@
class Movement:
def __init__(self, win, ev):
-@@ -131,7 +131,7 @@
+@@ -129,7 +129,7 @@
self.time = ev.time
self.lines = [(ev.event_x, ev.event_y)]
@@ -20,7 +20,7 @@
self.last = None
def motion(self, ev):
-@@ -187,7 +187,7 @@
+@@ -182,7 +182,7 @@
def finish(self, ev):
self.motion(ev)
if len(self.lines) > 1:
@@ -29,7 +29,7 @@
self.left = min(ev.event_x - 5, self.left)
self.right = max(ev.event_x + 5, self.right)
-@@ -209,8 +209,8 @@
+@@ -204,8 +204,8 @@
self.last.draw()
@@ -40,7 +40,7 @@
def __init__(self, win, ev):
self.win = win
self.x = ev.event_x
-@@ -218,7 +218,7 @@
+@@ -213,7 +213,7 @@
self.draw()
def draw(self):
@@ -49,11 +49,11 @@
self.win.window.poly_line(self.win.gc, X.CoordModePrevious,
[(self.x, self.y - 5),
(5, 5),
-Index: python-xlib-0.14/examples/draw-proto.py
+Index: trunk/examples/draw-proto.py
===================================================================
---- python-xlib-0.14.orig/examples/draw-proto.py 2008-10-16 14:35:25.000000000 +0100
-+++ python-xlib-0.14/examples/draw-proto.py 2008-10-16 14:36:42.000000000 +0100
-@@ -106,7 +106,7 @@
+--- trunk.orig/examples/draw-proto.py 2009-04-11 19:18:15.000000000 -0400
++++ trunk/examples/draw-proto.py 2009-11-05 06:06:25.000000000 -0500
+@@ -104,7 +104,7 @@
current.motion(e)
# A drawed objects, consisting of either a single
@@ -62,7 +62,7 @@
class Movement:
def __init__(self, win, ev):
-@@ -120,7 +120,7 @@
+@@ -118,7 +118,7 @@
self.time = ev.time
self.lines = [(ev.event_x, ev.event_y)]
@@ -71,7 +71,7 @@
self.last = None
def motion(self, ev):
-@@ -183,7 +183,7 @@
+@@ -179,7 +179,7 @@
def finish(self, ev):
self.motion(ev)
if len(self.lines) > 1:
@@ -80,7 +80,7 @@
self.left = min(ev.event_x - 5, self.left)
self.right = max(ev.event_x + 5, self.right)
-@@ -207,8 +207,8 @@
+@@ -203,8 +203,8 @@
self.last.draw()
@@ -91,7 +91,7 @@
def __init__(self, win, ev):
self.win = win
self.x = ev.event_x
-@@ -216,7 +216,7 @@
+@@ -212,7 +212,7 @@
self.draw()
def draw(self):
Modified: packages/python-xlib/trunk/debian/patches/fix-ssh-tunnel-auth
===================================================================
--- packages/python-xlib/trunk/debian/patches/fix-ssh-tunnel-auth 2009-11-05 10:32:12 UTC (rev 10294)
+++ packages/python-xlib/trunk/debian/patches/fix-ssh-tunnel-auth 2009-11-05 12:33:53 UTC (rev 10295)
@@ -1,6 +1,8 @@
---- python-xlib-0.14.orig/Xlib/support/unix_connect.py
-+++ python-xlib-0.14/Xlib/support/unix_connect.py
-@@ -146,6 +146,14 @@
+Index: trunk/Xlib/support/unix_connect.py
+===================================================================
+--- trunk.orig/Xlib/support/unix_connect.py 2009-11-05 06:06:09.000000000 -0500
++++ trunk/Xlib/support/unix_connect.py 2009-11-05 06:06:23.000000000 -0500
+@@ -161,6 +161,14 @@
except os.error:
pass
Modified: packages/python-xlib/trunk/debian/patches/fix-unix-socket-in-display
===================================================================
--- packages/python-xlib/trunk/debian/patches/fix-unix-socket-in-display 2009-11-05 10:32:12 UTC (rev 10294)
+++ packages/python-xlib/trunk/debian/patches/fix-unix-socket-in-display 2009-11-05 12:33:53 UTC (rev 10295)
@@ -1,8 +1,8 @@
-Index: python-xlib-0.13/Xlib/support/unix_connect.py
+Index: trunk/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 @@
+--- trunk.orig/Xlib/support/unix_connect.py 2008-07-23 11:33:36.000000000 -0400
++++ trunk/Xlib/support/unix_connect.py 2009-11-05 06:06:50.000000000 -0500
+@@ -60,6 +60,8 @@
name = display
host = m.group(1)
Modified: packages/python-xlib/trunk/debian/patches/increase-receiving-buffer
===================================================================
--- packages/python-xlib/trunk/debian/patches/increase-receiving-buffer 2009-11-05 10:32:12 UTC (rev 10294)
+++ packages/python-xlib/trunk/debian/patches/increase-receiving-buffer 2009-11-05 12:33:53 UTC (rev 10295)
@@ -1,6 +1,8 @@
---- python-xlib-0.14.orig/Xlib/protocol/display.py
-+++ python-xlib-0.14/Xlib/protocol/display.py
-@@ -534,7 +534,7 @@
+Index: trunk/Xlib/protocol/display.py
+===================================================================
+--- trunk.orig/Xlib/protocol/display.py 2008-03-18 16:08:27.000000000 -0400
++++ trunk/Xlib/protocol/display.py 2009-11-05 06:06:15.000000000 -0500
+@@ -533,7 +533,7 @@
# We're the recieving thread, parse the data
if recieving:
try:
Modified: packages/python-xlib/trunk/debian/patches/series
===================================================================
--- packages/python-xlib/trunk/debian/patches/series 2009-11-05 10:32:12 UTC (rev 10294)
+++ packages/python-xlib/trunk/debian/patches/series 2009-11-05 12:33:53 UTC (rev 10295)
@@ -1,6 +1,5 @@
fix-unix-socket-in-display
increase-receiving-buffer
add-texinfo-dir-entry
-add-texinfo-makefile
fix-ssh-tunnel-auth
fix-rhomboid-examples
Modified: packages/python-xlib/trunk/debian/rules
===================================================================
--- packages/python-xlib/trunk/debian/rules 2009-11-05 10:32:12 UTC (rev 10294)
+++ packages/python-xlib/trunk/debian/rules 2009-11-05 12:33:53 UTC (rev 10295)
@@ -12,7 +12,7 @@
PYVERS:=$(shell pyversions -r)
build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build-stamp: patch
dh_testdir
set -e; \
for py in $(PYVERS); do \
@@ -21,7 +21,7 @@
make -C doc
touch $@
-_clean: $(QUILT_STAMPFN)
+clean: unpatch
dh_testdir
dh_testroot
-for py in $(PYVERS); do \
@@ -33,9 +33,6 @@
make -C doc/info.deb clean
make -C doc/info clean
-clean: _clean unpatch
- dh_clean
-
install: install-stamp
install-stamp:
dh_testdir
More information about the Python-modules-commits
mailing list