Update codebase.

AUTHORS

@@ -43,7 +43,7 @@ Dennis Cranston and Andrew Sobala for various bug fixes.
 Calum Benson for HCI advice.
 Breda McColgan for online help.
 Evan Martin <martine@cs.washington.edu> for help with the menu buttons.
-Gregory Merchan <merchan@baton.phys.lsu.edu> for the calctool_display_frame
+Gregory Merchan <merchan@baton.phys.lsu.edu> for the calctool_display_frame 
 custom widget.
 
 ----

Makefile.am

@@ -1,17 +1,20 @@
 SUBDIRS = po src data help
 
+# Temporary fix for JHBuild, see https://bugzilla.gnome.org/show_bug.cgi?id=641652
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+
 DISTCLEANFILES = \
 	Makefile.in \
 	aclocal.m4 \
 	config.h.in \
 	configure \
 	depcomp \
-	mate-doc-utils.make \
 	install-sh \
 	missing \
 	mkinstalldirs \
 	omf.make \
 	xmldocs.make
 
 EXTRA_DIST = \
-	autogen.sh
+	autogen.sh \
+	mate-calc.doap

autogen.sh

@@ -5,21 +5,18 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="mate-calc"
+REQUIRED_AUTOMAKE_VERSION=1.7
+#REQUIRED_YELP_TOOLS_VERSION=3.1.1
 
-(test -f $srcdir/configure.ac) || {
+(test -f $srcdir/configure.ac \
+  && test -d $srcdir/src) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
+    echo " top-level mate-calc directory"
     exit 1
 }
 
 which mate-autogen || {
-    echo "You need to install mate-common from the MATE Git"
+    echo "You need to install mate-common from the MATE git"
     exit 1
 }
-
-REQUIRED_AUTOMAKE_VERSION=1.9
-USE_MATE2_MACROS=1
-USE_COMMON_DOC_BUILD=yes
-
-. mate-autogen
-
+USE_MATE2_MACROS=1 USE_COMMON_DOC_BUILD=yes . mate-autogen

configure.ac

@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE(mate-calc, 1.5.0)
+AM_INIT_AUTOMAKE(mate-calc, 1.5.1)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 MATE_MAINTAINER_MODE_DEFINES
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AC_ISC_POSIX
 AC_PROG_CC
@@ -19,59 +19,47 @@ dnl ###########################################################################
 dnl Dependencies
 dnl ###########################################################################
 
-GTK_REQUIRED=2.18
+GLIB_REQUIRED=2.31
 GIO_REQUIRED=2.25.10
+GTK_REQUIRED=2.18.0
 
 AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-	[AS_HELP_STRING([--with-gtk=2.0|3.0], [which gtk+ version to compile against (default: 2.0)])],
-	[case "$with_gtk" in
-		2.0|3.0) ;;
-		*) AC_MSG_ERROR([invalid gtk version specified]) ;;
-	 esac],
-	[with_gtk=2.0])
+AC_ARG_WITH([gtk+],
+            [AS_HELP_STRING([--with-gtk=2.0|3.0], [which gtk+ version to compile against (default: 2.0)])],
+            [case "$with_gtk" in
+                2.0|3.0) ;;
+                *) AC_MSG_ERROR([invalid gtk version specified]) ;;
+             esac],
+            [with_gtk=2.0])
 AC_MSG_RESULT([$with_gtk])
 
 case "$with_gtk" in
-	2.0) GTK_API_VERSION=2.0
-		GTK_REQUIRED=2.18.0
-		;;
-	3.0) GTK_API_VERSION=3.0
-		GTK_REQUIRED=2.90.4
-		;;
+    2.0) GTK_API_VERSION=2.0
+            GTK_REQUIRED=2.18.0
+            ;;
+    3.0) GTK_API_VERSION=3.0
+            GTK_REQUIRED=2.90.4
+            ;;
 esac
 
 PKG_CHECK_MODULES(MATE_CALC, [
-	gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-	gio-2.0 >= $GIO_REQUIRED
-	libxml-2.0
-	gmodule-export-2.0
+    gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+    glib-2.0 >= $GLIB_REQUIRED
+    gio-2.0 >= $GIO_REQUIRED
+    libxml-2.0
+    gmodule-export-2.0
 ])
 
 PKG_CHECK_MODULES(MATE_CALC_CMD, [
-	glib-2.0
+    glib-2.0 >= $GLIB_REQUIRED
+    gio-2.0 >= $GIO_REQUIRED
+    libxml-2.0
 ])
 
-AC_CHECK_LIB(m, log)
-
-dnl ###########################################################################
-dnl Determine if a usable lex is available on this system
-dnl ###########################################################################
-
-AM_PROG_LEX
-if [[ "$LEX" != "flex" ]]; then
-	AC_MSG_ERROR(flex is required to create the mate-calc scanners)
-fi
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+AC_SUBST(GLIB_MKENUMS)
 
-dnl ###########################################################################
-dnl Determine if a usable yacc is available on this system
-dnl ###########################################################################
-
-AC_PROG_YACC
-AC_CHECK_PROG(HAVE_YACC, $YACC, yes, no)
-if [[ "$HAVE_YACC" = "no" ]]; then
-	AC_MSG_ERROR($YACC is not usable as yacc - consider using bison)
-fi
+AC_CHECK_LIB(m, log)
 
 dnl ###########################################################################
 dnl Internationalization
@@ -84,16 +72,16 @@ dnl ###########################################################################
 dnl Documentation
 dnl ###########################################################################
 
-MATE_DOC_INIT
+YELP_HELP_INIT
 
 dnl ###########################################################################
 dnl Files to generate
 dnl ###########################################################################
 
 AC_OUTPUT([
-	Makefile
-	src/Makefile
-	po/Makefile.in
-	data/Makefile
-	help/Makefile
+Makefile
+src/Makefile
+po/Makefile.in
+data/Makefile
+help/Makefile
 ])

data/Makefile.am

@@ -15,7 +15,7 @@ Utilities_in_files = mate-calc.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-man1_MANS = mate-calc.1
+man1_MANS = mate-calc.1 mate-calc-cmd.1
 
 EXTRA_DIST = $(ui_DATA) org.mate.calc.gschema.xml.in mate-calc.desktop.in $(man1_MANS)