diff -u osm-gps-map-0.2/debian/changelog osm-gps-map-0.2/debian/changelog --- osm-gps-map-0.2/debian/changelog +++ osm-gps-map-0.2/debian/changelog @@ -1,3 +1,15 @@ +osm-gps-map (0.2-0ubuntu1.1) jaunty-proposed; urgency=low + + * Two patches to fix python module locations (LP: #387043) + * 01_correct-python-package-location-configure.dpatch + This patch fixes the configure script that was distributed from upstream + so that the python directories are detected correctly + * 02_correct-python-package-location-aclocal.dpatch + This patch fixes the aclocal file, for the same reason as the configure + script. + + -- Andrew Gee Wed, 01 Jul 2009 02:17:30 +0100 + osm-gps-map (0.2-0ubuntu1) jaunty; urgency=low * Initial release (LP: #320495) diff -u osm-gps-map-0.2/debian/rules osm-gps-map-0.2/debian/rules --- osm-gps-map-0.2/debian/rules +++ osm-gps-map-0.2/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +include /usr/share/dpatch/dpatch.make + CC = gcc CFLAGS = -g -Wall @@ -9,7 +11,7 @@ #export DH_VERBOSE=1 -clean: +clean: unpatch dh_testdir dh_clean rm -f build @@ -25,7 +27,7 @@ cd python && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/ -build: +build: build-stamp ./configure --prefix=/usr $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" touch build @@ -33,6 +35,8 @@ cd python && ./configure --prefix=/usr cd python && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" && touch build +build-stamp: patch-stamp + binary-indep: install # There are no architecture-independent files to be uploaded # generated by this package. If there were any they would be diff -u osm-gps-map-0.2/debian/control osm-gps-map-0.2/debian/control --- osm-gps-map-0.2/debian/control +++ osm-gps-map-0.2/debian/control @@ -4,7 +4,7 @@ Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Andrew Gee Build-Depends: debhelper (>= 7), libgtk2.0-dev, libsoup2.4-dev, python-dev, - python-gtk2-dev + python-gtk2-dev, dpatch XS-Python-Version: >= 2.5 Standards-Version: 3.8.0 Homepage: http://nzjrs.github.com/osm-gps-map/ only in patch2: unchanged: --- osm-gps-map-0.2.orig/debian/patches/01_correct-python-package-location-configure.dpatch +++ osm-gps-map-0.2/debian/patches/01_correct-python-package-location-configure.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_correct-python-package-location-configure.dpatch by Andrew Gee +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Working python/configure for dist-packages python modules location +## DP: Generated from changes from 02_correct-python-package-location-aclocal.dpatch + +@DPATCH@ +diff -urNad osm-gps-map-0.2~/python/configure osm-gps-map-0.2/python/configure +--- osm-gps-map-0.2~/python/configure 2009-01-29 08:42:55.000000000 +0000 ++++ osm-gps-map-0.2/python/configure 2009-07-01 14:10:42.000000000 +0100 +@@ -11778,7 +11778,13 @@ + if test "${am_cv_python_pythondir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || ++ if test "x$prefix" = xNONE ++ then ++ py_prefix_arg= ++ else ++ py_prefix_arg=",prefix='$prefix'" ++ fi ++ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + fi + { echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +@@ -11795,8 +11801,14 @@ + if test "${am_cv_python_pyexecdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || +- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` ++ if test "x$exec_prefix" = xNONE ++ then ++ py_exec_prefix_arg=$py_prefix_arg ++ else ++ py_exec_prefix_arg=",prefix='$exec_prefix'" ++ fi ++ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null || ++ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + fi + { echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 + echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; } only in patch2: unchanged: --- osm-gps-map-0.2.orig/debian/patches/02_correct-python-package-location-aclocal.dpatch +++ osm-gps-map-0.2/debian/patches/02_correct-python-package-location-aclocal.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 00_correct-python-package-location.dpatch by Andrew Gee +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: python/aclocal.m4 regenerated for the python modules directory to be +## DP: worked out correctly. + +@DPATCH@ +diff -urNad osm-gps-map-0.2~/python/aclocal.m4 osm-gps-map-0.2/python/aclocal.m4 +--- osm-gps-map-0.2~/python/aclocal.m4 2009-01-29 08:42:53.000000000 +0000 ++++ osm-gps-map-0.2/python/aclocal.m4 2009-07-01 14:02:50.000000000 +0100 +@@ -8916,7 +8975,13 @@ + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON script directory], + [am_cv_python_pythondir], +- [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || ++ [if test "x$prefix" = xNONE ++ then ++ py_prefix_arg= ++ else ++ py_prefix_arg=",prefix='$prefix'" ++ fi ++ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) + +@@ -8933,8 +8998,14 @@ + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], + [am_cv_python_pyexecdir], +- [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || +- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`]) ++ [if test "x$exec_prefix" = xNONE ++ then ++ py_exec_prefix_arg=$py_prefix_arg ++ else ++ py_exec_prefix_arg=",prefix='$exec_prefix'" ++ fi ++ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null || ++ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) + + dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) only in patch2: unchanged: --- osm-gps-map-0.2.orig/debian/patches/00list +++ osm-gps-map-0.2/debian/patches/00list @@ -0,0 +1,2 @@ +01_correct-python-package-location-configure.dpatch +02_correct-python-package-location-aclocal.dpatch