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,12 @@ +osm-gps-map (0.2-0ubuntu2) jaunty; urgency=low + + * New Patch: 01_correct-python-package-location.dpatch + In python/configure, the python paths for scripts and + modules was not being detected correctly, and reverting + to site-packages. + + -- Andrew Gee Sat, 20 Jun 2009 15:52:07 +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.dpatch +++ osm-gps-map-0.2/debian/patches/01_correct-python-package-location.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_correct-python-package-location.dpatch by Andrew Gee +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@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-06-20 15:50:37.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)" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + fi + { echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +@@ -11795,7 +11801,13 @@ + 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 || ++ 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)" 2>/dev/null || + echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` + fi + { echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 only in patch2: unchanged: --- osm-gps-map-0.2.orig/debian/patches/00list +++ osm-gps-map-0.2/debian/patches/00list @@ -0,0 +1 @@ +01_correct-python-package-location.dpatch