From: Bruno Haible <bruno@clisp.org>
Date: Mon, 16 Dec 2024 10:48:10 +0000 (+0100)
Subject: Rename some examples.
X-Git-Tag: v0.24~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ccf1005e0d6467fb5aaca5fa449527c974431b;p=thirdparty%2Fgettext.git

Rename some examples.

* gettext-tools/examples/hello-c-gnome2: Renamed from
gettext-tools/examples/hello-c-gnome.
* gettext-tools/examples/hello-c++-gnome2: Renamed from
gettext-tools/examples/hello-c++-gnome.
* gettext-tools/examples/hello-objc-gnome2: Renamed from
gettext-tools/examples/hello-objc-gnome.
* gettext-tools/examples/Makefile.am (EXAMPLESFILES, EXAMPLESDIRS): Update.
* gettext-tools/examples/po/Makefile.am (POTFILES, SMALLPOTS,
SMALLPOFILES_FOR_lang): Update.
* gettext-tools/examples/README: Update.
* gettext-tools/examples/check-examples: Update.
* check-copyright-headers: Update.
---

diff --git a/check-copyright-headers b/check-copyright-headers
index 1532e5798..996013353 100755
--- a/check-copyright-headers
+++ b/check-copyright-headers
@@ -129,7 +129,7 @@ func_check_file ()
       # in attaching our own copyright header to each.
       return 0 ;;
 
-    /gettext-tools/examples/hello-*-gnome/m4/*.m4 | \
+    /gettext-tools/examples/hello-*-gnome2/m4/*.m4 | \
     /gettext-tools/projects/GNOME/teams.html )
       # These files come from the GNOME project.
       # We are not interested in attaching our own copyright header to each.
diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index cf38db8da..dc75f7ffc 100644
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -40,18 +40,18 @@ EXAMPLESFILES = \
   hello-c/po/Makevars \
   hello-c/po/POTFILES.in \
   \
-  hello-c-gnome/INSTALL \
-  hello-c-gnome/autogen.sh \
-  hello-c-gnome/autoclean.sh \
-  hello-c-gnome/hello.c \
-  hello-c-gnome/Makefile.am \
-  hello-c-gnome/configure.ac \
-  hello-c-gnome/m4/Makefile.am \
-  hello-c-gnome/m4/gnome.m4 \
-  hello-c-gnome/m4/gnome-gnorba-check.m4 \
-  hello-c-gnome/m4/gnome-orbit-check.m4 \
-  hello-c-gnome/po/Makevars \
-  hello-c-gnome/po/POTFILES.in \
+  hello-c-gnome2/INSTALL \
+  hello-c-gnome2/autogen.sh \
+  hello-c-gnome2/autoclean.sh \
+  hello-c-gnome2/hello.c \
+  hello-c-gnome2/Makefile.am \
+  hello-c-gnome2/configure.ac \
+  hello-c-gnome2/m4/Makefile.am \
+  hello-c-gnome2/m4/gnome.m4 \
+  hello-c-gnome2/m4/gnome-gnorba-check.m4 \
+  hello-c-gnome2/m4/gnome-orbit-check.m4 \
+  hello-c-gnome2/po/Makevars \
+  hello-c-gnome2/po/POTFILES.in \
   \
   hello-c-gnome3/INSTALL \
   hello-c-gnome3/autogen.sh \
@@ -135,20 +135,20 @@ EXAMPLESFILES = \
   hello-c++-kde/po/Makevars \
   hello-c++-kde/po/POTFILES.in \
   \
-  hello-c++-gnome/INSTALL \
-  hello-c++-gnome/autogen.sh \
-  hello-c++-gnome/autoclean.sh \
-  hello-c++-gnome/hello.cc \
-  hello-c++-gnome/Makefile.am \
-  hello-c++-gnome/configure.ac \
-  hello-c++-gnome/m4/Makefile.am \
-  hello-c++-gnome/m4/gnome.m4 \
-  hello-c++-gnome/m4/gnome-gnorba-check.m4 \
-  hello-c++-gnome/m4/gnome-orbit-check.m4 \
-  hello-c++-gnome/m4/gtk.m4 \
-  hello-c++-gnome/m4/gtk--.m4 \
-  hello-c++-gnome/po/Makevars \
-  hello-c++-gnome/po/POTFILES.in \
+  hello-c++-gnome2/INSTALL \
+  hello-c++-gnome2/autogen.sh \
+  hello-c++-gnome2/autoclean.sh \
+  hello-c++-gnome2/hello.cc \
+  hello-c++-gnome2/Makefile.am \
+  hello-c++-gnome2/configure.ac \
+  hello-c++-gnome2/m4/Makefile.am \
+  hello-c++-gnome2/m4/gnome.m4 \
+  hello-c++-gnome2/m4/gnome-gnorba-check.m4 \
+  hello-c++-gnome2/m4/gnome-orbit-check.m4 \
+  hello-c++-gnome2/m4/gtk.m4 \
+  hello-c++-gnome2/m4/gtk--.m4 \
+  hello-c++-gnome2/po/Makevars \
+  hello-c++-gnome2/po/POTFILES.in \
   \
   hello-c++-wxwidgets/INSTALL \
   hello-c++-wxwidgets/autogen.sh \
@@ -183,18 +183,18 @@ EXAMPLESFILES = \
   hello-objc-gnustep/po/GNUmakefile \
   hello-objc-gnustep/po/LocaleAliases \
   \
-  hello-objc-gnome/INSTALL \
-  hello-objc-gnome/autogen.sh \
-  hello-objc-gnome/autoclean.sh \
-  hello-objc-gnome/hello.m \
-  hello-objc-gnome/Makefile.am \
-  hello-objc-gnome/configure.ac \
-  hello-objc-gnome/m4/Makefile.am \
-  hello-objc-gnome/m4/gnome.m4 \
-  hello-objc-gnome/m4/gnome-gnorba-check.m4 \
-  hello-objc-gnome/m4/gnome-orbit-check.m4 \
-  hello-objc-gnome/po/Makevars \
-  hello-objc-gnome/po/POTFILES.in \
+  hello-objc-gnome2/INSTALL \
+  hello-objc-gnome2/autogen.sh \
+  hello-objc-gnome2/autoclean.sh \
+  hello-objc-gnome2/hello.m \
+  hello-objc-gnome2/Makefile.am \
+  hello-objc-gnome2/configure.ac \
+  hello-objc-gnome2/m4/Makefile.am \
+  hello-objc-gnome2/m4/gnome.m4 \
+  hello-objc-gnome2/m4/gnome-gnorba-check.m4 \
+  hello-objc-gnome2/m4/gnome-orbit-check.m4 \
+  hello-objc-gnome2/po/Makevars \
+  hello-objc-gnome2/po/POTFILES.in \
   \
   hello-sh/INSTALL \
   hello-sh/autogen.sh \
@@ -393,17 +393,17 @@ EXAMPLESFILES = \
 # List of examples directories containing a po directory.
 EXAMPLESDIRS = \
   hello-c \
-  hello-c-gnome \
+  hello-c-gnome2 \
   hello-c-gnome3 \
   hello-c++ \
   hello-c++20 \
   hello-c++-qt \
   hello-c++-kde \
-  hello-c++-gnome \
+  hello-c++-gnome2 \
   hello-c++-wxwidgets \
   hello-objc \
   hello-objc-gnustep \
-  hello-objc-gnome \
+  hello-objc-gnome2 \
   hello-sh \
   hello-python \
   hello-clisp \
diff --git a/gettext-tools/examples/README b/gettext-tools/examples/README
index 5d6434807..a3193bb31 100644
--- a/gettext-tools/examples/README
+++ b/gettext-tools/examples/README
@@ -6,17 +6,17 @@ environment.
     Example                    Language          GUI Environment
 
     hello-c                    C
-    hello-c-gnome              C                 GNOME (obsolete)
+    hello-c-gnome2             C                 GNOME 2 (obsolete)
     hello-c-gnome3             C                 GNOME 3.10 or later
     hello-c++                  C++
     hello-c++20                C++ 20
     hello-c++-qt               C++               Qt
     hello-c++-kde              C++               KDE
-    hello-c++-gnome            C++               GNOME (obsolete)
+    hello-c++-gnome2           C++               GNOME 2 (obsolete)
     hello-c++-wxwidgets        C++               wxWidgets
     hello-objc                 ObjectiveC
     hello-objc-gnustep         ObjectiveC        GNUstep
-    hello-objc-gnome           ObjectiveC        GNOME (obsolete)
+    hello-objc-gnome2          ObjectiveC        GNOME 2 (obsolete)
     hello-sh                   Shell
     hello-python               Python
     hello-clisp                Lisp
@@ -56,14 +56,14 @@ Makefile types:
     Example                    Binary catalog format   Makefile type
 
     hello-c                    .gmo                    Makefile.in
-    hello-c-gnome              .gmo                    Makefile.in
+    hello-c-gnome2             .gmo                    Makefile.in
     hello-c-gnome3             .gmo                    Makefile.in
     hello-c++                  .gmo                    Makefile.in
     hello-c++20                .gmo                    Makefile.in
     hello-c++-kde              .gmo                    Makefile.in
-    hello-c++-gnome            .gmo                    Makefile.in
+    hello-c++-gnome2           .gmo                    Makefile.in
     hello-objc                 .gmo                    Makefile.in
-    hello-objc-gnome           .gmo                    Makefile.in
+    hello-objc-gnome2          .gmo                    Makefile.in
     hello-c++-wxwidgets        .gmo                    Makefile.am
     hello-sh                   .gmo                    Makefile.am
     hello-python               .gmo                    Makefile.am
diff --git a/gettext-tools/examples/check-examples b/gettext-tools/examples/check-examples
index 5a7fa4e4b..55ce06e7b 100755
--- a/gettext-tools/examples/check-examples
+++ b/gettext-tools/examples/check-examples
@@ -129,17 +129,17 @@ func_check_autoclean_all ()
 {
   rm -f hello-*.out
   func_check_autoclean hello-c
-  func_check_autoclean hello-c-gnome
+  func_check_autoclean hello-c-gnome2
   func_check_autoclean hello-c-gnome3
   func_check_autoclean hello-c++
   func_check_autoclean hello-c++20
   func_check_autoclean hello-c++-qt
   func_check_autoclean hello-c++-kde
-  func_check_autoclean hello-c++-gnome
+  func_check_autoclean hello-c++-gnome2
   func_check_autoclean hello-c++-wxwidgets
   func_check_autoclean hello-objc
   func_check_autoclean hello-objc-gnustep
-  func_check_autoclean hello-objc-gnome
+  func_check_autoclean hello-objc-gnome2
   func_check_autoclean hello-sh
   func_check_autoclean hello-python
   func_check_autoclean hello-clisp
@@ -170,12 +170,12 @@ func_check_autoclean_all ()
 
 
 # Known configure failures:
-# hello-c-gnome: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install
+# hello-c-gnome2: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install
 # hello-c-gnome3: error: can't find gtk+-3.0 >= 3.10
 # hello-c++-qt: error: cannot find correct Qt headers!
 # hello-c++-kde: configure: error: Qt (>= Qt 3.1.0) (headers and libraries) not found. Please check your installation!
-# hello-c++-gnome: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install
-# hello-objc-gnome: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install
+# hello-c++-gnome2: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install
+# hello-objc-gnome2: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install
 # hello-ycp: *** Essential program y2base not found
 
 # func_check_distclean sample
@@ -202,17 +202,17 @@ func_check_distclean_all ()
 {
   rm -f hello-*.log hello-*.out
   func_check_distclean hello-c
- #func_check_distclean hello-c-gnome
+ #func_check_distclean hello-c-gnome2
  #func_check_distclean hello-c-gnome3
   func_check_distclean hello-c++
   func_check_distclean hello-c++20
  #func_check_distclean hello-c++-qt
  #func_check_distclean hello-c++-kde
- #func_check_distclean hello-c++-gnome
+ #func_check_distclean hello-c++-gnome2
   func_check_distclean hello-c++-wxwidgets
   func_check_distclean hello-objc
   func_check_distclean hello-objc-gnustep
- #func_check_distclean hello-objc-gnome
+ #func_check_distclean hello-objc-gnome2
   func_check_distclean hello-sh
   func_check_distclean hello-python
   func_check_distclean hello-clisp
@@ -277,17 +277,17 @@ func_check_maintainerclean_all ()
 {
   rm -f hello-*.log hello-*.out
   func_check_maintainerclean hello-c
- #func_check_maintainerclean hello-c-gnome
+ #func_check_maintainerclean hello-c-gnome2
  #func_check_maintainerclean hello-c-gnome3
   func_check_maintainerclean hello-c++
   func_check_maintainerclean hello-c++20
  #func_check_maintainerclean hello-c++-qt
  #func_check_maintainerclean hello-c++-kde
- #func_check_maintainerclean hello-c++-gnome
+ #func_check_maintainerclean hello-c++-gnome2
   func_check_maintainerclean hello-c++-wxwidgets
   func_check_maintainerclean hello-objc
   func_check_maintainerclean hello-objc-gnustep
- #func_check_maintainerclean hello-objc-gnome
+ #func_check_maintainerclean hello-objc-gnome2
   func_check_maintainerclean hello-sh
   func_check_maintainerclean hello-python
   func_check_maintainerclean hello-clisp
@@ -355,17 +355,17 @@ func_check_maintainerclean_vpath_all ()
 {
   rm -f hello-*.log hello-*.out
   func_check_maintainerclean_vpath hello-c
- #func_check_maintainerclean_vpath hello-c-gnome
+ #func_check_maintainerclean_vpath hello-c-gnome2
  #func_check_maintainerclean_vpath hello-c-gnome3
   func_check_maintainerclean_vpath hello-c++
   func_check_maintainerclean_vpath hello-c++20
  #func_check_maintainerclean_vpath hello-c++-qt
  #func_check_maintainerclean_vpath hello-c++-kde
- #func_check_maintainerclean_vpath hello-c++-gnome
+ #func_check_maintainerclean_vpath hello-c++-gnome2
   func_check_maintainerclean_vpath hello-c++-wxwidgets
   func_check_maintainerclean_vpath hello-objc
   func_check_maintainerclean_vpath hello-objc-gnustep
- #func_check_maintainerclean_vpath hello-objc-gnome
+ #func_check_maintainerclean_vpath hello-objc-gnome2
   func_check_maintainerclean_vpath hello-sh
   func_check_maintainerclean_vpath hello-python
   func_check_maintainerclean_vpath hello-clisp
@@ -440,17 +440,17 @@ func_check_dist_all ()
 {
   rm -f hello-*.log hello-*.out
   func_check_dist hello-c
- #func_check_dist hello-c-gnome
+ #func_check_dist hello-c-gnome2
  #func_check_dist hello-c-gnome3
   func_check_dist hello-c++
   func_check_dist hello-c++20
  #func_check_dist hello-c++-qt
  #func_check_dist hello-c++-kde
- #func_check_dist hello-c++-gnome
+ #func_check_dist hello-c++-gnome2
   func_check_dist hello-c++-wxwidgets
   func_check_dist hello-objc
   func_check_dist hello-objc-gnustep
- #func_check_dist hello-objc-gnome
+ #func_check_dist hello-objc-gnome2
   func_check_dist hello-sh
   func_check_dist hello-python
   func_check_dist hello-clisp
@@ -525,17 +525,17 @@ func_check_dist_vpath_all ()
 {
   rm -f hello-*.log hello-*.out
   func_check_dist_vpath hello-c
- #func_check_dist_vpath hello-c-gnome
+ #func_check_dist_vpath hello-c-gnome2
  #func_check_dist_vpath hello-c-gnome3
   func_check_dist_vpath hello-c++
   func_check_dist_vpath hello-c++20
  #func_check_dist_vpath hello-c++-qt
  #func_check_dist_vpath hello-c++-kde
- #func_check_dist_vpath hello-c++-gnome
+ #func_check_dist_vpath hello-c++-gnome2
   func_check_dist_vpath hello-c++-wxwidgets
   func_check_dist_vpath hello-objc
   func_check_dist_vpath hello-objc-gnustep
- #func_check_dist_vpath hello-objc-gnome
+ #func_check_dist_vpath hello-objc-gnome2
   func_check_dist_vpath hello-sh
   func_check_dist_vpath hello-python
   func_check_dist_vpath hello-clisp
@@ -602,17 +602,17 @@ func_check_install_all ()
   rm -f hello-*.log
   rm -rf "$instdir/hello-*"
   func_check_install hello-c
- #func_check_install hello-c-gnome
+ #func_check_install hello-c-gnome2
  #func_check_install hello-c-gnome3
   func_check_install hello-c++
   func_check_install hello-c++20
  #func_check_install hello-c++-qt
  #func_check_install hello-c++-kde
- #func_check_install hello-c++-gnome
+ #func_check_install hello-c++-gnome2
   func_check_install hello-c++-wxwidgets
   func_check_install hello-objc
   func_check_install hello-objc-gnustep
- #func_check_install hello-objc-gnome
+ #func_check_install hello-objc-gnome2
   func_check_install hello-sh
   func_check_install hello-python
   func_check_install hello-clisp
@@ -676,17 +676,17 @@ func_check_uninstall_all ()
   rm -f hello-*.log hello-*.out
   rm -rf "$instdir/hello-*"
   func_check_uninstall hello-c
- #func_check_uninstall hello-c-gnome
+ #func_check_uninstall hello-c-gnome2
  #func_check_uninstall hello-c-gnome3
   func_check_uninstall hello-c++
   func_check_uninstall hello-c++20
  #func_check_uninstall hello-c++-qt
  #func_check_uninstall hello-c++-kde
- #func_check_uninstall hello-c++-gnome
+ #func_check_uninstall hello-c++-gnome2
   func_check_uninstall hello-c++-wxwidgets
   func_check_uninstall hello-objc
   func_check_uninstall hello-objc-gnustep
- #func_check_uninstall hello-objc-gnome
+ #func_check_uninstall hello-objc-gnome2
   func_check_uninstall hello-sh
   func_check_uninstall hello-python
   func_check_uninstall hello-clisp
@@ -752,17 +752,17 @@ func_check_distcheck_all ()
 {
   rm -f hello-*.log
   func_check_distcheck hello-c
- #func_check_distcheck hello-c-gnome
+ #func_check_distcheck hello-c-gnome2
  #func_check_distcheck hello-c-gnome3
   func_check_distcheck hello-c++
   func_check_distcheck hello-c++20
  #func_check_distcheck hello-c++-qt
  #func_check_distcheck hello-c++-kde
- #func_check_distcheck hello-c++-gnome
+ #func_check_distcheck hello-c++-gnome2
   func_check_distcheck hello-c++-wxwidgets
   func_check_distcheck hello-objc
   func_check_distcheck hello-objc-gnustep
- #func_check_distcheck hello-objc-gnome
+ #func_check_distcheck hello-objc-gnome2
   func_check_distcheck hello-sh
   func_check_distcheck hello-python
   func_check_distcheck hello-clisp
@@ -803,17 +803,17 @@ func_check ()
 func_check_all ()
 {
   func_check hello-c
-  func_check hello-c-gnome
+  func_check hello-c-gnome2
   func_check hello-c-gnome3
   func_check hello-c++
   func_check hello-c++20
   func_check hello-c++-qt
   func_check hello-c++-kde
-  func_check hello-c++-gnome
+  func_check hello-c++-gnome2
   func_check hello-c++-wxwidgets
   func_check hello-objc
   func_check hello-objc-gnustep
-  func_check hello-objc-gnome
+  func_check hello-objc-gnome2
   func_check hello-sh
   func_check hello-python
   func_check hello-clisp
diff --git a/gettext-tools/examples/hello-c++-gnome/INSTALL b/gettext-tools/examples/hello-c++-gnome2/INSTALL
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/INSTALL
rename to gettext-tools/examples/hello-c++-gnome2/INSTALL
diff --git a/gettext-tools/examples/hello-c++-gnome/Makefile.am b/gettext-tools/examples/hello-c++-gnome2/Makefile.am
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/Makefile.am
rename to gettext-tools/examples/hello-c++-gnome2/Makefile.am
diff --git a/gettext-tools/examples/hello-c++-gnome/autoclean.sh b/gettext-tools/examples/hello-c++-gnome2/autoclean.sh
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/autoclean.sh
rename to gettext-tools/examples/hello-c++-gnome2/autoclean.sh
diff --git a/gettext-tools/examples/hello-c++-gnome/autogen.sh b/gettext-tools/examples/hello-c++-gnome2/autogen.sh
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/autogen.sh
rename to gettext-tools/examples/hello-c++-gnome2/autogen.sh
diff --git a/gettext-tools/examples/hello-c++-gnome/configure.ac b/gettext-tools/examples/hello-c++-gnome2/configure.ac
similarity index 89%
rename from gettext-tools/examples/hello-c++-gnome/configure.ac
rename to gettext-tools/examples/hello-c++-gnome2/configure.ac
index 5d82e95e5..ae287736b 100644
--- a/gettext-tools/examples/hello-c++-gnome/configure.ac
+++ b/gettext-tools/examples/hello-c++-gnome2/configure.ac
@@ -3,7 +3,7 @@ dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
 
-AC_INIT([hello-c++-gnome], [0], , [hello-c++-gnome])
+AC_INIT([hello-c++-gnome2], [0], , [hello-c++-gnome2])
 AC_CONFIG_SRCDIR([hello.cc])
 AM_INIT_AUTOMAKE([1.11])
 
diff --git a/gettext-tools/examples/hello-c++-gnome/hello.cc b/gettext-tools/examples/hello-c++-gnome2/hello.cc
similarity index 95%
rename from gettext-tools/examples/hello-c++-gnome/hello.cc
rename to gettext-tools/examples/hello-c++-gnome2/hello.cc
index 5c41ab303..45200d57d 100644
--- a/gettext-tools/examples/hello-c++-gnome/hello.cc
+++ b/gettext-tools/examples/hello-c++-gnome2/hello.cc
@@ -42,8 +42,8 @@ main (int argc, char *argv[])
 
   setlocale (LC_ALL, "");
   application = new Gtk::Main (argc, argv);
-  textdomain ("hello-c++-gnome");
-  bindtextdomain ("hello-c++-gnome", LOCALEDIR);
+  textdomain ("hello-c++-gnome2");
+  bindtextdomain ("hello-c++-gnome2", LOCALEDIR);
 
   /* Create the GUI elements.  */
 
diff --git a/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am b/gettext-tools/examples/hello-c++-gnome2/m4/Makefile.am
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
rename to gettext-tools/examples/hello-c++-gnome2/m4/Makefile.am
diff --git a/gettext-tools/examples/hello-c++-gnome/m4/gnome-gnorba-check.m4 b/gettext-tools/examples/hello-c++-gnome2/m4/gnome-gnorba-check.m4
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/m4/gnome-gnorba-check.m4
rename to gettext-tools/examples/hello-c++-gnome2/m4/gnome-gnorba-check.m4
diff --git a/gettext-tools/examples/hello-c++-gnome/m4/gnome-orbit-check.m4 b/gettext-tools/examples/hello-c++-gnome2/m4/gnome-orbit-check.m4
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/m4/gnome-orbit-check.m4
rename to gettext-tools/examples/hello-c++-gnome2/m4/gnome-orbit-check.m4
diff --git a/gettext-tools/examples/hello-c++-gnome/m4/gnome.m4 b/gettext-tools/examples/hello-c++-gnome2/m4/gnome.m4
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/m4/gnome.m4
rename to gettext-tools/examples/hello-c++-gnome2/m4/gnome.m4
diff --git a/gettext-tools/examples/hello-c++-gnome/m4/gtk--.m4 b/gettext-tools/examples/hello-c++-gnome2/m4/gtk--.m4
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/m4/gtk--.m4
rename to gettext-tools/examples/hello-c++-gnome2/m4/gtk--.m4
diff --git a/gettext-tools/examples/hello-c++-gnome/m4/gtk.m4 b/gettext-tools/examples/hello-c++-gnome2/m4/gtk.m4
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/m4/gtk.m4
rename to gettext-tools/examples/hello-c++-gnome2/m4/gtk.m4
diff --git a/gettext-tools/examples/hello-c++-gnome/po/LINGUAS b/gettext-tools/examples/hello-c++-gnome2/po/LINGUAS
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/po/LINGUAS
rename to gettext-tools/examples/hello-c++-gnome2/po/LINGUAS
diff --git a/gettext-tools/examples/hello-c++-gnome/po/Makevars b/gettext-tools/examples/hello-c++-gnome2/po/Makevars
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/po/Makevars
rename to gettext-tools/examples/hello-c++-gnome2/po/Makevars
diff --git a/gettext-tools/examples/hello-c++-gnome/po/POTFILES.in b/gettext-tools/examples/hello-c++-gnome2/po/POTFILES.in
similarity index 100%
rename from gettext-tools/examples/hello-c++-gnome/po/POTFILES.in
rename to gettext-tools/examples/hello-c++-gnome2/po/POTFILES.in
diff --git a/gettext-tools/examples/hello-c-gnome/INSTALL b/gettext-tools/examples/hello-c-gnome2/INSTALL
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/INSTALL
rename to gettext-tools/examples/hello-c-gnome2/INSTALL
diff --git a/gettext-tools/examples/hello-c-gnome/Makefile.am b/gettext-tools/examples/hello-c-gnome2/Makefile.am
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/Makefile.am
rename to gettext-tools/examples/hello-c-gnome2/Makefile.am
diff --git a/gettext-tools/examples/hello-c-gnome/autoclean.sh b/gettext-tools/examples/hello-c-gnome2/autoclean.sh
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/autoclean.sh
rename to gettext-tools/examples/hello-c-gnome2/autoclean.sh
diff --git a/gettext-tools/examples/hello-c-gnome/autogen.sh b/gettext-tools/examples/hello-c-gnome2/autogen.sh
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/autogen.sh
rename to gettext-tools/examples/hello-c-gnome2/autogen.sh
diff --git a/gettext-tools/examples/hello-c-gnome/configure.ac b/gettext-tools/examples/hello-c-gnome2/configure.ac
similarity index 92%
rename from gettext-tools/examples/hello-c-gnome/configure.ac
rename to gettext-tools/examples/hello-c-gnome2/configure.ac
index dc2a4fd92..70ea1bb7b 100644
--- a/gettext-tools/examples/hello-c-gnome/configure.ac
+++ b/gettext-tools/examples/hello-c-gnome2/configure.ac
@@ -3,7 +3,7 @@ dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
 
-AC_INIT([hello-c-gnome], [0])
+AC_INIT([hello-c-gnome2], [0])
 AC_CONFIG_SRCDIR([hello.c])
 AM_INIT_AUTOMAKE([1.11])
 
diff --git a/gettext-tools/examples/hello-c-gnome/hello.c b/gettext-tools/examples/hello-c-gnome2/hello.c
similarity index 96%
rename from gettext-tools/examples/hello-c-gnome/hello.c
rename to gettext-tools/examples/hello-c-gnome2/hello.c
index d175c3dfb..a46defb1a 100644
--- a/gettext-tools/examples/hello-c-gnome/hello.c
+++ b/gettext-tools/examples/hello-c-gnome2/hello.c
@@ -38,8 +38,8 @@ main (int argc, char *argv[])
   /* Initializations.  */
 
   gnome_init (PACKAGE, VERSION, argc, argv);
-  textdomain ("hello-c-gnome");
-  bindtextdomain ("hello-c-gnome", LOCALEDIR);
+  textdomain ("hello-c-gnome2");
+  bindtextdomain ("hello-c-gnome2", LOCALEDIR);
 
   /* Create the GUI elements.  */
 
diff --git a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am b/gettext-tools/examples/hello-c-gnome2/m4/Makefile.am
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/m4/Makefile.am
rename to gettext-tools/examples/hello-c-gnome2/m4/Makefile.am
diff --git a/gettext-tools/examples/hello-c-gnome/m4/gnome-gnorba-check.m4 b/gettext-tools/examples/hello-c-gnome2/m4/gnome-gnorba-check.m4
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/m4/gnome-gnorba-check.m4
rename to gettext-tools/examples/hello-c-gnome2/m4/gnome-gnorba-check.m4
diff --git a/gettext-tools/examples/hello-c-gnome/m4/gnome-orbit-check.m4 b/gettext-tools/examples/hello-c-gnome2/m4/gnome-orbit-check.m4
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/m4/gnome-orbit-check.m4
rename to gettext-tools/examples/hello-c-gnome2/m4/gnome-orbit-check.m4
diff --git a/gettext-tools/examples/hello-c-gnome/m4/gnome.m4 b/gettext-tools/examples/hello-c-gnome2/m4/gnome.m4
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/m4/gnome.m4
rename to gettext-tools/examples/hello-c-gnome2/m4/gnome.m4
diff --git a/gettext-tools/examples/hello-c-gnome/po/LINGUAS b/gettext-tools/examples/hello-c-gnome2/po/LINGUAS
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/po/LINGUAS
rename to gettext-tools/examples/hello-c-gnome2/po/LINGUAS
diff --git a/gettext-tools/examples/hello-c-gnome/po/Makevars b/gettext-tools/examples/hello-c-gnome2/po/Makevars
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/po/Makevars
rename to gettext-tools/examples/hello-c-gnome2/po/Makevars
diff --git a/gettext-tools/examples/hello-c-gnome/po/POTFILES.in b/gettext-tools/examples/hello-c-gnome2/po/POTFILES.in
similarity index 100%
rename from gettext-tools/examples/hello-c-gnome/po/POTFILES.in
rename to gettext-tools/examples/hello-c-gnome2/po/POTFILES.in
diff --git a/gettext-tools/examples/hello-objc-gnome/INSTALL b/gettext-tools/examples/hello-objc-gnome2/INSTALL
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/INSTALL
rename to gettext-tools/examples/hello-objc-gnome2/INSTALL
diff --git a/gettext-tools/examples/hello-objc-gnome/Makefile.am b/gettext-tools/examples/hello-objc-gnome2/Makefile.am
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/Makefile.am
rename to gettext-tools/examples/hello-objc-gnome2/Makefile.am
diff --git a/gettext-tools/examples/hello-objc-gnome/autoclean.sh b/gettext-tools/examples/hello-objc-gnome2/autoclean.sh
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/autoclean.sh
rename to gettext-tools/examples/hello-objc-gnome2/autoclean.sh
diff --git a/gettext-tools/examples/hello-objc-gnome/autogen.sh b/gettext-tools/examples/hello-objc-gnome2/autogen.sh
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/autogen.sh
rename to gettext-tools/examples/hello-objc-gnome2/autogen.sh
diff --git a/gettext-tools/examples/hello-objc-gnome/configure.ac b/gettext-tools/examples/hello-objc-gnome2/configure.ac
similarity index 94%
rename from gettext-tools/examples/hello-objc-gnome/configure.ac
rename to gettext-tools/examples/hello-objc-gnome2/configure.ac
index 8efeb3b62..697cc28dc 100644
--- a/gettext-tools/examples/hello-objc-gnome/configure.ac
+++ b/gettext-tools/examples/hello-objc-gnome2/configure.ac
@@ -3,7 +3,7 @@ dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
 
-AC_INIT([hello-objc-gnome], [0])
+AC_INIT([hello-objc-gnome2], [0])
 AC_CONFIG_SRCDIR([hello.m])
 AM_INIT_AUTOMAKE([1.11])
 
diff --git a/gettext-tools/examples/hello-objc-gnome/hello.m b/gettext-tools/examples/hello-objc-gnome2/hello.m
similarity index 96%
rename from gettext-tools/examples/hello-objc-gnome/hello.m
rename to gettext-tools/examples/hello-objc-gnome2/hello.m
index cb3a7dbe1..507fbaa97 100644
--- a/gettext-tools/examples/hello-objc-gnome/hello.m
+++ b/gettext-tools/examples/hello-objc-gnome2/hello.m
@@ -39,8 +39,8 @@ main (int argc, char *argv[])
   /* Initializations.  */
 
   application = [[Gnome_App alloc] initApp: PACKAGE : VERSION : argc : argv];
-  textdomain ("hello-objc-gnome");
-  bindtextdomain ("hello-objc-gnome", LOCALEDIR);
+  textdomain ("hello-objc-gnome2");
+  bindtextdomain ("hello-objc-gnome2", LOCALEDIR);
 
   /* Create the GUI elements.  */
 
diff --git a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am b/gettext-tools/examples/hello-objc-gnome2/m4/Makefile.am
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
rename to gettext-tools/examples/hello-objc-gnome2/m4/Makefile.am
diff --git a/gettext-tools/examples/hello-objc-gnome/m4/gnome-gnorba-check.m4 b/gettext-tools/examples/hello-objc-gnome2/m4/gnome-gnorba-check.m4
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/m4/gnome-gnorba-check.m4
rename to gettext-tools/examples/hello-objc-gnome2/m4/gnome-gnorba-check.m4
diff --git a/gettext-tools/examples/hello-objc-gnome/m4/gnome-orbit-check.m4 b/gettext-tools/examples/hello-objc-gnome2/m4/gnome-orbit-check.m4
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/m4/gnome-orbit-check.m4
rename to gettext-tools/examples/hello-objc-gnome2/m4/gnome-orbit-check.m4
diff --git a/gettext-tools/examples/hello-objc-gnome/m4/gnome.m4 b/gettext-tools/examples/hello-objc-gnome2/m4/gnome.m4
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/m4/gnome.m4
rename to gettext-tools/examples/hello-objc-gnome2/m4/gnome.m4
diff --git a/gettext-tools/examples/hello-objc-gnome/po/LINGUAS b/gettext-tools/examples/hello-objc-gnome2/po/LINGUAS
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/po/LINGUAS
rename to gettext-tools/examples/hello-objc-gnome2/po/LINGUAS
diff --git a/gettext-tools/examples/hello-objc-gnome/po/Makevars b/gettext-tools/examples/hello-objc-gnome2/po/Makevars
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/po/Makevars
rename to gettext-tools/examples/hello-objc-gnome2/po/Makevars
diff --git a/gettext-tools/examples/hello-objc-gnome/po/POTFILES.in b/gettext-tools/examples/hello-objc-gnome2/po/POTFILES.in
similarity index 100%
rename from gettext-tools/examples/hello-objc-gnome/po/POTFILES.in
rename to gettext-tools/examples/hello-objc-gnome2/po/POTFILES.in
diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am
index ee0d6fd91..e724e267b 100644
--- a/gettext-tools/examples/po/Makefile.am
+++ b/gettext-tools/examples/po/Makefile.am
@@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = 1.5 gnits
 # List of files which contain translatable strings.
 POTFILES = \
   hello-c/hello.c \
-  hello-c-gnome/hello.c \
+  hello-c-gnome2/hello.c \
   hello-c-gnome3/hello.c \
   hello-c-gnome3/hello.desktop.in.in \
   hello-c-gnome3/hello.gschema.xml \
@@ -32,7 +32,7 @@ POTFILES = \
   hello-c++-kde/hello.cc \
   hello-c++-kde/hellowindow.h \
   hello-c++-kde/hellowindow.cc \
-  hello-c++-gnome/hello.cc \
+  hello-c++-gnome2/hello.cc \
   hello-c++-wxwidgets/hello.cc \
   hello-objc/hello.m \
   hello-objc-gnustep/main.m \
@@ -40,7 +40,7 @@ POTFILES = \
   hello-objc-gnustep/AppController.m \
   hello-objc-gnustep/Hello.h \
   hello-objc-gnustep/Hello.m \
-  hello-objc-gnome/hello.m \
+  hello-objc-gnome2/hello.m \
   hello-sh/hello.sh \
   hello-python/hello.py.in \
   hello-clisp/hello.lisp.in \
@@ -66,17 +66,17 @@ POTFILES = \
 # List of small POT files.
 SMALLPOTS = \
   hello-c.pot \
-  hello-c-gnome.pot \
+  hello-c-gnome2.pot \
   hello-c-gnome3.pot \
   hello-c++.pot \
   hello-c++20.pot \
   hello-c++-qt.pot \
   hello-c++-kde.pot \
-  hello-c++-gnome.pot \
+  hello-c++-gnome2.pot \
   hello-c++-wxwidgets.pot \
   hello-objc.pot \
   hello-objc-gnustep.pot \
-  hello-objc-gnome.pot \
+  hello-objc-gnome2.pot \
   hello-sh.pot \
   hello-python.pot \
   hello-clisp.pot \
@@ -248,8 +248,8 @@ USE_BUILT_PROGS = \
 hello-c.pot : $(POTFILES_DEPS)
 	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c
 
-hello-c-gnome.pot : $(POTFILES_DEPS)
-	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c-gnome
+hello-c-gnome2.pot : $(POTFILES_DEPS)
+	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c-gnome2
 
 hello-c-gnome3.pot : $(POTFILES_DEPS)
 	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c-gnome3
@@ -266,8 +266,8 @@ hello-c++-qt.pot : $(POTFILES_DEPS)
 hello-c++-kde.pot : $(POTFILES_DEPS)
 	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c++-kde
 
-hello-c++-gnome.pot : $(POTFILES_DEPS)
-	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c++-gnome
+hello-c++-gnome2.pot : $(POTFILES_DEPS)
+	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c++-gnome2
 
 hello-c++-wxwidgets.pot : $(POTFILES_DEPS)
 	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c++-wxwidgets
@@ -278,8 +278,8 @@ hello-objc.pot : $(POTFILES_DEPS)
 hello-objc-gnustep.pot : $(POTFILES_DEPS)
 	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-objc-gnustep
 
-hello-objc-gnome.pot : $(POTFILES_DEPS)
-	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-objc-gnome
+hello-objc-gnome2.pot : $(POTFILES_DEPS)
+	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-objc-gnome2
 
 hello-sh.pot : $(POTFILES_DEPS)
 	$(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-sh
@@ -418,17 +418,17 @@ $(DUMMYPOFILES):
 
 SMALLPOFILES_FOR_lang = \
   $(srcdir)/../hello-c/po/$$lang.po \
-  $(srcdir)/../hello-c-gnome/po/$$lang.po \
+  $(srcdir)/../hello-c-gnome2/po/$$lang.po \
   $(srcdir)/../hello-c-gnome3/po/$$lang.po \
   $(srcdir)/../hello-c++/po/$$lang.po \
   $(srcdir)/../hello-c++20/po/$$lang.po \
   $(srcdir)/../hello-c++-qt/po/$$lang.po \
   $(srcdir)/../hello-c++-kde/po/$$lang.po \
-  $(srcdir)/../hello-c++-gnome/po/$$lang.po \
+  $(srcdir)/../hello-c++-gnome2/po/$$lang.po \
   $(srcdir)/../hello-c++-wxwidgets/po/$$lang.po \
   $(srcdir)/../hello-objc/po/$$lang.po \
   $(srcdir)/../hello-objc-gnustep/po/$$lang.po \
-  $(srcdir)/../hello-objc-gnome/po/$$lang.po \
+  $(srcdir)/../hello-objc-gnome2/po/$$lang.po \
   $(srcdir)/../hello-sh/po/$$lang.po \
   $(srcdir)/../hello-python/po/$$lang.po \
   $(srcdir)/../hello-clisp/po/$$lang.po \
@@ -453,8 +453,8 @@ SMALLPOFILES_FOR_lang = \
 $(srcdir)/../hello-c/po/$(LL).po: $(srcdir)/hello-c.pot $(srcdir)/$(LL).po
 	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c $(LL)
 
-$(srcdir)/../hello-c-gnome/po/$(LL).po: $(srcdir)/hello-c-gnome.pot $(srcdir)/$(LL).po
-	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c-gnome $(LL)
+$(srcdir)/../hello-c-gnome2/po/$(LL).po: $(srcdir)/hello-c-gnome2.pot $(srcdir)/$(LL).po
+	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c-gnome2 $(LL)
 
 $(srcdir)/../hello-c-gnome3/po/$(LL).po: $(srcdir)/hello-c-gnome3.pot $(srcdir)/$(LL).po
 	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c-gnome3 $(LL)
@@ -471,8 +471,8 @@ $(srcdir)/../hello-c++-qt/po/$(LL).po: $(srcdir)/hello-c++-qt.pot $(srcdir)/$(LL
 $(srcdir)/../hello-c++-kde/po/$(LL).po: $(srcdir)/hello-c++-kde.pot $(srcdir)/$(LL).po
 	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c++-kde $(LL)
 
-$(srcdir)/../hello-c++-gnome/po/$(LL).po: $(srcdir)/hello-c++-gnome.pot $(srcdir)/$(LL).po
-	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c++-gnome $(LL)
+$(srcdir)/../hello-c++-gnome2/po/$(LL).po: $(srcdir)/hello-c++-gnome2.pot $(srcdir)/$(LL).po
+	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c++-gnome2 $(LL)
 
 $(srcdir)/../hello-c++-wxwidgets/po/$(LL).po: $(srcdir)/hello-c++-wxwidgets.pot $(srcdir)/$(LL).po
 	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c++-wxwidgets $(LL)
@@ -483,8 +483,8 @@ $(srcdir)/../hello-objc/po/$(LL).po: $(srcdir)/hello-objc.pot $(srcdir)/$(LL).po
 $(srcdir)/../hello-objc-gnustep/po/$(LL).po: $(srcdir)/hello-objc-gnustep.pot $(srcdir)/$(LL).po
 	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-objc-gnustep $(LL)
 
-$(srcdir)/../hello-objc-gnome/po/$(LL).po: $(srcdir)/hello-objc-gnome.pot $(srcdir)/$(LL).po
-	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-objc-gnome $(LL)
+$(srcdir)/../hello-objc-gnome2/po/$(LL).po: $(srcdir)/hello-objc-gnome2.pot $(srcdir)/$(LL).po
+	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-objc-gnome2 $(LL)
 
 $(srcdir)/../hello-sh/po/$(LL).po: $(srcdir)/hello-sh.pot $(srcdir)/$(LL).po
 	$(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-sh $(LL)