mbohun
12/5/2012 - 9:29 AM

replacing 'gnu_shader_composer' with 'gtk_shader_composer' (for consistency; not at GNUpoint (GNU's gun point))

replacing 'gnu_shader_composer' with 'gtk_shader_composer' (for consistency; not at GNUpoint (GNU's gun point))

diff --git a/Makefile.am b/Makefile.am
index 94d3be6..6854b27 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,8 @@ SUBDIRS = src po

 EXTRA_DIST = \
        autogen.sh \
-       gnu_shader_composer.glade \
-       gnu_shader_composer.gladep
+       gtk_shader_composer.glade \
+       gtk_shader_composer.gladep

 install-data-local:
        @$(NORMAL_INSTALL)
diff --git a/configure.in b/configure.in
index b4b1828..31af9d7 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.

 AC_INIT(configure.in)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(gnu_shader_composer, 0.1)
+AM_INIT_AUTOMAKE(gtk_shader_composer, 0.1)
 AM_CONFIG_HEADER(config.h)

 AC_ISC_POSIX
@@ -36,7 +36,7 @@ LIBGLADE_LIBS="`pkg-config libglade-2.0 --libs`"
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)

-GETTEXT_PACKAGE=gnu_shader_composer
+GETTEXT_PACKAGE=gtk_shader_composer
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])

diff --git a/src/Makefile.am b/src/Makefile.am
index 874b668..b98d803 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,13 +5,13 @@ INCLUDES = \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        @PACKAGE_CFLAGS@ @GTK_CFLAGS@ @GTKGLEXT_CFLAGS@ @LIBGLADE_CFLAGS@

-bin_PROGRAMS = gnu_shader_composer
+bin_PROGRAMS = gtk_shader_composer

-gnu_shader_composer_SOURCES = \
+gtk_shader_composer_SOURCES = \
        main.c \
        support.c support.h \
        callbacks.c callbacks.h \
        trackball.c trackball.h

-gnu_shader_composer_LDADD = @PACKAGE_LIBS@ @GTK_LIBS@ @GTKGLEXT_LIBS@ @LIBGLADE_LIBS@ $(INTLLIBS)
+gtk_shader_composer_LDADD = @PACKAGE_LIBS@ @GTK_LIBS@ @GTKGLEXT_LIBS@ @LIBGLADE_LIBS@ $(INTLLIBS)

diff --git a/src/main.c b/src/main.c
index 0fb83a1..54900db 100644
--- a/src/main.c
+++ b/src/main.c
@@ -111,7 +111,7 @@ int main(int argc, char *argv[] )
 #endif


-  xml =glade_xml_new ("gnu_shader_composer.glade", NULL, NULL );
+  xml =glade_xml_new ("gtk_shader_composer.glade", NULL, NULL );

   //autoconnect does NOT work with data !
   //glade_xml_signal_autoconnect(xml );
martin@yobbo:~/src/gtk_shader_ide$ grep GNU src/gtk_shader_composer.glade
  <property name="title" translatable="yes">GNU Shader Composer</property>
  <property name="title" translatable="yes">Exit GNU Shader Composer</property>
              <property name="label" translatable="yes">&lt;b&gt;Really quit GNU Shader Composer ?&lt;/b&gt;</property>
martin@yobbo:~/src/gtk_shader_ide$
martin@yobbo:~/src/gtk_shader_ide$ git status
# On branch master
nothing to commit, working directory clean

# first in files
#
martin@yobbo:~/src/gtk_shader_ide$ find ./ -name "*.h" | xargs grep 'gnu_shader_composer'
martin@yobbo:~/src/gtk_shader_ide$ find ./ -name "*.c" | xargs grep 'gnu_shader_composer'
./src/main.c:  xml =glade_xml_new ("gnu_shader_composer.glade", NULL, NULL );

martin@yobbo:~/src/gtk_shader_ide$ find ./ -name "*.in" | xargs grep 'gnu_shader_composer'
./configure.in:AM_INIT_AUTOMAKE(gnu_shader_composer, 0.1)
./configure.in:GETTEXT_PACKAGE=gnu_shader_composer

martin@yobbo:~/src/gtk_shader_ide$ find ./ -name "*.am" | xargs grep 'gnu_shader_composer'
./Makefile.am:  gnu_shader_composer.glade \
./Makefile.am:  gnu_shader_composer.gladep
./src/Makefile.am:bin_PROGRAMS = gnu_shader_composer
./src/Makefile.am:gnu_shader_composer_SOURCES = \
./src/Makefile.am:gnu_shader_composer_LDADD = @PACKAGE_LIBS@ @GTK_LIBS@ @GTKGLEXT_LIBS@ @LIBGLADE_LIBS@ $(INTLLIBS)

# and file names
#
martin@yobbo:~/src/gtk_shader_ide$ find ./ | grep 'gnu_shader_composer'
./gnu_shader_composer.gladep
./release/20041014/linux/gnu_shader_composer
./release/20041014/linux/gnu_shader_composer.glade
./release/20041014/windoze/gnu_shader_composer.exe
./release/20041014/windoze/gnu_shader_composer.glade
./release/20041104/linux/gnu_shader_composer
./release/20041104/linux/gnu_shader_composer.glade
./release/20041104/windoze/gnu_shader_composer.exe
./release/20041104/windoze/gnu_shader_composer.glade
./src/gnu_shader_composer.glade

martin@yobbo:~/src/gtk_shader_ide$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       renamed:    gnu_shader_composer.gladep -> gtk_shader_composer.gladep
#       renamed:    src/gnu_shader_composer.glade -> src/gtk_shader_composer.glade
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   Makefile.am
#       modified:   configure.in
#       modified:   src/Makefile.am
#       modified:   src/main.c
#

martin@yobbo:~/src/gtk_shader_ide$ git diff > rename.patch
martin@yobbo:~/src/gtk_shader_ide$ cat rename.patch