[Pspp-cvs] pspp doc/ChangeLog doc/automake.mk po/de.po po/...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/05/09 07:06:37

Modified files:
        doc            : ChangeLog automake.mk 
        po             : de.po en_GB.po 
        src/ui/gui     : ChangeLog automake.mk 

Log message:
        Fix problems with yelp opening info files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/doc/ChangeLog?cvsroot=pspp&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/pspp/doc/automake.mk?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/pspp/po/en_GB.po?cvsroot=pspp&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.53&r2=1.54

Patches:
Index: doc/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/doc/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- doc/ChangeLog       12 Mar 2008 02:48:44 -0000      1.55
+++ doc/ChangeLog       9 May 2008 07:06:35 -0000       1.56
@@ -1,3 +1,8 @@
+2008-05-08 John Darrington <address@hidden>
+
+       * automake.mk: Compress the info files, because later
+       versions of yelp seem to crash otherwise.
+
 2008-03-11  Jason Stover  <address@hidden>
 
        * regression.texi (REGRESSION): Fixed use of @dots in @math

Index: doc/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/doc/automake.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- doc/automake.mk     11 Nov 2007 05:51:38 -0000      1.6
+++ doc/automake.mk     9 May 2008 07:06:36 -0000       1.7
@@ -43,3 +43,15 @@
 doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
        @$(MKDIR_P)  doc
        @PERL@ $(top_srcdir)/doc/get-commands.pl 
$(top_srcdir)/src/language/command.def > $@
+
+# It seems that recent versions of yelp, upon which the gui relies to display 
the reference
+# manual, are broken.  It only works on compressed info files.  So we must 
compress them.
+install-data-hook::
+       for ifile in $(DESTDIR)$(infodir)/pspp.info-[0-9] \
+               $(DESTDIR)$(infodir)/pspp.info  ; do \
+         gzip -f $$ifile ; \
+       done
+
+uninstall-hook::
+       rm -f $(DESTDIR)$(infodir)/pspp.info-[0-9].gz
+       rm -f $(DESTDIR)$(infodir)/pspp.info.gz

Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- po/de.po    9 May 2008 06:35:33 -0000       1.112
+++ po/de.po    9 May 2008 07:06:36 -0000       1.113
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-05-09 13:35+0800\n"
+"POT-Creation-Date: 2008-05-09 11:48+0800\n"
 "PO-Revision-Date: 2006-07-28 19:32+0800\n"
 "Last-Translator: John Darrington <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"

Index: po/en_GB.po
===================================================================
RCS file: /sources/pspp/pspp/po/en_GB.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- po/en_GB.po 9 May 2008 06:35:33 -0000       1.128
+++ po/en_GB.po 9 May 2008 07:06:36 -0000       1.129
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-05-09 13:35+0800\n"
+"POT-Creation-Date: 2008-05-09 11:48+0800\n"
 "PO-Revision-Date: 2007-09-15 08:29+0800\n"
 "Last-Translator: John Darrington <address@hidden>\n"
 "Language-Team: John Darrington <address@hidden>\n"

Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- src/ui/gui/ChangeLog        8 May 2008 23:58:56 -0000       1.126
+++ src/ui/gui/ChangeLog        9 May 2008 07:06:37 -0000       1.127
@@ -1,3 +1,7 @@
+2008-05-09  John Darrington <address@hidden>
+
+       * automake.mk: On make install, warn about the non-existance of yelp.
+
 2008-05-08  Ben Pfaff  <address@hidden>
 
        Patch #6505.  Reviewed by John Darrington.

Index: src/ui/gui/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/ui/gui/automake.mk      16 Mar 2008 20:06:29 -0000      1.53
+++ src/ui/gui/automake.mk      9 May 2008 07:06:37 -0000       1.54
@@ -195,4 +195,12 @@
        src/ui/gui/window-manager.c \
        src/ui/gui/window-manager.h
 
-
+install-data-hook::
+       @if ! yelp --version > /dev/null 2>&1 ; then \
+               echo    ; \
+               echo '    The Yelp document viewer does not seem to be 
installed on the system.' ; \
+               echo '    If Yelp is not available at run time, then the 
PSPPIRE online reference' ; \
+               echo '    manual will not be available.' ; \
+               echo '    Yelp is available from the GNOME project.  
ftp://ftp.gnome.org/pub/gnome/sources/yelp' ; \
+               echo ; \
+       fi