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

[Ian Haywood]

The following commit has been merged in the newmaster branch:
commit 4469a410fd9a248639826db2d73c59cd26faf9ff
Author: Ian Haywood <ian at haywood.id.au>
Date:   Sun Apr 6 06:38:25 2014 +0000

    correct installed file lists for gambas3-gb-desktop and gambas3-gb-desktop-gnome
    refresh find_postgresql_files patch

diff --git a/debian/gambas3-gb-desktop-gnome.install b/debian/gambas3-gb-desktop-gnome.install
index cbec1bd..0658bd3 100644
--- a/debian/gambas3-gb-desktop-gnome.install
+++ b/debian/gambas3-gb-desktop-gnome.install
@@ -1 +1,3 @@
 usr/lib/gambas3/gb.desktop.gnome*
+usr/share/gambas3/info/gb.desktop.gnome.info
+usr/share/gambas3/info/gb.desktop.gnome.list
diff --git a/debian/gambas3-gb-desktop.install b/debian/gambas3-gb-desktop.install
index caea78e..73dd5bf 100644
--- a/debian/gambas3-gb-desktop.install
+++ b/debian/gambas3-gb-desktop.install
@@ -1,7 +1,8 @@
 usr/lib/gambas3/gb.desktop.so*
 usr/lib/gambas3/gb.desktop.so
 usr/lib/gambas3/gb.desktop.component
+usr/lib/gambas3/gb.desktop.gambas
 usr/share/gambas3/control/gb.desktop
 usr/share/gambas3/info/gb.desktop.info
 usr/share/gambas3/info/gb.desktop.list
-usr/share/gambas3/control/gb.desktop
+usr/share/gambas3/control/gb.desktop/desktopwatcher.png
diff --git a/debian/patches/find_postgresql_headers b/debian/patches/find_postgresql_headers
index c969999..1b3db08 100644
--- a/debian/patches/find_postgresql_headers
+++ b/debian/patches/find_postgresql_headers
@@ -3,9 +3,11 @@ Description: find postgresql header files
  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
+Index: gambas3-3.5.2/gb.db.postgresql/configure.ac
+===================================================================
+--- gambas3-3.5.2.orig/gb.db.postgresql/configure.ac	2014-04-06 04:34:28.520013576 +0000
++++ gambas3-3.5.2/gb.db.postgresql/configure.ac	2014-04-06 04:34:28.510012934 +0000
+@@ -9,7 +9,7 @@
  
  GB_COMPONENT(
    postgresql, POSTGRESQL, gb.db.postgresql, [src],
@@ -13,3 +15,4 @@ Bug-Debian: http://bugs.debian.org/741789
 +  [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])
+  

-- 
Gambas 3