update
svn: r2722
This commit is contained in:
		@@ -1,3 +1,7 @@
 | 
				
			|||||||
 | 
					2004-01-27  Don Allingham  <dallingham@users.sourceforge.net>
 | 
				
			||||||
 | 
						* src/docgen/PdfDoc.py: fix encoding exception
 | 
				
			||||||
 | 
						* gramps-mdk.spec: Mandrake RPM spec file
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2004-01-27  Alex Roitman  <shura@alex.neuro.umn.edu>
 | 
					2004-01-27  Alex Roitman  <shura@alex.neuro.umn.edu>
 | 
				
			||||||
	* src/po/ru.po: Minor corrections.
 | 
						* src/po/ru.po: Minor corrections.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
SUBDIRS = src doc example
 | 
					SUBDIRS = src doc example
 | 
				
			||||||
 | 
					
 | 
				
			||||||
EXTRA_DIST = autogen.sh gramps.spec.in gramps.spec COPYING-DOCS FAQ
 | 
					EXTRA_DIST = autogen.sh gramps.spec.in gramps.spec gramps-mdk.spec gramps-mdk.spec.in COPYING-DOCS FAQ
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bin_SCRIPTS = gramps
 | 
					bin_SCRIPTS = gramps
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -133,7 +133,7 @@ target_alias = @target_alias@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
SUBDIRS = src doc example
 | 
					SUBDIRS = src doc example
 | 
				
			||||||
 | 
					
 | 
				
			||||||
EXTRA_DIST = autogen.sh gramps.spec.in gramps.spec COPYING-DOCS FAQ
 | 
					EXTRA_DIST = autogen.sh gramps.spec.in gramps.spec gramps-mdk.spec gramps-mdk.spec.in COPYING-DOCS FAQ
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bin_SCRIPTS = gramps
 | 
					bin_SCRIPTS = gramps
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -141,7 +141,7 @@ CLEANFILES = gramps
 | 
				
			|||||||
subdir = .
 | 
					subdir = .
 | 
				
			||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 | 
					ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 | 
				
			||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 | 
					mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 | 
				
			||||||
CONFIG_CLEAN_FILES = gramps.spec gramps.sh
 | 
					CONFIG_CLEAN_FILES = gramps.spec gramps-mdk.spec gramps.sh
 | 
				
			||||||
SCRIPTS = $(bin_SCRIPTS)
 | 
					SCRIPTS = $(bin_SCRIPTS)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DIST_SOURCES =
 | 
					DIST_SOURCES =
 | 
				
			||||||
@@ -153,8 +153,8 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 | 
				
			|||||||
	check-recursive installcheck-recursive
 | 
						check-recursive installcheck-recursive
 | 
				
			||||||
DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
 | 
					DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
 | 
				
			||||||
	COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
 | 
						COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
 | 
				
			||||||
	configure configure.in gramps.sh.in gramps.spec.in install-sh \
 | 
						configure configure.in gramps-mdk.spec.in gramps.sh.in \
 | 
				
			||||||
	missing mkinstalldirs py-compile
 | 
						gramps.spec.in install-sh missing mkinstalldirs py-compile
 | 
				
			||||||
DIST_SUBDIRS = $(SUBDIRS)
 | 
					DIST_SUBDIRS = $(SUBDIRS)
 | 
				
			||||||
all: all-recursive
 | 
					all: all-recursive
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -177,6 +177,8 @@ $(ACLOCAL_M4):  configure.in
 | 
				
			|||||||
	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 | 
						cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 | 
				
			||||||
gramps.spec: $(top_builddir)/config.status gramps.spec.in
 | 
					gramps.spec: $(top_builddir)/config.status gramps.spec.in
 | 
				
			||||||
	cd $(top_builddir) && $(SHELL) ./config.status $@
 | 
						cd $(top_builddir) && $(SHELL) ./config.status $@
 | 
				
			||||||
 | 
					gramps-mdk.spec: $(top_builddir)/config.status gramps-mdk.spec.in
 | 
				
			||||||
 | 
						cd $(top_builddir) && $(SHELL) ./config.status $@
 | 
				
			||||||
gramps.sh: $(top_builddir)/config.status gramps.sh.in
 | 
					gramps.sh: $(top_builddir)/config.status gramps.sh.in
 | 
				
			||||||
	cd $(top_builddir) && $(SHELL) ./config.status $@
 | 
						cd $(top_builddir) && $(SHELL) ./config.status $@
 | 
				
			||||||
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 | 
					binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										698
									
								
								gramps2/configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										698
									
								
								gramps2/configure
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -5,8 +5,8 @@ AC_PREREQ(2.57)
 | 
				
			|||||||
AC_INIT(gramps, 1.0.0, gramps-bugs@lists.sourceforge.net)
 | 
					AC_INIT(gramps, 1.0.0, gramps-bugs@lists.sourceforge.net)
 | 
				
			||||||
AC_CONFIG_SRCDIR(src/gramps.py)
 | 
					AC_CONFIG_SRCDIR(src/gramps.py)
 | 
				
			||||||
AM_INIT_AUTOMAKE(1.6.3)
 | 
					AM_INIT_AUTOMAKE(1.6.3)
 | 
				
			||||||
RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
 | 
					dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
 | 
				
			||||||
dnl RELEASE=1
 | 
					RELEASE=rc1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
VERSIONSTRING=$VERSION
 | 
					VERSIONSTRING=$VERSION
 | 
				
			||||||
if test x"$RELEASE" != "x"
 | 
					if test x"$RELEASE" != "x"
 | 
				
			||||||
@@ -267,5 +267,6 @@ doc/gramps-manual/hu/Makefile
 | 
				
			|||||||
example/Makefile
 | 
					example/Makefile
 | 
				
			||||||
example/gramps/Makefile
 | 
					example/gramps/Makefile
 | 
				
			||||||
gramps.spec
 | 
					gramps.spec
 | 
				
			||||||
 | 
					gramps-mdk.spec
 | 
				
			||||||
gramps.sh])
 | 
					gramps.sh])
 | 
				
			||||||
AC_OUTPUT
 | 
					AC_OUTPUT
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
%define ver      1.0.0
 | 
					%define ver      1.0.0
 | 
				
			||||||
%define rel      0.CVS20040120
 | 
					%define rel      0.CVS20040127
 | 
				
			||||||
%define prefix   /usr
 | 
					%define prefix   /usr
 | 
				
			||||||
%define localstatedir /var/lib
 | 
					%define localstatedir /var/lib
 | 
				
			||||||
# Ensure that internal RPM macros for configure & makeinstall 
 | 
					# Ensure that internal RPM macros for configure & makeinstall 
 | 
				
			||||||
@@ -7,23 +7,23 @@
 | 
				
			|||||||
%define _prefix   %prefix
 | 
					%define _prefix   %prefix
 | 
				
			||||||
%define _localstatedir %localstatedir
 | 
					%define _localstatedir %localstatedir
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Summary:   Genealogical Research and Analysis Management Programming System.
 | 
					Summary: Genealogical Research and Analysis Management Programming System.
 | 
				
			||||||
Name:      gramps
 | 
					Name: gramps
 | 
				
			||||||
Version:   %ver
 | 
					Version: %ver
 | 
				
			||||||
Release:   %rel
 | 
					Release: %rel
 | 
				
			||||||
License:   GPL
 | 
					License: GPL
 | 
				
			||||||
Group:     Applications/Genealogy
 | 
					Group: Applications/Genealogy
 | 
				
			||||||
Source:    http://download.sourceforge.net/gramps/gramps-%{ver}.tar.gz
 | 
					Source: http://download.sourceforge.net/gramps/gramps-%{ver}.tar.gz
 | 
				
			||||||
BuildRoot: /var/tmp/%{name}-%{version}-root
 | 
					BuildRoot: /var/tmp/%{name}-%{version}-root
 | 
				
			||||||
 | 
					
 | 
				
			||||||
URL:       http://gramps.sourceforge.net/
 | 
					URL: http://gramps.sourceforge.net/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Requires:  python >= 2.2
 | 
					Requires: python >= 2.2
 | 
				
			||||||
Requires:  gnome-python >= 1.99
 | 
					Requires: gnome-python >= 1.99
 | 
				
			||||||
Requires:  gnome-python-gconf >= 1.99
 | 
					Requires: gnome-python-gconf >= 1.99
 | 
				
			||||||
Requires:  gnome-python-canvas >= 1.99
 | 
					Requires: gnome-python-canvas >= 1.99
 | 
				
			||||||
Requires:  gnome-python-gnomevfs >= 1.99
 | 
					Requires: gnome-python-gnomevfs >= 1.99
 | 
				
			||||||
Requires:  pygtk2.0-libglade >= 1.99
 | 
					Requires: pygtk2.0-libglade >= 1.99
 | 
				
			||||||
 | 
					
 | 
				
			||||||
BuildRequires: scrollkeeper >= 0.3.5
 | 
					BuildRequires: scrollkeeper >= 0.3.5
 | 
				
			||||||
BuildRequires: automake >= 1.6
 | 
					BuildRequires: automake >= 1.6
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
%define ver      1.0.0
 | 
					%define ver      1.0.0
 | 
				
			||||||
%define rel      0.CVS20040120
 | 
					%define rel      0.CVS20040127
 | 
				
			||||||
%define prefix   /usr
 | 
					%define prefix   /usr
 | 
				
			||||||
%define localstatedir /var/lib
 | 
					%define localstatedir /var/lib
 | 
				
			||||||
# Ensure that internal RPM macros for configure & makeinstall 
 | 
					# Ensure that internal RPM macros for configure & makeinstall 
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user