[SCM] grits branch, master, updated. upstream/0.6-33-g736184a

Andy Spencer andy753421 at gmail.com
Wed Feb 15 06:45:41 UTC 2012


The following commit has been merged in the master branch:
commit b8c44f3760c1f5fbf4253f764c608767fdd3e28c
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Tue Jan 10 09:30:32 2012 +0000

    Patch configure.ac

diff --git a/debian/patches/libtool.patch b/debian/patches/libtool.patch
new file mode 100644
index 0000000..ebd0dc4
--- /dev/null
+++ b/debian/patches/libtool.patch
@@ -0,0 +1,15 @@
+Description: Remove custom libtool code
+Author: Andy Spencer <andy753421 at gmail.com>
+
+--- libgrits-0.6.3.orig/configure.ac
++++ libgrits-0.6.3/configure.ac
+@@ -15,9 +15,6 @@ GRITS_SUBDIR=grits_subdir
+ AC_SUBST(LIB_VERSION)
+ AC_SUBST(GRITS_SUBDIR)
+ 
+-# Fix broken libtool
+-lt_cv_sys_lib_dlsearch_path_spec="/lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64"
+-
+ # Check for required programs
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fa8c452
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+libtool.patch
diff --git a/debian/rules b/debian/rules
index 6912deb..479f688 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh $@ --with autoreconf
 
 override_dh_auto_test:
 	# Skip interactive tests

-- 
A Virtual Globe library



More information about the Pkg-grass-devel mailing list