[cheese/three-point-oh] move valasrc to src directory

[Daniel G. Siegel <dgsiegel src gnome org>]

commit d8b9a6ff39d12037b2fd070d8627c12dbb580b44
Author: daniel g. siegel <dgsiegel gnome org>
Date:   Thu Jul 1 00:00:05 2010 +0200

    move valasrc to src directory

 Makefile.am                                    |    2 +-
 autogen.sh                                     |    2 +-
 configure.ac                                   |   45 +++++++++++------------
 {valasrc => src}/Makefile.am                   |    0
 {valasrc => src}/cheese-countdown.vala         |    0
 {valasrc => src}/cheese-effects-manager.vala   |    0
 {valasrc => src}/cheese-main.vala              |    0
 {valasrc => src}/cheese-window.vala            |    0
 {valasrc => src}/thumbview/cheese-gconf.c      |    0
 {valasrc => src}/thumbview/cheese-gconf.h      |    0
 {valasrc => src}/thumbview/cheese-thumb-view.c |    0
 {valasrc => src}/thumbview/cheese-thumb-view.h |    0
 {valasrc => src}/thumbview/eog-thumb-nav.c     |    0
 {valasrc => src}/thumbview/eog-thumb-nav.h     |    0
 {valasrc => src}/thumbview/eog-thumbnail.c     |    0
 {valasrc => src}/thumbview/eog-thumbnail.h     |    0
 {valasrc => src}/vapi/cheese-common.deps       |    0
 {valasrc => src}/vapi/cheese-common.vapi       |    0
 {valasrc => src}/vapi/cheese-thumbview.vapi    |    0
 {valasrc => src}/vapi/config.vapi              |    0
 {valasrc => src}/vapi/eogthumbnav.vapi         |    0
 21 files changed, 24 insertions(+), 25 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index da49445..935778a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libcheese valasrc tests po data help docs 
+SUBDIRS = libcheese src tests po data help docs 
 
 EXTRA_DIST =			\
 	$(cheesedoc_DATA)	\
diff --git a/autogen.sh b/autogen.sh
index 90dfc5e..cce7341 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="cheese"
 
-(test -f $srcdir/valasrc/cheese-main.vala) || {
+(test -f $srcdir/src/cheese-main.vala) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/configure.ac b/configure.ac
index eb34929..08c4bd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ PANGOCAIRO_REQUIRED=1.18.0
 LIBRSVG_REQUIRED=2.18.0
 CLUTTER_REQUIRED=1.0
 CLUTTERGTK_REQUIRED=0.10
-CLUTTERGST_REQUIRED=0.10
+CLUTTERGST_REQUIRED=1.0
 UNIQUE_REQUIRED=1.1
 GEE_REQUIRED=0.5
 MX_REQUIRED=1.0
@@ -101,36 +101,35 @@ MX_REQUIRED=1.0
 
 UDEV_PKG=
 PKG_CHECK_MODULES(UDEV, gudev-1.0,
-		  [AC_DEFINE(HAVE_UDEV, 1, [Define to 1 to enable udev support])
-		  UDEV_PKG=gudev-1.0],
-		  [UDEV_PKG=])
+                  [AC_DEFINE(HAVE_UDEV, 1, [Define to 1 to enable udev support])
+                  UDEV_PKG=gudev-1.0],
+                  [UDEV_PKG=])
 
 AC_MSG_CHECKING([operating system])
 case $host in
-	*-linux*)
-		AC_DEFINE(OS_LINUX, [], [Linux backend])
-		AC_SUBST(OS_LINUX)
-		AC_MSG_RESULT([Linux])
-		if test x$UDEV_PKG = "x" ; then
-			AC_MSG_ERROR([libgudev is required under Linux and not installed])
-		fi
-		;;
-	*)
-		AC_MSG_RESULT([unsupported operating system])
+  *-linux*)
+    AC_DEFINE(OS_LINUX, [], [Linux backend])
+    AC_SUBST(OS_LINUX)
+    AC_MSG_RESULT([Linux])
+    if test x$UDEV_PKG = "x" ; then
+            AC_MSG_ERROR([libgudev is required under Linux and not installed])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([unsupported operating system])
 esac
 
 
 AC_CHECK_HEADER([sys/videoio.h],
-		[AC_DEFINE(USE_SYS_VIDEOIO_H, 1, define to 1 if sys/videoio.h is present)],
-		[AC_DEFINE(USE_SYS_VIDEOIO_H, 0, define to 1 if sys/videoio.h is present)], [])
+                [AC_DEFINE(USE_SYS_VIDEOIO_H, 1, define to 1 if sys/videoio.h is present)],
+                [AC_DEFINE(USE_SYS_VIDEOIO_H, 0, define to 1 if sys/videoio.h is present)], [])
 
 XTEST_LIBS=
 AC_CHECK_HEADER(X11/extensions/XTest.h, [
-    AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, [
-      AC_DEFINE(HAVE_XTEST, 1, [Defined if the XTEST X extension is
-present])
-      XTEST_LIBS="-lX11 -lXtst"])
-  ])
+  AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, [
+    AC_DEFINE(HAVE_XTEST, 1, [Defined if the XTEST X extension is present])
+    XTEST_LIBS="-lX11 -lXtst"])
+])
 AC_SUBST(XTEST_LIBS)
 AM_CONDITIONAL(HAVE_XTEST, test "x$HAVE_TEST" = "xyes")
 
@@ -151,7 +150,7 @@ PKG_CHECK_MODULES(CHEESE, \
   librsvg-2.0 >= $LIBRSVG_REQUIRED \
   clutter-1.0 >= $CLUTTER_REQUIRED \
   clutter-gtk-0.10 >= $CLUTTERGTK_REQUIRED \
-  clutter-gst-0.10 >= $CLUTTERGST_REQUIRED \
+  clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \
   unique-1.0  >= $UNIQUE_REQUIRED \
   gee-1.0 >= $GEE_REQUIRED \
   mx-1.0 >= $MX_REQUIRED \
@@ -199,7 +198,7 @@ data/icons/scalable/actions/Makefile
 data/pixmaps/Makefile
 help/Makefile
 libcheese/Makefile
-valasrc/Makefile
+src/Makefile
 tests/Makefile
 po/Makefile.in
 ])
diff --git a/valasrc/Makefile.am b/src/Makefile.am
similarity index 100%
rename from valasrc/Makefile.am
rename to src/Makefile.am
diff --git a/valasrc/cheese-countdown.vala b/src/cheese-countdown.vala
similarity index 100%
rename from valasrc/cheese-countdown.vala
rename to src/cheese-countdown.vala
diff --git a/valasrc/cheese-effects-manager.vala b/src/cheese-effects-manager.vala
similarity index 100%
rename from valasrc/cheese-effects-manager.vala
rename to src/cheese-effects-manager.vala
diff --git a/valasrc/cheese-main.vala b/src/cheese-main.vala
similarity index 100%
rename from valasrc/cheese-main.vala
rename to src/cheese-main.vala
diff --git a/valasrc/cheese-window.vala b/src/cheese-window.vala
similarity index 100%
rename from valasrc/cheese-window.vala
rename to src/cheese-window.vala
diff --git a/valasrc/thumbview/cheese-gconf.c b/src/thumbview/cheese-gconf.c
similarity index 100%
rename from valasrc/thumbview/cheese-gconf.c
rename to src/thumbview/cheese-gconf.c
diff --git a/valasrc/thumbview/cheese-gconf.h b/src/thumbview/cheese-gconf.h
similarity index 100%
rename from valasrc/thumbview/cheese-gconf.h
rename to src/thumbview/cheese-gconf.h
diff --git a/valasrc/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
similarity index 100%
rename from valasrc/thumbview/cheese-thumb-view.c
rename to src/thumbview/cheese-thumb-view.c
diff --git a/valasrc/thumbview/cheese-thumb-view.h b/src/thumbview/cheese-thumb-view.h
similarity index 100%
rename from valasrc/thumbview/cheese-thumb-view.h
rename to src/thumbview/cheese-thumb-view.h
diff --git a/valasrc/thumbview/eog-thumb-nav.c b/src/thumbview/eog-thumb-nav.c
similarity index 100%
rename from valasrc/thumbview/eog-thumb-nav.c
rename to src/thumbview/eog-thumb-nav.c
diff --git a/valasrc/thumbview/eog-thumb-nav.h b/src/thumbview/eog-thumb-nav.h
similarity index 100%
rename from valasrc/thumbview/eog-thumb-nav.h
rename to src/thumbview/eog-thumb-nav.h
diff --git a/valasrc/thumbview/eog-thumbnail.c b/src/thumbview/eog-thumbnail.c
similarity index 100%
rename from valasrc/thumbview/eog-thumbnail.c
rename to src/thumbview/eog-thumbnail.c
diff --git a/valasrc/thumbview/eog-thumbnail.h b/src/thumbview/eog-thumbnail.h
similarity index 100%
rename from valasrc/thumbview/eog-thumbnail.h
rename to src/thumbview/eog-thumbnail.h
diff --git a/valasrc/vapi/cheese-common.deps b/src/vapi/cheese-common.deps
similarity index 100%
rename from valasrc/vapi/cheese-common.deps
rename to src/vapi/cheese-common.deps
diff --git a/valasrc/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
similarity index 100%
rename from valasrc/vapi/cheese-common.vapi
rename to src/vapi/cheese-common.vapi
diff --git a/valasrc/vapi/cheese-thumbview.vapi b/src/vapi/cheese-thumbview.vapi
similarity index 100%
rename from valasrc/vapi/cheese-thumbview.vapi
rename to src/vapi/cheese-thumbview.vapi
diff --git a/valasrc/vapi/config.vapi b/src/vapi/config.vapi
similarity index 100%
rename from valasrc/vapi/config.vapi
rename to src/vapi/config.vapi
diff --git a/valasrc/vapi/eogthumbnav.vapi b/src/vapi/eogthumbnav.vapi
similarity index 100%
rename from valasrc/vapi/eogthumbnav.vapi
rename to src/vapi/eogthumbnav.vapi