diff --git a/src/DateHandler/Makefile.am b/src/DateHandler/Makefile.am
index 54bc3ae24..5f46c0b5e 100644
--- a/src/DateHandler/Makefile.am
+++ b/src/DateHandler/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/DateHandler level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/DateHandler/_Date_zh.py b/src/DateHandler/_Date_zh.py
index 21b0192f6..d4e6e3f58 100644
--- a/src/DateHandler/_Date_zh.py
+++ b/src/DateHandler/_Date_zh.py
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # DateHandler/_Date_zh.py
-# $Id: _Date_zh.py 18361 2011-10-23 03:13:50Z paul-franklin $
+# $Id$
 #
 
 #-------------------------------------------------------------------------
diff --git a/src/Filters/Makefile.am b/src/Filters/Makefile.am
index 99682e96e..8ead38ffc 100644
--- a/src/Filters/Makefile.am
+++ b/src/Filters/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters level Makefile for Gramps
+# $Id$
 
 SUBDIRS = Rules SideBar
 
diff --git a/src/Filters/Rules/Citation/Makefile.am b/src/Filters/Rules/Citation/Makefile.am
index 2ce89afa3..a1aac815d 100644
--- a/src/Filters/Rules/Citation/Makefile.am
+++ b/src/Filters/Rules/Citation/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/Rules/Citation level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Citation
 
diff --git a/src/Filters/Rules/Event/Makefile.am b/src/Filters/Rules/Event/Makefile.am
index 2223bc098..5474cf1b4 100644
--- a/src/Filters/Rules/Event/Makefile.am
+++ b/src/Filters/Rules/Event/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/Rules/Event level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Event
 
diff --git a/src/Filters/Rules/Family/Makefile.am b/src/Filters/Rules/Family/Makefile.am
index 1856247d6..9ed4c50f1 100644
--- a/src/Filters/Rules/Family/Makefile.am
+++ b/src/Filters/Rules/Family/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/Rules/Family level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Family
 
diff --git a/src/Filters/Rules/Makefile.am b/src/Filters/Rules/Makefile.am
index 7176e895c..935b14ca6 100644
--- a/src/Filters/Rules/Makefile.am
+++ b/src/Filters/Rules/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/Rules level Makefile for Gramps
+# $Id$
 
 SUBDIRS = Person Family Event Place Source MediaObject Repository Note Citation
 
diff --git a/src/Filters/Rules/MediaObject/Makefile.am b/src/Filters/Rules/MediaObject/Makefile.am
index 4e296ccfc..10b2b8cf8 100644
--- a/src/Filters/Rules/MediaObject/Makefile.am
+++ b/src/Filters/Rules/MediaObject/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/Rules/MediaObject level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/MediaObject
 
diff --git a/src/Filters/Rules/Note/Makefile.am b/src/Filters/Rules/Note/Makefile.am
index b30456927..546f1b4ff 100644
--- a/src/Filters/Rules/Note/Makefile.am
+++ b/src/Filters/Rules/Note/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/Rules/Note level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Note
 
diff --git a/src/Filters/Rules/Person/Makefile.am b/src/Filters/Rules/Person/Makefile.am
index 5a3f15a71..e874ae157 100644
--- a/src/Filters/Rules/Person/Makefile.am
+++ b/src/Filters/Rules/Person/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/Rules/Person level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Person
 
diff --git a/src/Filters/Rules/Person/_IsRelatedWith.py b/src/Filters/Rules/Person/_IsRelatedWith.py
index 964d541c4..f870ca750 100644
--- a/src/Filters/Rules/Person/_IsRelatedWith.py
+++ b/src/Filters/Rules/Person/_IsRelatedWith.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: _IsRelatedWith.py 18338 2011-10-16 20:21:22Z paul-franklin $
+# $Id$
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/Filters/Rules/Place/Makefile.am b/src/Filters/Rules/Place/Makefile.am
index c5097315a..a30a5d3c1 100644
--- a/src/Filters/Rules/Place/Makefile.am
+++ b/src/Filters/Rules/Place/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/Rules/Place level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Place
 
diff --git a/src/Filters/Rules/Repository/Makefile.am b/src/Filters/Rules/Repository/Makefile.am
index 62d0ea383..62798fb6c 100644
--- a/src/Filters/Rules/Repository/Makefile.am
+++ b/src/Filters/Rules/Repository/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/Rules/Media level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Repository
 
diff --git a/src/Filters/Rules/Source/Makefile.am b/src/Filters/Rules/Source/Makefile.am
index 707eaeddd..628a8195b 100644
--- a/src/Filters/Rules/Source/Makefile.am
+++ b/src/Filters/Rules/Source/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/Rules/Source level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Source
 
diff --git a/src/Filters/SideBar/Makefile.am b/src/Filters/SideBar/Makefile.am
index 23dc08615..df4339df1 100644
--- a/src/Filters/SideBar/Makefile.am
+++ b/src/Filters/SideBar/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Filters/SideBar level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/SideBar
 
diff --git a/src/GrampsLocale/Makefile.am b/src/GrampsLocale/Makefile.am
index a1deda683..2713c2ac9 100644
--- a/src/GrampsLocale/Makefile.am
+++ b/src/GrampsLocale/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/GrampsLocale level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/GrampsLogger/Makefile.am b/src/GrampsLogger/Makefile.am
index 75399fc48..f1bd132b9 100644
--- a/src/GrampsLogger/Makefile.am
+++ b/src/GrampsLogger/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/GrampsLogger level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/Merge/Makefile.am b/src/Merge/Makefile.am
index 20462d8ad..c33e42be7 100644
--- a/src/Merge/Makefile.am
+++ b/src/Merge/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/RelLib level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/Simple/Makefile.am b/src/Simple/Makefile.am
index 4987a1feb..dbf9e5621 100644
--- a/src/Simple/Makefile.am
+++ b/src/Simple/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Report level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/Simple
 
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index d1306bf62..4efc0385a 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/DataViews level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/cli/plug/Makefile.am b/src/cli/plug/Makefile.am
index 144639a5e..66da2cd9c 100644
--- a/src/cli/plug/Makefile.am
+++ b/src/cli/plug/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/cli/plug level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/cli/user.py b/src/cli/user.py
index 2c3e14931..754e83f30 100644
--- a/src/cli/user.py
+++ b/src/cli/user.py
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: user.py 18393 2011-10-31 16:46:50Z paul-franklin $
+# $Id$
 #
 
 """
diff --git a/src/docgen/Makefile.am b/src/docgen/Makefile.am
index fdd9d8d73..d106caf0f 100644
--- a/src/docgen/Makefile.am
+++ b/src/docgen/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/docgen level Makefile for Gramps
+# $Id$
 # Use GNU make's ':=' syntax for nice wildcard use.
 # If not using GNU make, then list all .py files individually
 
diff --git a/src/gen/Makefile.am b/src/gen/Makefile.am
index cd88ac96d..61b91bb76 100644
--- a/src/gen/Makefile.am
+++ b/src/gen/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/RelLib level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gen/db/Makefile.am b/src/gen/db/Makefile.am
index e204e4a11..fb1f775b2 100644
--- a/src/gen/db/Makefile.am
+++ b/src/gen/db/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/RelLib level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gen/display/Makefile.am b/src/gen/display/Makefile.am
index 92d41c255..24366b2cf 100644
--- a/src/gen/display/Makefile.am
+++ b/src/gen/display/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gen/display level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gen/lib/Makefile.am b/src/gen/lib/Makefile.am
index e93115a7f..1480e385e 100644
--- a/src/gen/lib/Makefile.am
+++ b/src/gen/lib/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gen/lib level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gen/mime/Makefile.am b/src/gen/mime/Makefile.am
index 73cedab21..f3130c26a 100644
--- a/src/gen/mime/Makefile.am
+++ b/src/gen/mime/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gen/mime level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gen/plug/Makefile.am b/src/gen/plug/Makefile.am
index a31a1af46..ac29546bd 100644
--- a/src/gen/plug/Makefile.am
+++ b/src/gen/plug/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gen/plug level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gen/plug/docbackend/Makefile.am b/src/gen/plug/docbackend/Makefile.am
index 0945023ae..17e1bc118 100644
--- a/src/gen/plug/docbackend/Makefile.am
+++ b/src/gen/plug/docbackend/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gen/plug/menu level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gen/plug/docgen/Makefile.am b/src/gen/plug/docgen/Makefile.am
index 5557d5687..ba0360b52 100644
--- a/src/gen/plug/docgen/Makefile.am
+++ b/src/gen/plug/docgen/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gen/plug/menu level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gen/plug/menu/Makefile.am b/src/gen/plug/menu/Makefile.am
index 80837d9aa..2adb63283 100644
--- a/src/gen/plug/menu/Makefile.am
+++ b/src/gen/plug/menu/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gen/plug/menu level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gen/plug/report/Makefile.am b/src/gen/plug/report/Makefile.am
index 359f24010..a02064a40 100644
--- a/src/gen/plug/report/Makefile.am
+++ b/src/gen/plug/report/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gen/plug/report level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/gen/plug/report
 
diff --git a/src/gen/proxy/Makefile.am b/src/gen/proxy/Makefile.am
index 49aef7fca..2b1770710 100644
--- a/src/gen/proxy/Makefile.am
+++ b/src/gen/proxy/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/RelLib level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gen/user.py b/src/gen/user.py
index 1956ab9a4..f1965bf49 100644
--- a/src/gen/user.py
+++ b/src/gen/user.py
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: user.py 18393 2011-10-31 16:46:50Z paul-franklin $
+# $Id$
 #
 
 """
diff --git a/src/gen/utils/Makefile.am b/src/gen/utils/Makefile.am
index 2c8773d08..4c1146963 100644
--- a/src/gen/utils/Makefile.am
+++ b/src/gen/utils/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/RelLib level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index f845139b7..b06381198 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/RelLib level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gui/editors/Makefile.am b/src/gui/editors/Makefile.am
index fb3175a3f..737250814 100644
--- a/src/gui/editors/Makefile.am
+++ b/src/gui/editors/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gui/editors level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gui/editors/displaytabs/Makefile.am b/src/gui/editors/displaytabs/Makefile.am
index c71d81eab..f97b98525 100644
--- a/src/gui/editors/displaytabs/Makefile.am
+++ b/src/gui/editors/displaytabs/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gui/editors/displaytabs level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/gui/editors/displaytabs
 
diff --git a/src/gui/plug/Makefile.am b/src/gui/plug/Makefile.am
index 263388e90..0b4d4bf73 100644
--- a/src/gui/plug/Makefile.am
+++ b/src/gui/plug/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/PluginUtils level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gui/plug/report/Makefile.am b/src/gui/plug/report/Makefile.am
index 72cd0e6cc..39896b7a6 100644
--- a/src/gui/plug/report/Makefile.am
+++ b/src/gui/plug/report/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gui/plug/report level Makefile for Gramps
+# $Id$
 
 pkgdatadir = $(datadir)/@PACKAGE@/gui/plug/report
 
diff --git a/src/gui/selectors/Makefile.am b/src/gui/selectors/Makefile.am
index 0c5c666ff..bb8df8b4e 100644
--- a/src/gui/selectors/Makefile.am
+++ b/src/gui/selectors/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/Selectors level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gui/user.py b/src/gui/user.py
index cbd1dabc2..8a0083895 100644
--- a/src/gui/user.py
+++ b/src/gui/user.py
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: user.py 18393 2011-10-31 16:46:50Z paul-franklin $
+# $Id$
 #
 
 """
diff --git a/src/gui/views/Makefile.am b/src/gui/views/Makefile.am
index 3d7fac2c7..826ffafb8 100644
--- a/src/gui/views/Makefile.am
+++ b/src/gui/views/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/DataViews level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gui/views/treemodels/Makefile.am b/src/gui/views/treemodels/Makefile.am
index 413d96b35..12c93f1c6 100644
--- a/src/gui/views/treemodels/Makefile.am
+++ b/src/gui/views/treemodels/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/DataViews level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gui/widgets/Makefile.am b/src/gui/widgets/Makefile.am
index fadc34f90..f0b66b3ed 100644
--- a/src/gui/widgets/Makefile.am
+++ b/src/gui/widgets/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/gui/widgets level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/gui/widgets/basicentry.py b/src/gui/widgets/basicentry.py
index 1c9ecb7a6..7d5119ca5 100644
--- a/src/gui/widgets/basicentry.py
+++ b/src/gui/widgets/basicentry.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: basicentry.py 17965 2011-07-25 22:47:57Z nick-h $
+# $Id$
 
 __all__ = ["BasicEntry"]
 
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index bbd99bce3..77864903f 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/plugins level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/plugins/docgen/Makefile.am b/src/plugins/docgen/Makefile.am
index da0f1b9cf..2c4eae819 100644
--- a/src/plugins/docgen/Makefile.am
+++ b/src/plugins/docgen/Makefile.am
@@ -1,39 +1,40 @@
-# This is the src/plugins/docgen level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/docgen
-
-pkgdata_PYTHON = \
-	AsciiDoc.py \
-	docgen.gpr.py\
-	GtkPrint.py \
-	HtmlDoc.py \
-	LaTeXDoc.py \
-	ODFDoc.py \
-	PdfDoc.py \
-	PSDrawDoc.py \
-	RTFDoc.py \
-	SvgDrawDoc.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/docgen
-pkgpythondir = @pkgpythondir@/plugins/docgen
-
-GLADEFILES = \
-	gtkprint.glade 
-
-GRAPHICS = 
-
-DATAFILES = 
-
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/docgen level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/docgen
+
+pkgdata_PYTHON = \
+	AsciiDoc.py \
+	docgen.gpr.py\
+	GtkPrint.py \
+	HtmlDoc.py \
+	LaTeXDoc.py \
+	ODFDoc.py \
+	PdfDoc.py \
+	PSDrawDoc.py \
+	RTFDoc.py \
+	SvgDrawDoc.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/docgen
+pkgpythondir = @pkgpythondir@/plugins/docgen
+
+GLADEFILES = \
+	gtkprint.glade 
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/drawreport/Makefile.am b/src/plugins/drawreport/Makefile.am
index 3ba36cc57..8da6a9360 100644
--- a/src/plugins/drawreport/Makefile.am
+++ b/src/plugins/drawreport/Makefile.am
@@ -1,27 +1,28 @@
-# This is the src/plugins/drawreport level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/drawreport
-
-pkgdata_PYTHON = \
-	AncestorTree.py \
-	Calendar.py\
-	DescendTree.py \
-	drawplugins.gpr.py\
-	FanChart.py \
-	StatisticsChart.py \
-	TimeLine.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/drawreport
-pkgpythondir = @pkgpythondir@/plugins/drawreport
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/drawreport level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/drawreport
+
+pkgdata_PYTHON = \
+	AncestorTree.py \
+	Calendar.py\
+	DescendTree.py \
+	drawplugins.gpr.py\
+	FanChart.py \
+	StatisticsChart.py \
+	TimeLine.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/drawreport
+pkgpythondir = @pkgpythondir@/plugins/drawreport
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/export/Makefile.am b/src/plugins/export/Makefile.am
index 8b4ad1db4..b98d39510 100644
--- a/src/plugins/export/Makefile.am
+++ b/src/plugins/export/Makefile.am
@@ -1,43 +1,44 @@
-# This is the src/plugins/export level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/export
-
-pkgdata_PYTHON = \
-	export.gpr.py \
-	ExportCsv.py \
-	ExportFtree.py \
-	ExportGedcom.py \
-	ExportGeneWeb.py \
-	ExportPkg.py \
-	ExportVCalendar.py \
-	ExportVCard.py \
-	ExportXml.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/export
-pkgpythondir = @pkgpythondir@/plugins/export
-
-GLADEFILES = \
-	exportcsv.glade \
-	exportftree.glade \
-	exportgeneweb.glade \
-	exportvcalendar.glade \
-	exportvcard.glade
-
-
-GRAPHICS = 
-
-DATAFILES = 
-
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/export level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/export
+
+pkgdata_PYTHON = \
+	export.gpr.py \
+	ExportCsv.py \
+	ExportFtree.py \
+	ExportGedcom.py \
+	ExportGeneWeb.py \
+	ExportPkg.py \
+	ExportVCalendar.py \
+	ExportVCard.py \
+	ExportXml.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/export
+pkgpythondir = @pkgpythondir@/plugins/export
+
+GLADEFILES = \
+	exportcsv.glade \
+	exportftree.glade \
+	exportgeneweb.glade \
+	exportvcalendar.glade \
+	exportvcard.glade
+
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/gramplet/Makefile.am b/src/plugins/gramplet/Makefile.am
index d86af79b5..195ef6f69 100644
--- a/src/plugins/gramplet/Makefile.am
+++ b/src/plugins/gramplet/Makefile.am
@@ -1,56 +1,57 @@
-# This is the src/plugins/drawreport level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/gramplet
-
-pkgdata_PYTHON = \
-	AgeOnDateGramplet.py \
-	AgeStats.py \
-	Attributes.py \
-	AttributesGramplet.py \
-	Backlinks.py \
-	bottombar.gpr.py \
-	CalendarGramplet.py \
-	Children.py \
-	Citations.py \
-	DescendGramplet.py \
-        EditExifMetadata.py \
-	Events.py \
-	FanChartGramplet.py \
-	FaqGramplet.py \
-	Filter.py \
-	Gallery.py \
-	GivenNameGramplet.py \
-	gramplet.gpr.py \
-	MediaPreview.py \
-	MetadataViewer.py \
-	Notes.py \
-	PedigreeGramplet.py \
-	PersonDetails.py \
-	PersonResidence.py \
-	PlaceDetails.py \
-	PluginManagerGramplet.py\
-	QuickViewGramplet.py \
-	RelativeGramplet.py \
-	RepositoryDetails.py \
-	SessionLogGramplet.py \
-	StatsGramplet.py \
-	SurnameCloudGramplet.py \
-	ToDoGramplet.py \
-	TopSurnamesGramplet.py \
-	WelcomeGramplet.py \
-	WhatsNext.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/gramplet
-pkgpythondir = @pkgpythondir@/plugins/gramplet
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/drawreport level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/gramplet
+
+pkgdata_PYTHON = \
+	AgeOnDateGramplet.py \
+	AgeStats.py \
+	Attributes.py \
+	AttributesGramplet.py \
+	Backlinks.py \
+	bottombar.gpr.py \
+	CalendarGramplet.py \
+	Children.py \
+	Citations.py \
+	DescendGramplet.py \
+        EditExifMetadata.py \
+	Events.py \
+	FanChartGramplet.py \
+	FaqGramplet.py \
+	Filter.py \
+	Gallery.py \
+	GivenNameGramplet.py \
+	gramplet.gpr.py \
+	MediaPreview.py \
+	MetadataViewer.py \
+	Notes.py \
+	PedigreeGramplet.py \
+	PersonDetails.py \
+	PersonResidence.py \
+	PlaceDetails.py \
+	PluginManagerGramplet.py\
+	QuickViewGramplet.py \
+	RelativeGramplet.py \
+	RepositoryDetails.py \
+	SessionLogGramplet.py \
+	StatsGramplet.py \
+	SurnameCloudGramplet.py \
+	ToDoGramplet.py \
+	TopSurnamesGramplet.py \
+	WelcomeGramplet.py \
+	WhatsNext.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/gramplet
+pkgpythondir = @pkgpythondir@/plugins/gramplet
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/graph/Makefile.am b/src/plugins/graph/Makefile.am
index 5ed97a96b..e16695ff7 100644
--- a/src/plugins/graph/Makefile.am
+++ b/src/plugins/graph/Makefile.am
@@ -1,24 +1,25 @@
-# This is the src/plugins/graph level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/graph
-
-pkgdata_PYTHON = \
-	graphplugins.gpr.py\
-	GVFamilyLines.py \
-	GVHourGlass.py \
-	GVRelGraph.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/graph
-pkgpythondir = @pkgpythondir@/plugins/graph
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/graph level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/graph
+
+pkgdata_PYTHON = \
+	graphplugins.gpr.py\
+	GVFamilyLines.py \
+	GVHourGlass.py \
+	GVRelGraph.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/graph
+pkgpythondir = @pkgpythondir@/plugins/graph
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/import/Makefile.am b/src/plugins/import/Makefile.am
index 49c253ad6..f70141187 100644
--- a/src/plugins/import/Makefile.am
+++ b/src/plugins/import/Makefile.am
@@ -1,38 +1,39 @@
-# This is the src/plugins/import level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/import
-
-pkgdata_PYTHON = \
-	import.gpr.py \
-	ImportCsv.py \
-	ImportGedcom.py \
-	ImportGeneWeb.py \
-	ImportGpkg.py \
-	ImportGrdb.py \
-	ImportProGen.py \
-	ImportVCard.py \
-	ImportXml.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/import
-pkgpythondir = @pkgpythondir@/plugins/import
-
-GLADEFILES = \
-	importgedcom.glade
-
-GRAPHICS = 
-
-DATAFILES = 
-
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/import level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/import
+
+pkgdata_PYTHON = \
+	import.gpr.py \
+	ImportCsv.py \
+	ImportGedcom.py \
+	ImportGeneWeb.py \
+	ImportGpkg.py \
+	ImportGrdb.py \
+	ImportProGen.py \
+	ImportVCard.py \
+	ImportXml.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/import
+pkgpythondir = @pkgpythondir@/plugins/import
+
+GLADEFILES = \
+	importgedcom.glade
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/lib/Makefile.am b/src/plugins/lib/Makefile.am
index cf5952e91..ebce60fc3 100644
--- a/src/plugins/lib/Makefile.am
+++ b/src/plugins/lib/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/plugins/lib level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/plugins/lib/libmetadata.py b/src/plugins/lib/libmetadata.py
index 2df19cd79..f792b0cca 100644
--- a/src/plugins/lib/libmetadata.py
+++ b/src/plugins/lib/libmetadata.py
@@ -19,7 +19,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: libmetadata.py 17931 2011-07-15 14:57:35Z nick-h $
+# $Id$
 #
 
 from ListModel import ListModel
diff --git a/src/plugins/lib/maps/Makefile.am b/src/plugins/lib/maps/Makefile.am
index 72db2e4ac..f056ab946 100644
--- a/src/plugins/lib/maps/Makefile.am
+++ b/src/plugins/lib/maps/Makefile.am
@@ -1,4 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/plugins/lib/maps
+# $Id$
 
 pkgdata_PYTHON = \
 	constants.py\
diff --git a/src/plugins/mapservices/Makefile.am b/src/plugins/mapservices/Makefile.am
index 6fd40574f..5f92c6944 100644
--- a/src/plugins/mapservices/Makefile.am
+++ b/src/plugins/mapservices/Makefile.am
@@ -1,32 +1,33 @@
-# This is the src/plugins/mapservices level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/mapservices
-
-pkgdata_PYTHON = \
-	googlemap.py\
-	mapservice.gpr.py\
-	openstreetmap.py\
-	eniroswedenmap.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/mapservices
-pkgpythondir = @pkgpythondir@/plugins/mapservices
-
-GLADEFILES = 
-
-GRAPHICS = 
-
-DATAFILES = 
-
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/mapservices level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/mapservices
+
+pkgdata_PYTHON = \
+	googlemap.py\
+	mapservice.gpr.py\
+	openstreetmap.py\
+	eniroswedenmap.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/mapservices
+pkgpythondir = @pkgpythondir@/plugins/mapservices
+
+GLADEFILES = 
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/quickview/Makefile.am b/src/plugins/quickview/Makefile.am
index 16cd58e99..be51f60ca 100644
--- a/src/plugins/quickview/Makefile.am
+++ b/src/plugins/quickview/Makefile.am
@@ -1,33 +1,34 @@
-# This is the src/plugins/quickview level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/quickview
-
-pkgdata_PYTHON = \
-	AgeOnDate.py \
-	all_events.py \
-	all_relations.py \
-	AttributeMatch.py \
-	FilterByName.py \
-	lineage.py \
-	OnThisDay.py \
-	quickview.gpr.py \
-	References.py \
-	LinkReferences.py \
-	Reporef.py \
-	SameSurnames.py\
-	siblings.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/quickview
-pkgpythondir = @pkgpythondir@/plugins/quickview
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/quickview level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/quickview
+
+pkgdata_PYTHON = \
+	AgeOnDate.py \
+	all_events.py \
+	all_relations.py \
+	AttributeMatch.py \
+	FilterByName.py \
+	lineage.py \
+	OnThisDay.py \
+	quickview.gpr.py \
+	References.py \
+	LinkReferences.py \
+	Reporef.py \
+	SameSurnames.py\
+	siblings.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/quickview
+pkgpythondir = @pkgpythondir@/plugins/quickview
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/rel/Makefile.am b/src/plugins/rel/Makefile.am
index e170b14d8..258936055 100644
--- a/src/plugins/rel/Makefile.am
+++ b/src/plugins/rel/Makefile.am
@@ -1,38 +1,39 @@
-# This is the src/plugins/rel level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/rel
-
-pkgdata_PYTHON = \
-	relplugins.gpr.py\
-	rel_cs.py\
-	rel_da.py\
-	rel_de.py\
-	rel_es.py\
-	rel_fi.py\
-	rel_fr.py\
+# This is the src/plugins/rel level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/rel
+
+pkgdata_PYTHON = \
+	relplugins.gpr.py\
+	rel_cs.py\
+	rel_da.py\
+	rel_de.py\
+	rel_es.py\
+	rel_fi.py\
+	rel_fr.py\
 	rel_hu.py\
-        rel_hr.py\
-	rel_it.py\
-	rel_nl.py\
-	rel_no.py\
-	rel_pl.py\
-	rel_pt.py\
-	rel_ru.py\
+        rel_hr.py\
+	rel_it.py\
+	rel_nl.py\
+	rel_no.py\
+	rel_pl.py\
+	rel_pt.py\
+	rel_ru.py\
 	rel_sk.py\
-	rel_sl.py\
-	rel_sv.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/rel
-pkgpythondir = @pkgpythondir@/plugins/rel
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	rel_sl.py\
+	rel_sv.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/rel
+pkgpythondir = @pkgpythondir@/plugins/rel
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/sidebar/Makefile.am b/src/plugins/sidebar/Makefile.am
index 049ffca29..93c780784 100644
--- a/src/plugins/sidebar/Makefile.am
+++ b/src/plugins/sidebar/Makefile.am
@@ -1,22 +1,23 @@
-# This is the src/plugins/sidebar level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/sidebar
-
-pkgdata_PYTHON = \
-	categorysidebar.py\
-	sidebar.gpr.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/sidebar
-pkgpythondir = @pkgpythondir@/plugins/sidebar
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/sidebar level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/sidebar
+
+pkgdata_PYTHON = \
+	categorysidebar.py\
+	sidebar.gpr.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/sidebar
+pkgpythondir = @pkgpythondir@/plugins/sidebar
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/textreport/Makefile.am b/src/plugins/textreport/Makefile.am
index 0249547d1..3e3f6730e 100644
--- a/src/plugins/textreport/Makefile.am
+++ b/src/plugins/textreport/Makefile.am
@@ -1,36 +1,37 @@
-# This is the src/plugins/textreport level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/textreport
-
-pkgdata_PYTHON = \
-	AncestorReport.py\
-	BirthdayReport.py\
-	CustomBookText.py\
-	DescendReport.py\
-	DetAncestralReport.py\
-	DetDescendantReport.py\
-	EndOfLineReport.py\
-	FamilyGroup.py\
-	IndivComplete.py\
-	KinshipReport.py\
-	NumberOfAncestorsReport.py\
-	PlaceReport.py\
-	SimpleBookTitle.py\
+# This is the src/plugins/textreport level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/textreport
+
+pkgdata_PYTHON = \
+	AncestorReport.py\
+	BirthdayReport.py\
+	CustomBookText.py\
+	DescendReport.py\
+	DetAncestralReport.py\
+	DetDescendantReport.py\
+	EndOfLineReport.py\
+	FamilyGroup.py\
+	IndivComplete.py\
+	KinshipReport.py\
+	NumberOfAncestorsReport.py\
+	PlaceReport.py\
+	SimpleBookTitle.py\
 	Summary.py\
-        TagReport.py\
-	textplugins.gpr.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/textreport
-pkgpythondir = @pkgpythondir@/plugins/textreport
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+        TagReport.py\
+	textplugins.gpr.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/textreport
+pkgpythondir = @pkgpythondir@/plugins/textreport
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/tool/Makefile.am b/src/plugins/tool/Makefile.am
index 107294e09..bb1e1cff2 100644
--- a/src/plugins/tool/Makefile.am
+++ b/src/plugins/tool/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/plugins/tool level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/plugins/view/Makefile.am b/src/plugins/view/Makefile.am
index 14f9a927c..d861242dc 100644
--- a/src/plugins/view/Makefile.am
+++ b/src/plugins/view/Makefile.am
@@ -1,46 +1,47 @@
-# This is the src/plugins/quickview level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/view
-
-pkgdata_PYTHON = \
-	citationlistview.py \
-	citationtreeview.py \
-	eventview.py \
-	familyview.py \
-	fanchartview.gpr.py \
-	fanchartview.py \
-	geoevents.py \
-	geoplaces.py \
-	geoperson.py \
-	geofamily.py \
-	geography.gpr.py \
-	htmlrenderer.gpr.py \
-	grampletview.py \
-	htmlrenderer.py \
-	mediaview.py \
-	noteview.py \
-	pedigreeview.py \
-	personlistview.py \
-	persontreeview.py \
-	placelistview.py \
-	placetreeview.py \
-	placetreeview.gpr.py \
-	relview.py \
-	repoview.py \
-	sourceview.py \
-	view.gpr.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/view
-pkgpythondir = @pkgpythondir@/plugins/view
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/quickview level Makefile for Gramps
+# $Id$
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/view
+
+pkgdata_PYTHON = \
+	citationlistview.py \
+	citationtreeview.py \
+	eventview.py \
+	familyview.py \
+	fanchartview.gpr.py \
+	fanchartview.py \
+	geoevents.py \
+	geoplaces.py \
+	geoperson.py \
+	geofamily.py \
+	geography.gpr.py \
+	htmlrenderer.gpr.py \
+	grampletview.py \
+	htmlrenderer.py \
+	mediaview.py \
+	noteview.py \
+	pedigreeview.py \
+	personlistview.py \
+	persontreeview.py \
+	placelistview.py \
+	placetreeview.py \
+	placetreeview.gpr.py \
+	relview.py \
+	repoview.py \
+	sourceview.py \
+	view.gpr.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/view
+pkgpythondir = @pkgpythondir@/plugins/view
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/webreport/Makefile.am b/src/plugins/webreport/Makefile.am
index 0b43b6f8e..1ab33fae7 100644
--- a/src/plugins/webreport/Makefile.am
+++ b/src/plugins/webreport/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/plugins/webreport level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/plugins/webstuff/Makefile.am b/src/plugins/webstuff/Makefile.am
index 9afb8d42f..110468368 100644
--- a/src/plugins/webstuff/Makefile.am
+++ b/src/plugins/webstuff/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/plugins/webstuff level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/plugins/webstuff/css/Makefile.am b/src/plugins/webstuff/css/Makefile.am
index 896234dcf..d2ee6c0d6 100644
--- a/src/plugins/webstuff/css/Makefile.am
+++ b/src/plugins/webstuff/css/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/plugins/webstuff level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
diff --git a/src/plugins/webstuff/images/Makefile.am b/src/plugins/webstuff/images/Makefile.am
index 0f90f1b71..3c17161b3 100644
--- a/src/plugins/webstuff/images/Makefile.am
+++ b/src/plugins/webstuff/images/Makefile.am
@@ -1,4 +1,5 @@
 # This is the src/plugins/webstuff level Makefile for Gramps
+# $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually