Fix for bug #609456 and changes for new release.GNOME_MAG_0_16_1

4 files changed, 30 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index 1c4e5bb..a7ddc49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,16 +10,16 @@ EXTRA_DIST=gnome-mag-1.0.pc.in \
 	intltool-merge.in \
 	intltool-update.in \
 	ChangeLog.pre-git \
-	tools
+	tools \
+	$(CB_XD)
 	
-EXTRA_DIST+=$(CB_XD)
-
 doc_tarball_files = \
 	docs/reference/html
 
 DISTCLEANFILES = intltool-extract \
 	intltool-merge \
-	intltool-update
+	intltool-update \
+	$(CB_CXD)
 
 gnome-mag-1-0-docs.tar.gz:
 	tar cf - $(doc_tarball_files) | gzip -c --best >$@
diff --git a/NEWS b/NEWS
index 97415bb..aeacaec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+What's new in gnome-mag-0.16.1:
+
+* Fixes:
+	#612818 - gnome-mag fails to build with latest gtk 2.19.7 (André Klapper)
+	#610935 - POTFILES.in is broken
+	#609456 - Broken build because of colorblind when building from git
+
+* Translations:
+	Fran Diéguez (gl), Inaki Larranaga Murgoitio (eu), Kostas Papadimas (el)
+	Roman Mátyus (sk)
+
 What's new in gnome-mag-0.16.0:
 
 * New features:
diff --git a/README b/README
index 3f4d4e9..db6af33 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is gnome-mag version 0.16.0 (Unstable)
+This is gnome-mag version 0.16.1 (Unstable)
 
 This directory contains the gnome-mag magnification
 service definition and sample implementation.
diff --git a/configure.in b/configure.in
index ead1f14..0ecfe11 100644
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@ GNOME_MAG_CURRENT=`expr $GNOME_MAG_MINOR_VERSION - $GNOME_MAG_INTERFACE_AGE`
 
 dnl increment any time the source you release changes; set to
 dnl 0 if you increment CURRENT
-GNOME_MAG_REVISION=0
+GNOME_MAG_REVISION=1
 
 GNOME_MAG_MICRO_VERSION=$GNOME_MAG_REVISION
 
@@ -301,20 +301,15 @@ if test -z "$DEFAULT_GMAG_INTROSPECTION_PATH"; then
           DEFAULT_GMAG_INTROSPECTION_PATH=gnome-mag/dbus
 fi
 
-if test "x$enable_colorblind_applet" = "xyes"; then
-	CB_OUT="colorblind/Makefile
-colorblind/defs.py
-colorblind/ui/Makefile
-colorblind/osutils/Makefile
-colorblind/data/Makefile
-colorblind/data/art/Makefile
-colorblind/keybinder/Makefile"
-else
-	CB_XD="colorblind/ColorblindApplet.py colorblind/GNOME_Magnifier_ColorblindApplet.server.in.in colorblind/Keybinder.py colorblind/data/colorblind-applet.schemas.in colorblind/data/Colorblind_Applet.xml colorblind/data/colorblind-prefs.ui colorblind/ui/WindowUI.py colorblind/ui/About.py colorblind/ui/ColorblindPreferencesUI.py"
-	CB_OUT=""
+# Force the colorblind applet to be distribute the sources inclusive when the tarball roller don't have the colorblind dev package
+if test "x$enable_colorblind_applet" != "xyes"; then
+	CB_XD="colorblind"
+	# This is not maintanable, but it don't make distcheck fail when colorblind-dev is not present. A better approach must be found.
+	CB_CXD="colorblind/defs.py colorblind/Makefile colorblind/osutils/Makefile colorblind/osutils/.deps/_osutilsmodule.Plo colorblind/ui/Makefile colorblind/keybinder/Makefile colorblind/keybinder/.deps/tomboykeybinder.Plo colorblind/keybinder/.deps/eggaccelerators.Plo colorblind/keybinder/.deps/_keybinder.Plo colorblind/keybinder/.deps/_keybindermodule.Plo colorblind/data/Makefile colorblind/data/art/Makefile"
 fi
 
 AC_SUBST(CB_XD)
+AC_SUBST(CB_CXD)
 
 AC_OUTPUT([
 Makefile
@@ -330,5 +325,11 @@ test/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/man/Makefile
-$CB_OUT
+colorblind/Makefile
+colorblind/defs.py
+colorblind/ui/Makefile
+colorblind/osutils/Makefile
+colorblind/data/Makefile
+colorblind/data/art/Makefile
+colorblind/keybinder/Makefile
 ])