diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | README | 14 | ||||
| -rw-r--r-- | README.SVN (renamed from README.CVS) | 43 | ||||
| -rwxr-xr-x | autogen.sh | 9 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | po/de.po | 6 | ||||
| -rw-r--r-- | po/fr.po | 6 | ||||
| -rw-r--r-- | po/libgpg-error.pot | 6 | ||||
| -rw-r--r-- | po/pl.po | 6 | ||||
| -rw-r--r-- | po/ro.po | 6 | ||||
| -rw-r--r-- | po/vi.po | 6 | ||||
| -rw-r--r-- | src/gpg-error.c | 10 |
13 files changed, 78 insertions, 52 deletions
@@ -1,5 +1,15 @@ 2006-11-30 Werner Koch <wk@g10code.com> + Released 1.5. + + * configure.ac: Set LT version to C3/A3/R1. + + * README: Switch to tar.bz2 and sha1sum. + + * src/gpg-error.c (main): Add option --version. + + * autogen.sh (FORCE): Add option --force. + * intl/: Removed. * Makefile.am (SUBDIRS): Removed intl. * configure.ac (AM_GNU_GETTEXT): Use external flag @@ -1,10 +1,12 @@ -Noteworthy changes in version 1.5 +Noteworthy changes in version 1.5 (2006-11-30) ---------------------------------------------- * Minor build system fixes. * Updated gettext. Removed included gettext copy. + * gpg-error has a new option --version. + Noteworthy changes in version 1.4 (2006-09-14) ---------------------------------------------- @@ -32,7 +32,7 @@ Here is a quick summary: important step! 2) Unpack the archive. With GNU tar you can do it this way: - "tar xzvf libgpg-error-x.y.tar.gz" + "tar xjvf libgpg-error-x.y.tar.bz2" 3) "cd libgpg-error-x.y" @@ -53,24 +53,24 @@ do it in one of the following ways: a) If you already have a trusted version of GnuPG installed, you can simply check the supplied signature: - $ gpg --verify libgpg-error-x.y.tar.gz.sig + $ gpg --verify libgpg-error-x.y.tar.bz2.sig - This checks that the detached signature libgpg-error-x.y.tar.gz.sig - is indeed a a signature of libgpg-error-x.y.tar.gz. + This checks that the detached signature libgpg-error-x.y.tar.bz2.sig + is indeed a a signature of libgpg-error-x.y.tar.bz2. Please note that you have to use an old version of GnuPG to do all this stuff. *Never* use the version which was built using the library you are trying to verify! b) If you don't have any a trusted version of GnuPG, you can attempt - to verify the MD5 checksum, using a trusted version of the md5sum + to verify the SHA1 checksum, using a trusted version of the sha1sum program: - $ md5sum libgpg-error-x.y.tar.gz + $ sha1sum libgpg-error-x.y.tar.bz2 This should yield an output _similar_ to this: - fd9351b26b3189c1d577f0970f9dcadc libgpg-error-x.y.tar.gz + 610064e5b77700f5771c8fde2691c4365e1ca100 libgpg-error-x.y.tar.bz2 Now check that this checksum is _exactly_ the same as the one published via the announcement list and probably via Usenet. @@ -1,18 +1,19 @@ -If you are building from CVS, run the script +If you are building from Subversion, run the script -$ ./autogen.sh +./autogen.sh -to make sure that all the necessary maintainer tools are installed and -to build the actual configuration files. Then run +first, to make sure that you have all the necessary maintainer tools +are installed and to build the actual configuration files. If you +have just updated from SVN, you should add the option "--force" to +autogen.sh so that meta data from SVN is noticed. Then run -$ ./configure --enable-maintainer-mode +./configure --enable-maintainer-mode followed by the usual make. - If autogen.sh complains about insufficient versions of the required -tools, or the tools are not installed in the default location, you may -use environment variables to override the default tool names: +tools, or the tools are not installed, you may use environment +variables to override the default tool names: AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake package. For example @@ -24,27 +25,27 @@ use environment variables to override the default tool names: uses "automake" and "aclocal" in the /usr/foo/bin directory. AUTOCONF_SUFFIX is used as a suffix for all tools from the automake - package. + package AUTOCONF_PREFIX is used as a prefix for all tools from the automake - package. + package GETTEXT_SUFFIX is used as a suffix for all tools from the gettext - package. + package GETTEXT_PREFIX is used as a prefix for all tools from the gettext - package. - + package It is also possible to use the variable name AUTOMAKE, AUTOCONF, ACLOCAL, AUTOHEADER, GETTEXT and MSGMERGE to directly specify the name of the programs to run. It is however better to use the suffix and -prefix forms as described above, because that does not require -knowledge about the actual tools used by autogen.sh. +prefix forms as described above because that does not require +knowledge about the actual tools used by autgen.sh. Please don't use autopoint, libtoolize or autoreconf unless you are the current maintainer and want to update the standard configuration -files. All the files generated from these tools should be in the -repository and only updated manually if the maintainer decides that -newer versions are required. The maintainer should also make sure -that the required version of automake et al. are properly indicated at -the top of configure.ac and take care to copy the files and not merely -use symlinks. +files. All those files should be in the SVN and only updated manually +if the maintainer decides that newer versions are required. The +maintainer should also make sure that the required version of automake +et al. are properly indicated at the top of configure.ac and take care +to copy the files and not merely use symlinks. + + @@ -29,6 +29,11 @@ check_version () { } DIE=no +FORCE= +if test "$1" == "--force"; then + FORCE=" --force" + shift +fi # ***** W32 build script ******* # Used to cross-compile for Windows. @@ -186,7 +191,7 @@ echo "Running autoheader..." $AUTOHEADER echo "Running automake --gnu ..." $AUTOMAKE --gnu; -echo "Running autoconf..." -$AUTOCONF +echo "Running autoconf${FORCE} ..." +$AUTOCONF${FORCE} echo "You may now run \"./configure --enable-maintainer-mode && make\"." diff --git a/configure.ac b/configure.ac index 3124c0c..5a4e28e 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ min_automake_version="1.9.6" # Set my_issvn to "yes" for non-released code. Remember to run an # "svn up" and "autogen.sh" right before creating a distribution. m4_define([my_version], [1.5]) -m4_define([my_issvn], [yes]) +m4_define([my_issvn], [no]) m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \ || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')])) @@ -40,7 +40,7 @@ AC_INIT([libgpg-error], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]), # Note that added error codes don't constitute an interface change. LIBGPG_ERROR_LT_CURRENT=3 LIBGPG_ERROR_LT_AGE=3 -LIBGPG_ERROR_LT_REVISION=0 +LIBGPG_ERROR_LT_REVISION=1 AC_SUBST(LIBGPG_ERROR_LT_CURRENT) AC_SUBST(LIBGPG_ERROR_LT_AGE) AC_SUBST(LIBGPG_ERROR_LT_REVISION) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error-1.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-09-14 14:58+0200\n" +"POT-Creation-Date: 2006-11-30 15:57+0100\n" "PO-Revision-Date: 2006-09-14 15:11+0200\n" "Last-Translator: Werner Koch <wk@gnupg.org>\n" "Language-Team: none\n" @@ -1023,12 +1023,12 @@ msgstr "Dateiende" msgid "Unknown error code" msgstr "Unbekannter Fehlercode" -#: src/gpg-error.c:456 +#: src/gpg-error.c:457 #, c-format msgid "Usage: %s GPG-ERROR [...]\n" msgstr "Aufruf: %s GPG-FEHLER [...]\n" -#: src/gpg-error.c:477 +#: src/gpg-error.c:485 #, c-format msgid "%s: warning: could not recognize %s\n" msgstr "%s: Warnung: %s konnte nicht erkannt werden\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-09-14 14:58+0200\n" +"POT-Creation-Date: 2006-11-30 15:57+0100\n" "PO-Revision-Date: 2005-08-18 16:48+0100\n" "Last-Translator: Stephane Roy <sroy@j2n.net>\n" "Language-Team: French <LL@li.org>\n" @@ -1040,12 +1040,12 @@ msgstr "Fin du fichier" msgid "Unknown error code" msgstr "Code d'erreur inconnu" -#: src/gpg-error.c:456 +#: src/gpg-error.c:457 #, c-format msgid "Usage: %s GPG-ERROR [...]\n" msgstr "Usage : %s GPG-ERROR [...]\n" -#: src/gpg-error.c:477 +#: src/gpg-error.c:485 #, c-format msgid "%s: warning: could not recognize %s\n" msgstr "%s : attention : pourrait ne pas reconnaître %s\n" diff --git a/po/libgpg-error.pot b/po/libgpg-error.pot index 0f71ee6..8ee0f65 100644 --- a/po/libgpg-error.pot +++ b/po/libgpg-error.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-09-14 14:58+0200\n" +"POT-Creation-Date: 2006-11-30 15:57+0100\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" @@ -1024,12 +1024,12 @@ msgstr "" msgid "Unknown error code" msgstr "" -#: src/gpg-error.c:456 +#: src/gpg-error.c:457 #, c-format msgid "Usage: %s GPG-ERROR [...]\n" msgstr "" -#: src/gpg-error.c:477 +#: src/gpg-error.c:485 #, c-format msgid "%s: warning: could not recognize %s\n" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-09-14 14:58+0200\n" +"POT-Creation-Date: 2006-11-30 15:57+0100\n" "PO-Revision-Date: 2005-07-04 17:42+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -1043,12 +1043,12 @@ msgstr "Koniec pliku" msgid "Unknown error code" msgstr "Nieznany kod b³êdu" -#: src/gpg-error.c:456 +#: src/gpg-error.c:457 #, c-format msgid "Usage: %s GPG-ERROR [...]\n" msgstr "Sk³adnia: %s B£¡D-GPG [...]\n" -#: src/gpg-error.c:477 +#: src/gpg-error.c:485 #, c-format msgid "%s: warning: could not recognize %s\n" msgstr "%s: uwaga: nie rozpoznano %s\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-09-14 14:58+0200\n" +"POT-Creation-Date: 2006-11-30 15:57+0100\n" "PO-Revision-Date: 2005-06-30 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" @@ -1046,12 +1046,12 @@ msgstr "Sfârºit de fiºier" msgid "Unknown error code" msgstr "Cod de eroare necunoscut" -#: src/gpg-error.c:456 +#: src/gpg-error.c:457 #, c-format msgid "Usage: %s GPG-ERROR [...]\n" msgstr "Folosire: %s EROARE-GPG [...]\n" -#: src/gpg-error.c:477 +#: src/gpg-error.c:485 #, c-format msgid "%s: warning: could not recognize %s\n" msgstr "%s: avertisment: nu am putut recunoaºte %s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error-1.1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-09-14 14:58+0200\n" +"POT-Creation-Date: 2006-11-30 15:57+0100\n" "PO-Revision-Date: 2006-01-08 16:33+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" @@ -1050,12 +1050,12 @@ msgstr "Kết thức táºp tin" msgid "Unknown error code" msgstr "Mã lá»—i lạ" -#: src/gpg-error.c:456 +#: src/gpg-error.c:457 #, c-format msgid "Usage: %s GPG-ERROR [...]\n" msgstr "Cách sá» dụng: %s GPG-ERROR [...]\n" -#: src/gpg-error.c:477 +#: src/gpg-error.c:485 #, c-format msgid "%s: warning: could not recognize %s\n" msgstr "%s: cảnh báo : không thể nháºn ra %s\n" diff --git a/src/gpg-error.c b/src/gpg-error.c index e5b7fc4..cc26292 100644 --- a/src/gpg-error.c +++ b/src/gpg-error.c @@ -451,11 +451,19 @@ main (int argc, char *argv[]) i18n_init (); + if (argc == 1) { - fprintf (stderr, _("Usage: %s GPG-ERROR [...]\n"), argv[0]); + fprintf (stderr, _("Usage: %s GPG-ERROR [...]\n"), + strrchr (argv[0],'/')? (strrchr (argv[0], '/')+1): argv[0]); exit (1); } + else if (argc == 2 && !strcmp (argv[1], "--version")) + { + fputs ("gpg-error (" PACKAGE_NAME ") " PACKAGE_VERSION "\n", stdout); + exit (0); + } + while (i < argc) { |