Merge branch 'maint'

Reconcile the cmake build.

CMakeLists.txt

@@ -440,21 +440,14 @@ IF (GNC_BUILD_AS_INSTALL)
 ENDIF()
 # Install DOC files from top level directory
 
-#FILE(WRITE COPYING
-#"This is a placeholder for the COPYING file as generated by automake.
-#If and when CMake becomes the default build system, we will need to
-#put COPYING under version control."
-#)
-
-#FILE(WRITE INSTALL
-#"This is a placeholder for the INSTALL file as generated by automake.
-#If and when CMake becomes the default build system, we will need to
-#put INSTALL under version control."
-#)
 
 SET(gnucash_DOCS
     AUTHORS
     ChangeLog
+    ChangeLog.1999
+    ChangeLog.2000
+    ChangeLog.2001
+    ChangeLog.2002
     ChangeLog.2003
     ChangeLog.2004
     ChangeLog.2005

cmake/CMakeLists.txt

@@ -24,3 +24,5 @@ IF (GNC_BUILD_AS_INSTALL)
   ADD_CUSTOM_TARGET(compiled-schemas ALL DEPENDS ${SCHEMA_DIRECTORY}/gschemas.compiled)
 
 ENDIF(GNC_BUILD_AS_INSTALL)
+
+INSTALL(FILES INSTALL COPYING DESTINATION share/doc/gnucash)

po/CMakeLists.txt

@@ -3,7 +3,7 @@
 # Set of available languages.
 SET (TP_LINGUAS az ca cs da eu fa ja nl pt rw sk sr sv tr uk zh_CN)
 # already marked as external at TP:
-SET (GC_LINGUAS ar bg de el en_GB es fi fr gu he hi hu it kn ko lt lv mr nb ne pl pt_BR ro ru ta te ur vi zh_TW)
+SET (GC_LINGUAS ar bg de el en_GB es fi fr gu he hi hu it kn ko lt lv mr nb ne pl pt_BR pt_PT ro ru ta te ur vi zh_TW)
 # not marked or no TP team:
 SET (NEW_LINGUAS as brx doi es_NI kok kok@latin ks mai mni mni@bengali)
 

src/libqof/CMakeLists.txt

@@ -71,6 +71,7 @@ SET (gnc_qof_SOURCES
    qof/qofutil.cpp
    qof/qof-string-cache.cpp
 )
+
 IF (WIN32)
   ADD_DEFINITIONS (-DOS_WIN32)
   SET (gnc_qof_SOURCES ${gnc_qof_SOURCES}

src/plugins/bi_import/dialog-bi-import-gui.c

@@ -289,6 +289,7 @@ void gnc_bi_import_gui_filenameChanged_cb (GtkWidget *widget, gpointer data)
     g_free( filename );
 }
 
+// Semicolon separated
 void gnc_bi_import_gui_option1_cb (GtkWidget *widget, gpointer data)
 {
     BillImportGui *gui = data;
@@ -298,6 +299,7 @@ void gnc_bi_import_gui_option1_cb (GtkWidget *widget, gpointer data)
     gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui);
 }
 
+// Comma separated
 void gnc_bi_import_gui_option2_cb (GtkWidget *widget, gpointer data)
 {
     BillImportGui *gui = data;
@@ -307,6 +309,7 @@ void gnc_bi_import_gui_option2_cb (GtkWidget *widget, gpointer data)
     gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui);
 }
 
+// Semicolon separated with quotes
 void gnc_bi_import_gui_option3_cb (GtkWidget *widget, gpointer data)
 {
     BillImportGui *gui = data;
@@ -316,6 +319,7 @@ void gnc_bi_import_gui_option3_cb (GtkWidget *widget, gpointer data)
     gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui);
 }
 
+// Comma separated with quote
 void gnc_bi_import_gui_option4_cb (GtkWidget *widget, gpointer data)
 {
     BillImportGui *gui = data;
@@ -325,6 +329,7 @@ void gnc_bi_import_gui_option4_cb (GtkWidget *widget, gpointer data)
     gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui);
 }
 
+// DIY regex.
 void gnc_bi_import_gui_option5_cb (GtkWidget *widget, gpointer data)
 {
     BillImportGui *gui = data;

src/quotes/CMakeLists.txt

@@ -9,11 +9,12 @@ FILE(WRITE ${_TMPDIR}/copy_with_perms.cmake
    FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)"
 )
 
+SET(_BIN_FILES "")
 FOREACH(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-update.in gnc-fq-dump)
   STRING(REPLACE ".in" "" _OUTPUT_FILE_NAME ${file})
   GNC_CONFIGURE2(${file} ${_OUTPUT_FILE_NAME})
   SET(_ABS_OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_OUTPUT_FILE_NAME})
-  INSTALL(PROGRAMS ${_ABS_OUPUT_FILE} DESTINATION bin)
+  LIST(APPEND _BIN_FILES ${_ABS_OUTPUT_FILE})
   IF (GNC_BUILD_AS_INSTALL)
     ADD_CUSTOM_COMMAND(
       OUTPUT ${_ABS_OUTPUT_FILE}
@@ -43,4 +44,5 @@ ENDFOREACH(file)
 ADD_CUSTOM_TARGET(quotes-man ALL DEPENDS ${_MAN_FILES})
 ADD_CUSTOM_TARGET(quotes-bin ALL DEPENDS gnc-fq-check gnc-fq-update)
 INSTALL(FILES ${_MAN_FILES} DESTINATION share/man/man1)
+INSTALL(PROGRAMS ${_BIN_FILES} DESTINATION bin)
 

src/scm/price-quotes.scm

@@ -424,7 +424,7 @@
                   (if (gnc-commodity-equiv (gnc-price-get-currency saved-price)
                                            commodity)
                       (set! price (gnc-numeric-invert price)))
-                  (if (> (gnc-price-get-source saved-price) PRICE-SOURCE-FQ)
+                  (if (>= (gnc-price-get-source saved-price) PRICE-SOURCE-FQ)
                       (begin
                         (gnc-price-begin-edit saved-price)
                         (gnc-price-set-time saved-price gnc-time)