[Python-modules-commits] r24495 - in packages/urwid/trunk/debian (3 files)

[kitterman at users.alioth.debian.org]

    Date: Wednesday, May 22, 2013 @ 20:07:10
  Author: kitterman
Revision: 24495

* Team upload
* Upload to unstable
* Fix debian/rules to support builds with multiple python3 versions
  (Closes: #692383)
* New upstream release
  - Refreshed debian/patches/001_fix_event_loop_arch_build_errors.patch

Modified:
  packages/urwid/trunk/debian/changelog
  packages/urwid/trunk/debian/patches/001_fix_event_loop_arch_build_errors.patch
  packages/urwid/trunk/debian/rules

Modified: packages/urwid/trunk/debian/changelog
===================================================================
--- packages/urwid/trunk/debian/changelog	2013-05-22 18:39:22 UTC (rev 24494)
+++ packages/urwid/trunk/debian/changelog	2013-05-22 20:07:10 UTC (rev 24495)
@@ -1,9 +1,21 @@
-urwid (1.1.0-2) UNRELEASED; urgency=low
+urwid (1.1.1-1) unstable; urgency=low
 
+  * Team upload
+  * Upload to unstable
+
+  [ Dmitrijs Ledkovs ]
+  * Fix debian/rules to support builds with multiple python3 versions
+    (Closes: #692383)
+
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:04:15 +0200
+  [ Scott Kitterman ]
+  * New upstream release
+    - Refreshed debian/patches/001_fix_event_loop_arch_build_errors.patch
 
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 22 May 2013 09:22:00 -0400
+
 urwid (1.1.0-1) experimental; urgency=low
 
   [ Piotr Ożarowski ]

Modified: packages/urwid/trunk/debian/patches/001_fix_event_loop_arch_build_errors.patch
===================================================================
--- packages/urwid/trunk/debian/patches/001_fix_event_loop_arch_build_errors.patch	2013-05-22 18:39:22 UTC (rev 24494)
+++ packages/urwid/trunk/debian/patches/001_fix_event_loop_arch_build_errors.patch	2013-05-22 20:07:10 UTC (rev 24495)
@@ -1,7 +1,8 @@
-diff --git a/urwid/main_loop.py b/urwid/main_loop.py
---- a/urwid/main_loop.py
-+++ b/urwid/main_loop.py
-@@ -650,8 +650,8 @@
+Index: urwid-1.1.1/urwid/main_loop.py
+===================================================================
+--- urwid-1.1.1.orig/urwid/main_loop.py	2013-05-22 15:44:37.196591626 -0400
++++ urwid-1.1.1/urwid/main_loop.py	2013-05-22 15:44:37.188591626 -0400
+@@ -729,8 +729,8 @@
          ...     raise ExitMainLoop
          >>> def exit_error():
          ...     1/0
@@ -12,7 +13,7 @@
          >>> evl.enter_idle(say_waiting)
          1
          >>> evl.run()
-@@ -884,8 +884,8 @@
+@@ -974,8 +974,8 @@
              ...     raise ExitMainLoop
              >>> def exit_error():
              ...     1/0
@@ -23,7 +24,7 @@
              >>> evl.enter_idle(say_waiting)
              1
              >>> evl.run()
-@@ -1129,7 +1129,8 @@
+@@ -1232,7 +1232,8 @@
              >>> handle = evl.alarm(0.03125, say_hello)
              >>> evl.enter_idle(say_waiting)
              1

Modified: packages/urwid/trunk/debian/rules
===================================================================
--- packages/urwid/trunk/debian/rules	2013-05-22 18:39:22 UTC (rev 24494)
+++ packages/urwid/trunk/debian/rules	2013-05-22 20:07:10 UTC (rev 24495)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL=/usr/lib/@PYTHONBINARY@/dist-packages/
+DEB_PYTHON_INSTALL_ARGS_ALL=--prefix=/usr --no-compile -O0 --install-layout=deb
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG
@@ -12,9 +14,14 @@
 	touch build-docs-test-stamp
 
 install/python-urwid::
-	chmod a+x debian/tmp/usr/lib/python*/site-packages/urwid/*.py
-	chmod a-x debian/tmp/usr/lib/python*/site-packages/urwid/version.py
+	chmod a+x debian/tmp/usr/lib/python*/dist-packages/urwid/*.py
+	chmod a-x debian/tmp/usr/lib/python*/dist-packages/urwid/version.py
 
+install/python3-urwid::
+	mv debian/tmp/usr/lib/$(shell py3versions -d) debian/tmp/usr/lib/python3
+	-cp debian/tmp/usr/lib/python3.*/dist-packages/urwid/*.so debian/tmp/usr/lib/python3/dist-packages/urwid/
+	rm -rf debian/tmp/usr/lib/python3.*
+
 clean::
 	rm -rf build build-docs-test-stamp urwid.egg-info
 	find . -name '*.so' -delete