tags 617022 patch
user [email protected]
usertags 617022 ubuntu-patch oneiric
thanks

On Mon, Mar 07, 2011 at 12:51:10AM +0000, Matthias Klose wrote:
> The package build-depends on python-central, which should be
> removed in time for the wheezy release.  dh_python2 should be used instead.
> dh_python2 installs into the same locations as pycentral, but
> avoids the creation and removal of symlinks at package installation
> and removal time, making the upgrade process more robust and faster.

Here's a patch.  Note that I removed the code that removes /usr/lib;
this doesn't seem appropriate any more with dh_python2 (which installs
links in /usr/lib/pythonX.Y by design).

  * Convert to dh_python2.

diff -u python-pysearch-3.1/debian/control python-pysearch-3.1/debian/control
--- python-pysearch-3.1/debian/control
+++ python-pysearch-3.1/debian/control
@@ -1,11 +1,10 @@
 Source: python-pysearch
 Section: python
-XS-Python-Version: all
 Priority: optional
 Maintainer: Thomas Bläsing <[email protected]>
 Uploaders: Debian Python Modules Team 
<[email protected]>
 Standards-Version: 3.7.3
-Build-Depends: python, python-central (>= 0.5), debhelper (>= 5)
+Build-Depends: python (>= 2.6.6-3~), debhelper (>= 5)
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-pysearch
 Vcs-Browser: 
http://svn.debian.org/wsvn/python-modules/packages/python-pysearch/trunk/?op=log
 
@@ -14,7 +13,6 @@
 Replaces: python-pysearch (=3.0-1)
 Architecture: all
 Depends: ${python:Depends}
-XB-Python-Version: ${python:Versions}
 Homepage: http://pysearch.sourceforge.net/
 Description: Python module for the Yahoo Search Web Service
  This module implements a set of classes and functions to work with the
diff -u python-pysearch-3.1/debian/rules python-pysearch-3.1/debian/rules
--- python-pysearch-3.1/debian/rules
+++ python-pysearch-3.1/debian/rules
@@ -14,13 +14,12 @@
        dh_testroot
        dh_clean -k
        dh_installdirs
-       python setup.py install --no-compile 
--root=$(CURDIR)/debian/python-yahoo
+       python setup.py install --no-compile 
--root=$(CURDIR)/debian/python-yahoo --install-layout=deb
 
 binary-indep: install
        dh_testdir
        dh_testroot
-       dh_pycentral -ppython-yahoo
-       rm -rf $(CURDIR)/debian/python-yahoo/usr/lib
+       dh_python2
        dh_installchangelogs ChangeLog
        dh_installdocs
        dh_installexamples

Thanks,

-- 
Colin Watson                                       [[email protected]]



-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to