reverted: --- pyslide-0.4/Pyslide/File.py +++ pyslide-0.4.orig/Pyslide/File.py @@ -21,8 +21,6 @@ # along with Pyslide; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import sys -sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) import misc class InvalidCSS(misc.PyslideError): diff -u pyslide-0.4/debian/patches/00list pyslide-0.4/debian/patches/00list --- pyslide-0.4/debian/patches/00list +++ pyslide-0.4/debian/patches/00list @@ -2,0 +3 @@ +03-old_xmlplus.dpatch diff -u pyslide-0.4/debian/copyright pyslide-0.4/debian/copyright --- pyslide-0.4/debian/copyright +++ pyslide-0.4/debian/copyright @@ -31,2 +31,2 @@ -Daniel Baumann , (C) 2006-2007 Kartik Mistry - and is licensed under the GPL, see above. +Daniel Baumann , (C) 2006-2008 Kartik Mistry + and is licensed under the GPL, see above. diff -u pyslide-0.4/debian/changelog pyslide-0.4/debian/changelog --- pyslide-0.4/debian/changelog +++ pyslide-0.4/debian/changelog @@ -1,3 +1,28 @@ +pyslide (0.4-11ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #298837), remaining changes: + - Explicitely add the directory in sys.path, where the + old _xmlplus module can be found. (LP: #199014) + * The Ubuntu change mentioned above was done directly in the + diff.gz despite the fact that Debian uses a patch system. I + have moved this change to debian/patches/03-old _xmlplus.dpatch + + -- Andrew Starr-Bochicchio Wed, 05 Nov 2008 04:48:31 +0000 + +pyslide (0.4-11) unstable; urgency=low + + * debian/control: + + Updated Standards-Version to 3.8.0 (no changes needed) + + Updated my maintainer email address + + Adjusted Python dependency + * debian/watch: + + Added dummy watch file as per DEHS and Debian Policy + requirements + * debian/copyright: + + Updated my maintainer email address and copyright year + + -- Kartik Mistry Fri, 12 Sep 2008 11:51:06 +0530 + pyslide (0.4-10ubuntu3) intrepid; urgency=low * Re-add dependency on python-xml. (LP: #199014) @@ -105,0 +131 @@ + diff -u pyslide-0.4/debian/control pyslide-0.4/debian/control --- pyslide-0.4/debian/control +++ pyslide-0.4/debian/control @@ -4,7 +4,7 @@ Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Kartik Mistry Build-Depends: debhelper (>= 5.0.38), dpatch, libsdl1.2-dev, python-all-dev (>= 2.4), python-pygame, python-support (>= 0.5.3) -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Package: pyslide Architecture: any only in patch2: unchanged: --- pyslide-0.4.orig/debian/watch +++ pyslide-0.4/debian/watch @@ -0,0 +1,2 @@ +# pyslide has no upstream maintainer at moment. This watch file was added due to +# DEHS and Debian Policy requirements. only in patch2: unchanged: --- pyslide-0.4.orig/debian/patches/03-old_xmlplus.dpatch +++ pyslide-0.4/debian/patches/03-old_xmlplus.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03-old_xmlplus.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## +## DP: LP Bug #199014: https://bugs.edge.launchpad.net/ubuntu/+bug/199014 +## DP: Explicitely adds the directory in sys.path, where the old _xmlplus module can be found. +## DP: +## DP: Added in pyslide (0.4-10ubuntu2) by Matthias Klose directly to diff.gz, +## DP: moved to dpatch by Andrew Starr-Bochicchio in pyslide (0.4-11ubuntu1) + +--- pyslide-0.4.orig/Pyslide/File.py ++++ pyslide-0.4/Pyslide/File.py +@@ -21,6 +21,8 @@ + # along with Pyslide; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ++import sys ++sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) + + import misc + class InvalidCSS(misc.PyslideError):