[osm-gps-map] 59/153: debian/patches/01-fix_python_linking.patch added, fixes FTBFS because of wrong linking of local library

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository osm-gps-map.

commit 30bfeba32b747f40c369d83300b40d6a7c499209
Author: David Paleino <dapal at debian.org>
Date:   Thu Jun 3 09:10:41 2010 +0200

    debian/patches/01-fix_python_linking.patch added, fixes FTBFS because of wrong linking of local library
---
 debian/changelog                           |  9 ++++++---
 debian/patches/01-fix_python_linking.patch | 18 ++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bfd4451..40e14bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 osm-gps-map (0.7.0-1) UNRELEASED; urgency=low
 
   * New upstream version
-  * debian/patches/00-fix_python-COPYING added, makes COPYING a real
-    file instead of a symlink.
+  * debian/patches/:
+    - 00-fix_python-COPYING added, makes COPYING a real file
+      instead of a symlink.
+    - 01-fix_python_linking.patch added, fixes FTBFS because of
+      wrong linking of local library
   * debian/control:
     - added gnome-common build-dependency
     - added gtk-doc-tools build-dependency
@@ -11,7 +14,7 @@ osm-gps-map (0.7.0-1) UNRELEASED; urgency=low
     - don't delete version.xml.in on clean
     - remove docs/reference/version.xml and gkt-doc.make on clean
 
- -- David Paleino <dapal at debian.org>  Thu, 03 Jun 2010 08:50:21 +0200
+ -- David Paleino <dapal at debian.org>  Thu, 03 Jun 2010 09:09:52 +0200
 
 osm-gps-map (0.6.0-1) unstable; urgency=low
 
diff --git a/debian/patches/01-fix_python_linking.patch b/debian/patches/01-fix_python_linking.patch
new file mode 100644
index 0000000..a53798f
--- /dev/null
+++ b/debian/patches/01-fix_python_linking.patch
@@ -0,0 +1,18 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix linking to locally compiled library
+
+---
+ python/configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- osm-gps-map.orig/python/configure.ac
++++ osm-gps-map/python/configure.ac
+@@ -52,7 +52,7 @@ if test -f ../src/libosmgpsmap.la; then
+ 
+ 	#and we must link to the local lib
+ 	OSMGPSMAP_CFLAGS="-I\$(top_srcdir)/../src/"
+-	OSMGPSMAP_LIBS="\$(top_builddir)/../src/libosmgpsmap.la"
++	OSMGPSMAP_LIBS="-L\$(top_builddir)/../src/.libs/ -losmgpsmap"
+ else
+ 	PKG_CHECK_MODULES(OSMGPSMAP, osmgpsmap = 0.7.0)
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index e699c2f..486743b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 00-fix_python-COPYING.patch
+01-fix_python_linking.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-gps-map.git