GNOME.org
 

[clutter/wip/clutter-1.99: 1/47] 2.0: Bump clutter-1.0 to clutter-2.0

commit 2956cd5becb57af6a46310cb2b58d79e4c9116b0
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sun Oct 7 20:11:43 2012 +0100

    2.0: Bump clutter-1.0 to clutter-2.0
    
    Some places in the build system do not (or cannot) use the macro-ified
    CLUTTER_API_VERSION, so we need to fix them up manually.

 autogen.sh                                         |    2 +-
 clutter/abicheck.sh                                |    2 +-
 clutter/cally/cally.pc.in                          |    2 +-
 clutter/clutter-main.c                             |    4 ++--
 configure.ac                                       |    2 +-
 doc/cookbook/examples/Makefile.am                  |    2 +-
 .../examples/events-pointer-motion-stacked.c       |    2 --
 doc/cookbook/introduction.xml                      |    6 +++---
 doc/reference/clutter/running-clutter.xml          |    4 ++--
 po/Makevars                                        |    2 +-
 tests/data/Makefile.am                             |    2 +-
 ...r-1.0.suppressions => clutter-2.0.suppressions} |    0
 12 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 61c3b46..5e19560 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@ test $TEST_TYPE $FILE || {
 
 # GNU gettext automake support doesn't get along with git.
 # https://bugzilla.gnome.org/show_bug.cgi?id=661128
-touch -t 200001010000 po/clutter-1.0.pot
+touch -t 200001010000 po/clutter-2.0.pot
 
 GTKDOCIZE=`which gtkdocize`
 if test -z $GTKDOCIZE; then
diff --git a/clutter/abicheck.sh b/clutter/abicheck.sh
index 1675980..f34f763 100755
--- a/clutter/abicheck.sh
+++ b/clutter/abicheck.sh
@@ -20,5 +20,5 @@ fi
 
 cpp -P ${cppargs} ${srcdir:-.}/clutter.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' -e 's/ DATA//' | sort > expected-abi
 
-nm -D -g --defined-only .libs/libclutter-1.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
+nm -D -g --defined-only .libs/libclutter-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
 diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
diff --git a/clutter/cally/cally.pc.in b/clutter/cally/cally.pc.in
index 779491c..40f266a 100644
--- a/clutter/cally/cally.pc.in
+++ b/clutter/cally/cally.pc.in
@@ -10,4 +10,4 @@ Description: Clutter Accessibility Implementation Library
 Version: @VERSION@
 Libs: -L${libdir} -lclutter-${apiversion}
 Cflags: -I${includedir}/clutter-${apiversion}
-Requires: atk clutter-1.0
+Requires: atk clutter-${apiversion}
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 089dc5a..652c587 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -441,7 +441,7 @@ clutter_config_read (void)
   gchar *config_path;
 
   config_path = g_build_filename (CLUTTER_SYSCONFDIR,
-                                  "clutter-1.0",
+                                  "clutter-2.0",
                                   "settings.ini",
                                   NULL);
   if (g_file_test (config_path, G_FILE_TEST_EXISTS))
@@ -450,7 +450,7 @@ clutter_config_read (void)
   g_free (config_path);
 
   config_path = g_build_filename (g_get_user_config_dir (),
-                                  "clutter-1.0",
+                                  "clutter-2.0",
                                   "settings.ini",
                                   NULL);
   if (g_file_test (config_path, G_FILE_TEST_EXISTS))
diff --git a/configure.ac b/configure.ac
index 46a457a..9b417c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1127,7 +1127,7 @@ dnl === I18N ==================================================================
 AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT([external])
 
-GETTEXT_PACKAGE="clutter-1.0"
+GETTEXT_PACKAGE="clutter-2.0"
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
                    ["$GETTEXT_PACKAGE"],
diff --git a/doc/cookbook/examples/Makefile.am b/doc/cookbook/examples/Makefile.am
index 054128f..410d958 100644
--- a/doc/cookbook/examples/Makefile.am
+++ b/doc/cookbook/examples/Makefile.am
@@ -129,7 +129,7 @@ ui_data = \
 	$(srcdir)/script-ui.json			\
 	$(NULL)
 
-examplesdir = $(datadir)/clutter-1.0/cookbook/examples
+examplesdir = $(datadir)/clutter-2.0/cookbook/examples
 examples_DATA = $(uidata) $(srcdir)/*.c $(srcdir)/*.h
 
 -include $(top_srcdir)/build/autotools/Makefile.am.gitignore
diff --git a/doc/cookbook/examples/events-pointer-motion-stacked.c b/doc/cookbook/examples/events-pointer-motion-stacked.c
index f92fa02..a03df3e 100644
--- a/doc/cookbook/examples/events-pointer-motion-stacked.c
+++ b/doc/cookbook/examples/events-pointer-motion-stacked.c
@@ -7,8 +7,6 @@
  *
  * but when the pointer is over the overlap between red and green,
  * signals are emitted by green
- *
- * gcc -g -O0 -o stacked-actors-and-events stacked-actors-and-events.c `pkg-config --libs --cflags clutter-1.0 glib-2.0` -lm
  */
 #include <clutter/clutter.h>
 
diff --git a/doc/cookbook/introduction.xml b/doc/cookbook/introduction.xml
index ee9ac1b..b176d3d 100644
--- a/doc/cookbook/introduction.xml
+++ b/doc/cookbook/introduction.xml
@@ -84,7 +84,7 @@
       <title>Compiling the examples</title>
 
       <para>This document comes with full examples, usually stored
-      on disk in <filename><emphasis>datadir</emphasis>/clutter-1.0/cookbook/examples</filename>
+      on disk in <filename><emphasis>datadir</emphasis>/clutter-2.0/cookbook/examples</filename>
       directory.</para>
 
       <para>Each example can be compiled using:</para>
@@ -92,9 +92,9 @@
       <informalexample>
         <programlisting>
 cc \
-  `pkg-config --cflags clutter-1.0` \
+  `pkg-config --cflags clutter-2.0` \
   -o <emphasis>example</emphasis> <emphasis>example</emphasis>.c \
-  `pkg-config --libs clutter-1.0`
+  `pkg-config --libs clutter-2.0`
         </programlisting>
       </informalexample>
 
diff --git a/doc/reference/clutter/running-clutter.xml b/doc/reference/clutter/running-clutter.xml
index 0469ead..f7b81bf 100644
--- a/doc/reference/clutter/running-clutter.xml
+++ b/doc/reference/clutter/running-clutter.xml
@@ -243,8 +243,8 @@
       <title>Configuration File</title>
 
       <para>Clutter will look for files named <filename>settings.ini</filename>
-      located in the <filename>/etc/clutter-1.0</filename> and
-      <filename>$XDG_CONFIG_HOME/clutter-1.0</filename> directories. These files
+      located in the <filename>/etc/clutter-2.0</filename> and
+      <filename>$XDG_CONFIG_HOME/clutter-2.0</filename> directories. These files
       must be valid key files (see #GKeyFile in the GLib documentation) and may
       have three sections:</para>
 
diff --git a/po/Makevars b/po/Makevars
index fd5863b..cf27a75 100644
--- a/po/Makevars
+++ b/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 = clutter-1.0
+DOMAIN = clutter-2.0
 
 # These two variables depend on the location of this directory.
 subdir = po
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 896ed5b..5c2f00c 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -25,4 +25,4 @@ png_files = \
 	light0.png 		\
 	$(NULL)
 
-EXTRA_DIST = $(json_files) $(png_files) clutter-1.0.suppressions
+EXTRA_DIST = $(json_files) $(png_files) clutter-2.0.suppressions
diff --git a/tests/data/clutter-1.0.suppressions b/tests/data/clutter-2.0.suppressions
similarity index 100%
rename from tests/data/clutter-1.0.suppressions
rename to tests/data/clutter-2.0.suppressions
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]