tags 616836 patch
user ubuntu-de...@lists.ubuntu.com
usertags 616836 oneiric
thanks
On Mon, Mar 07, 2011 at 12:48:00AM +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.
* Convert to dh_python2.
diff -Nru gst0.10-python-0.10.21/debian/control
gst0.10-python-0.10.21/debian/control
--- gst0.10-python-0.10.21/debian/control 2011-02-08 09:51:40.000000000
+0000
+++ gst0.10-python-0.10.21/debian/control 2011-06-24 15:23:17.000000000
+0100
@@ -15,12 +15,11 @@
python-dev,
python-gobject-dev (>= 2.11.2),
python-gobject-dbg,
- python-all-dev (>= 2.3.5-11),
+ python-all-dev (>= 2.6.6-3~),
python-all-dbg,
- python-central (>= 0.6.11),
autotools-dev
Standards-Version: 3.8.4
-XS-Python-Version: >= 2.3
+X-Python-Version: >= 2.3
Homepage: http://gstreamer.freedesktop.org
Package: python-gst0.10
@@ -35,7 +34,6 @@
Conflicts: python2.3-gst0.10,
python2.4-gst0.10
Suggests: python-gst0.10-dev, python-gst0.10-dbg
-XB-Python-Version: ${python:Versions}
Description: generic media-playing framework (Python bindings)
GStreamer is a media processing framework with support for a wide variety
of data sources, sinks, and formats through the use of dynamically loaded
@@ -56,7 +54,6 @@
Provides: ${python:Provides}
Replaces: python-gst0.10 (<< 0.10.15)
Suggests: python-gst0.10-dbg
-XB-Python-Version: ${python:Versions}
Description: generic media-playing framework (Python bindings)
GStreamer is a media processing framework with support for a wide variety
of data sources, sinks, and formats through the use of dynamically loaded
diff -Nru gst0.10-python-0.10.21/debian/rules
gst0.10-python-0.10.21/debian/rules
--- gst0.10-python-0.10.21/debian/rules 2011-02-08 09:51:40.000000000 +0000
+++ gst0.10-python-0.10.21/debian/rules 2011-06-24 15:27:17.000000000 +0100
@@ -11,7 +11,7 @@
PY_DEFAULT := $(shell pyversions --default)
PY_VERSIONS = $(sort $(shell pyversions --requested) $(PY_DEFAULT))
-include /usr/share/pycentral-data/pycentral.mk
+include /usr/share/python/python.mk
PATCH_DIR := debian/patches
@@ -46,10 +46,10 @@
./configure $(configure_flags)
$(MAKE)
$(MAKE) install DESTDIR=$(CURDIR)/debian/python-gst0.10 \
- PYEXECDIR=/usr/lib/$*/$(call sitedir,$*) \
- PYLIBDIR=/usr/lib/$*/$(call sitedir,$*) \
- pyexecdir=/usr/lib/$*/$(call sitedir,$*) \
- pylibdir=/usr/lib/$*/$(call sitedir,$*)
+ PYEXECDIR=$(call py_libdir,$(subst python,,$*)) \
+ PYLIBDIR=$(call py_libdir,$(subst python,,$*)) \
+ pyexecdir=$(call py_libdir,$(subst python,,$*)) \
+ pylibdir=$(call py_libdir,$(subst python,,$*))
# move installed files to a per python runtime location to allow
# comparison of the resulting files across runtimes or shipping
# multiple versions
@@ -72,10 +72,10 @@
./configure $(configure_flags)
$(MAKE)
$(MAKE) install DESTDIR=$(CURDIR)/debian/python-gst0.10-dbg \
- PYEXECDIR=/usr/lib/$*/$(call sitedir,$*) \
- PYLIBDIR=/usr/lib/$*/$(call sitedir,$*) \
- pyexecdir=/usr/lib/$*/$(call sitedir,$*) \
- pylibdir=/usr/lib/$*/$(call sitedir,$*)
+ PYEXECDIR=$(call py_libdir,$(subst python,,$*)) \
+ PYLIBDIR=$(call py_libdir,$(subst python,,$*)) \
+ pyexecdir=$(call py_libdir,$(subst python,,$*)) \
+ pylibdir=$(call py_libdir,$(subst python,,$*))
touch $@
build-arch: $(addprefix build-stamp-, $(PY_VERSIONS)) $(addprefix
dbg-build-stamp-, $(PY_VERSIONS))
@@ -134,7 +134,7 @@
dh_strip -s -Npython-gst0.10-dbg --dbg-package=python-gst0.10-dbg
dh_compress -s -Xexample
dh_fixperms -s
- DH_PYCENTRAL=include-links dh_pycentral -s
+ dh_python2 -s
dh_installdeb -s
dh_shlibdeps -s
dh_gencontrol -s
Thanks,
--
Colin Watson [cjwat...@ubuntu.com]
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
