gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Jun 3 13:27:53 EDT 2018
Updated via https://github.com/Gnucash/gnucash/commit/eb67baba (commit)
via https://github.com/Gnucash/gnucash/commit/69c81565 (commit)
via https://github.com/Gnucash/gnucash/commit/61071b9f (commit)
via https://github.com/Gnucash/gnucash/commit/435b0ace (commit)
via https://github.com/Gnucash/gnucash/commit/52ac539d (commit)
via https://github.com/Gnucash/gnucash/commit/6be7e82b (commit)
via https://github.com/Gnucash/gnucash/commit/b7a0fb6b (commit)
via https://github.com/Gnucash/gnucash/commit/4a4e7a9a (commit)
from https://github.com/Gnucash/gnucash/commit/0064dafb (commit)
commit eb67baba5b18dc4eaba7f29bf306e9091a1ff1d7
Merge: 0064daf 69c8156
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 3 10:26:52 2018 -0700
Merge Keve Mueller's 'xea-fixes' into maint
commit 69c81565682880df118e71143c0103739ab78294
Author: Keve Müller <keve.mueller at gmail.com>
Date: Mon May 28 12:15:31 2018 +0200
Small XML related fixes removing ambiguity improving uniformity
acctchrt_common:
there is a gratituous "i"
acctchrt_full (ja):
the Retirement and Spouse's retirement accounts have two parents
(Investment as well as ROOT), removed ROOT.
uk-vat:
the root account was pasted a line too high 7y ago. all other files have
the header block continuous
diff --git a/data/accounts/ca/acctchrt_common.gnucash-xea b/data/accounts/ca/acctchrt_common.gnucash-xea
index b24bfa4..9e82663 100644
--- a/data/accounts/ca/acctchrt_common.gnucash-xea
+++ b/data/accounts/ca/acctchrt_common.gnucash-xea
@@ -698,7 +698,7 @@
<act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>Recollida de brossa</act:name>i
+ <act:name>Recollida de brossa</act:name>
<act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
diff --git a/data/accounts/en_GB/uk-vat.gnucash-xea b/data/accounts/en_GB/uk-vat.gnucash-xea
index 5603576..31bdb59 100644
--- a/data/accounts/en_GB/uk-vat.gnucash-xea
+++ b/data/accounts/en_GB/uk-vat.gnucash-xea
@@ -40,13 +40,13 @@
<gnc-act:long-description>
A basic set of accounts for tracking VAT in the UK.
</gnc-act:long-description>
+ <gnc-act:start-selected>0</gnc-act:start-selected>
<gnc:account version="2.0.0">
<act:name>Root Account</act:name>
<act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
<act:type>ROOT</act:type>
<act:commodity-scu>0</act:commodity-scu>
</gnc:account>
- <gnc-act:start-selected>0</gnc-act:start-selected>
<gnc:account version="2.0.0">
<act:name>Bank Accounts</act:name>
<act:id type="new">48a242bf9a2d8c947cb41d96493d91da</act:id>
diff --git a/data/accounts/ja/acctchrt_full.gnucash-xea b/data/accounts/ja/acctchrt_full.gnucash-xea
index be7a7b5..535271b 100644
--- a/data/accounts/ja/acctchrt_full.gnucash-xea
+++ b/data/accounts/ja/acctchrt_full.gnucash-xea
@@ -266,7 +266,7 @@
<cmdty:id>USD</cmdty:id>
</act:commodity>
<act:description>個人年金</act:description>
- <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+ <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -277,7 +277,6 @@
<slot:value type="string">ç¢ºå®šæ‹ å‡ºå¹´é‡‘ã€é€€è·é‡‘ã€IRAã€401(k)ãªã©</slot:value>
</slot>
</act:slots>
- <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>債券</act:name>
@@ -332,7 +331,7 @@
<cmdty:id>USD</cmdty:id>
</act:commodity>
<act:description>é…å¶è€…個人年金</act:description>
- <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+ <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
<act:slots>
<slot>
<slot:key>notes</slot:key>
@@ -343,7 +342,6 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>債券</act:name>
commit 61071b9f6d9b912ca6418b1b7018e6a3e6fcc6f2
Merge: 435b0ac 61fe647
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat May 12 14:10:38 2018 +0200
Merge branch 'maint'
commit 435b0ace18d5d7a89b1fef0449b5861474d5910a
Merge: 52ac539 8b3a874
Author: gnucash-dev <gnucash-dev at DellFedora27VM.home>
Date: Fri May 4 10:13:29 2018 -0700
Merge branch 'maint'
commit 52ac539d2334821749241d7e9c8f7bf09116f6cf
Merge: 6be7e82 85c7f7d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri May 4 10:25:38 2018 +0200
Merge branch 'maint' into master
Handle conflict between version number reset and lowercasing all commands
diff --cc CMakeLists.txt
index 2b1e421,e58f9f1..aad63a8
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,28 -1,28 +1,28 @@@
# CMakeLists.txt for GnuCash
- IF (WIN32 OR APPLE)
- CMAKE_MINIMUM_REQUIRED (VERSION 3.3.2)
- ELSE()
- CMAKE_MINIMUM_REQUIRED (VERSION 3.0)
- ENDIF()
+ if (WIN32 OR APPLE)
+ cmake_minimum_required (VERSION 3.3.2)
+ else()
+ cmake_minimum_required (VERSION 3.0)
+ endif()
- PROJECT (gnucash)
+ project (gnucash)
- ENABLE_TESTING()
+ enable_testing()
# Version number of gnucash
- SET (GNUCASH_MAJOR_VERSION 3)
- SET (GNUCASH_MINOR_VERSION 900)
- SET (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}")
- SET (GNUCASH_LATEST_STABLE_SERIES 3.x)
-
- SET (PACKAGE gnucash)
- SET (PACKAGE_NAME GnuCash)
- SET (PACKAGE_VERSION 3.900)
- SET (PACKAGE_BUGREPORT gnucash-devel at gnucash.org)
- SET (PACKAGE_TARNAME ${PACKAGE})
- SET (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
- SET (PACKAGE_URL "")
+ set (GNUCASH_MAJOR_VERSION 3)
-set (GNUCASH_MINOR_VERSION 1)
++set (GNUCASH_MINOR_VERSION 900)
+ set (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}")
+ set (GNUCASH_LATEST_STABLE_SERIES 3.x)
+
+ set (PACKAGE gnucash)
+ set (PACKAGE_NAME GnuCash)
-set (PACKAGE_VERSION 3.1)
++set (PACKAGE_VERSION 3.900)
+ set (PACKAGE_BUGREPORT gnucash-devel at gnucash.org)
+ set (PACKAGE_TARNAME ${PACKAGE})
+ set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
+ set (PACKAGE_URL "")
# Change this in development versions when changing anything that
# affects stored data structures. Reset to zero when bumping version.
commit 6be7e82b9fad874bfb07f07a7fe61c9c902fcddf
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 29 11:50:17 2018 -0700
Restore version in CMakeLists.txt.
Didn't raise a conflict in the merge for some reason.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdb69f7..2b1e421 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,13 +12,13 @@ ENABLE_TESTING()
# Version number of gnucash
SET (GNUCASH_MAJOR_VERSION 3)
-SET (GNUCASH_MINOR_VERSION 1)
+SET (GNUCASH_MINOR_VERSION 900)
SET (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}")
SET (GNUCASH_LATEST_STABLE_SERIES 3.x)
SET (PACKAGE gnucash)
SET (PACKAGE_NAME GnuCash)
-SET (PACKAGE_VERSION 3.1)
+SET (PACKAGE_VERSION 3.900)
SET (PACKAGE_BUGREPORT gnucash-devel at gnucash.org)
SET (PACKAGE_TARNAME ${PACKAGE})
SET (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
commit b7a0fb6bdff0259f832e999e6757c4ce47a53490
Merge: 4a4e7a9 6645d93
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 29 11:48:19 2018 -0700
Merge branch 'maint'
commit 4a4e7a9a7b543f51dbfd37e726bf72c12c4fee4c
Merge: ba3bf37 5e807a0
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 14 16:45:52 2018 -0700
Merge branch 'maint'
Summary of changes:
CMakeLists.txt | 4 ++--
data/accounts/ca/acctchrt_common.gnucash-xea | 2 +-
data/accounts/en_GB/uk-vat.gnucash-xea | 2 +-
data/accounts/ja/acctchrt_full.gnucash-xea | 6 ++----
4 files changed, 6 insertions(+), 8 deletions(-)
More information about the gnucash-changes
mailing list