ready for 4.0.1

svn: r22585

.get_packages_list.py

@@ -0,0 +1,11 @@
+import os
+
+from distutils2.util import find_packages
+
+exclude_list = ('src.gui.glade', 'src.guiQML', 'src.guiQML.views', 'src.images', 'src.plugins',
+                'src.webapp', 'src.webapp.grampsdb', 'src.webapp.grampsdb.templatetags', 'src.webapp.grampsdb.view', )
+
+packages = sorted(find_packages(exclude=exclude_list))
+
+for package in packages:
+    print("            '%s'," % package)

.gitignore

@@ -10,11 +10,3 @@ dist/
 data/tips.xml
 gramps/plugins/lib/holidays.xml
 po/.intltool-merge-cache
-docs/_build/
-
-# Editing
-tags
-*.swp
-
-# Testing
-test/data

COPYING

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+                          675 Mass Ave, Cambridge, MA 02139, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

Gramps.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
@@ -16,9 +15,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+# $Id$
+
 """
 This is a stub to start Gramps. It is provided for the sole reason of being
 able to run gramps from the source directory without setting PYTHONPATH

INSTALL

@@ -72,12 +72,12 @@ from the source directory.
    this for you.
 
  b) You downloaded the Gramps source code to a directory, and want to run it.
-    You can start Gramps from the source code directory with
+    First, copy/rename the gramps/gen/const.py.in to gramps/gen/const.py. 
+    Edit this file if needed. Now you can start Gramps from the source code
+    directory with
 
      python Gramps.py
 
-    See gramps/gen/const.py how Gramps finds his resource directories in case
-    you encounter problems.
 
 Custom directory installation
 -------------------------------------

LICENSE

@@ -3,7 +3,7 @@
 
 
  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

MANIFEST.in

@@ -1,7 +1,6 @@
 include AUTHORS
 include COPYING
 include FAQ
-include Gramps.py
 include INSTALL
 include LICENSE
 include MANIFEST.in
@@ -22,6 +21,7 @@ recursive-include windows *
 
 # Remove files created in the build
 exclude data/tips.xml
+#exclude gramps/gen/const.py
 exclude gramps/plugins/lib/holidays.xml
 exclude po/.intltool-merge-cache
 global-exclude *.pyc

NEWS

@@ -1,252 +1,3 @@
-2015-02-28
-Version 4.1.2, "That's no ordinary rabbit", a maintenance release.
-* Error converting python2 utf-8 strings to python3 str when loading data from database
-* Removing a parent place from a place leaves a dangling reference
-* Error during checking the database
-* Stubborn blank space in database won't be removed, fix removing rows in flat list views
-* Database upgrade fails if default media path is not set
-* Error converting database after upgrade to Gramps 4.1.1
-* Error in a single place within the places section
-* Entries from the add-or-choose selector of Place/Source/Media/Note cannot be dragged
-* Enclosing places tab should work like other similar tabs, new place reference editor
-* Association editor refuses dropped persons
-* Error on opening twice an object from clipboard
-* Incorrect spacing in export assistant file chooser
-* New Event types are saved as a disordered list
-* Always display main participants
-* Place titles can now be generated on-the-fly by a place displayer, default is still to use the place title field
-* GEDCOM import of embedded notes attached to media does not work
-* Crash on Ancestry.com .ged import; consistent.
-* Errors handling owner/submitter information in GEDCOM files.
-Only import researcher from GEDCOM or XML if the family tree was originally empty.
-* GEDCOM export does not export media attached to citations.
-* The fanchart view crashes if max generation is set to 1 away.
-* Sidebar Filters do not match placetypes in new placeview, two new filter rules (HasTitle, HasData)
-* Fix bug when family has no parents
-* Fix bad handle in explanation note for unknown event
-* Some labels now fit better on citations sidebar filter
-* Views in Geography should not always use the last option set by the user
-* Request for keyboard-controlled zoom on Geography view
-* Error geography view - Displaying main menu
-* Configure screen needs a file selector to select directory for "offline mode" files
-* Filter panel on geography view displays improperly
-* Detailed descendant report crashes, bibliography (citations)
-* Can't disable box shadow in SVG descendant tree
-* Descendant tree graphical report, syntax error in svg output
-* Regression: Complete Individual report has partially-untranslated output
-* Events Page in Narrative Report not working
-* Gramps freeze after defining a report style with German cm values
-* Various problems with docgen.TextDoc.add_media_object
-* Report event attribute name is not translated
-* Records Gramplet uses wrong text
-* Closing detached gramplet causes python to crash
-* Cannot reduce size of gramplets detached from a gramplet bar
-* Gramplets don't fill window when detached from dashboard
-* ImageMetadata doesn't show metadata
-* typo on GLib call, used by an addon only
-* Fix error setting gramplet tab label
-* Check for active person in session log gramplet
-* Spurious spaces in CLI List Family Trees, tab delimited output.
-Print statements changed to assemble the whole line before output.
-* Gtk3 warning and custom undoableentry widget, see bugzilla_id 644927
-* Warnings: deprecated Gtk properties and errors loading theme icon.
-Fix: database manager dialog is inconsistent for older gtk+3 versions.
-Warnings: deprecated Gtk properties and errors loading theme icon.
-Fix: Error loading theme icon 'gtk-apply'
-* gramps fails to start with gtk+-3.13.3
-* Places in data.gramps are not in the new Place hierarchy
-* Upgrade the version of some dependencies for Mac OS and Windows OS.
-* Keywords entry in gramps.desktop does not work
-* 'Available Gramps Updates for Addons' window not on top
-* Some text not translatable in context menu fancharts
-* Fix for Unit test
-* date inflections in _datehandler.py, update for Ukrainian, Russian, Croatian
-* Better support for Serbian and Turkish locales
-* New translation: Icelandic
-* Re-enable Turkish support after a major review. Thank you Uğur.
-* Updated translations: cs, de, eo, fi, fr, hr, hu, it, nb, nn, ru, sk, sr, sv, uk, zh_CN
-
-2014-10-24
-Version 4.1.1, "MachineThatGoes...Ping!", a maintenance release.
-* Fix custom place types in the place editor
-* Allow place type combobox to receive focus.
-* Store custom place types in the metadata table
-* Fix place type for places without a main location
-* Fix bug adding parent places to a new place
-* Prevent user creating a cycle in the place hierarchy
-* Avoid infinite loop when place cycle encountered
-* Prevent creation of a place cycle when merging
-* Fix error when no place is selected
-* Check that a place has been selected when saving.
-* Use the standard place selection widget to be consistent.
-* Add a new Top Level place through the Place Reference Editor
-* Fix backlinks code in place report
-* Backlinks for places can now also be places as well as events.
-* Fix check and repair tool for empty placerefs
-* Update location utilities to work with proxies
-* Place report does not run
-* Update place details gramplet
-* Locations are now displayed in a new separate gramplet.
-* Add check for empty handle in gramplets
-* Check DB lock on the recent opened trees list
-* Sidebarfilter gramplet does not fit well into People, Events or Media views
-* Fix new event default type considering existing events with *default* role
-* Rebuild secondary indexes after database upgrade
-* Importing gedcom files containing multibyte UTF-8 characters fails
-* Ahnentafel Report did not use Christening Date if no Birth Date
-* [Narweb:] Missing webpage for media under some circumstances
-* Fix narrated web report with gendex option enabled
-* Tweak to "default" CSS choice for the narrated web report
-* Invalid link for Merge citation Help button
-* Fix 'todo' gramplet
-* Fix path when using drag & drop to add media
-* Limit the number of generations displayed in the ancestor gramplet
-* Export of a subset of the tree failed
-* Fix issues in python3, and bytes-string mismatch with ICU
-* Fix url/uri handling with non-ascii characters under linux and mac
-* Fix name format on graphical reports
-* Fix name format on textual reports
-* Better GUI support for embeded custom attributes list on media object
-* Better keys for search under linux shells (.desktop file)
-* 'Unknown' person in detailed ancestor report can not be translated
-* Translations don't show in many labels
-* Ensure python text domain gets the right encoding.
-* Translate some punctuation marks
-* Various fixes around Geography and osmgpsmap
-* Allow gramplets to be displayed in the dashboard only
-* Update FSF address
-* Add Arabic-script, Islamic-date, Thai script, Married Name and more dates examples
-* Fix on czech date handler for calculated and estimated dates
-* Enhance Serbian date handler to handle Cyrillic dates
-* Simplify Canadian Ash Wednesday holiday
-* Re-enable Esperanto support (for non-Windows OS only) after a large review
-* New translation: Serbian
-* Various fixes in German and Czech
-* Updated translations: ar, cs, de, fi, fr, it, sv
-
-2014-06-15
-Version 4.1.0, the "Name go in book", new major release.
-* GEP 006: Better Place handling
-* New Tags support on Event, Place, Repository, Source, and Citation
-* Source/Citation Data becomes Attributes
-* Add optional support for checksum on Media object
-* New place hierarchies model
-* By default, you can choose navigator modes with a drop down.
-* New Place editor
-* Enhanced MediaReference Editor
-* Some debug tools move to new gramplets
-* Full Python 3 support
-* New functions and widgets related to Place and Media selections
-* Enhancements on to_struct()
-* New methods on Date handlers
-* Better support on translation for inflection rules
-
-2014-05-22
-Version 4.0.4, "Not the comfy chair", a maintenance release.
-* Upgrade to db version 17 fails in Python 3 due to use of iteritems
-* Database corrupted - TypeError: unhashable type: 'list'
-* Fix bug in abandon changes and quit
-* Consistency on create_id method
-* Better handling for non-ASCII characters on database-path
-* Better support for ANSEL characters
-* 'Display as' field in Name Editor reverts to Preferences default
-* Fix vcard date converter
-* View does not communicate over proxy server with autorisation
-* Enhanced Bookmark support
-* Event gramplet filter does not have field for primary role,
-* New HasDayOfWeek filter rule
-* Error when leaving a Gramps type field blank in an editor
-* Fix creation of events with same Gramps-ID
-* Crash when opening details of a person
-* Fix spacing on dialogs for some recent linux distribution
-* date editor and Date class allow e.g. Hebrew dates with newyear (Mar25)
-* Fix crash in fan chart view when scrolling
-* Poor contrast mouse on mouse over
-* Drag and drop only one data into Editors tabs
-* Enhancements and consitency on events gramplet, selector and view
-* Sometimes says 'no data exists for note' when saving
-* Enhanced Citation Editor
-* Do not always raise errors when some plugins are hidden
-* Remove hover selection from embedded lists
-* Fix update of active object after merge
-* Cleanup on warnings and messages around locale directory
-* Media Editor error if Path value was changed to a non existing file
-* Register history objects at startup
-* Avoid dumb encoding error when compiling gpr file
-* Work around Py2Cairo
-* Given Name Cloud Gramplet splits up given names into words
-* Users should not be allowed to edit and delete 'default' style into Style Editor
-* Filename Decoding Error in Graphical Reports
-* Missing closing bracket in Web_Basic-Spruce.css
-* Reorder tool: global name 'gen' is not defined
-* Fix start in East Asian language, force UTF-8 locale on Mac
-* Fix apple_collation
-* Spelling messages at random cause hang for a few seconds.
-* Media viewer list crashes during start if one try to select an entry where the media isn't available
-* 'Available Gramps Updates for Addons' window not on top
-* HTML View fails to load
-* Paper names and Styles values are now translated
-* Sort failure using glocale.sort_key
-* Improve support for collation variants
-* Translate some punctuation marks
-* Fix unit tests and python3 issues
-* Fix Relationships handler for Portuguese
-* Updated translations: ar, cs, de, fi, fr, he, it, lt, nb, nl, pl, pt_BR, ru, sv, uk
-
-2014-01-27
-Version 4.0.3, "It's tomorrow, ask me now", a maintenance release.
-* Fix copy via context menu on Views into Charts Category
-* Fix Tab sequence in Name Editor
-* Fix citations gramplet into media view
-* Fix unhandled exception when inspecting media
-* Fix Citation sidebar filter for python3
-* Fix add link to a "Html code" note
-* Fix message on backup dialog
-* Fix space for selection lists
-* Fix spell with myspell and LANG
-* Fix changes root cursor to hand
-* Recent file parser now gives the file location
-* Fix vertical overflows on check and repair-tool dialog
-* Fix custom key/value (data item) on Database difference report
-* Fix unhandled exception in media exif information under Windows OS
-* Fix person selector in searchfilter under Windows OS
-* Starting Gramps without console is now possible under Windows OS
-* Specific OS handling
-* Common fixes and changes with 3.4.7.
-* Updated translations: ca, de, fi, fr, ru
-
-2013-11-08
-Version 4.0.2, "Welcome to our humble abode", a maintenance release.
-* Citation merge works better for all objects with citations
-* Fixed citations attached to family events
-* Fixed several crashes, hangs, and data corruption scenarios
-* Fixed bugs in determining whether a person is alive, potentially resolving private data leak via export or report
-* Fixed bugs on proxies
-* VCF export/import now support gender information
-* Several bugs with filtering fixed, most filters now support regular expressions
-* Fixed bug in Hebrew calendar date calculations
-* Fix some regressions on GEDCOM file format export and enhancement on CONT/CONC handling
-* Multiple fixes and improvements on gramplets
-* Multiple fixes in the narrated website and web calendar reports
-* Enhancements on date and calendar
-* Some fixes and improvements of the webapp
-* Fix on Database Differences module
-* Enhancements of the citation tree view (Sources category)
-* Improvements on User classes
-* Polish and consistency on Gramps XML export
-* Bump XML schema to 1.5.1
-* Fixed several long-standing problems with report generation
-* Better support of RTL locales (Arabic, Hebrew, etc.) in GUI
-* Better support for selected lang on some reports
-* Better way for displaying missing dependencies
-* Better Spell support
-* Platform-specific fixes for Mac and Windows
-* Add printing functionality for all geography views
-* New date handlers for Arabic and Greek
-* Translation updates (ar, cs, de, fr, lt, nb, nl, ru, sv) and translation-related fixes
-* Repaired and enhanced tests broken since 3.3.x, resulting in overall reliability improvements
-* Add a support for AppData
-
 2013-06-24
 Version 4.0.1, the "What is washing when we are on the verge of a great scientific breakthrough?", a maintenance release.
 * Gtk3: fix menu on person editor and Geography views, convert deprecated code for the indicator in entryfield
@@ -309,7 +60,7 @@ Version 3.4.4 of Gramps! "The Ministry of Silly Names", a maintenance release.
 * Various updated translations: ca, de, fr, it, nl, pt_BR, ru, sv, uk
 
 2013-03-19
-Version 3.4.3 of Gramps! "Whenever life gets you down, Mrs. Brown", a maintenance release.
+Version 3.4.3 of Gramps! "'Whenever life gets you down, Mrs. Brown'", a maintenance release.
 * Sorting (both in the main display window, and particularly in Narrative Web output) now uses PyICU (if that module is available). Inclusion of PyICU is 'strongly recommended'. This resolves a number of bugs particularly related to sorting of non-Latin characters, and sorting on MS Windows and Mac OS X. Some changes have been made in Narrative Web to support contractions for alphabetic indices.
 * The automatic Addon checking and download now works once again (the location used in Gramps 3.4.2 and before had been changed, so the the automatic process was no longer working).
 * Import from Pro-Gen has been updated (at last) to take account of the change to Citations (in 3.4.0)

RELEASE_NOTES

@@ -1,34 +1,67 @@
 $Id$
 
-UNSTABLE Gramps 4.0.0 Beta2 release.
-
-This is a technology preview to allow distribution packagers (and plugin
-writers) to update their scripts (and plugins). This release is not
-production ready, so only use it for testing!
-
-It is recommended that Gramps 4.0.0 be used with python 2.7 since many
-dependent packages do not yet have python 3 versions.  A determined person
-can probably download their sources and build them, however.
-
-The dependencies for Gramps 4.0.0 are _completely_ different than 3.4 due 
-to the switch to GObject introspection, and the removal of autotools. So 
-only install 4.0.0 if you are certain you can obtain the dependencies, 
-see README and INSTALL. 
-
-For linux, in Ubuntu 12.10 you can install 4.0.0, but you will need to 
-compile and install osmgpsmap manually to have the maps working (see 
-http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion#OsmGpsMap_for_Geography ) 
+Gramps 4.0.0, the "The Miracle of Birth", release.
 
+This is a major release, don't upgrade before verifying your system can run it.
+As one of the very first big ($5.4 million), multi-platform (Linux, 
+Windows, Mac OS X, ...), non-Gnome GTK applications, Gramps makes the 
+jump to GTK 3. At the same time python 2.7 and python 3 are supported, 
+though the last must still be considered experimental. Gramps 4.0 
+further uses distutils for distribution, so the install sequence is changed.
+The Gramps developers have tried to make Gramps 4.0 as identical as 
+possible to 3.4, so no data changes are done, nor are there big interface 
+changes. In other words, a .gramps backup file of version 4.0 will open 
+without problems in Gramps 3.4, giving users the possibility to fully try Gramps 4.0.
+Don't be mistaken though, a huge amount of code is new and changed! 
+In order to bring this release we thank the many developers who helped 
+the GTK support on Mac, Windows and Linux forward. Note however, 
+Gramps 4.0 will only work on a top of a very recent sortware stack. 
+A Windows installer will probably not be available soon. In Linux current 
+distro's don't contain the optional packages in the form Gramps 4.0 needs. 
+All this should make clear you can safely keep using version 3.4 and wait 
+for packagers to catch up. People who cannot upgrade the required components 
+but want to use Gramps 4.0 should use it in Virtualbox.
 
 Major enhancements in Gramps 4.0.0:
 
-* GEP 8: code reorganization: http://www.gramps-project.org/wiki/index.php?title=GEPS_008:_File_Organization
+* GEP 8: code reorganization: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_008:_File_Organization
 
-* GEP 26: Replace make: http://www.gramps-project.org/wiki/index.php?title=GEPS_026:_Replace_%27make%27_for_Gramps_build
+* GEP 26: Replace make: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_026:_Replace_%27make%27_for_Gramps_build
 
-* GEP 29: Gtk 3 :http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion
+* GEP 29: Gtk 3: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion
 
-* GEP 31: Python 3 support: http://www.gramps-project.org/wiki/index.php?title=GEPS_031:_Python_3_support
+* GEP 31: Python 3 support: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_031:_Python_3_support
+
+* Completely reworked localization handling
+
+Others changes in Gramps 4.0.0:
+
+* The Gramplet view has been renamed Dashboard. This to avoid an overload 
+of the word Gramplet, and to make it more clear to new users what can 
+be expected in this view
+
+* GTK 3 uses new themes, so users not on Gnome must set a nice GTK 3 
+theme to fully appreciate Gramps 4.0. Install a GTK 3 theme and set it. 
+If Gramps looks ugly, you made an error in this step.
+
+* Different sidebar navigators can be installed
+
+* New Ancestor Fan Chart View and Descendant Fan Chart View, which offer 
+a lot of insight in your family tree on a small space. Direct printing 
+is available from these views.
+
+* All wizards are reworked, so the exporter dialog, help and bug report 
+dialog are different from version 3.4, but offer the same functions
+
+* New To Do Gramplets listing all To Do Notes
+
+* More reports support output in a different language than the interface language
+
+* Narrative Web has been reworked to make it more stable.
 
 More info in the manual 
 http://www.gramps-project.org/wiki/index.php?title=Gramps_4.0_Wiki_Manual_-_What%27s_new%3F

data/css/GeoView.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
 ----------------------------------------------------------------------------

data/css/Web_Basic-Blue.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # $Id: Web_Basic-Blue.css 15540 2010-06-07 16:32:00Z robhealey1 $
 #

data/css/Web_Basic-Spruce.css

@@ -514,7 +514,6 @@ i + div.grampsstylednote p {
 }
 div.grampsstylednote p {
     margin-bottom: 0.5em;
-}
 
 /* Subsection : Family Map
 ----------------------------------------------------- */

data/css/Web_Citations-Outline.css

@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
 ******************************************************

data/css/Web_DropDown-Menus.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # $Id$
 #

data/css/Web_Fade-Menus.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # $Id$
 #

data/css/Web_Horizontal-Menus.css

@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
 ******************************************************

data/css/Web_Vertical-Menus.css

@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
 **************************************************************************************************

data/css/Web_Visually.css

@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
 **************************************************************************************************

data/css/ancestortree.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # $Id: $
 #

data/css/behaviour.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
 **************************************************************************************************

data/css/narrative-maps.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # $Id$
 #

data/gramps.appdata.xml.in

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
-<id type="desktop">gramps.desktop</id>
-<licence>CC0</licence>
-<description>
-<_p>Gramps is a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.</_p>
-<_p>It gives you the ability to record the many details of the life of an individual as well as the complex relationships between various people, places and events.</_p>
-<_p>All of your research is kept organized, searchable and as precise as you need it to be.</_p>
-</description>
-<url type="homepage">http://gramps-project.org/</url>
-<screenshots>
-<screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/5/5f/AppData1.png</screenshot>
-<screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/6/68/AppData2.png</screenshot>
-<screenshot type="default" width="1226" height="740">http://www.gramps-project.org/wiki/images/e/e9/AppData3.png</screenshot>
-<screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/6/68/AppData4.png</screenshot>
-<screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/5/50/AppData5.png</screenshot>
-</screenshots>
-</application>

data/gramps.desktop.in

@@ -8,6 +8,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Office;
-_Keywords=Genealogy;Family History;Research;Family Tree;GEDCOM;
 MimeType=application/x-gramps;application/x-gedcom;application/x-gramps-package;application/x-gramps-xml;
 Exec=gramps %F

data/gramps_canonicalize.xsl

@@ -16,7 +16,7 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
  $Id$

data/grampsxml.dtd

@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2001       Graham J. Williams
 # Copyright (C) 2000-2007  Donald N. Allingham
-# Copyright (C) 2010-2014  Nick Hall
+# Copyright (C) 2010-2011  Nick Hall
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,21 +19,21 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 # $Id$
 -->
 
 <!--
-    This is the Document Type Definition file for v1.6.0
+    This is the Document Type Definition file for v1.5.0
     of the GRAMPS XML genealogy data format.
     Please use the following formal public identifier to identify it:
 
-    "-//GRAMPS//DTD GRAMPS XML V1.6.0//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.5.0//EN"
 
     For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.6.0//EN"
-                "http://gramps-project.org/xml/1.6.0/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.5.0//EN"
+                "http://gramps-project.org/xml/1.5.0/grampsxml.dtd"
                 [...]>
 -->
 
@@ -62,7 +62,7 @@ DATABASE
 <!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
                     citations?, sources?, places?, objects?, repositories?,
                     notes?, bookmarks?, namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.6.0/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.5.0/">
 
 
 <!--    ************************************************************
@@ -215,8 +215,7 @@ EVENT
 <!ELEMENT events (event)*>
 
 <!ELEMENT event (type?, (daterange|datespan|dateval|datestr)?, place?, cause?,
-                 description?, attribute*, noteref*, citationref*, objref*,
-                 tagref*)>
+                 description?, attribute*, noteref*, citationref*, objref*)>
 <!ATTLIST event 
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
@@ -230,7 +229,7 @@ SOURCES
 
 <!ELEMENT sources (source)*>
 <!ELEMENT source (stitle?, sauthor?, spubinfo?, sabbrev?,
-                  noteref*, objref*, srcattribute*, reporef*, tagref*)>
+                  noteref*, objref*, data_item*, reporef*)>
 <!ATTLIST source
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
@@ -248,20 +247,16 @@ PLACES
 
 <!ELEMENT places (placeobj)*>
 
-<!ELEMENT placeobj (ptitle?, code?, alt_name*, coord?, placeref*, location*,
-                    objref*, url*, noteref*, citationref*, tagref*)>
+<!ELEMENT placeobj (ptitle?, coord?, location*, objref*, url*, noteref*,
+                    citationref*)>
 <!ATTLIST placeobj
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
         priv      (0|1) #IMPLIED
         change    CDATA #REQUIRED
-        name      CDATA #REQUIRED
-        type      CDATA #REQUIRED
 >
 
 <!ELEMENT ptitle (#PCDATA)>
-<!ELEMENT code (#PCDATA)>
-<!ELEMENT alt_name (#PCDATA)>
 
 <!ELEMENT coord EMPTY>
 <!ATTLIST coord
@@ -301,7 +296,6 @@ OBJECTS
 <!ATTLIST file
         src         CDATA #REQUIRED
         mime        CDATA #REQUIRED
-        checksum    CDATA #IMPLIED
         description CDATA #REQUIRED
 >
 
@@ -311,7 +305,7 @@ REPOSITORIES
 
 <!ELEMENT repositories (repository)*>
 
-<!ELEMENT repository (rname, type, address*, url*, noteref*, tagref*)>
+<!ELEMENT repository (rname, type, address*, url*, noteref*)>
 <!ATTLIST repository
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
@@ -373,8 +367,8 @@ CITATIONS
 
 <!ELEMENT citations (citation)*>
 
-<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence,
-                    noteref*, objref*, srcattribute*, sourceref, tagref*)>
+<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence?,
+                    noteref*, objref*, data_item*, sourceref)>
 <!ATTLIST citation
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
@@ -499,13 +493,6 @@ SHARED ELEMENTS
         value   CDATA   #REQUIRED
 >
 
-<!ELEMENT srcattribute EMPTY>
-<!ATTLIST srcattribute
-        priv    (0|1)   #IMPLIED
-        type    CDATA   #REQUIRED
-        value   CDATA   #REQUIRED
->
-
 <!ELEMENT place EMPTY>
 <!ATTLIST place hlink IDREF #REQUIRED>
 
@@ -526,11 +513,6 @@ SHARED ELEMENTS
         priv (0|1)  #IMPLIED
 >
 
-<!ELEMENT placeref ((daterange|datespan|dateval|datestr)?)>
-<!ATTLIST placeref
-        hlink IDREF #REQUIRED
->
-
 <!ELEMENT region EMPTY>
 <!ATTLIST region
         corner1_x  CDATA #REQUIRED

data/grampsxml.rng

@@ -4,7 +4,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2005-2007  Donald N. Allingham
-# Copyright (C) 2010-2014  Nick Hall
+# Copyright (C) 2010-2011  Nick Hall
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,20 +18,21 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 # Written by Alex Roitman
 
+# $Id$
 -->
 
 <!--
-  This is the RELAX NG schema for the Gramps XML genealogy data format.
+  This is the RELAX NG schema for the GRAMPS XML genealogy data format.
 -->
 
 
 <grammar
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.6.0/"
+  ns="http://gramps-project.org/xml/1.5.0/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -427,31 +428,26 @@
     <zeroOrMore><element name="objref">
         <ref name="objref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
   </define>
 
   <define name="citation-content">
     <ref name="primary-object"/>
     <optional><ref name="date-content"/></optional>
     <optional><element name="page"><text/></element></optional>
-    <element name="confidence"><text/></element>
+    <optional><element name="confidence"><text/></element></optional>
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
     <zeroOrMore><element name="objref">
         <ref name="objref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="srcattribute">
-        <ref name="srcattribute-content"/>
+    <zeroOrMore><element name="data_item">
+        <attribute name="key"><text/></attribute>
+        <attribute name="value"><text/></attribute>
     </element></zeroOrMore>
     <element name="sourceref">
         <ref name="sourceref-content"/>
     </element>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
   </define>
 
   <define name="source-content">
@@ -466,31 +462,22 @@
     <zeroOrMore><element name="objref">
         <ref name="objref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="srcattribute">
-        <ref name="srcattribute-content"/>
+    <zeroOrMore><element name="data_item">
+        <attribute name="key"><text/></attribute>
+        <attribute name="value"><text/></attribute>
     </element></zeroOrMore>
     <zeroOrMore><element name="reporef">
         <ref name="reporef-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
   </define>
 
   <define name="place-content">
     <ref name="primary-object"/>
-    <attribute name="name"><text/></attribute>
-    <attribute name="type"><text/></attribute>
     <optional><element name="ptitle"><text/></element></optional>
-    <optional><element name="code"><text/></element></optional>
-    <zeroOrMore><element name="alt_name"><text/></element></zeroOrMore>
     <optional><element name="coord">
         <attribute name="long"><text/></attribute>
         <attribute name="lat"><text/></attribute>
     </element></optional>
-    <zeroOrMore><element name="placeref">
-        <ref name="placeref-content"/>
-    </element></zeroOrMore>
     <zeroOrMore><element name="location">
         <optional><attribute name="street"><text/></attribute></optional>
         <optional><attribute name="locality"><text/></attribute></optional>
@@ -514,9 +501,6 @@
     <zeroOrMore><element name="citationref">
         <ref name="citationref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
   </define>
 
   <define name="object-content">
@@ -524,8 +508,7 @@
     <element name="file">
         <attribute name="src"><text/></attribute>
         <attribute name="mime"><text/></attribute>
-        <optional><attribute name="checksum"><text/></attribute></optional>
-        <optional><attribute name="description"><text/></attribute></optional>
+        <attribute name="description"><text/></attribute>
     </element>
     <zeroOrMore><element name="attribute">
         <ref name="attribute-content"/>
@@ -555,9 +538,6 @@
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
   </define>
 
   <define name="bookmark-content">
@@ -700,14 +680,6 @@
         <ref name="noteref-content"/>
     </element></zeroOrMore>
   </define>
-  
-  <define name="srcattribute-content">
-    <optional><attribute name="priv">
-        <ref name="priv-content"/>
-    </attribute></optional>
-    <attribute name="type"><text/></attribute>
-    <attribute name="value"><text/></attribute>
-  </define>
 
   <define name="url-content">
       <optional><attribute name="priv">
@@ -772,11 +744,6 @@
     <text/>
   </define>
 
-  <define name="placeref-content">
-    <attribute name="hlink"><data type="IDREF"/></attribute>
-    <optional><ref name="date-content"/></optional>
-  </define>
-
   <define name="tagref-content">
     <attribute name="hlink"><data type="IDREF"/></attribute>
   </define>

data/man/conf.py

@@ -48,9 +48,9 @@ copyright = u'2012, Gramps project'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.1.0'
+release = '4.0.0-alpha2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

data/man/fr/conf.py

@@ -48,9 +48,9 @@ copyright = u'2012, Gramps project'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = 'trunk'
+release = '4.0.0-alpha2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

data/man/fr/fr.rst

@@ -152,7 +152,7 @@ gramps(1)                @VERSION@               gramps(1)
 
 
 **Opération**
-       Si le premie argument de la ligne de commande ne commence pas par un
+       Si le premier argument de la ligne de commande ne commence pas par un
        tiret (i.e. pas d'instruction), gramps va essayer d'ouvrir la base de
        données avec le nom donné par le premier argument et démarrer une ses‐
        sion interactive, en ignorant le reste de la ligne de commande.

data/man/fr/gramps.1.in

@@ -172,7 +172,7 @@ Imprime le numéro de version pour gramps puis quitte.
 .UNINDENT
 .TP
 .B \fBOpération\fP
-Si le premie argument de la ligne de commande ne commence pas par un
+Si le premier argument de la ligne de commande ne commence pas par un
 tiret (i.e. pas d\(aqinstruction), gramps va essayer d\(aqouvrir la base de
 données avec le nom donné par le premier argument et démarrer une ses‐
 sion interactive, en ignorant le reste de la ligne de commande.

data/man/update_man.py

@@ -19,7 +19,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 """
 update_man.py for command line documentation.

data/templates/admin/base_site.html

@@ -1,10 +1,10 @@
 {% extends "admin/base.html" %}
 {% load i18n %}
 
-{% block title %}{{ title }} | Adminstration{% endblock %}
+{% block title %}{{ title }} | My New Title{% endblock %}
 
 {% block branding %}
-<h1 id="site-name">Administration</h1>
+<h1 id="site-name">My new title for the Admin site!</h1>
 {% endblock %}
 
 {% block nav-global %}
@@ -13,8 +13,9 @@
         .ml {margin:0 10px 10px;display:block;float:left}
     </style>
 
-    <a href="/" clas="ml">Home</a>  
-    <a href="/admin/" class="ml">Administration home</a>
+    <a href="/" clas="ml">Website home</a>  
+    <a href="/admin/" class="ml">Admin home</a>
+    <a href="/admin/members/invoice/" class="ml">Invoices</a>
     <a href="/admin/auth/user/?is_active__exact=0" class="ml">New Users</a>
     <a href="/admin/auth/user/" class="ml">All Users</a>
     {% endif %}

data/templates/gramps-base.html

@@ -390,7 +390,7 @@ function buttonOut(button) {
     <p id="createdate">
       <a href="http://www.gramps-project.org/wiki/index.php?title=Gramps-Connect">Gramps-Connect, version {{gramps_version}}</a>.
     </p>
-    <p id="copyright">&copy; 2009-2013 <a href="http://www.gramps-project.org/">www.gramps-project.org</a> 
+    <p id="copyright">&copy; 2009-2012 <a href="http://www.gramps-project.org/">www.gramps-project.org</a> 
     </p>
     {% endblock %}
    </div>

data/templates/view_event_detail.html

@@ -73,34 +73,6 @@
 </table>
 </div>
 </div>
-
-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/event/%s" event.handle args %}
-    <input type="hidden" id="place_return" name="place_return" value=""/>
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/event/" args %}
-      <input type="hidden" id="place_return" name="place_return" value=""/>
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Event" "/event/add" args %}
-      {% make_button "?Edit Event" "/event/%s/edit" event.handle args %}
-      {% make_button "-Delete Event" "/event/%s/delete" event.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -132,6 +104,32 @@
   </div>
 </div>
 
+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/event/%s" event.handle args %}
+    <input type="hidden" id="place_return" name="place_return" value=""/>
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/event/" args %}
+      <input type="hidden" id="place_return" name="place_return" value=""/>
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Event" "/event/add" args %}
+      {% make_button "?Edit Event" "/event/%s/edit" event.handle args %}
+      {% make_button "-Delete Event" "/event/%s/delete" event.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}
 

data/templates/view_family_detail.html

@@ -131,35 +131,6 @@
 </div>
 </div>
 
-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/family/%s" family.handle args %}
-    <input type="hidden" id="father_return" name="father_return" value=""/>
-    <input type="hidden" id="mother_return" name="mother_return" value=""/>
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/family/" args %}
-      <input type="hidden" id="father_return" name="father_return" value=""/>
-      <input type="hidden" id="mother_return" name="mother_return" value=""/>
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Family" "/family/add" args %}
-      {% make_button "?Edit Family" "/family/%s/edit" family.handle args %}
-      {% make_button "-Delete Family" "/family/%s/delete" family.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -200,6 +171,34 @@
   </div>
 </div>
 
+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/family/%s" family.handle args %}
+    <input type="hidden" id="father_return" name="father_return" value=""/>
+    <input type="hidden" id="mother_return" name="mother_return" value=""/>
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/family/" args %}
+      <input type="hidden" id="father_return" name="father_return" value=""/>
+      <input type="hidden" id="mother_return" name="mother_return" value=""/>
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Family" "/family/add" args %}
+      {% make_button "?Edit Family" "/family/%s/edit" family.handle args %}
+      {% make_button "-Delete Family" "/family/%s/delete" family.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}
 

data/templates/view_media_detail.html

@@ -53,31 +53,6 @@
 </tr>
 </table>
 
-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/media/%s" media.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/media/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Media" "/media/add" args %}
-      {% make_button "?Edit Media" "/media/%s/edit" media.handle args %}
-      {% make_button "-Delete Media" "/media/%s/delete" media.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -105,6 +80,30 @@
   </div>
 </div>
 
+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/media/%s" media.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/media/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Media" "/media/add" args %}
+      {% make_button "?Edit Media" "/media/%s/edit" media.handle args %}
+      {% make_button "-Delete Media" "/media/%s/delete" media.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}
 

data/templates/view_note_detail.html

@@ -70,6 +70,23 @@
 </tr>
 </table>
 
+<!-- Tabs -->
+
+<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
+  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+    <li class="ui-corner-top ui-state-default"><a class="tab-references" href="#tab-references">Reference</a></li>
+    <li class="ui-corner-top ui-state-default"><a class="tab-history" href="#tab-history">History</a></li>
+  </ul>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references" style="background-color: #f4f0ec;"> 
+    {% note_reference_table note user action %}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-history" style="background-color: #f4f0ec;"> 
+    {% history_table note user action %}
+  </div>
+</div>
+</div>
+</div>
+
 {% if user.is_superuser %}
   {% if action == "edit" %}
     {% make_button "Cancel" "/note/%s" note.handle args %}
@@ -94,24 +111,6 @@
   {% endif %}
 {% else %}
 {% endif %}
-
-<!-- Tabs -->
-
-<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
-  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
-    <li class="ui-corner-top ui-state-default"><a class="tab-references" href="#tab-references">Reference</a></li>
-    <li class="ui-corner-top ui-state-default"><a class="tab-history" href="#tab-history">History</a></li>
-  </ul>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references" style="background-color: #f4f0ec;"> 
-    {% note_reference_table note user action %}
-  </div>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-history" style="background-color: #f4f0ec;"> 
-    {% history_table note user action %}
-  </div>
-</div>
-</div>
-</div>
-
 </form>
 {% endblock %}
 

data/templates/view_person_detail.html

@@ -81,38 +81,6 @@
 
 </div>
 </div>
-
-{% if logform %}
-  <table>
-    {{logform.as_table}}
-  </table>
-{% endif %}
-
-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/person/%s" person.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/person/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Person" "/person/add" args %}
-      {% make_button "?Edit Person" "/person/%s/edit" person.handle args %}
-      {% make_button "-Delete Person" "/person/%s/delete" person.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -170,6 +138,36 @@
   </div>
 </div>
 
+{% if logform %}
+  <table>
+    {{logform.as_table}}
+  </table>
+{% endif %}
+
+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/person/%s" person.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/person/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Person" "/person/add" args %}
+      {% make_button "?Edit Person" "/person/%s/edit" person.handle args %}
+      {% make_button "-Delete Person" "/person/%s/delete" person.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}
 

data/templates/view_repository_detail.html

@@ -44,31 +44,6 @@
 </tr>
 </table>
 
-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/repository/%s" repository.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/repository/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px">
-      {% make_button "+Add Repository" "/repository/add" args %}
-      {% make_button "?Edit Repository" "/repository/%s/edit" repository.handle args %}
-      {% make_button "-Delete Repository" "/repository/%s/delete" repository.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->
 
 <div class="ui-tab ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -96,6 +71,30 @@
   </div>
 </div>
 
+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/repository/%s" repository.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/repository/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px">
+      {% make_button "+Add Repository" "/repository/add" args %}
+      {% make_button "?Edit Repository" "/repository/%s/edit" repository.handle args %}
+      {% make_button "-Delete Repository" "/repository/%s/delete" repository.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}
 

data/templates/view_source_detail.html

@@ -49,31 +49,6 @@
 </div>
 </div>
 
-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/source/%s" source.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/source/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Source" "/source/add" args %}
-      {% make_button "?Edit Source" "/source/%s/edit" source.handle args %}
-      {% make_button "-Delete Source" "/source/%s/delete" source.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -105,5 +80,29 @@
   </div>
 </div>
 
+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/source/%s" source.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/source/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Source" "/source/add" args %}
+      {% make_button "?Edit Source" "/source/%s/edit" source.handle args %}
+      {% make_button "-Delete Source" "/source/%s/delete" source.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

data/templates/view_tag_detail.html

@@ -42,6 +42,15 @@
 </tr>
 </table>
 
+<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
+  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+    <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a class="tab-references" href="#tab-references" style=":hover {color: black;}">Reference</a></li>
+  </ul>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-references" style="background-color: #f4f0ec;"> 
+    {% tag_reference_table tag user action %}
+  </div>
+</div>
+
 {% if user.is_superuser %}
   {% if action == "edit" %}
     {% make_button "Cancel" "/tag/%s" tag.handle args %}
@@ -66,16 +75,6 @@
   {% endif %}
 {% else %}
 {% endif %}
-
-<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
-  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
-    <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a class="tab-references" href="#tab-references" style=":hover {color: black;}">Reference</a></li>
-  </ul>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-references" style="background-color: #f4f0ec;"> 
-    {% tag_reference_table tag user action %}
-  </div>
-</div>
-
 </form>
 {% endblock %}
 

debian/README.Debian

@@ -1,18 +1,18 @@
-Gramps for Debian
+gramps for Debian
 ----------------------
 
-This is the Debian package of the 4.0 series of GRAMPS.
+This is the Debian package of GRAMPS.
 
-It is a major update of Gramps to upgrade to GTK 3. A switch was also made to distutils from autotools.
+Regarding the extra dependencies:
 
-The 4.0 series of Gramps is being packaged for the experimental distribution until all dependencies are available
-and it proves stable.
-
-Webkit - gir1.2-webkit-3.0 crashes. Gramps has been patched disable the hidden
-HTML view instead until a solution is found.
-
-Goocanvas2 - The latest Goocanvas is not available in Debian yet. If you miss
-the Graphview plugin, you could try installing the gir1.2-goocanvas-2.0-9 which
-is available in Ubuntu.
-
- -- Ross Gammon <rossgammon@mail.dk>  Sat, 25 Jan 2014 18:00:00 +0100
+Recommends: graphviz
+  Enable creation of graphs 
+Recommends: python-gtkmozembed
+Recommends: python-webkit
+  Enable html rendering for Geographic view and Web view. If both
+  are installed webkit will be used. python-gtkmozembed may be more
+  stable.
+Suggests: ttf-freefont
+  Allows more fonts in reports
+Suggests: python-gtkspell python-enchant
+  allows spell checking in the notes. Both need to be installed.

debian/changelog

@@ -1,21 +1,3 @@
-gramps (4.0.3) precise; urgency=low
-
-  * - 4.0.4-git.f08e40 Experimental stream gramps.git
-
- -- Jérôme Rapinat <romjerome@yahoo.fr>  Tue, 04 Feb 2014 19:49:32 +0100
- 
-gramps (4.0.2) precise; urgency=low
-
-  * experimental .deb for gramps 4.0.2
-  
--- Jérôme Rapinat <romjerome@yahoo.fr>  Wed, 04 Dec 2013 10:23:36 +0100
-
-gramps (4.0.1-2) precise; urgency=low
-
-  * bug 6918: make package more compliant according to Debian policy
-
- -- Jérôme Rapinat <romjerome@yahoo.fr>  Mon, 29 Jul 2013 18:00:11 +0200
-
 gramps (3.3.0-1) lucid; urgency=low
 
   * New upstream release

debian/compat

@@ -1 +1 @@
-9
+7

debian/control

@@ -1,47 +1,17 @@
 Source: gramps
+Maintainer: Gramps Development Team
 Section: python
 Priority: optional
-Maintainer: Ross Gammon <rossgammon@mail.dk>
-Build-Depends-Indep:
- dh-linktree,
- gettext,
- intltool,
- libxml-parser-perl,
- python-all,
- python-setuptools
-Build-Depends:
- debhelper (>= 9.0.0)
-Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/collab-maint/gramps.git
-Vcs-browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gramps.git
+Build-Depends-Indep: libxml-parser-perl, gettext, intltool
+Build-Depends: python-all (>= 2.7.0), debhelper (>= 7.4.3)
+Standards-Version: 3.9.1
 Homepage: http://www.gramps-project.org/
-X-Python-Version: >= 2.7
 
-Package: python-gramps
+Package: gramps
 Architecture: all
-Depends:
- gir1.2-gtk-3.0,
- librsvg2-2,
- python-gi,
- python-gi-cairo,
- xdg-utils,
- ${misc:Depends},
- ${python:Depends}
-Recommends:
- graphviz,
- libosmgpsmap-1.0-0-dev,
- python-pyicu
-Suggests:
- fonts-freefont-ttf,
- gir1.2-gexiv2-0.4,
- gir1.2-gtk-gtkspell3-3.0,
- python-pil,
- rcs
-Description: Genealogical research program
- GRAMPS is an Open Source genealogy program written in Python, using
- the GTK/GNOME interface. It is an extremely flexible program fitting
- the needs for both the amateur genealogist and serious genealogical
- researcher.
- GRAMPS has the ability to import GEDCOM files exported from many
- proprietary genealogy programs and can produce a large number of
- reports in many popular formats.
+Depends: ${misc:Depends}, ${python:Depends}, python-gobject (>= 3.3.2), librsvg2-2
+Recommends: python-pyicu, python-osmgpsmap,  graphviz, xdg-utils
+Suggests: ttf-freefont, python-gtkspell, libgexiv2-1, rcs, python-imaging, python-pygoocanvas
+Description: Gramps (Genealogical Research and Analysis Management
+ Programming System) is a full featured genealogy program supporting
+ a Python based plugin system.

debian/copyright

@@ -1,314 +1,251 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Gramps
-Source: http://gramps-project.org
+This package was originally debianized by Brandon L. Griffith
+<brandon@debian.org> on Sat, 19 May 2001 13:37:24 -0400.
 
-Files: *
-Copyright: 2000-2007, Alex Roitman
-           2000-2002, Bruce J. DeGrasse
-           2000-2008, Donald N. Allingham
-           2000-2007, Martin Hawlisch
-           2001, Andrés Sepúlveda
-           2001, David R. Hampton
-           2001-2013, Free Software Foundation, Inc.
-           2001, Graham J. Williams
-           2001, Jesper Zedlitz
-           2001-2013, The Gramps Project
-           2002, Gary Shao
-           2003-2006, Josiah Carlson
-           2004-2006, Eero Tamminen
-           2004-2013, Julio Sánchez
-           2004, Toshio Kuratomi
-           2005-2011, Serge Noiraud
-           2006-2011, Brian G. Matherly
-           2006, 2008-2011, Kees Bakker           
-           2006-2008, Steve Hall
-           2007-2012, Benny Malengier
-           2007-2012, Douglas S. Blank
-           2007-2012, Gary Burton
-           2007-2011, Jerome Rapinat
-           2007, Johan Gronqvist
-           2007, Robert Cawley
-           2007-2009, Stephane Charette
-           2007, Thom Sturgill
-           2007-2008, Zsolt Foldvari
-           2008-2010, 2012, Craig J. Anderson
-           2008-2009, James Friedmann
-           2008-2009, Jason Simanek
-           2008, Lukasz Rymarczyk
-           2008-2010, Peter G. Landgren
-           2008, 2010, Raphael Ackermann
-           2008-2011, Reinhard Mueller
-           2008, 2011, Robert Cheramy
-           2008-2012, Rob G. Healey
-           2008, Stefan Siegel
-           2008-2010, Stephen George
-           2009-2010, Andrew I Baznikin
-           2009, 2011, The Dojo Foundation
-           2009, Florian Heinle
-           2009, Gerald W. Britton
-           2009, Igal Shapira
-           2009, 2011, John Resig
-           2009-2013, Nick Hall
-           2009, Pander Musubi
-           2009, Robert Ham
-           2009, Swoon on bug tracker
-           2009, Yevgeny Zegzda
-           2010, Gramps
-           2010, Jakim Friant
-           2010, Josip
-           2010, lcc & Robert Jerome
-           2010-2012, Michiel D. Nauta
-           2010-2013, Tim G L Lyons
-           2010-2011, Vlada Perić
-           2011, Adam Stein
-           2011-2012,  Harald Rosemann
-           2011, 2013, Heinz Brinker
-           2011, Helge Herz
-           2011, 2013 John Ralls
-           2011, Matt Keenan
-           2011-2013, Paul Franklin
-           2012, Mathieu MD
-           2012, Nicolas Adenis-Lamarre
-           2013, Fedir Zinchuk
-           2013, Oleh Petrivk
-           2013, Vassilii Khachaturov
-           2013, Zissis Papadopoulos
-License: GPL-2+
+The current Debian maintainer is James A. Treacy <treacy@debian.org>
 
-Files: data/javascript/jquery-1.3.2.min.js
-Copyright: 2009, John Resig
-License: MIT and GPL
+It was downloaded from http://gramps-project.org
 
-Files: data/javascript/jquery-1.7.1.js
-Copyright: 2011, John Resig
-           2011, The Dojo Foundation
-License: BSD and MIT and GPL-2
+Upstream Authors:
+   Donald N. Allingham, Alexander Roitman, Martin Hawlisch, Richard Taylor,
+   Brian Matherly, Tim Waugh, Donald A. Peterson, David Hampton
 
-Files: data/javascript/jquery-ui-1.7.2.custom.min.js
-Copyright: 2009, jQuery UI Team (http://jqueryui.com/about/)
-License: MIT and GPL-2
+========================================================
+Copyright: 2001-2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
-Files: data/javascript/jquery.flexbox*
-Copyright: 2008-2010, Noah Heldman and Fairway Technologies
-License: Ms-PL
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-Files: data/jhtmlarea/Readme.txt
-Copyright: 2009, Chris Pietschmann
-License: Ms-RL
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 
-Files: data/jhtmlarea/scripts/jHtmlArea*
-Copyright: 2009, Chris Pietschmann
-License: Ms-RL
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL
 
-Files: data/jhtmlarea/scripts/jquery-1.3.2*
-Copyright: 2009, John Resig
-           2009, The Dojo Foundation
-License: MIT
+========================================================
+The files in help/C directory are Copyright 2006  Alexander Roitman
+  This documentation is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
-Files: data/jhtmlarea/scripts/jquery-ui-*
-Copyright: 2009, jQuery UI Team (http://jqueryui.com/about)
-License: MIT and GPL
+  This documentation is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-Files: debian/*
-Copyright: 2001-2002, Brandon L. Griffith
-           2002, Alex Roitman
-           2002-2012, James A. Treacy
-           2013, Ross Gammon
-License: GPL-2+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA 02111-1307 USA
 
-Files: gramps/webapp/grampsdb/view/png.py
-Copyright: 2006, Johann C. Rocholl
-           2009, David Jones
-           2006, Nicko van Someren
-License: MIT
+========================================================
+The files in help/fr directory are Copyright 2003-2006  Jerome Rapinat
+  This documentation is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  * Neither the name of the <organization> nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY John Resig ''AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  This documentation is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-License: GPL
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 1 only of the License.
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA 02111-1307 USA
 
-License: GPL-2
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 only of the License.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+========================================================
+The data/grampsxml.dtd file is Copyright 2001 Graham J. William
+                           and Copyright 2000-2006  Donald N. Allingham
 
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-License: Ms-PL
- This license governs use of the accompanying software. If you use the
- software, you accept this license. If you do not accept the license, do not
- use the software.
- .
- 1. Definitions
- .
- The terms "reproduce," "reproduction," "derivative works," and "distribution"
- have the same meaning here as under U.S. copyright law.
- .
- A "contribution" is the original software, or any additions or changes to the
- software.
- .
- A "contributor" is any person that distributes its contribution under this
- license.
- .
- "Licensed patents" are a contributor's patent claims that read directly on its
- contribution.
- .
- 2. Grant of Rights
- .
- (A) Copyright Grant- Subject to the terms of this license, including the
- license conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free copyright license to reproduce its
- contribution, prepare derivative works of its contribution, and distribute its
- contribution or any derivative works that you create.
- .
- (B) Patent Grant- Subject to the terms of this license, including the license
- conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free license under its licensed patents to
- make, have made, use, sell, offer for sale, import, and/or otherwise dispose of
- its contribution in the software or derivative works of the contribution in the
- software.
- .
- 3. Conditions and Limitations
- .
- (A) No Trademark License- This license does not grant you rights to use any
- contributors' name, logo, or trademarks.
- .
- (B) If you bring a patent claim against any contributor over patents that you
- claim are infringed by the software, your patent license from such contributor
- to the software ends automatically.
- .
- (C) If you distribute any portion of the software, you must retain all copyright,
- patent, trademark, and attribution notices that are present in the software.
- .
- (D) If you distribute any portion of the software in source code form, you may do
- so only under this license by including a complete copy of this license with your
- distribution. If you distribute any portion of the software in compiled or object
- code form, you may only do so under a license that complies with this license.
- .
- (E) The software is licensed "as-is." You bear the risk of using it. The
- contributors give no express warranties, guarantees or conditions. You may have
- additional consumer rights under your local laws which this license cannot change.
- To the extent permitted under your local laws, the contributors exclude the
- implied warranties of merchantability, fitness for a particular purpose and
- non-infringement.
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 
-License: Ms-RL
- This license governs use of the accompanying software. If you use the software,
- you accept this license. If you do not accept the license, do not use the software.
- .
- 1. Definitions
- The terms "reproduce," "reproduction," "derivative works," and "distribution" have
- the same meaning here as under U.S. copyright law.
- A "contribution" is the original software, or any additions or changes to the
- software.
- A "contributor" is any person that distributes its contribution under this license.
- "Licensed patents" are a contributor's patent claims that read directly on its
- contribution.
- .
- 2. Grant of Rights
- (A) Copyright Grant- Subject to the terms of this license, including the license
- conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free copyright license to reproduce its
- contribution, prepare derivative works of its contribution, and distribute its
- contribution or any derivative works that you create.
- (B) Patent Grant- Subject to the terms of this license, including the license
- conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free license under its licensed patents to make,
- have made, use, sell, offer for sale, import, and/or otherwise dispose of its
- contribution in the software or derivative works of the contribution in the software.
- .
- 3. Conditions and Limitations
- (A) Reciprocal Grants- For any file you distribute that contains code from the
- software (in source code or binary format), you must provide recipients the source
- code to that file along with a copy of this license, which license will govern that
- file. You may license other files that are entirely your own work and do not contain
- code from the software under any terms you choose.
- (B) No Trademark License- This license does not grant you rights to use any
- contributors' name, logo, or trademarks.
- (C) If you bring a patent claim against any contributor over patents that you claim
- are infringed by the software, your patent license from such contributor to the
- software ends automatically.
- (D) If you distribute any portion of the software, you must retain all copyright,
- patent, trademark, and attribution notices that are present in the software.
- (E) If you distribute any portion of the software in source code form, you may do so
- only under this license by including a complete copy of this license with your
- distribution. If you distribute any portion of the software in compiled or object code
- form, you may only do so under a license that complies with this license.
- (F) The software is licensed "as-is." You bear the risk of using it. The contributors
- give no express warranties, guarantees or conditions. You may have additional consumer
- rights under your local laws which this license cannot change. To the extent permitted
- under your local laws, the contributors exclude the implied warranties of
- merchantability, fitness for a particular purpose and non-infringement.
+========================================================
+The src/TreeTips.py file is Copyright 2004 Toshio Kuratomi
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The src/data/fdl.txt file is Copyright 2000,2001,2002 
+                             Free Software Foundation, Inc.
+                             59 Temple Place, Suite 330,
+                             Boston, MA  02111-1307  USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+
+========================================================
+The file src/docgen/ODFDoc.py file is Copyright 2005-2006 Serge Noiraud
+                                  and Copyright 2005-2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The file src/Mime/_WinMime.py file is Copyright 2006 Brian Matherly
+                                  and Copyright 2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The src/plugins/Ancestors.py file is Copyright 2003 Tim Waugh
+                                 and Copyright 2003-2006  Donald N. Allingham
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The src/plugins/CountAncestors.py file is Copyright 2001  Jesper Zedlitz
+                             and Copyright 2001-2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The files:
+   src/plugins/DetAncestralReport.py
+   src/plugins/DetDescendantReport.py
+are Copyright 2000-2002 Bruce J. DeGrasse
+and Copyright 2002-2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The files:
+   src/date_test.py
+   src/DataViews/_PedigreeView.py
+   src/plugins/DumpGenderStats.py
+   src/plugins/ExportVCalendar.py
+   src/plugins/ExportVCard.py
+   src/plugins/ImportGeneWeb.py
+   src/plugins/ImportvCard.py
+   src/plugins/TestcaseGenerator.py
+   src/plugins/WriteGeneWeb.py
+are Copyright 2001-2006 Martin Hawlisch, Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The files:
+   src/ReportBase/__init__.py
+   src/ReportBase/_Report.py
+are Copyright 2001 David R. Hampton
+and Copyright 2001-2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA

debian/gramps-help.docs

@@ -0,0 +1,2 @@
+NEWS
+README

debian/gramps.dirs

@@ -0,0 +1,2 @@
+usr/share/pixmaps
+usr/share/mime/packages

debian/gramps.docs

@@ -0,0 +1,5 @@
+AUTHORS
+FAQ
+NEWS
+README
+TODO

debian/gramps.files

@@ -0,0 +1,3 @@
+/usr/bin/
+/usr/share/
+/etc

debian/gramps.install

@@ -1,2 +0,0 @@
-# Install icon to the correct place
-debian/gramps.xpm usr/share/pixmaps/

debian/gramps.manpages

@@ -0,0 +1 @@
+data/man/gramps.1.in

debian/gramps.menu

@@ -0,0 +1,3 @@
+?package(gramps):needs="X11" section="Applications/Office"\
+  title="gramps" command="/usr/bin/gramps"\
+  icon="/usr/share/pixmaps/gramps.xpm"

debian/gramps.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+#DEBHELPER#

debian/gramps.postrm

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+#DEBHELPER#

debian/gramps.preinst

@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+# This was added by stdeb to workaround Debian #479852. In a nutshell,
+# pycentral does not remove normally remove its symlinks on an
+# upgrade. Since we're using python-support, however, those symlinks
+# will be broken. This tells python-central to clean up any symlinks.
+if [ -e /var/lib/dpkg/info/gramps.list ] && which pycentral >/dev/null 2>&1
+then
+    pycentral pkgremove gramps
+fi
+
+#DEBHELPER#

debian/gramps.prerm

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+# #DEBHELPER#

debian/patches/0001-Correct-resource-path-in-setup.py.patch

@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 3f702ae..9622d75 100644
---- a/setup.py
-+++ b/setup.py
-@@ -248,7 +248,7 @@ class install(_install):
-                                      'utils', 'resource-path')
-         with io.open(resource_file, 'w', encoding='utf-8',
-                      errors='strict') as fp:
--            path = os.path.abspath(os.path.join(self.install_data, 'share'))
-+            path = '/usr/share'
-             if sys.version_info[0] < 3:
-                 path = unicode(path)
-             fp.write(path)

debian/patches/0002-Disable-HTML-View.patch

@@ -1,22 +0,0 @@
-diff --git a/gramps/plugins/view/htmlrenderer.py b/gramps/plugins/view/htmlrenderer.py
-index c41942a..8f35b16 100644
---- a/gramps/plugins/view/htmlrenderer.py
-+++ b/gramps/plugins/view/htmlrenderer.py
-@@ -122,11 +122,12 @@ user_pref("general.useragent.locale, %(lang)s);
- 
- TOOLKIT = NOWEB
- 
--try:
--    from gi.repository import WebKit as webkit
--    TOOLKIT = WEBKIT
--except:
--    pass
-+#Disable webkit as it is causing a crash in Gramps 4.0.2
-+#try:
-+#    from gi.repository import WebKit as webkit
-+#    TOOLKIT = WEBKIT
-+#except:
-+#    pass
- 
- #no interfaces present, raise Error so that options for GeoView do not show
- if TOOLKIT == NOWEB :

debian/patches/series

@@ -1,2 +0,0 @@
-0001-Correct-resource-path-in-setup.py.patch
-0002-Disable-HTML-View.patch

debian/pycompat

@@ -0,0 +1 @@
+2

debian/rules

@@ -1,37 +1,9 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
+# This file was automatically generated by stdeb 0.6.0+git at
+# Sun, 31 Mar 2013 16:54:38 +0200
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --buildsystem=python_distutils
 
-# Override auto test because upstream do not use the standard unittest discover
-override_dh_auto_test:
 
-# Override of auto_build
-override_dh_auto_build:
-	python setup.py build
-
-# Override of auto_install to remove information from package
-override_dh_auto_install:
-	#dh_auto_install
-	# Remove duplicate copyright information
-	#rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/COPYING
-	# Remove install file as it is not needed by package users
-	#rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/INSTALL
-	# Remove duplicate license information
-	#rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/LICENSE
-	python setup.py install --root=debian/python-gramps --install-layout=deb
-
-# Make css style sheets and png icons non-executable
-override_dh_fixperms:
-	dh_fixperms
-	chmod a-x $(CURDIR)/debian/python-gramps/usr/share/gramps/css/Web_*.css
-	chmod a-x $(CURDIR)/debian/python-gramps/usr/share/gramps/images/22x22/gramps*.png
-	chmod a-x $(CURDIR)/debian/python-gramps/usr/share/gramps/images/16x16/gramps*.png
-
-# Avoid compressing COPYING file so that it can appear in the "About" dialog
-override_dh_compress:
-	dh_compress -X COPYING

debian/source/format

@@ -1 +0,0 @@
-1.0

debian/source/local-options

@@ -1 +0,0 @@
-unapply-patches

debian/substvars

@@ -0,0 +1,2 @@
+shlibs:Depends=libbonobo2-0 (>= 2.4.3), libc6 (>= 2.3.2.ds1-4), libglib2.0-0 (>= 2.2.3), libgnomevfs2-0 (>= 2.4.1), libgnomevfs2-common (>= 2.4.1), liborbit2 (>= 1:2.8.0)
+python:Depends=python (>= 2.3), python (<< 2.4)

debian/watch

@@ -1,4 +0,0 @@
-version=3
-
-opts="dversionmangle=s/\+dfsg//g" \
-http://sf.net/gramps/gramps-(.+)\.tar\.gz

docs/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = GRAMPS_RESOURCES=$$PWD/.. sphinx-build
+SPHINXBUILD   = sphinx-build
 PAPER         =
 
 # Internal variables.

docs/api.rst

@@ -2,12 +2,12 @@
 Code Documentation
 ##################
 
-*Gramps* provides several general API. The most important is the *gen* module, providing access to all code that can be of interest outside of the Gramps program.
+*GRAMPS* provides several general API. The most important is the *gen* module, providing access to all code that can be of interest outside of the GRAMPS program.
 
 The :mod:`gen` Module
 =======================
 
-.. automodule:: gramps.gen
+.. automodule:: gen
 
 Contents:
 
@@ -22,7 +22,7 @@ Contents:
    gen/gen_proxy
    gen/gen_utils
 
-The Gramps Application
+The GRAMPS Application
 ========================
 
 Contents:
@@ -32,12 +32,11 @@ Contents:
 
    corecli/cli
    coregui/gui
-   coregui/gui_widgets
    date
    relationship
    simple
 
-Useful snippets
+Usefull snippets
 ===================
 
 Contents:

docs/conf.py

@@ -18,8 +18,13 @@ import sys, os
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.append(os.path.abspath('.'))
 
-#documentation in root/docs, allow import from root
-sys.path.append(os.path.abspath(os.pardir))
+#documentation in root/docs, allow import from root/src where GRAMPS modules life
+sourcedir = (os.path.abspath('.')).split(os.sep)[:-1] + ['gramps']
+sys.path.append((os.sep).join(sourcedir))
+#make it possible to add plugins --> walk the plugin dir and add to sys.path.append
+for (dirpath, dirnames, filenames) in os.walk((os.sep).join(sourcedir + ['plugins'])):
+    # add the directory to the python search path
+    sys.path.append(dirpath)
 
 # -- General configuration -----------------------------------------------------
 
@@ -48,9 +53,9 @@ copyright = u'2012, The Gramps Project'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.99-trunk'
+release = '4.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -89,8 +94,6 @@ pygments_style = 'sphinx'
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
-# If true, todo entries will be included in the output.
-todo_include_todos = True
 
 # -- Options for HTML output ---------------------------------------------------
 

docs/corecli/cli.rst

@@ -2,12 +2,12 @@
 The :mod:`cli` Module
 ##########################
 
-.. automodule:: gramps.cli
+.. automodule:: cli
 
 *****************************
 Argument Handler
 *****************************
-.. automodule:: gramps.cli.arghandler
+.. automodule:: cli.arghandler
 .. autoclass:: ArgHandler
    :members:
    :undoc-members:
@@ -16,7 +16,7 @@ Argument Handler
 *****************************
 Argument Parser
 *****************************
-.. automodule:: gramps.cli.argparser
+.. automodule:: cli.argparser
 .. autoclass:: ArgParser
    :members:
    :undoc-members:
@@ -25,7 +25,7 @@ Argument Parser
 *****************************
 CLI DB manager
 *****************************
-.. automodule:: gramps.cli.clidbman
+.. automodule:: cli.clidbman
 .. autoclass:: CLIDbManager
    :members:
    :undoc-members:
@@ -34,7 +34,7 @@ CLI DB manager
 *****************************
 Gramps CLI
 *****************************
-.. automodule:: gramps.cli.grampscli
+.. automodule:: cli.grampscli
 .. autoclass:: CLIDbLoader
    :members:
    :undoc-members:
@@ -47,7 +47,7 @@ Gramps CLI
 *****************************
 User
 *****************************
-.. automodule:: gramps.cli.user
+.. automodule:: cli.user
 .. autoclass:: User
    :members:
    :undoc-members:

docs/coregui/gui.rst

@@ -1,6 +1,6 @@
-############################
+##########################
 The :mod:`gramps.gui` Module
-############################
+##########################
 
 .. automodule:: gramps.gui
 
@@ -153,6 +153,23 @@ Filter Editor
    :undoc-members:
    :show-inheritance:
 
+*****************************
+Gramps Bar
+*****************************
+.. automodule:: gramps.gui.grampsbar
+.. autoclass::  DetachedWindow
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass::  GrampsBar
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass::  TabGramplet
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 *****************************
 Navigator
 *****************************
@@ -163,7 +180,7 @@ Navigator
    :show-inheritance:
 
 *****************************
-Plugin Manager
+Plugins Manager
 *****************************
 .. automodule:: gramps.gui.pluginmanager
 .. autoclass::  GuiPluginManager
@@ -198,7 +215,7 @@ Utils
    :show-inheritance:
 
 *****************************
-View Manager
+Views Manager
 *****************************
 .. automodule:: gramps.gui.viewmanager
 .. autoclass:: ViewManager

docs/coregui/gui_widgets.rst

@@ -1,433 +0,0 @@
-####################################
-The :mod:`gramps.gui.widgets` Module
-####################################
-
-.. automodule:: gramps.gui.widgets
-
-*****************************
-Basic Entry
-*****************************
-.. automodule:: gramps.gui.widgets.basicentry
-.. autoclass:: BasicEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Buttons
-*****************************
-.. automodule:: gramps.gui.widgets.buttons
-.. autoclass:: IconButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: WarnButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: SimpleButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: PrivacyButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Date Entry
-*****************************
-.. automodule:: gramps.gui.widgets.dateentry
-.. autoclass:: DateEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Expand Collapse Arrow
-*****************************
-.. automodule:: gramps.gui.widgets.expandcollapsearrow
-.. autoclass:: ExpandCollapseArrow
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Fanchart
-*****************************
-.. automodule:: gramps.gui.widgets.fanchart
-.. autoclass:: FanChartBaseWidget
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: FanChartWidget
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: FanChartGrampsGUI
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Fanchart Descendant
-*****************************
-.. automodule:: gramps.gui.widgets.fanchartdesc
-.. autoclass:: FanChartDescWidget
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: FanChartDescGrampsGUI
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Gramplet Bar
-*****************************
-.. automodule:: gramps.gui.widgets.grampletbar
-.. autoclass::  DetachedWindow
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass::  GrampletBar
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass::  TabGramplet
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Gramplet Pane
-*****************************
-.. automodule:: gramps.gui.widgets.grampletpane
-.. autoclass:: LinkTag
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GrampletWindow
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GuiGramplet
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GridGramplet
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GrampletPane
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: Configuration
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Labels
-*****************************
-.. automodule:: gramps.gui.widgets.labels
-.. autoclass:: LinkLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: EditLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: BasicLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GenderLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MarkupLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: DualMarkupLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Link Box
-*****************************
-.. automodule:: gramps.gui.widgets.linkbox
-.. autoclass:: LinkBox
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Menu Item
-*****************************
-.. automodule:: gramps.gui.widgets.menuitem
-.. autoclass:: MenuItemWithData
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Monitored Widgets
-*****************************
-.. automodule:: gramps.gui.widgets.monitoredwidgets
-.. autoclass:: MonitoredCheckbox
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredEntryIndicator
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredSpinButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredText
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredType
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredDataType
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredMenu
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredStrMenu
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredDate
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredComboSelectedEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredTagList
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Multi Tree View
-*****************************
-.. automodule:: gramps.gui.widgets.multitreeview
-.. autoclass:: MultiTreeView
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Photo
-*****************************
-.. automodule:: gramps.gui.widgets.photo
-.. autoclass:: Photo
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Progress Dialog
-*****************************
-.. automodule:: gramps.gui.widgets.progressdialog
-.. autoclass:: LongOpStatus
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: ProgressMonitor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GtkProgressDialog
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Shortlist ComboEntry
-*****************************
-.. automodule:: gramps.gui.widgets.shortlistcomboentry
-.. autoclass:: ShortlistComboEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Spring Separator
-*****************************
-.. automodule:: gramps.gui.widgets.springseparator
-.. autoclass:: SpringSeparatorToolItem
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: SpringSeparatorAction
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Statusbar
-*****************************
-.. automodule:: gramps.gui.widgets.statusbar
-.. autoclass:: Statusbar
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Styled Text Buffer
-*****************************
-.. automodule:: gramps.gui.widgets.styledtextbuffer
-.. autoclass:: LinkTag
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GtkSpellState
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: StyledTextBuffer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Styled Text Editor
-*****************************
-.. automodule:: gramps.gui.widgets.styledtexteditor
-.. autoclass:: StyledTextEditor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Tool ComboEntry
-*****************************
-.. automodule:: gramps.gui.widgets.toolcomboentry
-.. autoclass:: ToolComboEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Undoable Buffer
-*****************************
-.. automodule:: gramps.gui.widgets.undoablebuffer
-.. autoclass:: Stack
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableInsert
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableDelete
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableBuffer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Undoable Entry
-*****************************
-.. automodule:: gramps.gui.widgets.undoableentry
-.. autoclass:: UndoableInsertEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableDeleteEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Undoable Styled Buffer
-*****************************
-.. automodule:: gramps.gui.widgets.undoablestyledbuffer
-.. autoclass:: UndoableInsertStyled
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableDeleteStyled
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableApplyStyle
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableStyledBuffer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Validated Combo Entry
-*****************************
-.. automodule:: gramps.gui.widgets.validatedcomboentry
-.. autoclass:: ValidatedComboEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Validated Masked Entry
-*****************************
-.. automodule:: gramps.gui.widgets.validatedmaskedentry
-.. autoclass:: FadeOut
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MaskedEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: ValidatableMaskedEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Value Action
-*****************************
-.. automodule:: gramps.gui.widgets.valueaction
-.. autoclass:: ValueAction
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Value Tool Item
-*****************************
-.. automodule:: gramps.gui.widgets.valuetoolitem
-.. autoclass:: ValueToolItem
-   :members:
-   :undoc-members:
-   :show-inheritance:

docs/date.rst

@@ -4,22 +4,15 @@ The :class:`Date Handler` Classes
 
 DateParser
 ====================================
-.. automodule:: gramps.gen.datehandler._dateparser
+.. automodule:: gen.datehandler._dateparser
 .. autoclass:: DateParser
    :members:
    :undoc-members:
    :show-inheritance:
 
-DateStrings
-===========
-.. automodule:: gramps.gen.datehandler._datestrings
-.. autoclass:: DateStrings
-   :members:
-   :show-inheritance:
-
 DateDisplay
 ====================================
-.. automodule:: gramps.gen.datehandler._datedisplay
+.. automodule:: gen.datehandler._datedisplay
 .. autoclass:: DateDisplay
    :members:
    :undoc-members:
@@ -31,14 +24,14 @@ DateDisplay
 
 DateUtils
 ====================================
-.. automodule:: gramps.gen.datehandler._dateutils
+.. automodule:: gen.datehandler._dateutils
    :members:
    :undoc-members:
    :show-inheritance:
 
 DateHandler
 ====================================
-.. automodule:: gramps.gen.datehandler._datehandler
+.. automodule:: gen.datehandler._datehandler
    :members:
    :undoc-members:
    :show-inheritance:
@@ -49,11 +42,11 @@ Localized Date Handlers
 *****************************
 DateHandler (Bulgarian)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_bg.DateParserBG
+.. autoclass:: gen.datehandler._date_bg.DateParserBG
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_bg.DateDisplayBG
+.. autoclass:: gen.datehandler._date_bg.DateDisplayBG
    :members:
    :undoc-members:
    :show-inheritance: 
@@ -61,11 +54,11 @@ DateHandler (Bulgarian)
 *****************************
 DateHandler (Catalan)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_ca.DateParserCA
+.. autoclass:: gen.datehandler._date_ca.DateParserCA
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_ca.DateDisplayCA
+.. autoclass:: gen.datehandler._date_ca.DateDisplayCA
    :members:
    :undoc-members:
    :show-inheritance:
@@ -73,11 +66,11 @@ DateHandler (Catalan)
 *****************************
 DateHandler (Czech)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_cs.DateParserCZ
+.. autoclass:: gen.datehandler._date_cs.DateParserCZ
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_cs.DateDisplayCZ
+.. autoclass:: gen.datehandler._date_cs.DateDisplayCZ
    :members:
    :undoc-members:
    :show-inheritance:
@@ -85,11 +78,11 @@ DateHandler (Czech)
 *****************************
 DateHandler (German)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_de.DateParserDE
+.. autoclass:: gen.datehandler._date_de.DateParserDE
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_de.DateDisplayDE
+.. autoclass:: gen.datehandler._date_de.DateDisplayDE
    :members:
    :undoc-members:
    :show-inheritance:
@@ -97,11 +90,11 @@ DateHandler (German)
 *****************************
 DateHandler (Spanish)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_es.DateParserES
+.. autoclass:: gen.datehandler._date_es.DateParserES
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_es.DateDisplayES
+.. autoclass:: gen.datehandler._date_es.DateDisplayES
    :members:
    :undoc-members:
    :show-inheritance: 
@@ -109,11 +102,11 @@ DateHandler (Spanish)
 *****************************
 DateHandler (Finnish)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_fi.DateParserFI
+.. autoclass:: gen.datehandler._date_fi.DateParserFI
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_fi.DateDisplayFI
+.. autoclass:: gen.datehandler._date_fi.DateDisplayFI
    :members:
    :undoc-members:
    :show-inheritance: 
@@ -121,11 +114,11 @@ DateHandler (Finnish)
 *****************************
 DateHandler (French)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_fr.DateParserFR
+.. autoclass:: gen.datehandler._date_fr.DateParserFR
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_fr.DateDisplayFR
+.. autoclass:: gen.datehandler._date_fr.DateDisplayFR
    :members:
    :undoc-members:
    :show-inheritance: 
@@ -133,11 +126,11 @@ DateHandler (French)
 *****************************
 DateHandler (Croatian)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_hr.DateParserHR
+.. autoclass:: gen.datehandler._date_hr.DateParserHR
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_hr.DateDisplayHR
+.. autoclass:: gen.datehandler._date_hr.DateDisplayHR
    :members:
    :undoc-members:
    :show-inheritance:
@@ -145,11 +138,11 @@ DateHandler (Croatian)
 *****************************
 DateHandler (Italian)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_it.DateParserIT
+.. autoclass:: gen.datehandler._date_it.DateParserIT
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_it.DateDisplayIT
+.. autoclass:: gen.datehandler._date_it.DateDisplayIT
    :members:
    :undoc-members:
    :show-inheritance: 
@@ -157,11 +150,11 @@ DateHandler (Italian)
 *****************************
 DateHandler (Lituanian)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_lt.DateParserLT
+.. autoclass:: gen.datehandler._date_lt.DateParserLT
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_lt.DateDisplayLT
+.. autoclass:: gen.datehandler._date_lt.DateDisplayLT
    :members:
    :undoc-members:
    :show-inheritance:  
@@ -169,11 +162,11 @@ DateHandler (Lituanian)
 *****************************
 DateHandler (Norwegian)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_nb.DateParserNb
+.. autoclass:: gen.datehandler._date_nb.DateParserNb
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_nb.DateDisplayNb
+.. autoclass:: gen.datehandler._date_nb.DateDisplayNb
    :members:
    :undoc-members:
    :show-inheritance: 
@@ -181,11 +174,11 @@ DateHandler (Norwegian)
 *****************************
 DateHandler (Dutch)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_nl.DateParserNL
+.. autoclass:: gen.datehandler._date_nl.DateParserNL
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_nl.DateDisplayNL
+.. autoclass:: gen.datehandler._date_nl.DateDisplayNL
    :members:
    :undoc-members:
    :show-inheritance: 
@@ -193,11 +186,11 @@ DateHandler (Dutch)
 *****************************
 DateHandler (Polish)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_pl.DateParserPL
+.. autoclass:: gen.datehandler._date_pl.DateParserPL
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_pl.DateDisplayPL
+.. autoclass:: gen.datehandler._date_pl.DateDisplayPL
    :members:
    :undoc-members:
    :show-inheritance:
@@ -205,11 +198,11 @@ DateHandler (Polish)
 *****************************
 DateHandler (Portuguese)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_pt.DateParserPT
+.. autoclass:: gen.datehandler._date_pt.DateParserPT
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_pt.DateDisplayPT
+.. autoclass:: gen.datehandler._date_pt.DateDisplayPT
    :members:
    :undoc-members:
    :show-inheritance:
@@ -217,11 +210,11 @@ DateHandler (Portuguese)
 *****************************
 DateHandler (Russian)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_ru.DateParserRU
+.. autoclass:: gen.datehandler._date_ru.DateParserRU
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_ru.DateDisplayRU
+.. autoclass:: gen.datehandler._date_ru.DateDisplayRU
    :members:
    :undoc-members:
    :show-inheritance:
@@ -229,11 +222,11 @@ DateHandler (Russian)
 *****************************
 DateHandler (Slovak)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_sk.DateParserSK
+.. autoclass:: gen.datehandler._date_sk.DateParserSK
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_sk.DateDisplaySK
+.. autoclass:: gen.datehandler._date_sk.DateDisplaySK
    :members:
    :undoc-members:
    :show-inheritance:
@@ -241,11 +234,11 @@ DateHandler (Slovak)
 *****************************
 DateHandler (Slovenian)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_sl.DateParserSL
+.. autoclass:: gen.datehandler._date_sl.DateParserSL
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_sl.DateDisplaySL
+.. autoclass:: gen.datehandler._date_sl.DateDisplaySL
    :members:
    :undoc-members:
    :show-inheritance:
@@ -253,11 +246,11 @@ DateHandler (Slovenian)
 *****************************
 DateHandler (Serbian)
 *****************************
-.. autoclass:: gramps.gen.datehandler._date_sr.DateParserSR
+.. autoclass:: gen.datehandler._date_sr.DateParserSR
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass:: gramps.gen.datehandler._date_sr.DateDisplaySR_latin
+.. autoclass:: gen.datehandler._date_sr.DateDisplaySR_latin
    :members:
    :undoc-members:
    :show-inheritance:
@@ -265,11 +258,11 @@ DateHandler (Serbian)
 *****************************
 DateHandler (Swedish)
 *****************************
-.. autoclass::  gramps.gen.datehandler._date_sv.DateParserSv
+.. autoclass::  gen.datehandler._date_sv.DateParserSv
    :members:
    :undoc-members:
    :show-inheritance:
-.. autoclass::  gramps.gen.datehandler._date_sv.DateDisplaySv
+.. autoclass::  gen.datehandler._date_sv.DateDisplaySv
    :members:
    :undoc-members:
    :show-inheritance:

docs/gen/gen.rst

@@ -1,13 +1,13 @@
-############################
-The :mod:`gramps.gen` Module
-############################
+##########################
+The :mod:`gen` Module
+##########################
 
-.. automodule:: gramps.gen
+.. automodule:: gen
 
 *****************************
 Database State
 *****************************
-.. automodule:: gramps.gen.dbstate
+.. automodule:: gen.dbstate
 .. autoclass::  DbState
    :members:
    :undoc-members:
@@ -16,7 +16,7 @@ Database State
 *****************************
 Errors
 *****************************
-.. automodule:: gramps.gen.errors
+.. automodule:: gen.errors
 .. autoclass::  DatabaseError
    :members:
    :undoc-members:
@@ -35,7 +35,7 @@ TODO
 *****************************
 Recent Files
 *****************************
-.. automodule:: gramps.gen.recentfiles
+.. automodule:: gen.recentfiles
 .. autoclass::  RecentFiles
    :members:
    :undoc-members:
@@ -52,7 +52,7 @@ Recent Files
 *****************************
 Sort
 *****************************
-.. automodule:: gramps.gen.sort
+.. automodule:: gen.sort
 .. autoclass::  Sort
    :members:
    :undoc-members:
@@ -61,7 +61,7 @@ Sort
 *****************************
 Update callback
 *****************************
-.. automodule:: gramps.gen.updatecallback
+.. automodule:: gen.updatecallback
 .. autoclass::  UpdateCallback
    :members:
    :undoc-members:
@@ -70,7 +70,7 @@ Update callback
 *****************************
 User
 *****************************
-.. automodule:: gramps.gen.user
+.. automodule:: gen.user
 .. autoclass:: User
    :members:
    :undoc-members:

docs/gen/gen_db.rst

@@ -1,78 +1,78 @@
-###############################
-The :mod:`gramps.gen.db` Module
-###############################
+##########################
+The :mod:`gen.db` Module
+##########################
 
-.. automodule:: gramps.gen.db
+.. automodule:: gen.db
 
 GrampsDbBase
 ====================================
-.. automodule:: gramps.gen.db.base
+.. automodule:: gen.db.base
    :members:
    :undoc-members:
    :show-inheritance:
 
 GrampsDbRead
 ====================================
-.. automodule:: gramps.gen.db.read
+.. automodule:: gen.db.read
    :members:
    :show-inheritance:
 
 GrampsDbWrite
 ====================================
-.. automodule:: gramps.gen.db.write
+.. automodule:: gen.db.write
    :members:
    :undoc-members:
    :show-inheritance:
 
 GrampsCursor
 ====================================
-.. automodule:: gramps.gen.db.cursor
+.. automodule:: gen.db.cursor
    :members:
    :undoc-members:
    :show-inheritance:
 
 BSDDBtxn
 ====================================
-.. automodule:: gramps.gen.db.bsddbtxn
+.. automodule:: gen.db.bsddbtxn
    :members:
    :undoc-members:
    :show-inheritance:
 
 GrampsDbTxn
 ====================================
-.. automodule:: gramps.gen.db.txn
+.. automodule:: gen.db.txn
    :members:
    :undoc-members:
    :show-inheritance:
 
 GrampsDbUndo
 ====================================
-.. automodule:: gramps.gen.db.undoredo
+.. automodule:: gen.db.undoredo
    :members:
    :undoc-members:
    :show-inheritance:
 
 DbConst
 ====================================
-.. automodule:: gramps.gen.db.dbconst
+.. automodule:: gen.db.dbconst
    :members:
 
 GrampsDbException
 ====================================
-.. automodule:: gramps.gen.db.exceptions
+.. automodule:: gen.db.exceptions
    :members:
    :undoc-members:
    :show-inheritance:
 
 Upgrade utilities
 ====================================
-.. automodule:: gramps.gen.db.upgrade
+.. automodule:: gen.db.upgrade
    :members:
    :undoc-members:
 
 Backup
 ====================================
-.. automodule:: gramps.gen.db.backup
+.. automodule:: gen.db.backup
    :members:
    :undoc-members:
    :show-inheritance:

docs/gen/gen_display.rst

@@ -1,12 +1,12 @@
-####################################
-The :mod:`gramps.gen.display` Module
-####################################
+#############################
+The :mod:`gen.display` Module
+#############################
 
-.. automodule:: gramps.gen.display
+.. automodule:: gen.display
 
 Name
 ====================================
-.. automodule:: gramps.gen.display.name
+.. automodule:: gen.display.name
    :members:
    :undoc-members:
    :show-inheritance:

docs/gen/gen_lib.rst

@@ -1,8 +1,8 @@
-################################
-The :mod:`gramps.gen.lib` Module
-################################
+##########################
+The :mod:`gen.lib` Module
+##########################
 
-.. automodule:: gramps.gen.lib
+.. automodule:: gen.lib
 
 *****************************
 Base objects
@@ -10,60 +10,39 @@ Base objects
 
 BaseObject
 ====================================
-.. automodule:: gramps.gen.lib.baseobj
-.. autoclass:: gramps.gen.lib.baseobj.BaseObject
+.. automodule:: gen.lib.baseobj
+.. autoclass:: gen.lib.baseobj.BaseObject
    :members:
    :undoc-members:
    :show-inheritance:
 
 AddressBase
 ====================================
-.. automodule:: gramps.gen.lib.addressbase
+.. automodule:: gen.lib.addressbase
 .. autoclass:: AddressBase
    :members:
    :undoc-members:
    :show-inheritance:
 
-AttributeRootBase
-====================================
-.. automodule:: gramps.gen.lib.attrbase
-.. autoclass:: AttributeRootBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 AttributeBase
 ====================================
+.. automodule:: gen.lib.attrbase
 .. autoclass:: AttributeBase
    :members:
    :undoc-members:
    :show-inheritance:
 
-SrcAttributeBase
-====================================
-.. autoclass:: SrcAttributeBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 CitationBase
 ====================================
-.. automodule:: gramps.gen.lib.citationbase
+.. automodule:: gen.lib.citationbase
 .. autoclass:: CitationBase
    :members:
    :undoc-members:
    :show-inheritance:
    
-IndirectCitationBase
-====================================
-.. autoclass:: IndirectCitationBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-   
 DateBase
 ====================================
-.. automodule:: gramps.gen.lib.datebase
+.. automodule:: gen.lib.datebase
 .. autoclass:: DateBase
    :members:
    :undoc-members:
@@ -71,7 +50,7 @@ DateBase
    
 LdsOrdBase
 ====================================
-.. automodule:: gramps.gen.lib.ldsordbase
+.. automodule:: gen.lib.ldsordbase
 .. autoclass:: LdsOrdBase
    :members:
    :undoc-members:
@@ -79,7 +58,7 @@ LdsOrdBase
    
 LocationBase
 ====================================
-.. automodule:: gramps.gen.lib.locationbase
+.. automodule:: gen.lib.locationbase
 .. autoclass:: LocationBase
    :members:
    :undoc-members:
@@ -87,7 +66,7 @@ LocationBase
    
 MediaBase
 ====================================
-.. automodule:: gramps.gen.lib.mediabase
+.. automodule:: gen.lib.mediabase
 .. autoclass:: MediaBase
    :members:
    :undoc-members:
@@ -95,7 +74,7 @@ MediaBase
 
 NoteBase
 ====================================
-.. automodule:: gramps.gen.lib.notebase
+.. automodule:: gen.lib.notebase
 .. autoclass:: NoteBase
    :members:
    :undoc-members:
@@ -103,7 +82,7 @@ NoteBase
 
 PlaceBase
 ====================================
-.. automodule:: gramps.gen.lib.placebase
+.. automodule:: gen.lib.placebase
 .. autoclass:: PlaceBase
    :members:
    :undoc-members:
@@ -111,7 +90,7 @@ PlaceBase
 
 PrivacyBase
 ====================================
-.. automodule:: gramps.gen.lib.privacybase
+.. automodule:: gen.lib.privacybase
 .. autoclass:: PrivacyBase
    :members:
    :undoc-members:
@@ -119,7 +98,7 @@ PrivacyBase
    
 RefBase
 ====================================
-.. automodule:: gramps.gen.lib.refbase
+.. automodule:: gen.lib.refbase
 .. autoclass:: RefBase
    :members:
    :undoc-members:
@@ -127,7 +106,7 @@ RefBase
 
 SurnameBase
 ====================================
-.. automodule:: gramps.gen.lib.surnamebase
+.. automodule:: gen.lib.surnamebase
 .. autoclass:: SurnameBase
    :members:
    :undoc-members:
@@ -135,7 +114,7 @@ SurnameBase
       
 TagBase
 ====================================
-.. automodule:: gramps.gen.lib.tagbase
+.. automodule:: gen.lib.tagbase
 .. autoclass:: TagBase
    :members:
    :undoc-members:
@@ -143,7 +122,7 @@ TagBase
 
 UrlBase
 ====================================
-.. automodule:: gramps.gen.lib.urlbase
+.. automodule:: gen.lib.urlbase
 .. autoclass:: UrlBase
    :members:
    :undoc-members:
@@ -155,7 +134,7 @@ Primary objects
 
 BasicPrimaryObject
 ====================================
-.. automodule:: gramps.gen.lib.primaryobj
+.. automodule:: gen.lib.primaryobj
 .. autoclass:: BasicPrimaryObject
    :members:
    :undoc-members:
@@ -170,7 +149,7 @@ PrimaryObject
 
 Person
 ====================================
-.. automodule:: gramps.gen.lib.person
+.. automodule:: gen.lib.person
 .. autoclass:: Person
    :members:
    :undoc-members:
@@ -178,7 +157,7 @@ Person
 
 Family
 ====================================
-.. automodule:: gramps.gen.lib.family
+.. automodule:: gen.lib.family
 .. autoclass:: Family
    :members:
    :undoc-members:
@@ -186,7 +165,7 @@ Family
 
 Event
 ====================================
-.. automodule:: gramps.gen.lib.event
+.. automodule:: gen.lib.event
 .. autoclass:: Event
    :members:
    :undoc-members:
@@ -194,7 +173,7 @@ Event
 
 Place
 ====================================
-.. automodule:: gramps.gen.lib.place
+.. automodule:: gen.lib.place
 .. autoclass:: Place
    :members:
    :undoc-members:
@@ -202,7 +181,7 @@ Place
 
 Source
 ====================================
-.. automodule:: gramps.gen.lib.src
+.. automodule:: gen.lib.src
 .. autoclass:: Source
    :members:
    :undoc-members:
@@ -210,7 +189,7 @@ Source
 
 Citation
 ====================================
-.. automodule:: gramps.gen.lib.citation
+.. automodule:: gen.lib.citation
 .. autoclass:: Citation
    :members:
    :undoc-members:
@@ -218,7 +197,7 @@ Citation
 
 Media Object
 ====================================
-.. automodule:: gramps.gen.lib.mediaobj
+.. automodule:: gen.lib.mediaobj
 .. autoclass:: MediaObject
    :members:
    :undoc-members:
@@ -226,7 +205,7 @@ Media Object
 
 Repository
 ====================================
-.. automodule:: gramps.gen.lib.repo
+.. automodule:: gen.lib.repo
 .. autoclass:: Repository
    :members:
    :undoc-members:
@@ -234,7 +213,7 @@ Repository
 
 Note
 ====================================
-.. automodule:: gramps.gen.lib.note
+.. automodule:: gen.lib.note
 .. autoclass:: Note
    :members:
    :undoc-members:
@@ -246,7 +225,7 @@ Secondary objects
 
 Secondary Object
 ====================================
-.. automodule:: gramps.gen.lib.secondaryobj
+.. automodule:: gen.lib.secondaryobj
 .. autoclass:: SecondaryObject
    :members:
    :undoc-members:
@@ -254,7 +233,7 @@ Secondary Object
 
 Address
 ====================================
-.. automodule:: gramps.gen.lib.address
+.. automodule:: gen.lib.address
 .. autoclass:: Address
    :members:
    :undoc-members:
@@ -262,22 +241,15 @@ Address
 
 Attribute
 ====================================
-.. automodule:: gramps.gen.lib.attribute
+.. automodule:: gen.lib.attribute
 .. autoclass:: Attribute
    :members:
    :undoc-members:
    :show-inheritance:
 
-AttributeRoot
-====================================
-.. autoclass:: AttributeRoot
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 LdsOrd
 ====================================
-.. automodule:: gramps.gen.lib.ldsord
+.. automodule:: gen.lib.ldsord
 .. autoclass:: LdsOrd
    :members:
    :undoc-members:
@@ -285,7 +257,7 @@ LdsOrd
 
 Location
 ====================================
-.. automodule:: gramps.gen.lib.location
+.. automodule:: gen.lib.location
 .. autoclass:: Location
    :members:
    :undoc-members:
@@ -293,7 +265,7 @@ Location
 
 Name
 ====================================
-.. automodule:: gramps.gen.lib.name
+.. automodule:: gen.lib.name
 .. autoclass:: Name
    :members:
    :undoc-members:
@@ -301,7 +273,7 @@ Name
 
 Surname
 ====================================
-.. automodule:: gramps.gen.lib.surname
+.. automodule:: gen.lib.surname
 .. autoclass:: Surname
    :members:
    :undoc-members:
@@ -309,7 +281,7 @@ Surname
 
 Url
 ====================================
-.. automodule:: gramps.gen.lib.url
+.. automodule:: gen.lib.url
 .. autoclass:: Url
    :members:
    :undoc-members:
@@ -321,7 +293,7 @@ Reference objects
 
 ChildRef
 ====================================
-.. automodule:: gramps.gen.lib.childref
+.. automodule:: gen.lib.childref
 .. autoclass:: ChildRef
    :members:
    :undoc-members:
@@ -329,7 +301,7 @@ ChildRef
 
 EventRef
 ====================================
-.. automodule:: gramps.gen.lib.eventref
+.. automodule:: gen.lib.eventref
 .. autoclass:: EventRef
    :members:
    :undoc-members:
@@ -337,7 +309,7 @@ EventRef
 
 MediaRef
 ====================================
-.. automodule:: gramps.gen.lib.mediaref
+.. automodule:: gen.lib.mediaref
 .. autoclass:: MediaRef
    :members:
    :undoc-members:
@@ -345,43 +317,27 @@ MediaRef
 
 PersonRef
 ====================================
-.. automodule:: gramps.gen.lib.personref
+.. automodule:: gen.lib.personref
 .. autoclass:: PersonRef
    :members:
    :undoc-members:
    :show-inheritance:
 
-PlaceRef
-====================================
-.. automodule:: gramps.gen.lib.placeref
-.. autoclass:: PlaceRef
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 RepoRef
 ====================================
-.. automodule:: gramps.gen.lib.reporef
+.. automodule:: gen.lib.reporef
 .. autoclass:: RepoRef
    :members:
    :undoc-members:
    :show-inheritance:
    
 *****************************
-Table objects
+Table object
 *****************************
 
 Table object
 ====================================
-.. automodule:: gramps.gen.lib.tableobj
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Tag
-====================================
-.. automodule:: gramps.gen.lib.tag
-.. autoclass:: Tag
+.. automodule:: gen.lib.tableobj
    :members:
    :undoc-members:
    :show-inheritance:
@@ -389,7 +345,7 @@ Tag
 *****************************
 Date objects
 *****************************
-.. automodule:: gramps.gen.lib.date
+.. automodule:: gen.lib.date
 
 Date
 ====================================
@@ -415,7 +371,7 @@ Text objects
 
 StyledTextTag
 ===================
-.. automodule:: gramps.gen.lib.styledtexttag
+.. automodule:: gen.lib.styledtexttag
 .. autoclass:: StyledTextTag
    :members:
    :undoc-members:
@@ -423,7 +379,7 @@ StyledTextTag
 
 StyledText
 ===========
-.. automodule:: gramps.gen.lib.styledtext
+.. automodule:: gen.lib.styledtext
 .. autoclass:: StyledText
    :members:
    :undoc-members:
@@ -436,7 +392,7 @@ Meta data
 GenderStats
 ============
 
-.. automodule:: gramps.gen.lib.genderstats
+.. automodule:: gen.lib.genderstats
 .. autoclass:: GenderStats
    :members:
    :undoc-members:
@@ -444,7 +400,7 @@ GenderStats
 
 Researcher
 ===========
-.. automodule:: gramps.gen.lib.researcher
+.. automodule:: gen.lib.researcher
 .. autoclass:: Researcher
    :members:
    :undoc-members:
@@ -453,7 +409,7 @@ Researcher
 *****************************
 Type classes
 *****************************
-.. automodule:: gramps.gen.lib.grampstype
+.. automodule:: gen.lib.grampstype
 .. autoclass:: GrampsTypeMeta
    :members:
    :undoc-members:
@@ -468,21 +424,21 @@ GrampsType
 
 AttributeType
 =============
-.. automodule:: gramps.gen.lib.attrtype
+.. automodule:: gen.lib.attrtype
    :members:
    :undoc-members:
    :show-inheritance:
 
 ChildRefType
 =============
-.. automodule:: gramps.gen.lib.childreftype
+.. automodule:: gen.lib.childreftype
    :members:
    :undoc-members:
    :show-inheritance:
 
 EventType
 ===========
-.. automodule:: gramps.gen.lib.eventtype
+.. automodule:: gen.lib.eventtype
 .. autoclass:: EventType
    :members:
    :undoc-members:
@@ -490,77 +446,70 @@ EventType
    
 EventRoleType
 ==============
-.. automodule:: gramps.gen.lib.eventroletype
+.. automodule:: gen.lib.eventroletype
    :members:
    :undoc-members:
    :show-inheritance:
 
 FamilyRelType
 =============
-.. automodule:: gramps.gen.lib.familyreltype
+.. automodule:: gen.lib.familyreltype
    :members:
    :undoc-members:
    :show-inheritance:
 
 MarkerType
 ==========
-.. automodule:: gramps.gen.lib.markertype
+.. automodule:: gen.lib.markertype
    :members:
    :undoc-members:
    :show-inheritance:
 
 NameType
 ===========
-.. automodule:: gramps.gen.lib.nametype
+.. automodule:: gen.lib.nametype
    :members:
    :undoc-members:
    :show-inheritance:
 
 NameOriginType
 ==============
-.. automodule:: gramps.gen.lib.nameorigintype
+.. automodule:: gen.lib.nameorigintype
    :members:
    :undoc-members:
    :show-inheritance:
 
 NoteType
 =========
-.. automodule:: gramps.gen.lib.notetype
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-PlaceType
-=========
-.. automodule:: gramps.gen.lib.placetype
+.. automodule:: gen.lib.notetype
    :members:
    :undoc-members:
    :show-inheritance:
 
 RepositoryType
 ==============
-.. automodule:: gramps.gen.lib.repotype
+.. automodule:: gen.lib.repotype
    :members:
    :undoc-members:
    :show-inheritance:
    
 SourceMediaType
 ================
-.. automodule:: gramps.gen.lib.srcmediatype
+.. automodule:: gen.lib.srcmediatype
    :members:
    :undoc-members:
    :show-inheritance:
 
 StyledTextTagType
 ==================
-.. automodule:: gramps.gen.lib.styledtexttagtype
+.. automodule:: gen.lib.styledtexttagtype
    :members:
    :undoc-members:
    :show-inheritance:
    
 UrlType
 ========
-.. automodule:: gramps.gen.lib.urltype
+.. automodule:: gen.lib.urltype
    :members:
    :undoc-members:
    :show-inheritance:
@@ -570,9 +519,9 @@ Privacy
 *****************************
 
 PrivateSourceNote
-=================
+============
 
-.. automodule:: gramps.gen.lib.privsrcnote
+.. automodule:: gen.lib.privsrcnote
 .. autoclass:: PrivateSourceNote
    :members:
    :undoc-members:

docs/gen/gen_plug.rst

@@ -1,119 +1,119 @@
-#################################
-The :mod:`gramps.gen.plug` Module
-#################################
+############################
+The :mod:`gen.plug` Module
+############################
 
-.. automodule:: gramps.gen.plug
+.. automodule:: gen.plug
 
 Plugin
 ====================================
-.. automodule:: gramps.gen.plug._plugin
+.. automodule:: gen.plug._plugin
    :members:
    :undoc-members:
    :show-inheritance:
 
 BaseManager
 ====================================
-.. automodule:: gramps.gen.plug._manager
+.. automodule:: gen.plug._manager
    :members:
    :undoc-members:
    :show-inheritance:
 
 Export
 ====================================
-.. automodule:: gramps.gen.plug._export
+.. automodule:: gen.plug._export
    :members:
    :undoc-members:
    :show-inheritance:
 
 Gramplet
 ====================================
-.. automodule:: gramps.gen.plug._gramplet
+.. automodule:: gen.plug._gramplet
    :members:
    :undoc-members:
    :show-inheritance:
 
 Import
 ====================================
-.. automodule:: gramps.gen.plug._import
+.. automodule:: gen.plug._import
    :members:
    :undoc-members:
    :show-inheritance:
 
 Menu
 ====================================
-.. automodule:: gramps.gen.plug.menu._menu
+.. automodule:: gen.plug.menu._menu
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._boolean
+.. automodule:: gen.plug.menu._boolean
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._booleanlist
+.. automodule:: gen.plug.menu._booleanlist
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._color
+.. automodule:: gen.plug.menu._color
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._destination
+.. automodule:: gen.plug.menu._destination
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._enumeratedlist
+.. automodule:: gen.plug.menu._enumeratedlist
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._family
+.. automodule:: gen.plug.menu._family
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._filter
+.. automodule:: gen.plug.menu._filter
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._media
+.. automodule:: gen.plug.menu._media
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._note
+.. automodule:: gen.plug.menu._note
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._number
+.. automodule:: gen.plug.menu._number
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._option
+.. automodule:: gen.plug.menu._option
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._person
+.. automodule:: gen.plug.menu._person
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._personlist
+.. automodule:: gen.plug.menu._personlist
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._placelist
+.. automodule:: gen.plug.menu._placelist
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._string
+.. automodule:: gen.plug.menu._string
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._style
+.. automodule:: gen.plug.menu._style
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._surnamecolor
+.. automodule:: gen.plug.menu._surnamecolor
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.menu._text
+.. automodule:: gen.plug.menu._text
    :members:
    :undoc-members:
    :show-inheritance:
@@ -121,38 +121,38 @@ Menu
 *****************************
 Options
 *****************************
-.. automodule:: gramps.gen.plug._options
+.. automodule:: gen.plug._options
    :members:
    :undoc-members:
    :show-inheritance:
 
 Reports
 ====================================
-.. automodule:: gramps.gen.plug.report._options
+.. automodule:: gen.plug.report._options
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.report._bibliography
+.. automodule:: gen.plug.report._bibliography
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.report._constants
+.. automodule:: gen.plug.report._constants
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.report.endnotes
+.. automodule:: gen.plug.report.endnotes
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.report._paper
+.. automodule:: gen.plug.report._paper
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.report._reportbase
+.. automodule:: gen.plug.report._reportbase
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.report.utils
+.. automodule:: gen.plug.report.utils
    :members:
    :undoc-members:
    :show-inheritance:
@@ -160,7 +160,7 @@ Reports
 *****************************
 Docgen
 *****************************
-.. automodule:: gramps.gen.plug._docgenplugin
+.. automodule:: gen.plug._docgenplugin
    :members:
    :undoc-members:
    :show-inheritance:
@@ -168,47 +168,47 @@ Docgen
 *****************************
 Generators
 *****************************
-.. automodule:: gramps.gen.plug.docgen.basedoc
+.. automodule:: gen.plug.docgen.basedoc
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docgen.drawdoc
+.. automodule:: gen.plug.docgen.drawdoc
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docgen.fontscale
+.. automodule:: gen.plug.docgen.fontscale
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docgen.fontstyle
+.. automodule:: gen.plug.docgen.fontstyle
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docgen.graphdoc
+.. automodule:: gen.plug.docgen.graphdoc
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docgen.graphicstyle
+.. automodule:: gen.plug.docgen.graphicstyle
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docgen.paperstyle
+.. automodule:: gen.plug.docgen.paperstyle
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docgen.paragraphstyle
+.. automodule:: gen.plug.docgen.paragraphstyle
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docgen.stylesheet
+.. automodule:: gen.plug.docgen.stylesheet
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docgen.tablestyle
+.. automodule:: gen.plug.docgen.tablestyle
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docgen.textdoc
+.. automodule:: gen.plug.docgen.textdoc
    :members:
    :undoc-members:
    :show-inheritance:
@@ -216,25 +216,25 @@ Generators
 *****************************
 Doc Backend
 *****************************
-.. automodule:: gramps.gen.plug.docbackend.cairobackend
+.. automodule:: gen.plug.docbackend.cairobackend
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.plug.docbackend.docbackend
+.. automodule:: gen.plug.docbackend.docbackend
    :members:
    :undoc-members:
    :show-inheritance:
 
 Register
 ====================================
-.. automodule:: gramps.gen.plug._pluginreg
+.. automodule:: gen.plug._pluginreg
    :members:
    :undoc-members:
    :show-inheritance:
 
 Utils
 ====================================
-.. automodule:: gramps.gen.plug.utils
+.. automodule:: gen.plug.utils
    :members:
    :undoc-members:
    :show-inheritance:

docs/gen/gen_proxy.rst

@@ -1,40 +1,40 @@
-##################################
-The :mod:`gramps.gen.proxy` Module
-##################################
+############################
+The :mod:`gen.proxy` Module
+############################
 
-.. automodule:: gramps.gen.proxy
+.. automodule:: gen.proxy
 
 Proxy Base
 ====================================
-.. automodule:: gramps.gen.proxy.proxybase
+.. automodule:: gen.proxy.proxybase
    :members:
    :undoc-members:
    :show-inheritance:
 
 Filter
 ====================================
-.. automodule:: gramps.gen.proxy.filter
+.. automodule:: gen.proxy.filter
    :members:
    :undoc-members:
    :show-inheritance:
 
 Living
 ====================================
-.. automodule:: gramps.gen.proxy.living
+.. automodule:: gen.proxy.living
    :members:
    :undoc-members:
    :show-inheritance:
 
 Private
 ====================================
-.. automodule:: gramps.gen.proxy.private
+.. automodule:: gen.proxy.private
    :members:
    :undoc-members:
    :show-inheritance:
 
 References
 ====================================
-.. automodule:: gramps.gen.proxy.referencedbyselection
+.. automodule:: gen.proxy.referencedbyselection
    :members:
    :undoc-members:
    :show-inheritance:

docs/gen/gen_utils.rst

@@ -1,101 +1,78 @@
-##################################
-The :mod:`gramps.gen.utils` Module
-##################################
+############################
+The :mod:`gen.utils` Module
+############################
 
-.. automodule:: gramps.gen.utils
+.. automodule:: gen.utils
 
-**********************************
-Utilities
-**********************************
-
-Callback
+Utils
 ====================================
-.. automodule:: gramps.gen.utils.callback
+.. automodule:: gen.utils.alive
    :members:
    :undoc-members:
    :show-inheritance:
-.. automodule:: gramps.gen.utils.callman
+.. automodule:: gen.utils.callback
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.callman
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.cast
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.config
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.configmanager
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.db
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.file
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.id
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.image
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.keyword
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.lds
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.mactrans
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.place
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.string
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.trans
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.unknown
    :members:
    :undoc-members:
    :show-inheritance:
 
-Configuration
-====================================
-.. automodule:: gramps.gen.utils.configmanager
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.config
-   :members:
-   :undoc-members:
-   :show-inheritance:
 
-Database
-====================================
-.. automodule:: gramps.gen.utils.alive
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.db
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.unknown
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-File
-====================================
-.. automodule:: gramps.gen.utils.file
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Image
-====================================
-.. automodule:: gramps.gen.utils.image
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Locale
-====================================
-.. automodule:: gramps.gen.utils.grampslocale
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.maclocale
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.keyword
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Place
-====================================
-.. automodule:: gramps.gen.utils.place
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Other
-====================================
-.. automodule:: gramps.gen.utils.cast
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.id
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.lds
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.string
-   :members:
-   :undoc-members:
-   :show-inheritance:

docs/html.rst

@@ -4,8 +4,8 @@ The :class:`Html` Class
 
 Contents:
 
-.. automodule:: gramps.plugins.lib.libhtml
+.. automodule:: libhtml
 .. autoclass:: Html
    :members:
    :undoc-members:
-   :show-inheritance:
+   :show-inheritance:

docs/relationship.rst

@@ -2,7 +2,7 @@
 The :class:`RelationshipCalculator` Class
 #########################################
 
-.. automodule:: gramps.gen.relationship
+.. automodule:: gen.relationship
 .. autoclass:: RelationshipCalculator
    :members:
    :undoc-members:
@@ -14,119 +14,119 @@ Localized Handlers
 
 Relationship (Czech)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_cs.RelationshipCalculator
+.. autoclass:: rel_cs.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Danish)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_da.RelationshipCalculator
+.. autoclass:: rel_da.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (German)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_de.RelationshipCalculator
+.. autoclass:: rel_de.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Spanish)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_es.RelationshipCalculator
+.. autoclass:: rel_es.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Finnish)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_fi.RelationshipCalculator
+.. autoclass:: rel_fi.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (French)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_fr.RelationshipCalculator
+.. autoclass:: rel_fr.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Croatian)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_hr.RelationshipCalculator
+.. autoclass:: rel_hr.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Hungarian)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_hu.RelationshipCalculator
+.. autoclass:: rel_hu.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Italian)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_it.RelationshipCalculator
+.. autoclass:: rel_it.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Dutch)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_nl.RelationshipCalculator
+.. autoclass:: rel_nl.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Norwegian)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_no.RelationshipCalculator
+.. autoclass:: rel_no.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Polish)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_pl.RelationshipCalculator
+.. autoclass:: rel_pl.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Portuguese)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_pt.RelationshipCalculator
+.. autoclass:: rel_pt.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Russian)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_ru.RelationshipCalculator
+.. autoclass:: rel_ru.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Slovak)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_sk.RelationshipCalculator
+.. autoclass:: rel_sk.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Slovenian)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_sl.RelationshipCalculator
+.. autoclass:: rel_sl.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:
 
 Relationship (Swedish)
 ====================================
-.. autoclass:: gramps.plugins.rel.rel_sv.RelationshipCalculator
+.. autoclass:: rel_sv.RelationshipCalculator
    :members:
    :undoc-members:
    :show-inheritance:

docs/simple.rst

@@ -2,25 +2,25 @@
 The :class:`Simple` Classes
 ###########################
 
-.. automodule:: gramps.gen.simple
+.. automodule:: gen.simple
 
 Simple Access
 ====================================
-.. automodule:: gramps.gen.simple._simpleaccess
+.. automodule:: gen.simple._simpleaccess
    :members:
    :undoc-members:
    :show-inheritance:
 
 Simple Doc
 ====================================
-.. automodule:: gramps.gen.simple._simpledoc
+.. automodule:: gen.simple._simpledoc
    :members:
    :undoc-members:
    :show-inheritance:
 
 Simple Table
 ====================================
-.. automodule:: gramps.gen.simple._simpletable
+.. automodule:: gen.simple._simpletable
    :members:
    :undoc-members:
    :show-inheritance:

docs/update_doc.py

@@ -19,7 +19,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 """
 update_doc.py for Gramps API(s) documentation.