diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 9e37abe96..d2d94b599 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,10 @@ +2006-03-02 Don Allingham + * configure.in: make distcheck fixes + * src/MapView.py: make distcheck fixes + * src/GrampsLogger/Makefile.am: make distcheck fixes + * src/Makefile.am: make distcheck fixes + * src/TreeViews.am: make distcheck fixes + 2006-03-02 Alex Roitman * src/GrampsLogger/Makefile.am (pkgdata_PYTHON): Typo. * configure.in: Generate Makefile-s in new directories. diff --git a/gramps2/src/GrampsLogger/Makefile.am b/gramps2/src/GrampsLogger/Makefile.am index bac1e4fa8..f7ee844f2 100644 --- a/gramps2/src/GrampsLogger/Makefile.am +++ b/gramps2/src/GrampsLogger/Makefile.am @@ -1,9 +1,9 @@ -# This is the src/RelLib level Makefile for Gramps +# This is the src/GrampsLogger 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@/TreeViews +pkgdatadir = $(datadir)/@PACKAGE@/GrampsLogger pkgdata_PYTHON = \ _ErrorReportAssistant.py\ @@ -12,8 +12,8 @@ pkgdata_PYTHON = \ __init__.py\ _RotateHandler.py -pkgpyexecdir = @pkgpyexecdir@/RelLib -pkgpythondir = @pkgpythondir@/RelLib +pkgpyexecdir = @pkgpyexecdir@/GrampsLogger +pkgpythondir = @pkgpythondir@/GrampsLogger GRAMPS_PY_MODPATH = "../" diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am index f51cf1a54..c236a0871 100644 --- a/gramps2/src/Makefile.am +++ b/gramps2/src/Makefile.am @@ -33,7 +33,7 @@ gdir_PYTHON = \ BaseDoc.py\ Bookmarks.py\ ColumnOrder.py\ - const.py.in\ + const.py\ DateDisplay.py\ DateEdit.py\ DateHandler.py\ @@ -67,7 +67,6 @@ gdir_PYTHON = \ GenericFilter.py\ GnomeMime.py\ GrampsCfg.py\ - GrampsDb\ GrampsDisplay.py\ GrampsGconfKeys.py\ GrampsIniKeys.py\ @@ -90,7 +89,6 @@ gdir_PYTHON = \ NameEdit.py\ Navigation.py\ NoteEdit.py\ - ObjectSelector\ Options.py\ PageView.py\ PaperMenu.py\ @@ -149,12 +147,20 @@ GLADEFILES = \ GRAPHICS = \ logo.png\ + bad.png\ + good.png\ gramps.png \ media.png\ place.png\ sources.png\ splash.jpg\ - tools.png + tools.png \ + land_shallow_topo_2048.jpg \ + land_shallow_topo_350.jpg \ + flist.svg \ + media.svg \ + person.svg \ + relation.svg # Other stuff that we need to install dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) diff --git a/gramps2/src/MapView.py b/gramps2/src/MapView.py index ff82a4c7e..1aef9e763 100644 --- a/gramps2/src/MapView.py +++ b/gramps2/src/MapView.py @@ -393,6 +393,7 @@ class MapView(PageView.PageView): hbox = gtk.HBox( False, 4) hbox.set_border_width( 4) + no = gtk.Image() # The large zoomable map self.zoom_map = ZoomMap( gtk.gdk.pixbuf_new_from_file("land_shallow_topo_2048.jpg"), diff --git a/gramps2/src/TreeViews/Makefile.am b/gramps2/src/TreeViews/Makefile.am index 352e4b778..0cb6b05a6 100644 --- a/gramps2/src/TreeViews/Makefile.am +++ b/gramps2/src/TreeViews/Makefile.am @@ -1,4 +1,4 @@ -# This is the src/RelLib level Makefile for Gramps +# This is the src/TreeViews 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 @@ -9,8 +9,8 @@ pkgdata_PYTHON = \ __init__.py\ _PersonTreeView.py -pkgpyexecdir = @pkgpyexecdir@/RelLib -pkgpythondir = @pkgpythondir@/RelLib +pkgpyexecdir = @pkgpyexecdir@/TreeViews +pkgpythondir = @pkgpythondir@/TreeViews GRAMPS_PY_MODPATH = "../"