diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 90362456c..1c35efeae 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2005-09-05 Don Allingham + * NEWS: update for 2.0.8 + * src/data/Makefile.am: install main6.css + * src/plugins/NavWebPage.py: Catch exception if thumbnailer fails. + 2005-09-05 Eero Tamminen * src/DateParser.py: Fixed what I broke diff --git a/gramps2/NEWS b/gramps2/NEWS index 5ceffd20c..9220702ca 100644 --- a/gramps2/NEWS +++ b/gramps2/NEWS @@ -1,4 +1,6 @@ -Version 2.0.6 -- the "Romanes eunt domus" release +Version 2.0.8 -- the "Romani ite domum" release + +Version 2.0.7 -- the "Romanes eunt domus" release * Addition of a spelling checker if python-gnome-extras is installed * Thumbnails are generated for objects other than images if an appropriate thumbnailer is found the the GCONF database. diff --git a/gramps2/configure.in b/gramps2/configure.in index 82a17a366..2156013bf 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -4,11 +4,11 @@ dnl Process this file with autoconf to produce a configure script. dnl May need to run automake && aclocal first AC_PREREQ(2.57) -AC_INIT(gramps, 2.0.6, gramps-bugs@lists.sourceforge.net) +AC_INIT(gramps, 2.0.8, gramps-bugs@lists.sourceforge.net) AC_CONFIG_SRCDIR(src/gramps.py) AM_INIT_AUTOMAKE(1.6.3) dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') -RELEASE=2 +RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" diff --git a/gramps2/src/data/Makefile.am b/gramps2/src/data/Makefile.am index a7ea2ef78..a0f6112c8 100644 --- a/gramps2/src/data/Makefile.am +++ b/gramps2/src/data/Makefile.am @@ -14,6 +14,7 @@ dist_pkgdata_DATA = \ main3.css\ main4.css\ main5.css\ + main6.css\ document.png EXTRA_DIST = \ diff --git a/gramps2/src/plugins/NavWebPage.py b/gramps2/src/plugins/NavWebPage.py index 9d2fa3d03..e9b7a4262 100644 --- a/gramps2/src/plugins/NavWebPage.py +++ b/gramps2/src/plugins/NavWebPage.py @@ -782,9 +782,12 @@ class MediaPage(BasePage): dirname = tempfile.mkdtemp() thmb_path = os.path.join(dirname,"temp.png") if ImgManip.run_thumbnailer(mime_type, photo.get_path(), thmb_path, 320): - path = "%s/%s.png" % (self.build_path(photo.handle,"preview"),photo.handle) - self.store_file(archive, self.html_dir, thmb_path, path) - os.unlink(thmb_path) + try: + path = "%s/%s.png" % (self.build_path(photo.handle,"preview"),photo.handle) + self.store_file(archive, self.html_dir, thmb_path, path) + os.unlink(thmb_path) + except IOError: + path = os.path.join('images','document.png') else: path = os.path.join('images','document.png') os.rmdir(dirname)