- updated for 1.8.6

Changed files:
    glom-desktop.patch -> 1.2
    glom-postgres-utils.patch -> 1.2

diff --git a/glom-desktop.patch b/glom-desktop.patch
index 604bd174d88531b52be48c25d45671ec12a79f97..549f38235ebc84bd69b5031811c8f166b4df71d1 100644 (file)
--- a/glom-desktop.patch
+++ b/glom-desktop.patch
@@ -1,12 +1,17 @@
-diff -aurN glom-1.0.4.orig/glom.desktop.in.in glom-1.0.4/glom.desktop.in.in
---- glom-1.0.4.orig/glom.desktop.in.in 2006-05-21 12:50:26.000000000 +0200
-+++ glom-1.0.4/glom.desktop.in.in      2006-08-06 22:47:34.599993864 +0200
-@@ -6,7 +6,7 @@
+diff -urN glom-1.8.5/glom.desktop.in.in glom-1.8.5.new/glom.desktop.in.in
+--- glom-1.8.5/glom.desktop.in.in      2008-10-28 17:23:33.000000000 +0100
++++ glom-1.8.5.new/glom.desktop.in.in  2009-02-11 11:17:19.000000000 +0100
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=Glom
+ _Comment=A user-friendly database environment.
+ Exec=glom
  Terminal=false
  Type=Application
  Icon=glom
 -Categories=Application;GNOME;Office;GTK;Database
 +Categories=GTK;GNOME;Office;Database;
  StartupNotify=true
+ MimeType=application/x-glom;
  X-GNOME-DocPath=glom/index.html
- X-GNOME-Bugzilla-Bugzilla=GNOME

diff --git a/glom-postgres-utils.patch b/glom-postgres-utils.patch
index b7cdfb77511c08c18e3a436e2fb60126e178a7fe..134bd43379491815b91a1c119b08c6ef789266a3 100644 (file)
--- a/glom-postgres-utils.patch
+++ b/glom-postgres-utils.patch
@@ -1,19 +1,18 @@
-diff -urN glom-1.6.13/configure.in glom-1.6.13.new/configure.in
---- glom-1.6.13/configure.in   2008-04-05 00:22:56.000000000 +0200
-+++ glom-1.6.13.new/configure.in       2008-04-07 13:29:21.000000000 +0200
-@@ -128,15 +128,6 @@
- AC_SUBST(POSTGRES_UTILS_PATH)
- AC_DEFINE_UNQUOTED([POSTGRES_UTILS_PATH], ["${POSTGRES_UTILS_PATH}"], [Path to the postgres utilities, such as postmaster.])
+diff -urN glom-1.8.5/configure.in glom-1.8.5.new/configure.in
+--- glom-1.8.5/configure.in    2009-01-04 17:59:33.000000000 +0100
++++ glom-1.8.5.new/configure.in        2009-02-11 11:20:00.000000000 +0100
+@@ -151,14 +151,6 @@
  
--if test $enable_client_only != yes; then
--      # Check that the supplied (or default) path really contains the postgres utilities:
--      AC_CHECK_PROG(HAVE_POSTMASTER, postmaster, yes, no, ${POSTGRES_UTILS_PATH})
--      if test "x$HAVE_POSTMASTER" = "xno"; then
--      AC_MSG_ERROR([The postgres utilities could not be found in the path: ${POSTGRES_UTILS_PATH}. They are needed for self-hosting of Glom databases. Please make sure that Postgres is installed, and provide the correct path with the --with-postgres-utils option.])
--      fi
--fi
--
+       AC_SUBST(POSTGRES_UTILS_PATH)
+       AC_DEFINE_UNQUOTED([POSTGRES_UTILS_PATH], ["${POSTGRES_UTILS_PATH}"], [Path to the postgres utilities, such as postmaster.])
 -
- # Allow use of gnome-doc-utils to be disabled for platforms (For instance, Maemo) that don't have it:
- AC_ARG_ENABLE([doc-utils],
-       AC_HELP_STRING([--enable-doc-utils],
+-      if test $enable_client_only != yes; then
+-              # Check that the supplied (or default) path really contains the postgres utilities:
+-              AC_CHECK_PROG(HAVE_POSTMASTER, postmaster, yes, no, ${POSTGRES_UTILS_PATH})
+-              if test "x$HAVE_POSTMASTER" = "xno"; then
+-              AC_MSG_ERROR([The postgres utilities could not be found in the path: ${POSTGRES_UTILS_PATH}. They are needed for self-hosting of Glom databases. Please make sure that Postgres is installed, and provide the correct path with the --with-postgres-utils option.])
+-              fi
+-      fi
+ fi
+ 
+