all: version update and build system fixes

git-svn-id: file:///beryl/trunk@1916 d7aaf104-2d23-0410-ae22-9d23157bf5a3

14 files changed, 24 insertions, 25 deletions

diff --git a/VERSION b/VERSION
index 482d27f..0bf02ea 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4
diff --git a/aquamarine/VERSION b/aquamarine/VERSION
index 482d27f..0bf02ea 100644
--- a/aquamarine/VERSION
+++ b/aquamarine/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4
diff --git a/aquamarine/configure.in.in b/aquamarine/configure.in.in
index 3320bb9..d23e58c 100644
--- a/aquamarine/configure.in.in
+++ b/aquamarine/configure.in.in
@@ -1,6 +1,6 @@
 #MIN_CONFIG
 KDE_ENABLE_HIDDEN_VISIBILITY
-AM_INIT_AUTOMAKE(aquamarine,0.1.3)
+AM_INIT_AUTOMAKE(aquamarine,0.1.4)
 
 AC_CHECK_RANDOM
 AC_CHECK_USLEEP
@@ -12,9 +12,8 @@ KDE_CHECK_HEADER(kdecoration.h,HAVE_KDECORATION=1,
 ])
 
 BERYL_SETTINGS_REQUIRES="\
-		    gtk+-2.0 >= 2.8.0 \
-            berylsettings >= 0.1.3 \
-            beryl"
+            berylsettings >= 0.1.4 \
+            glib-2.0"
 
 AC_ARG_ENABLE(berylsettings, AC_HELP_STRING([--disable-berylsettings], [disable beryl settings]), [berylsettings="${enableval}"], [berylsettings="yes"])
 AM_CONDITIONAL(include_bs, test "$berylsettings" = "yes")
diff --git a/beryl-core/VERSION b/beryl-core/VERSION
index 482d27f..0bf02ea 100644
--- a/beryl-core/VERSION
+++ b/beryl-core/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4
diff --git a/beryl-core/berylsettings.pc.in b/beryl-core/berylsettings.pc.in
index 28d0e6b..3922392 100644
--- a/beryl-core/berylsettings.pc.in
+++ b/beryl-core/berylsettings.pc.in
@@ -7,6 +7,6 @@ Name: beryl
 Description: OpenGL compositing manager
 Version: @VERSION@
 
-Requires: @BERYL_REQUIRES@ beryl
+Requires: @BERYL_REQUIRES@ beryl glib-2.0
 Libs: @BERYL_LIBS@ -L@libdir@ -lberylsettings
 Cflags: @BERYL_CFLAGS@ -I${includedir}/beryl
diff --git a/beryl-core/configure.ac b/beryl-core/configure.ac
index 5369169..67339eb 100644
--- a/beryl-core/configure.ac
+++ b/beryl-core/configure.ac
@@ -81,15 +81,15 @@ AC_SUBST(plugindir)
 imagedir=$datadir/beryl
 AC_SUBST(imagedir)
 
-BERYL_REQUIRES="libpng	    \
-		 xcomposite >= 0.3 \
-		 xfixes	    \
-		 xdamage    \
-		 xrandr	    \
-		 ice	    \
-		 sm	    \
-         xinerama \
-		 libstartup-notification-1.0 >= 0.7"
+BERYL_REQUIRES="libpng \
+xcomposite >= 0.3 \
+xfixes \
+xdamage \
+xrandr \
+ice \
+sm \
+xinerama \
+ libstartup-notification-1.0 >= 0.7"
 
 PKG_CHECK_MODULES(BERYL, $BERYL_REQUIRES)
 AC_SUBST(BERYL_REQUIRES)
diff --git a/beryl-dbus/VERSION b/beryl-dbus/VERSION
index 482d27f..0bf02ea 100644
--- a/beryl-dbus/VERSION
+++ b/beryl-dbus/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4
diff --git a/beryl-manager/VERSION b/beryl-manager/VERSION
index 482d27f..0bf02ea 100644
--- a/beryl-manager/VERSION
+++ b/beryl-manager/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4
diff --git a/beryl-plugins/VERSION b/beryl-plugins/VERSION
index 482d27f..0bf02ea 100644
--- a/beryl-plugins/VERSION
+++ b/beryl-plugins/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4
diff --git a/beryl-settings-bindings/VERSION b/beryl-settings-bindings/VERSION
index 482d27f..0bf02ea 100644
--- a/beryl-settings-bindings/VERSION
+++ b/beryl-settings-bindings/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4
diff --git a/beryl-settings/VERSION b/beryl-settings/VERSION
index 482d27f..0bf02ea 100644
--- a/beryl-settings/VERSION
+++ b/beryl-settings/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4
diff --git a/emerald-themes/VERSION b/emerald-themes/VERSION
index 482d27f..0bf02ea 100644
--- a/emerald-themes/VERSION
+++ b/emerald-themes/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4
diff --git a/emerald/VERSION b/emerald/VERSION
index 482d27f..0bf02ea 100644
--- a/emerald/VERSION
+++ b/emerald/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4
diff --git a/heliodor/VERSION b/heliodor/VERSION
index 482d27f..0bf02ea 100644
--- a/heliodor/VERSION
+++ b/heliodor/VERSION
@@ -1,2 +1,2 @@
 #beryl version header
-VERSION=0.1.3
+VERSION=0.1.4