From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 29 Jan 2009 22:37:37 +0000 (+0900)
Subject: Merge branch 'savannah/perl-module'
X-Git-Tag: v0.7.1~1
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d75247c28e0dce9c21070e4ee14fdc6a2338fb77;hp=-c;p=pspp-builds.git

Merge branch 'savannah/perl-module'

Conflicts:

	po/en_GB.po
	src/libpspp/automake.mk
---

d75247c28e0dce9c21070e4ee14fdc6a2338fb77
diff --combined po/en_GB.po
index ab295d01,1927c41f..6f2af173
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PSPP 0.7.0\n"
  "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
- "POT-Creation-Date: 2009-01-17 11:37+0900\n"
+ "POT-Creation-Date: 2009-01-08 16:40+0900\n"
  "PO-Revision-Date: 2008-11-05 08:17+0900\n"
  "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
  "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
@@@ -991,28 -991,28 +991,28 @@@ msgstr "
  msgid "An I/O error occurred writing system file \"%s\"."
  msgstr ""
  
 -#: src/data/variable.c:236
 +#: src/data/variable.c:240
  #, c-format
  msgid ""
  "Character `%c' (in %s) may not appear as the first character in a variable "
  "name."
  msgstr ""
  
 -#: src/data/variable.c:248
 +#: src/data/variable.c:252
  #, c-format
  msgid "Character `%c' (in %s) may not appear in a variable name."
  msgstr ""
  
 -#: src/data/variable.c:276
 +#: src/data/variable.c:280
  msgid "Variable name cannot be empty string."
  msgstr ""
  
 -#: src/data/variable.c:282
 +#: src/data/variable.c:286
  #, c-format
  msgid "Variable name %s exceeds %d-character limit."
  msgstr ""
  
 -#: src/data/variable.c:290
 +#: src/data/variable.c:294
  #, c-format
  msgid "`%s' may not be used as a variable name because it is a reserved word."
  msgstr ""
@@@ -4048,37 -4048,32 +4048,37 @@@ msgstr "
  msgid "Only USE ALL is currently implemented."
  msgstr ""
  
 -#: src/language/utilities/include.c:90
 +#: src/language/utilities/include.c:92
  msgid "Expecting BATCH or INTERACTIVE after SYNTAX."
  msgstr ""
  
 -#: src/language/utilities/include.c:107
 +#: src/language/utilities/include.c:109
  msgid "Expecting YES or NO after CD."
  msgstr ""
  
 -#: src/language/utilities/include.c:124
 +#: src/language/utilities/include.c:126
  msgid "Expecting CONTINUE or STOP after ERROR."
  msgstr ""
  
 -#: src/language/utilities/include.c:131
 +#: src/language/utilities/include.c:133
  #, c-format
  msgid "Unexpected token: `%s'."
  msgstr ""
  
 -#: src/language/utilities/include.c:176
 +#: src/language/utilities/include.c:178
  msgid "expecting file name"
  msgstr ""
  
 -#: src/language/utilities/include.c:188
 +#: src/language/utilities/include.c:190
  #, c-format
  msgid "Can't find `%s' in include file search path."
  msgstr ""
  
 +#: src/language/utilities/include.c:198
 +#, c-format
 +msgid "Unable to open `%s': %s."
 +msgstr ""
 +
  #: src/language/utilities/permissions.c:73
  #, c-format
  msgid "Expecting %s or %s."
@@@ -4512,12 -4507,12 +4512,12 @@@ msgstr "
  msgid "unknown configuration parameter `%s' for HTML device driver"
  msgstr ""
  
 -#: src/output/journal.c:68
 +#: src/output/journal.c:69
  #, c-format
  msgid "error writing \"%s\""
  msgstr ""
  
 -#: src/output/journal.c:90
 +#: src/output/journal.c:94
  #, c-format
  msgid "error creating \"%s\""
  msgstr ""
@@@ -5822,20 -5817,20 +5822,20 @@@ msgstr "
  msgid "Paste"
  msgstr ""
  
 -#: src/ui/gui/psppire.c:214
 +#: src/ui/gui/psppire.c:226
  msgid "_Reset"
  msgstr ""
  
 -#: src/ui/gui/psppire.c:215
 +#: src/ui/gui/psppire.c:227
  msgid "_Select"
  msgstr ""
  
 -#: src/ui/gui/psppire.c:251
 +#: src/ui/gui/psppire.c:263
  #, c-format
  msgid "Cannot open %s: %s.\n"
  msgstr ""
  
 -#: src/ui/gui/psppire.c:268
 +#: src/ui/gui/psppire.c:280
  #, c-format
  msgid "%s is neither a system nor portable file"
  msgstr ""
diff --combined src/libpspp/automake.mk
index 292068ec,9eed0027..dc512bb2
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@@ -75,10 -75,14 +75,14 @@@ src_libpspp_libpspp_la_CPPFLAGS = -I $(
  
  nodist_src_libpspp_libpspp_la_SOURCES = src/libpspp/version.c
  
 -src/libpspp/version.c: $(top_srcdir)/AUTHORS $(top_builddir)/Makefile
 +src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
  	@$(MKDIR_P) src/libpspp
  	echo "/* 	-*- mode: c; buffer-read-only: t -*-" > $@
- 	echo "   Generated by src/libpspp/automake.mk --- Do not edit. */">> $@
+ 	echo "   Generated by src/libpspp/automake.mk --- Do not edit.">> $@
+ 	echo "" >> $@
+ 	echo "   The following line is for the benefit of the perl module" >>$@
+ 	echo "\$$VERSION='"@VERSION@"';" >> $@
+ 	echo "*/" >> $@
  	echo "#include \"version.h\"" >> $@
  	echo "const char bare_version[] = \"@VERSION@\";" >> $@
  	echo "const char version[] = \"GNU @PACKAGE@ @VERSION@\";" >> $@