[osm-gps-map] 33/153: 02-fix_python_library_linking.patch removed, fixed upstream

[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 8509b66cfe0a17ab7d515ba887470c66238dc602
Author: David Paleino <dapal at debian.org>
Date:   Fri Jan 22 17:49:08 2010 +0100

    02-fix_python_library_linking.patch removed, fixed upstream
---
 debian/changelog                                   |  1 +
 debian/patches/02-fix_python_library_linking.patch | 21 ---------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f64f97..401d534 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ osm-gps-map (0.5-1) UNRELEASED; urgency=low
 
   * New upstream release
   * debian/patches/:
+    - 02-fix_python_library_linking.patch removed, fixed upstream
     - 03-add_missing_include.patch added, glib/gstdio.h was missing
       (Closes: #564907)
     - 04-tidy_code.patch added, fixing some minor issues causing
diff --git a/debian/patches/02-fix_python_library_linking.patch b/debian/patches/02-fix_python_library_linking.patch
deleted file mode 100644
index af90ce0..0000000
--- a/debian/patches/02-fix_python_library_linking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: use the local dynamic library instead of the static one
-Forwarded: no
-
----
- python/configure.ac |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- osm-gps-map.orig/python/configure.ac
-+++ osm-gps-map/python/configure.ac
-@@ -49,8 +49,8 @@ if test -f ../src/libosmgpsmap.la; then
- 	PKG_CHECK_MODULES(OSMGPSMAP, [gtk+-2.0 libsoup-2.4])
- 
- 	#and we must link to the static lib
--	OSMGPSMAP_CFLAGS="$OSMGPSMAP_CFLAGS -I../src"
--	OSMGPSMAP_LIBS="$OSMGPSMAP_LIBS ../src/libosmgpsmap.la"
-+	OSMGPSMAP_CFLAGS="$OSMGPSMAP_CFLAGS -I../src/"
-+	OSMGPSMAP_LIBS="$OSMGPSMAP_LIBS -L../src/.libs/ -losmgpsmap"
- else
- 	PKG_CHECK_MODULES(OSMGPSMAP, osmgpsmap)
- fi
diff --git a/debian/patches/series b/debian/patches/series
index 5d3190c..fe262d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-02-fix_python_library_linking.patch
 03-add_missing_include.patch
 04-tidy_code.patch

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