[Pkg-gambas-commits] [SCM] gambas3 branch, newmaster, updated. upstream/3.4.2-54-gdf8f7d9

Ian Haywood ian at haywood.id.au
Sat Apr 5 05:03:06 UTC 2014


The following commit has been merged in the newmaster branch:
commit df8f7d99009dfe9e7929290c1674b8a702d2c62c
Author: Ian Haywood <ian at haywood.id.au>
Date:   Sat Apr 5 03:50:58 2014 +0000

    need to patch autoconf scripts tgo find postgres headers on sid as now
    in postgresql-server-dev

diff --git a/debian/patches/find_postgresql_headers b/debian/patches/find_postgresql_headers
new file mode 100644
index 0000000..c969999
--- /dev/null
+++ b/debian/patches/find_postgresql_headers
@@ -0,0 +1,15 @@
+Description: find postgresql header files
+ add some additional paths for postgresql header files as postgres.h and pg_type.h
+ have moved into debia package postgresql-server-dev-X.Y
+Bug-Debian: http://bugs.debian.org/741789
+
+--- gambas3-3.5.2.orig/gb.db.postgresql/configure.ac
++++ gambas3-3.5.2/gb.db.postgresql/configure.ac
+@@ -9,7 +9,7 @@ dnl ---- PostgreSQL driver
+ 
+ GB_COMPONENT(
+   postgresql, POSTGRESQL, gb.db.postgresql, [src],
+-  [GB_FIND(libpq-fe.h postgres.h pg_type.h, /usr/local/lib /usr/local /opt /usr/lib /usr, include/pgsql* pgsql*/include include/postgresql* postgresql*/include include)],
++  [GB_FIND(libpq-fe.h postgres.h pg_type.h, /usr/local/lib /usr/local /opt /usr/lib /usr, include/pgsql* pgsql*/include include/postgresql* postgresql*/include include include/postgresql/*/server/catalog include/postgresql/*/server)],
+   [GB_FIND(libpq.$SHLIBEXT, /usr/local /opt /usr, lib pgsql*/lib postgresql*/lib)],
+   [$C_LIB -lpq])
diff --git a/debian/patches/series b/debian/patches/series
index ce150f0..2c739a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ detect_browser_debian
 dont_compile_examples
 fix_typos
 kfreebsd_support
+find_postgresql_headers
diff --git a/debian/rules b/debian/rules
index 3d38eb9..0fa8224 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,7 @@ binary-arch: build-arch install
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_shlibdeps -a
+	dh_shlibdeps -a --dpkg-shlibdeps-params=--ignore-missing-info
 	dh_gencontrol -a
 	dh_installdocs -a
 	dh_installchangelogs -a

-- 
Gambas 3



More information about the Pkg-gambas-commits mailing list