Merge from gramps50

jpschewe · Jul 12, 2018 · 257275f · 257275f
2 parents 9e61809 + 60ba912
commit 257275f
Showing 114 changed files with 239,240 additions and 217,131 deletions.
diff --git a/ChangeLog b/ChangeLog
diff --git a/NEWS b/NEWS
@@ -1,3 +1,106 @@
+2018-05-20
+Version 5.0.0-rc1
+* po/fi.po: Update Finnish translation
+* po/ru.po: Update Russian translation
+* po/de.po: update German translation
+* po/cs.po: Update Czech translation
+* po/ca.po: Update Catalan translation
+* Fix merge persons when removed person was the Home (default) person
+* Fix FanChartDesc for typo (copy/paste error). Bug occurs when selected
+  person has more than 4 parents.
+* Fix Tag editor for multiple tag removes
+* In Narweb, Relationship to Center person reversed
+* Fix Citation Tree view for crash after plugin reload
+* Fix 'References' Gramplet for issue when activated during an import 
+* disable Application Menu during import
+* Fix Person/Family/Event view updates on various associated changes
+  * Fix Event view for changes in Main Participants
+  * Fix Person/Event/Place views for update to a Place or enclosing place
+  * Fix Person views to update on changes in birth/death event/place
+* Allow unicode characters in json export
+* Filtering problems in the geography view
+* Crash when looking for a place within an area
+* use same box margin for SVG and PDF.
+* Webcal crashes after Narrative Web site exists
+  multiyear select option problem
+* Catch exceptions when loading recent files
+* Check that backend exists before loading database
+* Disable family tree manager features when a backend is unavailable
+  If the default backend is unavailable, then reset it to bsddb.
+* Enclose tree report image path and file name in braces
+* Crash when selecting an old note, event, media, ...
+  Try to sort on another column.
+* [NewRepositoryEditor]Fix help link
+* [ReorderGrampsID]Fix broken help link
+* Fix FTM for delete tree, followed by close; Title etc. shows old tree
+* Fix Relationship path between filter for silent fail
+* setup: Add configuration flag --no-compress-manpages.
+* glade: Don't strip newlines from builder files.
+* List sort by number for citation confidence level
+* Fix confidence level sort in list views -based on the date-sort code.
+* Fix confidence level tooltip -Stop run on text.
+* Fix error in place displayer when offset is outside valid range
+* Fix places in example.gramps 
+  - Moved Greek places into top level Greece entry & added English names.
+  - Removed Puerto Rico as a country as part of USA
+* Use sgettext for Name Format dialog
+* Enable copying the birth & death fields for relationship view 
+* Allow Copying of text fields for Details tabs in selected views with
+  Details gramplets.
+  - Person Details
+  - Place Details
+  - Repository Details
+* Geography: KML media objects not shown on map. Geography doesn't conform to the
+  relative paths If a place has no coordinates, KML files are not displayed.
+* Fix Fan charts for scrolling/resizing of window; bad rendering
+* Fix Clipboard for HandleErrors during db changes
+* Fix Clipboard for Drop/Edit of Surname group in People Tree view
+* Fix Relationship Graph for extraneous families when using filter
+* Fix export gpkg when media files have fractional timestamps.
+* Remove reference to postgresql in core code
+* Move dbapi-specific code out of DbGeneric
+* Create db _schema_exists method
+* Fix place format option in place report
+  * Use -1 instead of None for default place format
+  * adds New [Place format:] option on the [Report Options (2)] tab
+* [Narrative Web Report] Incorrect heading for stepmother or stepfather
+* Cairodoc: Fix Book TOC and Index numbering and placement
+* Fix Fan Chart(s) so they don't crash when opened as last view
+* Fix Organize Tag editor for exception on 'x' close
+* selectors: Change BaseSelector so that selection is kept during Find/Clear
+* Fix multi-page Graph output to pdf with filenames containg spaces
+* Fix Clipboard for right-click on empty clipboard
+* docs/conf.py, docs/gen/gen_db.rst: Fix ImportError & update API docs year 2018
+  - Fixes ImportError: No module named 'gramps.plugins.db.dummydb'
+  - Update Copyright to 2018
+* Webreport: Privacy problem with the relation to the center person.
+* Fix Report Options when used with empty db
+* debian/changelog: Finalise debian/changelog for beta1 release.
+  Also fix old syntax & trailing whitespace issues
+* debian/rules: Enable extra tests that were failing for alpha3
+* debian/patches: Patch person_rules_test.py To remove hard coded build path
+  from import. Fixes FTBFS due to test failure.
+* debian/NEWS: Delete debian/NEWS file, only really applies in Debian
+* debian/changelog: First beta release of gramps 5.0
+  * Sync debian directory with Debian experimental branch on salsa
+  * Point Vcs URLs at the Gramps Project on Github
+  * Correct spelling in debian/rules, node > nose
+  * Delete gbp.conf, not required as gbp not used to build package
+* debian/gbp.conf: Remove gbp.conf, will not be using gbp to build
+  deb package Avoids updating it for every branch used to build it
+* debian/rules: Fix spelling in d/rules node > nose
+* debian/control: Update Vcs URLs to point at Gramps Github repo
+* debian/NEWS, debian/README.Debian, debian/README.test,
+  debian/compat, debian/control, debian/copyright, debian/gbp.conf,
+  debian/gramps.docs, debian/rules, debian/source/format,
+  debian/source/local-options, debian/tests/control,
+  debian/tests/gramps-import-export, debian/upstream/metadata,
+  debian/watch: Resync debian dir from Debian 5.0 experimental branch
+* debian/changelog: Update debian/changelog with releases since 4.0.3
+* Fix testsuite failure when build happens out of the source tree.
+  Build path was hardcoded in an import in: person_rules_test.py
+* mac/Info.plist, mac/gramps.modules: Release Gramps 5.0.0-beta1 on MacOS.
+
 2017-08-01
 Version 4.2.6
 * Fix HasCitation rule in citation filter sidebar

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+gramps (5.0.0~rc1-1) unstable; urgency=medium
+
+  * First release candidate for Gramps 5.0
+  * Drop patch applied upstream
+  * Update copyrights
+
+ -- Ross Gammon <rossgammon@debian.org>  Sun, 01 Jul 2018 21:57:10 +0200
+
 gramps (5.0.0~beta1-1) unstable; urgency=medium
 
   * First beta release of gramps 5.0

diff --git a/debian/copyright b/debian/copyright
@@ -12,7 +12,7 @@ Copyright: 2000-2007, Alex Roitman
            2001-2017, Free Software Foundation, Inc.
            2001, Graham J. Williams
            2001, Jesper Zedlitz
-           2001-2017, The Gramps Project
+           2001-2018, The Gramps Project
            2002, Gary Shao
            2003-2006, Josiah Carlson
            2004-2006, Eero Tamminen

diff --git a/debian/patches/hardcoded_path_person_rules_test.patch b/debian/patches/hardcoded_path_person_rules_test.patch
diff --git a/debian/patches/series b/debian/patches/series
diff --git a/example/gramps/example.gramps b/example/gramps/example.gramps
@@ -13946,10 +13946,10 @@
       <place hlink="_VDCKQCZX3MEHKVDR8S"/>
       <description>Death of Schultz, Rev.Isaac</description>
     </event>
-    <event handle="_a5af0ed3f64432fb742" change="1284030595" id="E2618">
+    <event handle="_a5af0ed3f64432fb742" change="1520536150" id="E2618">
       <type>Burial</type>
       <dateval val="1818" type="about"/>
-      <place hlink="_4ECKQCWCLO5YIHXEXZ"/>
+      <place hlink="_c965872633b600e8b5ca4d5e6db"/>
       <description>Burial of Schultz, Rev.Isaac</description>
     </event>
     <event handle="_a5af0ed3f9b07f938fb" change="1284030602" id="E2619">
@@ -59404,10 +59404,6 @@
       <ptitle>USA</ptitle>
       <pname value="USA"/>
     </placeobj>
-    <placeobj handle="_4ECKQCWCLO5YIHXEXZ" change="1234373374" id="P1704" type="Country">
-      <ptitle>Puerto Rico</ptitle>
-      <pname value="Puerto Rico"/>
-    </placeobj>
     <placeobj handle="_4FUJQCDFTJJJNKKJMH" change="1234390522" id="P0958" type="City">
       <ptitle>Boone, IA</ptitle>
       <pname value="Boone"/>
@@ -65647,29 +65643,44 @@
       <pname value="St. Lawrence"/>
       <placeref hlink="_c96587263cc11e217c35cc9003f"/>
     </placeobj>
-    <placeobj handle="_d583a5b7ab21971300a" change="1467134436" id="P0435" type="Unknown">
+    <placeobj handle="_d583a5b7ab21971300a" change="1520535854" id="P0435" type="City">
       <ptitle>Δράμα</ptitle>
-      <pname value="Δράμα"/>
+      <pname value="Δράμα" lang="el"/>
+      <pname value="Drama" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
     </placeobj>
-    <placeobj handle="_d583a5b8614206a939d" change="1467134581" id="P0436" type="Unknown">
+    <placeobj handle="_d583a5b8614206a939d" change="1520535887" id="P0436" type="City">
       <ptitle>Θεσσαλονίκη</ptitle>
-      <pname value="Θεσσαλονίκη"/>
+      <pname value="Θεσσαλονίκη" lang="el"/>
+      <pname value="Thessaloniki" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
     </placeobj>
-    <placeobj handle="_d583a5b8a8c1474357d" change="1467135440" id="P0437" type="Unknown">
+    <placeobj handle="_d583a5b8a8c1474357d" change="1520535915" id="P0437" type="City">
       <ptitle>Ιωάννινα</ptitle>
-      <pname value="Ιωάννινα"/>
+      <pname value="Ιωάννινα" lang="el"/>
+      <pname value="Ioannina" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
     </placeobj>
-    <placeobj handle="_d583a5b8b586fb992c8" change="1467135553" id="P0438" type="Unknown">
+    <placeobj handle="_d583a5b8b586fb992c8" change="1520535978" id="P0438" type="City">
       <ptitle>Σιάτιστα</ptitle>
-      <pname value="Σιάτιστα"/>
+      <pname value="Σιάτιστα" lang="el"/>
+      <pname value="Siatista" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
     </placeobj>
-    <placeobj handle="_d583a5b8c380fb024c9" change="1467136002" id="P0439" type="Unknown">
+    <placeobj handle="_d583a5b8c380fb024c9" change="1520535800" id="P0439" type="City">
       <ptitle>Άργος</ptitle>
-      <pname value="Άργος"/>
+      <pname value="Άργος" lang="el"/>
+      <pname value="Argos" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
     </placeobj>
-    <placeobj handle="_d583a5b8d1106cda712" change="1467136077" id="P0440" type="Unknown">
+    <placeobj handle="_d583a5b8d1106cda712" change="1520535947" id="P0440" type="City">
       <ptitle>Μεσολόγγι</ptitle>
-      <pname value="Μεσολόγγι"/>
+      <pname value="Μεσολόγγι" lang="el"/>
+      <pname value="Missolonghi" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
+    </placeobj>
+    <placeobj handle="_dd445e5bfcc17bd1838" change="1520535973" id="P0441" type="Country">
+      <pname value="Greece" lang="en"/>
     </placeobj>
   </places>
   <objects>

diff --git a/gramps/cli/arghandler.py b/gramps/cli/arghandler.py
@@ -554,6 +554,9 @@ def check_db(self, dbpath, force_unlock=False):
         if self.dbman.needs_recovery(dbpath):
             self.__error(_("Database needs recovery, cannot open it!"))
             return False
+        if self.dbman.backend_unavailable(dbpath):
+            self.__error(_("Database backend unavailable, cannot open it!"))
+            return False
         return True
 
     #-------------------------------------------------------------------------

diff --git a/gramps/cli/clidbman.py b/gramps/cli/clidbman.py
@@ -48,8 +48,8 @@
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.config import config
 from gramps.gen.constfunc import win
-from gramps.gen.db.dbconst import DBLOGNAME
-from gramps.gen.db.utils import make_database
+from gramps.gen.db.dbconst import DBLOGNAME, DBBACKEND
+from gramps.gen.db.utils import make_database, get_dbid_from_path
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
 
@@ -68,8 +68,8 @@
 #-------------------------------------------------------------------------
 DEFAULT_TITLE = _("Family Tree")
 NAME_FILE = "name.txt"
-BACKEND_FILE = "database.txt"
 META_NAME = "meta_data.db"
+UNAVAILABLE = _('Unavailable')
 
 #-------------------------------------------------------------------------
 #
@@ -155,11 +155,7 @@ def get_dbdir_summary(self, dirpath, name):
         _("Version")
         _("Schema version")
         """
-        dbid = "bsddb"
-        dbid_path = os.path.join(dirpath, "database.txt")
-        if os.path.isfile(dbid_path):
-            with open(dbid_path) as file:
-                dbid = file.read().strip()
+        dbid = get_dbid_from_path(dirpath)
         if not self.is_locked(dirpath):
             try:
                 database = make_database(dbid)
@@ -183,7 +179,7 @@ def get_backend_name_from_dbid(self, dbid):
         for plugin in pmgr.get_reg_databases():
             if plugin.id == dbid:
                 return plugin._name
-        return _("Unknown")
+        return UNAVAILABLE
 
     def print_family_tree_summaries(self, database_names=None):
         """
@@ -236,11 +232,7 @@ def _populate_cli(self):
             for dpath in os.listdir(dbdir):
                 dirpath = os.path.join(dbdir, dpath)
                 path_name = os.path.join(dirpath, NAME_FILE)
-                try:
-                    with open(os.path.join(dirpath, "database.txt")) as file:
-                        backend_type = file.read()
-                except:
-                    backend_type = "bsddb"
+                backend_type = get_dbid_from_path(dirpath)
                 if os.path.isfile(path_name):
                     with open(path_name, 'r', encoding='utf8') as file:
                         name = file.readline().strip()
@@ -308,7 +300,7 @@ def create_new_db_cli(self, title=None, create_db=True, dbid=None):
                 dbid = config.get('database.backend')
             newdb = make_database(dbid)
 
-        backend_path = os.path.join(new_path, BACKEND_FILE)
+        backend_path = os.path.join(new_path, DBBACKEND)
         with open(backend_path, "w", encoding='utf8') as backend_file:
             backend_file.write(dbid)
 
@@ -402,6 +394,13 @@ def needs_recovery(self, dbpath):
             return True
         return False
 
+    def backend_unavailable(self, dbpath):
+        """
+        Returns True if the database in dirpath has an unavailable backend
+        """
+        dbid = get_dbid_from_path(dbpath)
+        return self.get_backend_name_from_dbid(dbid) == UNAVAILABLE
+
     def remove_database(self, dbname, user=None):
         """
         Deletes a database folder given a pattenr that matches