* configure.ac: Require libgcrypt 1.1.94.

Introduce PACKAGE_GT and set it to gnupg2.

* gpg-agent.c (main): Use new libgcrypt thread library register
scheme.

* Makevars (DOMAIN): Init from PACKAGE_GT

ChangeLog

@@ -1,6 +1,7 @@
 2004-04-06  Werner Koch  <wk@gnupg.org>
 
 	* configure.ac: Require libgcrypt 1.1.94.
+	Introduce PACKAGE_GT and set it to gnupg2.
 
 2004-03-23  Werner Koch  <wk@gnupg.org>
 
@@ -414,7 +415,7 @@
 	* configure.ac (HAVE_JNLIB_LOGGING): always define it.
 
 	
- Copyright 2001, 2002 Free Software Foundation, Inc.
+ Copyright 2001, 2002, 2004 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without

NEWS

@@ -7,6 +7,9 @@ Noteworthy changes in version 1.9.7
 
  * Include the smimeCapabilities attribute with signed messages.
 
+ * Now uses the gettext domain "gnupg2" to avoid conflicts with gnupg
+   versions < 1.9.
+
 
 Noteworthy changes in version 1.9.6 (2004-03-06)
 ------------------------------------------------

agent/gpg-agent.c

@@ -197,12 +197,12 @@ static void
 i18n_init (void)
 {
 #ifdef USE_SIMPLE_GETTEXT
-    set_gettext_file( PACKAGE );
+    set_gettext_file( PACKAGE_GT );
 #else
 #ifdef ENABLE_NLS
     setlocale (LC_ALL, "");
-    bindtextdomain (PACKAGE, LOCALEDIR);
+    bindtextdomain (PACKAGE_GT, LOCALEDIR);
-    textdomain (PACKAGE);
+    textdomain (PACKAGE_GT);
 #endif
 #endif
 }
@@ -649,7 +649,7 @@ main (int argc, char **argv )
      easier to switch only once instead of for every message and it
      actually helps when more then one thread is active (avoids an
      extra copy step). */
-    bind_textdomain_codeset (PACKAGE, "UTF-8");
+    bind_textdomain_codeset (PACKAGE_GT, "UTF-8");
 #endif
 
   /* now start with logging to a file if this is desired */

agent/protect-tool.c

@@ -141,12 +141,12 @@ static void
 i18n_init (void)
 {
 #ifdef USE_SIMPLE_GETTEXT
-    set_gettext_file( PACKAGE );
+    set_gettext_file( PACKAGE_GT );
 #else
 #ifdef ENABLE_NLS
     setlocale (LC_ALL, "");
-    bindtextdomain (PACKAGE, LOCALEDIR);
+    bindtextdomain (PACKAGE_GT, LOCALEDIR);
-    textdomain (PACKAGE);
+    textdomain (PACKAGE_GT);
 #endif
 #endif
 }

configure.ac

@@ -1,6 +1,6 @@
 # configure.ac - for GnuPG 1.9
 # Copyright (C) 1998, 1999, 2000, 2001, 2002,
-#               2003 Free Software Foundation, Inc.
+#               2003, 2004 Free Software Foundation, Inc.
 # 
 # This file is part of GnuPG.
 # 
@@ -43,6 +43,7 @@ NEED_OPENSC_VERSION=0.8.0
 
 
 PACKAGE=$PACKAGE_NAME
+PACKAGE_GT=${PACKAGE_NAME}2
 VERSION=$PACKAGE_VERSION
 
 AC_CONFIG_AUX_DIR(scripts)
@@ -68,8 +69,11 @@ GNUPG_BUILD_PROGRAM(scdaemon, yes)
 
 
 AC_SUBST(PACKAGE)
+AC_SUBST(PACKAGE_GT)
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
+AC_DEFINE_UNQUOTED(PACKAGE_GT, "$PACKAGE_GT",
+                                [Name of this package for gettext])
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
 AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",
                                         [Bug report address])

g10/g10.c

@@ -783,12 +783,12 @@ static void
 i18n_init(void)
 {
 #ifdef USE_SIMPLE_GETTEXT
-    set_gettext_file( PACKAGE );
+    set_gettext_file( PACKAGE_GT );
 #else
 #ifdef ENABLE_NLS
     setlocale( LC_ALL, "" );
-    bindtextdomain( PACKAGE, LOCALEDIR );
+    bindtextdomain( PACKAGE_GT, LOCALEDIR );
-    textdomain( PACKAGE );
+    textdomain( PACKAGE_GT );
 #endif
 #endif
 }

g10/gpgv.c

@@ -116,7 +116,7 @@ static void
 i18n_init(void)
 {
 #ifdef USE_SIMPLE_GETTEXT
-    set_gettext_file( PACKAGE );
+    set_gettext_file( PACKAGE_GT );
 #else
 #ifdef ENABLE_NLS
 #ifdef HAVE_LC_MESSAGES
@@ -125,8 +125,8 @@ i18n_init(void)
 #else
        setlocale( LC_ALL, "" );
 #endif
-    bindtextdomain( PACKAGE, LOCALEDIR );
+    bindtextdomain( PACKAGE_GT, LOCALEDIR );
-    textdomain( PACKAGE );
+    textdomain( PACKAGE_GT );
 #endif
 #endif
 }

g10/passphrase.c

@@ -649,8 +649,8 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
     }
   
 #ifdef ENABLE_NLS
-  /* The Assuan agent protol requires us to trasnmit utf-8 strings */
+  /* The Assuan agent protocol requires us to transmit utf-8 strings */
-  orig_codeset = bind_textdomain_codeset (PACKAGE, NULL);
+  orig_codeset = bind_textdomain_codeset (PACKAGE_GT, NULL);
 #ifdef HAVE_LANGINFO_CODESET
   if (!orig_codeset)
     orig_codeset = nl_langinfo (CODESET);
@@ -658,7 +658,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
   if (orig_codeset)
     { /* We only switch when we are able to restore the codeset later. */
       orig_codeset = xstrdup (orig_codeset);
-      if (!bind_textdomain_codeset (PACKAGE, "utf-8"))
+      if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
         orig_codeset = NULL; 
     }
 #endif
@@ -765,7 +765,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
           free_public_key( pk );
 #ifdef ENABLE_NLS
           if (orig_codeset)
-            bind_textdomain_codeset (PACKAGE, orig_codeset);
+            bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
 #endif
           xfree (orig_codeset);
           return pw;
@@ -857,7 +857,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
           free_public_key( pk );
 #ifdef ENABLE_NLS
           if (orig_codeset)
-            bind_textdomain_codeset (PACKAGE, orig_codeset);
+            bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
 #endif
           xfree (orig_codeset);
           return pw;
@@ -880,7 +880,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
  failure:
 #ifdef ENABLE_NLS
   if (orig_codeset)
-    bind_textdomain_codeset (PACKAGE, orig_codeset);
+    bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
 #endif
   xfree (atext);
   if ( fd != -1 )

kbx/kbxutil.c

@@ -117,20 +117,20 @@ my_strusage( int level )
 static void
 i18n_init(void)
 {
-  #ifdef USE_SIMPLE_GETTEXT
+#ifdef USE_SIMPLE_GETTEXT
-    set_gettext_file( PACKAGE );
+    set_gettext_file( PACKAGE_GT );
-  #else
+#else
-  #ifdef ENABLE_NLS
+#ifdef ENABLE_NLS
     #ifdef HAVE_LC_MESSAGES
        setlocale( LC_TIME, "" );
        setlocale( LC_MESSAGES, "" );
     #else
        setlocale( LC_ALL, "" );
     #endif
-    bindtextdomain( PACKAGE, LOCALEDIR );
+    bindtextdomain( PACKAGE_GT, LOCALEDIR );
-    textdomain( PACKAGE );
+    textdomain( PACKAGE_GT );
-  #endif
+#endif
-  #endif
+#endif
 }
 
 

po/ChangeLog

@@ -1,3 +1,7 @@
+2004-04-06  Werner Koch  <wk@gnupg.org>
+
+	* Makevars (DOMAIN): Init from PACKAGE_GT
+
 2003-12-09  Werner Koch  <wk@gnupg.org>
 
 	* Makevars (MSGID_BUGS_ADDRESS): New.

po/LINGUAS

@@ -1,18 +1,5 @@
 # Set of available languages.
-# we have disabled most of them for now.
-en@quot en@boldquot
-#ca cs
-#da
 de
-#eo el es et
+
-#fi fr
+
-#gl
+
-#hu
-#id it
-#ja
-#nl
-#pl 
-#pt_BR pt
-#sk sv
-#tr
-#zh_TW"

po/LINUGAS

@@ -1,4 +0,0 @@
-# Set of available languages.
-de 
-
-

po/Makevars

@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
+DOMAIN = gnupg2
 
 # These two variables depend on the location of this directory.
 subdir = po

po/POTFILES.in

@@ -31,3 +31,6 @@ sm/keydb.c
 sm/keylist.c
 sm/sign.c
 sm/verify.c
+
+tools/gpgconf.c
+tools/gpgconf-comp.c

scd/scdaemon.c

@@ -167,12 +167,12 @@ static void
 i18n_init (void)
 {
 #ifdef USE_SIMPLE_GETTEXT
-    set_gettext_file( PACKAGE );
+    set_gettext_file( PACKAGE_GT );
 #else
 #ifdef ENABLE_NLS
     setlocale (LC_ALL, "");
-    bindtextdomain (PACKAGE, LOCALEDIR);
+    bindtextdomain (PACKAGE_GT, LOCALEDIR);
-    textdomain (PACKAGE);
+    textdomain (PACKAGE_GT);
 #endif
 #endif
 }

sm/certdump.c

@@ -633,7 +633,7 @@ gpgsm_format_keydesc (ksba_cert_t cert)
 
 #ifdef ENABLE_NLS
   /* The Assuan agent protol requires us to transmit utf-8 strings */
-  orig_codeset = bind_textdomain_codeset (PACKAGE, NULL);
+  orig_codeset = bind_textdomain_codeset (PACKAGE_GT, NULL);
 #ifdef HAVE_LANGINFO_CODESET
   if (!orig_codeset)
     orig_codeset = nl_langinfo (CODESET);
@@ -641,7 +641,7 @@ gpgsm_format_keydesc (ksba_cert_t cert)
   if (orig_codeset)
     { /* We only switch when we are able to restore the codeset later. */
       orig_codeset = xstrdup (orig_codeset);
-      if (!bind_textdomain_codeset (PACKAGE, "utf-8"))
+      if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
         orig_codeset = NULL; 
     }
 #endif
@@ -659,7 +659,7 @@ gpgsm_format_keydesc (ksba_cert_t cert)
 
 #ifdef ENABLE_NLS
   if (orig_codeset)
-    bind_textdomain_codeset (PACKAGE, orig_codeset);
+    bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
 #endif
   xfree (orig_codeset);
 

sm/gpgsm.c

@@ -540,7 +540,7 @@ static void
 i18n_init(void)
 {
 #ifdef USE_SIMPLE_GETTEXT
-  set_gettext_file (PACKAGE);
+  set_gettext_file (PACKAGE_GT);
 #else
 # ifdef ENABLE_NLS
 #  ifdef HAVE_LC_MESSAGES
@@ -549,8 +549,8 @@ i18n_init(void)
 #  else
   setlocale (LC_ALL, "" );
 #  endif
-  bindtextdomain (PACKAGE, LOCALEDIR);
+  bindtextdomain (PACKAGE_GT, LOCALEDIR);
-  textdomain (PACKAGE);
+  textdomain (PACKAGE_GT);
 # endif
 #endif
 }
@@ -1318,7 +1318,7 @@ main ( int argc, char **argv)
 
     case aCallDirmngr:
       if (!argc)
-        wrong_args (_("--call-dirmngr <command> {args}"));
+        wrong_args ("--call-dirmngr <command> {args}");
       else
         if (gpgsm_dirmngr_run_command (&ctrl, *argv, argc-1, argv+1))
           gpgsm_exit (1);
@@ -1334,7 +1334,7 @@ main ( int argc, char **argv)
       else if (argc == 1)
         gpgsm_encrypt (&ctrl, recplist, open_read (*argv), stdout); /* from file */
       else
-        wrong_args (_("--encrypt [datafile]"));
+        wrong_args ("--encrypt [datafile]");
       break;
 
     case aSign: /* sign the given file */
@@ -1348,7 +1348,7 @@ main ( int argc, char **argv)
         gpgsm_sign (&ctrl, signerlist,
                     open_read (*argv), detached_sig, stdout); /* from file */
       else
-        wrong_args (_("--sign [datafile]"));
+        wrong_args ("--sign [datafile]");
       break;
         
     case aSignEncr: /* sign and encrypt the given file */
@@ -1375,7 +1375,7 @@ main ( int argc, char **argv)
         else if (argc == 2) /* detached signature (sig, detached) */
           gpgsm_verify (&ctrl, open_read (*argv), open_read (argv[1]), NULL); 
         else
-          wrong_args (_("--verify [signature [detached_data]]"));
+          wrong_args ("--verify [signature [detached_data]]");
 
         if (fp && fp != stdout)
           fclose (fp);
@@ -1383,7 +1383,7 @@ main ( int argc, char **argv)
       break;
 
     case aVerifyFiles:
-      log_error ("this command has not yet been implemented\n");
+      log_error (_("this command has not yet been implemented\n"));
       break;
 
     case aDecrypt:
@@ -1392,7 +1392,7 @@ main ( int argc, char **argv)
       else if (argc == 1)
         gpgsm_decrypt (&ctrl, open_read (*argv), stdout); /* from file */
       else
-        wrong_args (_("--decrypt [filename]"));
+        wrong_args ("--decrypt [filename]");
       break;
 
     case aDeleteKey:
@@ -1445,7 +1445,7 @@ main ( int argc, char **argv)
       if (argc == 1)
         gpgsm_p12_export (&ctrl, *argv, stdout);
       else
-        wrong_args (_("--export-secret-key-p12 KEY-ID"));
+        wrong_args ("--export-secret-key-p12 KEY-ID");
       break;
       
     case aSendKeys:

sm/import.c

@@ -644,7 +644,7 @@ parse_p12 (ksba_reader_t reader, FILE **retfp)
       while ( (i=waitpid (pid, &status, 0)) == -1 && errno == EINTR)
         ;
       if (i == -1)
-        log_error (_("waiting for protect-tools to terminate failed: %s\n"),
+        log_error (_("waiting for protect-tool to terminate failed: %s\n"),
                    strerror (errno));
       else if (WIFEXITED (status) && WEXITSTATUS (status) == 31)
         log_error (_("error running `%s': probably not installed\n"), pgmname);

tools/gpgconf.c

@@ -103,7 +103,7 @@ static void
 i18n_init(void)
 {
 #ifdef USE_SIMPLE_GETTEXT
-  set_gettext_file (PACKAGE);
+  set_gettext_file (PACKAGE_GT);
 #else
 # ifdef ENABLE_NLS
 #  ifdef HAVE_LC_MESSAGES
@@ -112,8 +112,8 @@ i18n_init(void)
 #  else
   setlocale (LC_ALL, "" );
 #  endif
-  bindtextdomain (PACKAGE, LOCALEDIR);
+  bindtextdomain (PACKAGE_GT, LOCALEDIR);
-  textdomain (PACKAGE);
+  textdomain (PACKAGE_GT);
 # endif
 #endif
 }