Import of release 1.0.7

7 files changed, 26 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index bee7a2c..59e25a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-07-03  Henning Makholm  <henning@makholm.net>
 
+	* Version 1.0.7
+	* Fix GPL-to-PD transition: missed copyrigh blurb in online banner.
+
+2009-07-03  Henning Makholm  <henning@makholm.net>
+
 	* Version 1.0.6
 	* Change licensing from GPL-2 to PD.
 	* Fix bug: A layer without an alpha channel bug with an active
diff --git a/configure b/configure
index 091b5bf..ad031da 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for Xcftools 1.0.6.
+# Generated by GNU Autoconf 2.63 for Xcftools 1.0.7.
 #
 # Report bugs to <henning@makholm.net>.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Xcftools'
 PACKAGE_TARNAME='xcftools'
-PACKAGE_VERSION='1.0.6'
-PACKAGE_STRING='Xcftools 1.0.6'
+PACKAGE_VERSION='1.0.7'
+PACKAGE_STRING='Xcftools 1.0.7'
 PACKAGE_BUGREPORT='henning@makholm.net'
 
 ac_unique_file="xcfinfo.c"
@@ -1290,7 +1290,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Xcftools 1.0.6 to adapt to many kinds of systems.
+\`configure' configures Xcftools 1.0.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1360,7 +1360,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Xcftools 1.0.6:";;
+     short | recursive ) echo "Configuration of Xcftools 1.0.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1459,7 +1459,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Xcftools configure 1.0.6
+Xcftools configure 1.0.7
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1473,7 +1473,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Xcftools $as_me 1.0.6, which was
+It was created by Xcftools $as_me 1.0.7, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -7895,7 +7895,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Xcftools $as_me 1.0.6, which was
+This file was extended by Xcftools $as_me 1.0.7, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7958,7 +7958,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-Xcftools config.status 1.0.6
+Xcftools config.status 1.0.7
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index cf77477..fcc8920 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl credit for writing it, in whichever way you find proper and customary.
 dnl
 dnl ------------------------
 dnl The following line is the MASTER SOURCE for the version number
-AC_INIT(Xcftools,1.0.6,henning@makholm.net,xcftools)
+AC_INIT(Xcftools,1.0.7,henning@makholm.net,xcftools)
 AC_CONFIG_SRCDIR(xcfinfo.c)
         
 AC_PROG_INSTALL
diff --git a/po/da.po b/po/da.po
index 96f5b61..0286cda 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xcftools 0.9\n"
 "Report-Msgid-Bugs-To: henning@makholm.net\n"
-"POT-Creation-Date: 2009-07-03 12:48+0200\n"
-"PO-Revision-Date: 2006-04-17 04:07+0200\n"
+"POT-Creation-Date: 2009-07-03 13:55+0200\n"
+"PO-Revision-Date: 2009-07-03 14:42+0200\n"
 "Last-Translator: Henning Makholm <henning@makholm.net>\n"
 "Language-Team: Til test af l10n-faciliteter; ikke vedligeholdt\n"
 "MIME-Version: 1.0\n"
@@ -352,7 +352,7 @@ msgstr ""
 msgid "Fractal"
 msgstr ""
 
-#: flatspec.c:45 utils.c:110
+#: flatspec.c:45 utils.c:105
 #, c-format
 msgid "Out of memory"
 msgstr "Ikke mere lagerplads"
@@ -476,28 +476,15 @@ msgstr "Billedet indeholder egenskaber som dette program ikke forstår:"
 
 #: utils.c:94
 #, c-format
-msgid ""
-"This program is free software; you can modify and distribute it\n"
-"under the terms of the GNU General Public License, version 2.\n"
-"There is no warranty for %s.\n"
-"\n"
-msgstr ""
-"Dette program er fri software; du må ændre og sprede det under de\n"
-"betingelser der fremgår af version 2 af GNU General Public License.\n"
-"Bemærk at %s leveres uden garanti.\n"
-"\n"
-
-#: utils.c:99
-#, c-format
 msgid "Type \"%s -h\" to get an option summary.\n"
 msgstr "Kommandoen »%s -h« giver en oversigt over kommandolinjeflag.\n"
 
-#: utils.c:135
+#: utils.c:130
 #, c-format
 msgid "!Cannot create file %s"
 msgstr "!Kan ikke oprette filen %s"
 
-#: utils.c:159
+#: utils.c:154
 #, c-format
 msgid "!Error writing file %s"
 msgstr "!Fejl under skrivning til %s"
diff --git a/po/xcftools.pot b/po/xcftools.pot
index 3eb43a0..760ae0e 100644
--- a/po/xcftools.pot
+++ b/po/xcftools.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: henning@makholm.net\n"
-"POT-Creation-Date: 2009-07-03 12:48+0200\n"
+"POT-Creation-Date: 2009-07-03 13:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -353,7 +353,7 @@ msgstr ""
 msgid "Fractal"
 msgstr ""
 
-#: flatspec.c:45 utils.c:110
+#: flatspec.c:45 utils.c:105
 #, c-format
 msgid "Out of memory"
 msgstr ""
@@ -474,24 +474,15 @@ msgstr ""
 
 #: utils.c:94
 #, c-format
-msgid ""
-"This program is free software; you can modify and distribute it\n"
-"under the terms of the GNU General Public License, version 2.\n"
-"There is no warranty for %s.\n"
-"\n"
-msgstr ""
-
-#: utils.c:99
-#, c-format
 msgid "Type \"%s -h\" to get an option summary.\n"
 msgstr ""
 
-#: utils.c:135
+#: utils.c:130
 #, c-format
 msgid "!Cannot create file %s"
 msgstr ""
 
-#: utils.c:159
+#: utils.c:154
 #, c-format
 msgid "!Error writing file %s"
 msgstr ""
diff --git a/utils.c b/utils.c
index c6afe30..b43f4a2 100644
--- a/utils.c
+++ b/utils.c
@@ -91,11 +91,6 @@ gpl_blurb(void)
 {
   fprintf(stderr,PACKAGE_STRING "\n");
   fprintf(stderr,
-          _("This program is free software; you can modify and distribute it\n"
-            "under the terms of the GNU General Public License, version 2.\n"
-            "There is no warranty for %s.\n\n"),
-          PACKAGE_NAME);
-  fprintf(stderr,
           _("Type \"%s -h\" to get an option summary.\n"),progname);
   exit(1) ;
 }
diff --git a/xcftools.spec b/xcftools.spec
index dbbec69..c66dca4 100644
--- a/xcftools.spec
+++ b/xcftools.spec
@@ -3,13 +3,13 @@
 # Henning Makholm, the xcftools author, have not had occasion to test
 # it, so use at your own peril. In particular, note that there is a
 # hard-coded version number just a few lines in. I make no promises
-# that I'll remember to update it for versions 1.0.6 - caveat emptor!
+# that I'll remember to update it for versions 1.0.7 - caveat emptor!
 
 #############################################################################
 # Variables
 #############################################################################
 %define name    xcftools
-%define version 1.0.6
+%define version 1.0.7
 %define release 1
 
 #############################################################################