mirror of
https://github.com/Gnucash/gnucash.git
synced 2026-09-03 20:53:02 -05:00
Merge branch 'maint'
- Bug 731889 - guile 2 exports different autoconf macros than what is expected - Bug 742624 - [patch] Scheduled Transaction Editor results in immediate segfault - Numeric values with more than commodity smallest fraction get silently dropped. - Bug 721196 - Use a regex for checking for a valid numeric value. - Bug 727647 - "gncInvoiceGetTotal" is not read-only function? - Bug 743609 - Add configure options to disable libsecret detection - Switch from guile to xml to manage our iso-currencies source file - Rewrite gnc-test-env in perl - Bug 619899 - Use normal gettext or intltool toolchain also for scm files Resolved conflicts: make-gnucash-potfiles.in po/POTFILES.in po/POTFILES.skip src/backend/dbi/test/Makefile.am
This commit is contained in:
+3
-80
@@ -8,34 +8,16 @@ src/gnome-utils/gnc-tree-model-selection.c
|
||||
src/gnc/.*
|
||||
src/optional/gtkmm/.*
|
||||
|
||||
# The scheme files are handled by intl-scm/guile-strings.c because
|
||||
# intltool wouldn't scan scheme files. They're here now because
|
||||
# intltool 0.50 *does* scan them, and it creates an error during make
|
||||
# check. Once the whole world has upgraded to intltool 0.50, intl-scm
|
||||
# can be deleted and these files added to POTFILES.in.
|
||||
# Skip softlinks to scm files. These softlinks are created
|
||||
# for testing purposes. Unfortunately distcheck doesn't appear
|
||||
# smart enough to ignore them.
|
||||
|
||||
src/app-utils/app-utils.scm
|
||||
src/app-utils/business-prefs.scm
|
||||
src/app-utils/date-utilities.scm
|
||||
src/app-utils/gnucash/app-utils.scm
|
||||
src/app-utils/prefs.scm
|
||||
src/import-export/qif-imp/qif-dialog-utils.scm
|
||||
src/import-export/qif-imp/qif-file.scm
|
||||
src/import-export/qif-imp/qif-import/qif-dialog-utils.scm
|
||||
src/import-export/qif-imp/qif-import/qif-file.scm
|
||||
src/import-export/qif-imp/qif-import/qif-merge-groups.scm
|
||||
src/import-export/qif-imp/qif-import/qif-parse.scm
|
||||
src/import-export/qif-imp/qif-import/qif-to-gnc.scm
|
||||
src/import-export/qif-imp/qif-merge-groups.scm
|
||||
src/import-export/qif-imp/qif-parse.scm
|
||||
src/import-export/qif-imp/qif-to-gnc.scm
|
||||
src/report/business-reports/aging.scm
|
||||
src/report/business-reports/balsheet-eg.eguile.scm
|
||||
src/report/business-reports/balsheet-eg.scm
|
||||
src/report/business-reports/business-reports.scm
|
||||
src/report/business-reports/customer-summary.scm
|
||||
src/report/business-reports/easy-invoice.scm
|
||||
src/report/business-reports/fancy-invoice.scm
|
||||
src/report/business-reports/gnucash/report/aging.scm
|
||||
src/report/business-reports/gnucash/report/balsheet-eg.eguile.scm
|
||||
src/report/business-reports/gnucash/report/balsheet-eg.scm
|
||||
@@ -52,46 +34,10 @@ src/report/business-reports/gnucash/report/receipt.scm
|
||||
src/report/business-reports/gnucash/report/receivables.scm
|
||||
src/report/business-reports/gnucash/report/taxinvoice.eguile.scm
|
||||
src/report/business-reports/gnucash/report/taxinvoice.scm
|
||||
src/report/business-reports/invoice.scm
|
||||
src/report/business-reports/job-report.scm
|
||||
src/report/business-reports/owner-report.scm
|
||||
src/report/business-reports/payables.scm
|
||||
src/report/business-reports/receipt.eguile.scm
|
||||
src/report/business-reports/receipt.scm
|
||||
src/report/business-reports/receivables.scm
|
||||
src/report/business-reports/taxinvoice.eguile.scm
|
||||
src/report/business-reports/taxinvoice.scm
|
||||
src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
|
||||
src/report/locale-specific/us/gnucash/report/taxtxf.scm
|
||||
src/report/locale-specific/us/taxtxf-de_DE.scm
|
||||
src/report/locale-specific/us/taxtxf.scm
|
||||
src/report/report-gnome/gnucash/report/report-gnome.scm
|
||||
src/report/report-gnome/report-gnome.scm
|
||||
src/report/report-system/eguile-gnc.scm
|
||||
src/report/report-system/gnucash/report/eguile-gnc.scm
|
||||
src/report/report-system/html-acct-table.scm
|
||||
src/report/report-system/html-fonts.scm
|
||||
src/report/report-system/html-style-sheet.scm
|
||||
src/report/report-system/html-utilities.scm
|
||||
src/report/report-system/options-utilities.scm
|
||||
src/report/report-system/report-utilities.scm
|
||||
src/report/report-system/report.scm
|
||||
src/report/standard-reports/account-piecharts.scm
|
||||
src/report/standard-reports/account-summary.scm
|
||||
src/report/standard-reports/advanced-portfolio.scm
|
||||
src/report/standard-reports/average-balance.scm
|
||||
src/report/standard-reports/balance-sheet.scm
|
||||
src/report/standard-reports/budget-balance-sheet.scm
|
||||
src/report/standard-reports/budget-barchart.scm
|
||||
src/report/standard-reports/budget-flow.scm
|
||||
src/report/standard-reports/budget-income-statement.scm
|
||||
src/report/standard-reports/budget.scm
|
||||
src/report/standard-reports/cash-flow.scm
|
||||
src/report/standard-reports/category-barchart.scm
|
||||
src/report/standard-reports/daily-reports.scm
|
||||
src/report/standard-reports/equity-statement.scm
|
||||
src/report/standard-reports/general-journal.scm
|
||||
src/report/standard-reports/general-ledger.scm
|
||||
src/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm
|
||||
src/report/standard-reports/gnucash/report/standard-reports/account-summary.scm
|
||||
src/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm
|
||||
@@ -117,38 +63,15 @@ src/report/standard-reports/gnucash/report/standard-reports/register.scm
|
||||
src/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm
|
||||
src/report/standard-reports/gnucash/report/standard-reports/transaction.scm
|
||||
src/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm
|
||||
src/report/standard-reports/income-statement.scm
|
||||
src/report/standard-reports/net-barchart.scm
|
||||
src/report/standard-reports/net-linechart.scm
|
||||
src/report/standard-reports/portfolio.scm
|
||||
src/report/standard-reports/price-scatter.scm
|
||||
src/report/standard-reports/register.scm
|
||||
src/report/standard-reports/sx-summary.scm
|
||||
src/report/standard-reports/transaction.scm
|
||||
src/report/standard-reports/trial-balance.scm
|
||||
src/report/stylesheets/gnucash/report/stylesheet-easy.scm
|
||||
src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
|
||||
src/report/stylesheets/gnucash/report/stylesheet-footer.scm
|
||||
src/report/stylesheets/gnucash/report/stylesheet-head-or-tail.scm
|
||||
src/report/stylesheets/gnucash/report/stylesheet-plain.scm
|
||||
src/report/stylesheets/stylesheet-easy.scm
|
||||
src/report/stylesheets/stylesheet-fancy.scm
|
||||
src/report/stylesheets/stylesheet-footer.scm
|
||||
src/report/stylesheets/stylesheet-head-or-tail.scm
|
||||
src/report/stylesheets/stylesheet-plain.scm
|
||||
src/report/utility-reports/gnucash/report/hello-world.scm
|
||||
src/report/utility-reports/gnucash/report/view-column.scm
|
||||
src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
|
||||
src/report/utility-reports/hello-world.scm
|
||||
src/report/utility-reports/view-column.scm
|
||||
src/report/utility-reports/welcome-to-gnucash.scm
|
||||
src/scm/build-config.scm
|
||||
src/scm/build-config.scm.in
|
||||
src/scm/command-line.scm
|
||||
src/scm/gnucash/price-quotes.scm
|
||||
src/scm/main-window.scm
|
||||
src/scm/price-quotes.scm
|
||||
src/tax/us/de_DE.scm
|
||||
src/tax/us/gnucash/tax/de_DE.scm
|
||||
src/tax/us/txf-de_DE.scm
|
||||
src/tax/us/txf.scm
|
||||
|
||||
Reference in New Issue
Block a user