gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e2f21a2a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/1dfbd606 (commit)
	from  https://github.com/Gnucash/gnucash/commit/df3d55ca (commit)



commit e2f21a2aa2ef1cebf38f2e93daafe4a6ef80d87e
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Feb 9 16:09:09 2014 +0100

    Fix detection of DBD modules for multiarch setups.
    
    On Debian unstable, the DBD modules are now under
    /usr/lib/${MULTIARCH}/dbd (where MULTIARCH depends on the architecture). This
    patch ensures that the DBD modules are correctly detected in that case, using
    pkg-config.

diff --git a/configure.ac b/configure.ac
index fa28a86..a900d17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,7 +604,7 @@ then
       [[GNC_DBD_DIR="$with_dbi_dbd_dir"
        EXTRA_SEARCH_LIBS=$GNC_DBD_DIR]],
       [[GNC_DBD_DIR=""
-       EXTRA_SEARCH_LIBS="/usr/lib/dbd:/usr/lib64/dbd:${libdir}/dbd"]]
+       EXTRA_SEARCH_LIBS="/usr/lib/dbd:/usr/lib64/dbd:${libdir}/dbd:$(pkg-config --variable=libdir dbi)/dbd"]]
        )
     case $host_os in
        win32*|mingw*)

commit 1dfbd606b0be7b64fe810bdc285c459b6022394a
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Mon Feb 17 18:13:38 2014 +0100

    Remove obsolete, unused gsettings schema

diff --git a/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in b/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in
index bd77f3c..6a71a44 100644
--- a/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in
+++ b/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in
@@ -6,7 +6,6 @@
     <child name="pricedb-editor" schema="org.gnucash.dialogs.pricedb-editor"/>
     <child name="reset-warnings" schema="org.gnucash.dialogs.reset-warnings"/>
     <child name="tax-info" schema="org.gnucash.dialogs.tax-info"/>
-    <child name="tip-of-the-day" schema="org.gnucash.dialogs.tip-of-the-day"/>
     <child name="fincalc" schema="org.gnucash.dialogs.fincalc"/>
     <child name="find" schema="org.gnucash.dialogs.find"/>
     <child name="export-accounts" schema="org.gnucash.dialogs.export-accounts"/>
@@ -85,16 +84,6 @@
     </key>
   </schema>
 
-  <schema id="org.gnucash.dialogs.tip-of-the-day" path="/org/gnucash/dialogs/tip-of-the-day/">
-    <key name="last-geometry" type="(iiii)">
-      <default>(-1,-1,-1,-1)</default>
-      <summary>Last window position and size</summary>
-      <description>This setting describes the size and position of the window when it was last closed.
-        The numbers are the X and Y coordinates of the top left corner of the window
-        followed by the width and height of the window.</description>
-    </key>
-  </schema>
-
   <schema id="org.gnucash.dialogs.fincalc" path="/org/gnucash/dialogs/fincalc/">
     <key name="last-geometry" type="(iiii)">
       <default>(-1,-1,-1,-1)</default>



Summary of changes:
 configure.ac                                             |  2 +-
 src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)