update

svn: r1717

gramps2/ChangeLog

@@ -1,3 +1,13 @@
+2003-06-12  Don Allingham  <dallingham@users.sourceforge.net>
+	* src/DrawDoc.py: support for drawing wedges and rotated text
+	* src/docgen/PSDrawDoc.py: postscipt support for wedges and rotated 
+	text
+	* src/docgen/PdfDrawDoc.py: PDF support for wedges and rotated text
+	* src/docgen/SvgDrawDoc.py: SVG support for wedges and rotated text
+	* src/docgen/OpenDrawDoc.py: OpenOffice support for wedges and rotated 
+	text
+	* src/plugins/FanChart.py: Fan chart report
+
 2003-06-12  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/docgen/KwordDoc.py (write_text): Replace & with &amp in text.
 	Closes gramps-bugs-649228, finally.
@@ -8,6 +18,14 @@
 	* src/docgen/OpenOfficeDoc.py: Fix typo. Prevent images from being
 	copied more than once.
 
+2003-06-11  Don Allingham  <dallingham@users.sourceforge.net>
+	* src/GenericFilter.py: rewrote IsAncestorOf and IsDescendantOf rules
+	to be more efficient and to properly handle loop detection.
+	* src/RelLib.py: Added the getValidDeath and getValidBirth methods to
+	the Person class
+	* src/plugins/WebPage.py: Handle filter errors
+	* src/docgen/OpenOfficeDoc.py: pass non-unicode names to zipfile
+
 2003-06-11  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/EditPlace.py (on_switch_page): Fix page numbers to enable proper
 	loading of gallery and references. 

gramps2/configure

@@ -1642,7 +1642,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 
 
-RELEASE=rc1
+RELEASE=1
 
 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"

gramps2/gramps.spec

@@ -1,5 +1,5 @@
 %define ver      0.9.2
-%define rel      rc1
+%define rel      1
 %define prefix   /usr
 %define localstatedir /var/lib
 # Ensure that internal RPM macros for configure & makeinstall 
@@ -29,6 +29,7 @@ BuildRequires: scrollkeeper >= 0.3.5
 BuildRequires: automake >= 1.6
 BuildRequires: autoconf >= 2.52
 BuildRequires: rpm >= 4.1
+BuildRequires: desktop-file-utils >= 0.2.92
 
 %description
 gramps (Genealogical Research and Analysis Management Programming
@@ -54,6 +55,12 @@ CFLAGS="$RPM_OPT_FLAGS" make
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
+mkdir $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor gramps --delete-original \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications  \
+	--add-category Application                     \
+	--add-category Utility                         \
+	$RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/gramps.desktop
 %find_lang gramps
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper/
 
@@ -68,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{prefix}/bin/gramps
 
-%{_datadir}/gnome/apps/Applications/gramps.desktop
+%{_datadir}/applications/*
 %{_datadir}/pixmaps/gramps.png
 
 %{_datadir}/gramps/*

gramps2/src/EditPerson.py

@@ -1245,7 +1245,6 @@ class EditPerson:
             Utils.modified()
 
     def on_apply_person_clicked(self,obj):
-    
         surname = self.surname_field.get_text()
         suffix = self.suffix.get_text()
         prefix = self.prefix.get_text()

gramps2/src/Makefile.in

@@ -260,7 +260,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	install-exec-recursive installdirs-recursive install-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README $(dist_pkgdata_DATA) $(pkgpython_PYTHON) AUTHORS \
-	ChangeLog Makefile.am Makefile.in NEWS const.py.in
+	ChangeLog Makefile.am Makefile.in NEWS TODO const.py.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 

gramps2/src/docgen/Makefile.am

@@ -3,8 +3,8 @@
 # If not using GNU make, then list all .py files individually
 
 pkgpython_PYTHON = \
-	AbiWordDoc.py\	
 	AbiWord2Doc.py\
+	AbiWordDoc.py\
 	HtmlDoc.py\
 	KwordDoc.py\
 	LaTeXDoc.py\

gramps2/src/docgen/Makefile.in

@@ -114,6 +114,7 @@ pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 
 pkgpython_PYTHON = \
+	AbiWord2Doc.py\
 	AbiWordDoc.py\
 	HtmlDoc.py\
 	KwordDoc.py\