Some changes for cjs

linuxmint · Jul 20, 2013 · d4d268e · d4d268e
1 parent 9a0eaf8
commit d4d268e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/configure.ac b/configure.ac
@@ -74,7 +74,7 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
                                gio-unix-2.0 dbus-glib-1 libxml-2.0
                                gtk+-3.0 >= $GTK_MIN_VERSION
                                libmuffin >= $MUFFIN_MIN_VERSION
-                               gjs-internals-1.0 >= $GJS_MIN_VERSION
+                               cjs-internals-1.0 >= $GJS_MIN_VERSION
 			       libgnome-menu-3.0 $recorder_modules gconf-2.0
                                gdk-x11-3.0 libsoup-2.4 gl
 			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
@@ -88,7 +88,7 @@ PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
 
 PKG_CHECK_MODULES(CINNAMON_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
 
-GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
+GJS_VERSION=`$PKG_CONFIG --modversion cjs-internals-1.0`
 AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
 AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
 
@@ -129,7 +129,7 @@ MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin`
 AC_SUBST(MUFFIN_GIR_DIR)
 AC_SUBST(MUFFIN_TYPELIB_DIR)
 
-GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
+GJS_CONSOLE=`$PKG_CONFIG --variable=cjs_console cjs-1.0`
 AC_SUBST(GJS_CONSOLE)
 
 AC_CHECK_FUNCS(fdwalk)

diff --git a/debian/control b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8),
                python-dev,
                gnome-pkg-tools (>= 0.11),
                intltool,
-               libgjs-dev (>= 1.29.18),
+               libcjs-dev (>= 1.29.18),
                gvfs-backends,
                gobject-introspection (>= 1.29.15),
                gir1.2-json-1.0,
@@ -47,7 +47,7 @@ Homepage: http://cinnamon.linuxmint.com
 Package: cinnamon
 Architecture: any
 Depends: ${gir:Depends},
-         gjs (>= 1.29.18),
+         cjs (>= 1.29.18),
          ${shlibs:Depends},
          ${misc:Depends},
          cinnamon-common (= ${source:Version}),
@@ -83,7 +83,7 @@ Depends: ${gir:Depends},
          python-pyinotify,
          metacity,
          gnome-panel | tint2
-Recommends: gnome-themes-standard, gnome-terminal, nemo, cinnamon-screensaver, gnome-session-bin, gir1.2-gjsdbus-1.0, blueman
+Recommends: gnome-themes-standard, gnome-terminal, nemo, cinnamon-screensaver, gnome-session-bin, gir1.2-cjsdbus-1.0, blueman
 Provides: notification-daemon, x-window-manager
 Description: Cinnamon desktop
  Cinnamon redefines user interactions with the GNOME desktop.

diff --git a/src/cinnamon-global-private.h b/src/cinnamon-global-private.h
@@ -4,7 +4,7 @@
 
 #include "cinnamon-global.h"
 
-#include <gjs/gjs.h>
+#include <cjs/gjs.h>
 
 void _cinnamon_global_init            (const char *first_property_name,
                                     ...);

diff --git a/src/cinnamon-global.c b/src/cinnamon-global.c
@@ -21,7 +21,7 @@
 #include <clutter/x11/clutter-x11.h>
 #include <gdk/gdkx.h>
 #include <gio/gio.h>
-#include <gjs/gjs-module.h>
+#include <cjs/gjs-module.h>
 #include <girepository.h>
 #include <meta/display.h>
 #include <meta/util.h>

diff --git a/src/cinnamon-plugin.c b/src/cinnamon-plugin.c
@@ -35,7 +35,7 @@
 #include <GL/glx.h>
 #include <GL/glxext.h>
 #endif
-#include <gjs/gjs.h>
+#include <cjs/gjs.h>
 #include <meta/display.h>
 #include <meta/meta-plugin.h>
 

diff --git a/src/run-js-test.c b/src/run-js-test.c
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * Based on gjs/console.c from GJS
+ * Based on cjs/console.c from GJS
  *
  * Copyright (c) 2008  litl, LLC
  * Copyright (c) 2010  Red Hat, Inc.
@@ -33,7 +33,7 @@
 #include <clutter/x11/clutter-x11.h>
 #include <gdk/gdkx.h>
 #include <girepository.h>
-#include <gjs/gjs.h>
+#include <cjs/gjs.h>
 #include <gtk/gtk.h>
 
 #include "cinnamon-global.h"