Merge lp:~ampelbein/ubuntu/natty/pyserial/lp-715766 into lp:ubuntu/natty/pyserial

[Andreas Moog]

pyserial (2.5-1ubuntu1) natty; urgency=low

  * debian/rules
    - don't delete contents of /usr/lib/* for python-serial (LP: #715766)

 -- Andreas Moog <email address hidden> Tue, 08 Mar 2011 23:18:02 +0100

[Dave Walker (davewalker)]

Looks good to me, and there is a Debian bug opened about this.

Thanks for this!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-25 07:59:17 +0000
+++ debian/changelog	2011-03-08 22:28:30 +0000
@@ -1,3 +1,10 @@
+pyserial (2.5-1ubuntu1) natty; urgency=low
+
+  * debian/rules
+    - don't delete contents of /usr/lib/* for python-serial (LP: #715766)
+
+ -- Andreas Moog <[e-mail]>  Tue, 08 Mar 2011 23:18:02 +0100
+
 pyserial (2.5-1) experimental; urgency=low
 
   * New upstream version. Closes: #520618.

=== modified file 'debian/control'
--- debian/control	2011-01-25 07:59:17 +0000
+++ debian/control	2011-03-08 22:28:30 +0000
@@ -1,7 +1,8 @@
 Source: pyserial
 Section: python
 Priority: optional
-Maintainer: Matthias Klose <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Matthias Klose <[e-mail]>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: python (>= 2.6.6-2~), python3 (>= 3.1.2-10~)
 XS-Python-Version: all

=== modified file 'debian/rules'
--- debian/rules	2011-01-25 07:59:17 +0000
+++ debian/rules	2011-03-08 22:28:30 +0000
@@ -33,7 +33,6 @@
 	python3 setup.py install --root=$(CURDIR)/debian/python3-serial --install-layout=deb
 	dh_python2
 	dh_python3
-	rm -rf debian/python-serial/usr/lib/python*
 	mv debian/python3-serial/usr/bin/miniterm.py debian/python3-serial/usr/bin/miniterm-py3k
 
 # Build architecture-independent files here.