Merge lp:~darkxst/ubuntu/trusty/gjs/1.38.1 into lp:ubuntu/trusty/gjs

[Tim Lunn]

[lp:~darkxst/ubuntu/trusty/gjs/1.38.1]

69. By Tim Lunn on 2013-10-25

debian/patches/git_fix_make_check.patch: Upstream patch to fix tests

70. By Tim Lunn on 2013-10-25

debian/rules: Make tests fatal again

[Jackson Doak (noskcaj)]

Could you contact the debian pkg-gnome team and package this there as well, it would help everyone a lot

[Jackson Doak (noskcaj)]

The work looks good though, you'll just need a developer to upload it.

[lp:~darkxst/ubuntu/trusty/gjs/1.38.1]

71. By Tim Lunn on 2013-10-25

* debian/control.in: add -tests package for installed tests
* debian/tests: Add autopkgtests

72. By Tim Lunn on 2013-10-27

Actually run the gjs tests

73. By Tim Lunn on 2013-10-27

Actually run gjstest

=== modified file 'Makefile-insttest.am'
--- Makefile-insttest.am	2013-08-23 11:54:16 +0000
+++ Makefile-insttest.am	2013-10-27 19:56:01 +0000
@@ -1,5 +1,7 @@
 EXTRA_DIST += \
-	installed-tests/jsunit.test.in
+	installed-tests/jsunit.test.in \
+	installed-tests/script.test.in \
+	$(NULL)
 
 installedtestmetadir = $(datadir)/installed-tests/gjs
 installedtestmeta_DATA = 
@@ -120,6 +122,6 @@
 	sed -e s,@pkglibexecdir\@,$(pkglibexecdir), -e s,@name\@,$(notdir $<), < $(srcdir)/installed-tests/script.test.in > $@.tmp && mv $@.tmp $@
 
 jsscripttestsdir = $(gjsinsttestdir)/scripts
-jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
+dist_jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
 installedtestmeta_DATA += testSystemExit.test
 endif
 
=== modified file 'Makefile.in'
--- Makefile.in	2013-08-23 11:54:16 +0000
+++ Makefile.in	2013-10-27 19:56:01 +0000
@@ -92,7 +92,8 @@
 	$(srcdir)/config.h.in $(srcdir)/gjs-1.0.pc.in \
 	$(srcdir)/gjs-internals-1.0.pc.in depcomp \
 	$(am__dist_gjsjs_DATA_DIST) $(dist_gjsoverride_DATA) \
-	$(dist_gjstweener_DATA) $(am__dist_jstests_DATA_DIST) \
+	$(dist_gjstweener_DATA) $(am__dist_jsscripttests_DATA_DIST) \
+	$(am__dist_jstests_DATA_DIST) \
 	$(nobase_gjs_module_include_HEADERS) \
 	$(nobase_gjs_public_include_HEADERS) $(noinst_HEADERS) COPYING \
 	compile config.guess config.sub install-sh missing ltmain.sh
@@ -181,12 +182,11 @@
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(privlibdir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(gjsinsttestdir)" \
 	"$(DESTDIR)$(gjsjsdir)" "$(DESTDIR)$(gjsoverridedir)" \
-	"$(DESTDIR)$(gjstweenerdir)" "$(DESTDIR)$(jstestsdir)" \
-	"$(DESTDIR)$(gjsinsttestdir)" \
+	"$(DESTDIR)$(gjstweenerdir)" "$(DESTDIR)$(jsscripttestsdir)" \
+	"$(DESTDIR)$(jstestsdir)" "$(DESTDIR)$(gjsinsttestdir)" \
 	"$(DESTDIR)$(installedtestmetadir)" \
-	"$(DESTDIR)$(jsscripttestsdir)" "$(DESTDIR)$(pkgconfigdir)" \
-	"$(DESTDIR)$(tapsetdir)" "$(DESTDIR)$(typelibdir)" \
-	"$(DESTDIR)$(gjs_module_includedir)" \
+	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(tapsetdir)" \
+	"$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(gjs_module_includedir)" \
 	"$(DESTDIR)$(gjs_public_includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
 	$(privlib_LTLIBRARIES)
@@ -374,6 +374,8 @@
 am__dist_gjsjs_DATA_DIST = modules/gettext.js modules/lang.js \
 	modules/mainloop.js modules/jsUnit.js modules/signals.js \
 	modules/promise.js modules/format.js modules/cairo.js
+am__dist_jsscripttests_DATA_DIST =  \
+	installed-tests/scripts/testSystemExit.js
 am__dist_jstests_DATA_DIST = installed-tests/js/test0010basic.js \
 	installed-tests/js/test0020importer.js \
 	installed-tests/js/test0030basicBoxed.js \
@@ -400,9 +402,9 @@
 	installed-tests/js/testUnicode.js \
 	installed-tests/js/testCairo.js
 DATA = $(dist_gjsjs_DATA) $(dist_gjsoverride_DATA) \
-	$(dist_gjstweener_DATA) $(dist_jstests_DATA) \
-	$(gjsinsttest_DATA) $(installedtestmeta_DATA) \
-	$(jsscripttests_DATA) $(noinst_DATA) $(pkgconfig_DATA) \
+	$(dist_gjstweener_DATA) $(dist_jsscripttests_DATA) \
+	$(dist_jstests_DATA) $(gjsinsttest_DATA) \
+	$(installedtestmeta_DATA) $(noinst_DATA) $(pkgconfig_DATA) \
 	$(tapset_DATA) $(typelib_DATA)
 HEADERS = $(nobase_gjs_module_include_HEADERS) \
 	$(nobase_gjs_public_include_HEADERS) $(noinst_HEADERS)
@@ -439,8 +441,8 @@
   else :; fi
 am__post_remove_distdir = $(am__remove_distdir)
 GZIP_ENV = --best
-DIST_ARCHIVES = $(distdir).tar.bz2
-DIST_TARGETS = dist-bzip2
+DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -614,7 +616,8 @@
 	$(tapset_in_files) examples/clutter.js examples/gio-cat.js \
 	examples/gtk.js examples/http-server.js examples/test.jpg \
 	test/run-with-dbus test/test-bus.conf \
-	installed-tests/jsunit.test.in autogen.sh COPYING.LGPL
+	installed-tests/jsunit.test.in installed-tests/script.test.in \
+	$(NULL) autogen.sh COPYING.LGPL
 gjstest_files_with_tests = gjs/context.c gjs/jsapi-util-array.c \
 	gjs/jsapi-util-error.c gjs/jsapi-util-string.c gjs/stack.c \
 	util/glib.c
@@ -863,7 +866,7 @@
 jstestsdir = $(gjsinsttestdir)/js
 dist_jstests_DATA = $(am__append_15) $(am__append_16)
 @BUILDOPT_INSTALL_TESTS_TRUE@jsscripttestsdir = $(gjsinsttestdir)/scripts
-@BUILDOPT_INSTALL_TESTS_TRUE@jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
+@BUILDOPT_INSTALL_TESTS_TRUE@dist_jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
 
 # Colin's handy Makefile bits for:
 # 1) stuffing tarballs with pre-generated scripts from your workstation
@@ -1825,6 +1828,27 @@
 	@list='$(dist_gjstweener_DATA)'; test -n "$(gjstweenerdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(gjstweenerdir)'; $(am__uninstall_files_from_dir)
+install-dist_jsscripttestsDATA: $(dist_jsscripttests_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_jsscripttests_DATA)'; test -n "$(jsscripttestsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(jsscripttestsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(jsscripttestsdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jsscripttestsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(jsscripttestsdir)" || exit $$?; \
+	done
+
+uninstall-dist_jsscripttestsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_jsscripttests_DATA)'; test -n "$(jsscripttestsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(jsscripttestsdir)'; $(am__uninstall_files_from_dir)
 install-dist_jstestsDATA: $(dist_jstests_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(dist_jstests_DATA)'; test -n "$(jstestsdir)" || list=; \
@@ -1888,27 +1912,6 @@
 	@list='$(installedtestmeta_DATA)'; test -n "$(installedtestmetadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(installedtestmetadir)'; $(am__uninstall_files_from_dir)
-install-jsscripttestsDATA: $(jsscripttests_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(jsscripttests_DATA)'; test -n "$(jsscripttestsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(jsscripttestsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(jsscripttestsdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jsscripttestsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(jsscripttestsdir)" || exit $$?; \
-	done
-
-uninstall-jsscripttestsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(jsscripttests_DATA)'; test -n "$(jsscripttestsdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(jsscripttestsdir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
@@ -2122,6 +2125,7 @@
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
+
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__post_remove_distdir)
@@ -2129,7 +2133,6 @@
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
-
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
@@ -2245,7 +2248,7 @@
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(privlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gjsinsttestdir)" "$(DESTDIR)$(gjsjsdir)" "$(DESTDIR)$(gjsoverridedir)" "$(DESTDIR)$(gjstweenerdir)" "$(DESTDIR)$(jstestsdir)" "$(DESTDIR)$(gjsinsttestdir)" "$(DESTDIR)$(installedtestmetadir)" "$(DESTDIR)$(jsscripttestsdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(tapsetdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(gjs_module_includedir)" "$(DESTDIR)$(gjs_public_includedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(privlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gjsinsttestdir)" "$(DESTDIR)$(gjsjsdir)" "$(DESTDIR)$(gjsoverridedir)" "$(DESTDIR)$(gjstweenerdir)" "$(DESTDIR)$(jsscripttestsdir)" "$(DESTDIR)$(jstestsdir)" "$(DESTDIR)$(gjsinsttestdir)" "$(DESTDIR)$(installedtestmetadir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(tapsetdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(gjs_module_includedir)" "$(DESTDIR)$(gjs_public_includedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -2308,9 +2311,9 @@
 info-am:
 
 install-data-am: install-dist_gjsjsDATA install-dist_gjsoverrideDATA \
-	install-dist_gjstweenerDATA install-dist_jstestsDATA \
-	install-gjsinsttestDATA install-gjsinsttestPROGRAMS \
-	install-installedtestmetaDATA install-jsscripttestsDATA \
+	install-dist_gjstweenerDATA install-dist_jsscripttestsDATA \
+	install-dist_jstestsDATA install-gjsinsttestDATA \
+	install-gjsinsttestPROGRAMS install-installedtestmetaDATA \
 	install-nobase_gjs_module_includeHEADERS \
 	install-nobase_gjs_public_includeHEADERS install-pkgconfigDATA \
 	install-privlibLTLIBRARIES install-tapsetDATA \
@@ -2365,9 +2368,9 @@
 
 uninstall-am: uninstall-binPROGRAMS uninstall-dist_gjsjsDATA \
 	uninstall-dist_gjsoverrideDATA uninstall-dist_gjstweenerDATA \
-	uninstall-dist_jstestsDATA uninstall-gjsinsttestDATA \
-	uninstall-gjsinsttestPROGRAMS uninstall-installedtestmetaDATA \
-	uninstall-jsscripttestsDATA uninstall-libLTLIBRARIES \
+	uninstall-dist_jsscripttestsDATA uninstall-dist_jstestsDATA \
+	uninstall-gjsinsttestDATA uninstall-gjsinsttestPROGRAMS \
+	uninstall-installedtestmetaDATA uninstall-libLTLIBRARIES \
 	uninstall-nobase_gjs_module_includeHEADERS \
 	uninstall-nobase_gjs_public_includeHEADERS \
 	uninstall-pkgconfigDATA uninstall-privlibLTLIBRARIES \
@@ -2389,11 +2392,11 @@
 	info-am install install-am install-binPROGRAMS install-data \
 	install-data-am install-dist_gjsjsDATA \
 	install-dist_gjsoverrideDATA install-dist_gjstweenerDATA \
-	install-dist_jstestsDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-exec-hook \
-	install-gjsinsttestDATA install-gjsinsttestPROGRAMS \
-	install-html install-html-am install-info install-info-am \
-	install-installedtestmetaDATA install-jsscripttestsDATA \
+	install-dist_jsscripttestsDATA install-dist_jstestsDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-exec-hook install-gjsinsttestDATA \
+	install-gjsinsttestPROGRAMS install-html install-html-am \
+	install-info install-info-am install-installedtestmetaDATA \
 	install-libLTLIBRARIES install-man \
 	install-nobase_gjs_module_includeHEADERS \
 	install-nobase_gjs_public_includeHEADERS install-pdf \
@@ -2405,9 +2408,9 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-dist_gjsjsDATA uninstall-dist_gjsoverrideDATA \
-	uninstall-dist_gjstweenerDATA uninstall-dist_jstestsDATA \
-	uninstall-gjsinsttestDATA uninstall-gjsinsttestPROGRAMS \
-	uninstall-installedtestmetaDATA uninstall-jsscripttestsDATA \
+	uninstall-dist_gjstweenerDATA uninstall-dist_jsscripttestsDATA \
+	uninstall-dist_jstestsDATA uninstall-gjsinsttestDATA \
+	uninstall-gjsinsttestPROGRAMS uninstall-installedtestmetaDATA \
 	uninstall-libLTLIBRARIES \
 	uninstall-nobase_gjs_module_includeHEADERS \
 	uninstall-nobase_gjs_public_includeHEADERS \
 
=== modified file 'aclocal.m4'
--- aclocal.m4	2013-07-30 09:15:40 +0000
+++ aclocal.m4	2013-10-27 19:56:01 +0000
@@ -1105,228 +1105,6 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-# gnome-common.m4
-#
-# serial 3
-# 
-
-dnl GNOME_COMMON_INIT
-
-AU_DEFUN([GNOME_COMMON_INIT],
-[
-  dnl this macro should come after AC_CONFIG_MACRO_DIR
-  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-
-  dnl ensure that when the Automake generated makefile calls aclocal,
-  dnl it honours the $ACLOCAL_FLAGS environment variable
-  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-  if test -n "$ac_macro_dir"; then
-    ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
-  fi
-
-  AC_SUBST([ACLOCAL_AMFLAGS])
-],
-[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
-in your top-level Makefile.am, instead, where "m4" is the macro directory set
-with AC_CONFIG_MACRO_DIR() in your configure.ac]])
-
-AC_DEFUN([GNOME_DEBUG_CHECK],
-[
-	AC_ARG_ENABLE([debug],
-                      AC_HELP_STRING([--enable-debug],
-                                     [turn on debugging]),,
-                      [enable_debug=no])
-
-	if test x$enable_debug = xyes ; then
-	    AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-		[Enable additional debugging at the expense of performance and size])
-	fi
-])
-
-dnl GNOME_MAINTAINER_MODE_DEFINES ()
-dnl define DISABLE_DEPRECATED
-dnl
-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
-[
-	AC_REQUIRE([AM_MAINTAINER_MODE])
-
-	DISABLE_DEPRECATED=""
-	if test $USE_MAINTAINER_MODE = yes; then
-	        DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP"
-	        for DOMAIN in $DOMAINS; do
-	               DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-	        done
-	fi
-
-	AC_SUBST(DISABLE_DEPRECATED)
-])
-
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings and substitute the result into
-dnl WARN_CFLAGS
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE(compile-warnings, 
-                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                                 [Turn on compiler warnings]),,
-                  [enable_compile_warnings="m4_default([$1],[yes])"])
-
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    dnl These are warning flags that aren't marked as fatal.  Can be
-    dnl overridden on a per-project basis with -Wno-foo.
-    base_warn_flags=" \
-        -Wall \
-        -Wstrict-prototypes \
-        -Wnested-externs \
-    "
-
-    dnl These compiler flags typically indicate very broken or suspicious
-    dnl code.  Some of them such as implicit-function-declaration are
-    dnl just not default because gcc compiles a lot of legacy code.
-    dnl We choose to make this set into explicit errors.
-    base_error_flags=" \
-        -Werror=missing-prototypes \
-        -Werror=implicit-function-declaration \
-        -Werror=pointer-arith \
-        -Werror=init-self \
-        -Werror=format-security \
-        -Werror=format=2 \
-        -Werror=missing-include-dirs \
-    "
-
-    case "$enable_compile_warnings" in
-    no)
-        warning_flags=
-        ;;
-    minimum)
-        warning_flags="-Wall"
-        ;;
-    yes)
-        warning_flags="$base_warn_flags $base_error_flags"
-        ;;
-    maximum|error)
-        warning_flags="$base_warn_flags $base_error_flags"
-        ;;
-    *)
-        AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-        ;;
-    esac
-
-    if test "$enable_compile_warnings" = "error" ; then
-        warning_flags="$warning_flags -Werror"
-    fi
-
-    dnl Check whether GCC supports the warning options
-    for option in $warning_flags; do
-	save_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $option"
-	AC_MSG_CHECKING([whether gcc understands $option])
-	AC_TRY_COMPILE([], [],
-	    has_option=yes,
-	    has_option=no,)
-	CFLAGS="$save_CFLAGS"
-	AC_MSG_RESULT([$has_option])
-	if test $has_option = yes; then
-	    tested_warning_flags="$tested_warning_flags $option"
-	fi
-	unset has_option
-	unset save_CFLAGS
-    done
-    unset option
-    CFLAGS="$realsave_CFLAGS"
-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($tested_warning_flags)
-
-    AC_ARG_ENABLE(iso-c,
-                  AC_HELP_STRING([--enable-iso-c],
-                                 [Try to warn if code is not ISO C ]),,
-                  [enable_iso_c=no])
-
-    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *[\ \	]-ansi[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *[\ \	]-pedantic[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    AC_MSG_RESULT($complCFLAGS)
-
-    WARN_CFLAGS="$tested_warning_flags $complCFLAGS"
-    AC_SUBST(WARN_CFLAGS)
-])
-
-dnl For C++, do basically the same thing.
-
-AC_DEFUN([GNOME_CXX_WARNINGS],[
-  AC_ARG_ENABLE(cxx-warnings,
-                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-                               [Turn on compiler warnings.]),,
-                [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
-  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-  warnCXXFLAGS=
-  if test "x$GXX" != xyes; then
-    enable_cxx_warnings=no
-  fi
-  if test "x$enable_cxx_warnings" != "xno"; then
-    if test "x$GXX" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-Wall[\ \	]*) ;;
-      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-      esac
-
-      ## -W is not all that useful.  And it cannot be controlled
-      ## with individual -Wno-xxx flags, unlike -Wall
-      if test "x$enable_cxx_warnings" = "xyes"; then
-	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-      fi
-    fi
-  fi
-  AC_MSG_RESULT($warnCXXFLAGS)
-
-   AC_ARG_ENABLE(iso-cxx,
-                 AC_HELP_STRING([--enable-iso-cxx],
-                                [Try to warn if code is not ISO C++ ]),,
-                 [enable_iso_cxx=no])
-
-   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-   complCXXFLAGS=
-   if test "x$enable_iso_cxx" != "xno"; then
-     if test "x$GXX" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-ansi[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-      esac
-
-      case " $CXXFLAGS " in
-      *[\ \	]-pedantic[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-      esac
-     fi
-   fi
-  AC_MSG_RESULT($complCXXFLAGS)
-
-  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-  AC_SUBST(WARN_CXXFLAGS)
-])
-
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -10118,6 +9896,243 @@
 m4_popdef([pkg_description])
 ]) dnl PKG_NOARCH_INSTALLDIR
 
+# gnome-common.m4
+#
+# serial 3
+# 
+
+dnl GNOME_COMMON_INIT
+
+AU_DEFUN([GNOME_COMMON_INIT],
+[
+  dnl this macro should come after AC_CONFIG_MACRO_DIR
+  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
+
+  dnl ensure that when the Automake generated makefile calls aclocal,
+  dnl it honours the $ACLOCAL_FLAGS environment variable
+  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+  if test -n "$ac_macro_dir"; then
+    ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+  fi
+
+  AC_SUBST([ACLOCAL_AMFLAGS])
+],
+[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
+in your top-level Makefile.am, instead, where "m4" is the macro directory set
+with AC_CONFIG_MACRO_DIR() in your configure.ac]])
+
+AC_DEFUN([GNOME_DEBUG_CHECK],
+[
+	AC_ARG_ENABLE([debug],
+                      AC_HELP_STRING([--enable-debug],
+                                     [turn on debugging]),,
+                      [enable_debug=no])
+
+	if test x$enable_debug = xyes ; then
+	    AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
+		[Enable additional debugging at the expense of performance and size])
+	fi
+])
+
+dnl GNOME_MAINTAINER_MODE_DEFINES ()
+dnl define DISABLE_DEPRECATED
+dnl
+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+[
+	AC_REQUIRE([AM_MAINTAINER_MODE])
+
+	DISABLE_DEPRECATED=""
+	if test $USE_MAINTAINER_MODE = yes; then
+	        DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP"
+	        for DOMAIN in $DOMAINS; do
+	               DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
+	        done
+	fi
+
+	AC_SUBST(DISABLE_DEPRECATED)
+])
+
+# gnome-compiler-flags.m4
+#
+# serial 2
+#
+
+dnl GNOME_COMPILE_WARNINGS
+dnl Turn on many useful compiler warnings and substitute the result into
+dnl WARN_CFLAGS
+dnl For now, only works on GCC
+dnl Pass the default value of the --enable-compile-warnings configure option as
+dnl the first argument to the macro, defaulting to 'yes'.
+dnl Additional warning/error flags can be passed as an optional second argument.
+dnl
+dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar])
+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+    dnl ******************************
+    dnl More compiler warnings
+    dnl ******************************
+
+    AC_ARG_ENABLE(compile-warnings, 
+                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+                                 [Turn on compiler warnings]),,
+                  [enable_compile_warnings="m4_default([$1],[yes])"])
+
+    if test "x$GCC" != xyes; then
+	enable_compile_warnings=no
+    fi
+
+    warning_flags=
+    realsave_CFLAGS="$CFLAGS"
+
+    dnl These are warning flags that aren't marked as fatal.  Can be
+    dnl overridden on a per-project basis with -Wno-foo.
+    base_warn_flags=" \
+        -Wall \
+        -Wstrict-prototypes \
+        -Wnested-externs \
+    "
+
+    dnl These compiler flags typically indicate very broken or suspicious
+    dnl code.  Some of them such as implicit-function-declaration are
+    dnl just not default because gcc compiles a lot of legacy code.
+    dnl We choose to make this set into explicit errors.
+    base_error_flags=" \
+        -Werror=missing-prototypes \
+        -Werror=implicit-function-declaration \
+        -Werror=pointer-arith \
+        -Werror=init-self \
+        -Werror=format-security \
+        -Werror=format=2 \
+        -Werror=missing-include-dirs \
+    "
+
+    dnl Additional warning or error flags provided by the module author to
+    dnl allow stricter standards to be imposed on a per-module basis.
+    dnl The author can pass -W or -Werror flags here as they see fit.
+    additional_flags="m4_default([$2],[])"
+
+    case "$enable_compile_warnings" in
+    no)
+        warning_flags=
+        ;;
+    minimum)
+        warning_flags="-Wall"
+        ;;
+    yes)
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
+        ;;
+    maximum|error)
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
+        ;;
+    *)
+        AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+        ;;
+    esac
+
+    if test "$enable_compile_warnings" = "error" ; then
+        warning_flags="$warning_flags -Werror"
+    fi
+
+    dnl Check whether GCC supports the warning options
+    for option in $warning_flags; do
+	save_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS $option"
+	AC_MSG_CHECKING([whether gcc understands $option])
+	AC_TRY_COMPILE([], [],
+	    has_option=yes,
+	    has_option=no,)
+	CFLAGS="$save_CFLAGS"
+	AC_MSG_RESULT([$has_option])
+	if test $has_option = yes; then
+	    tested_warning_flags="$tested_warning_flags $option"
+	fi
+	unset has_option
+	unset save_CFLAGS
+    done
+    unset option
+    CFLAGS="$realsave_CFLAGS"
+    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+    AC_MSG_RESULT($tested_warning_flags)
+
+    AC_ARG_ENABLE(iso-c,
+                  AC_HELP_STRING([--enable-iso-c],
+                                 [Try to warn if code is not ISO C ]),,
+                  [enable_iso_c=no])
+
+    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+    complCFLAGS=
+    if test "x$enable_iso_c" != "xno"; then
+	if test "x$GCC" = "xyes"; then
+	case " $CFLAGS " in
+	    *[\ \	]-ansi[\ \	]*) ;;
+	    *) complCFLAGS="$complCFLAGS -ansi" ;;
+	esac
+	case " $CFLAGS " in
+	    *[\ \	]-pedantic[\ \	]*) ;;
+	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
+	esac
+	fi
+    fi
+    AC_MSG_RESULT($complCFLAGS)
+
+    WARN_CFLAGS="$tested_warning_flags $complCFLAGS"
+    AC_SUBST(WARN_CFLAGS)
+])
+
+dnl For C++, do basically the same thing.
+
+AC_DEFUN([GNOME_CXX_WARNINGS],[
+  AC_ARG_ENABLE(cxx-warnings,
+                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+                               [Turn on compiler warnings.]),,
+                [enable_cxx_warnings="m4_default([$1],[minimum])"])
+
+  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+  warnCXXFLAGS=
+  if test "x$GXX" != xyes; then
+    enable_cxx_warnings=no
+  fi
+  if test "x$enable_cxx_warnings" != "xno"; then
+    if test "x$GXX" = "xyes"; then
+      case " $CXXFLAGS " in
+      *[\ \	]-Wall[\ \	]*) ;;
+      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+      esac
+
+      ## -W is not all that useful.  And it cannot be controlled
+      ## with individual -Wno-xxx flags, unlike -Wall
+      if test "x$enable_cxx_warnings" = "xyes"; then
+	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
+      fi
+    fi
+  fi
+  AC_MSG_RESULT($warnCXXFLAGS)
+
+   AC_ARG_ENABLE(iso-cxx,
+                 AC_HELP_STRING([--enable-iso-cxx],
+                                [Try to warn if code is not ISO C++ ]),,
+                 [enable_iso_cxx=no])
+
+   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+   complCXXFLAGS=
+   if test "x$enable_iso_cxx" != "xno"; then
+     if test "x$GXX" = "xyes"; then
+      case " $CXXFLAGS " in
+      *[\ \	]-ansi[\ \	]*) ;;
+      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+      esac
+
+      case " $CXXFLAGS " in
+      *[\ \	]-pedantic[\ \	]*) ;;
+      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+      esac
+     fi
+   fi
+  AC_MSG_RESULT($complCXXFLAGS)
+
+  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+  AC_SUBST(WARN_CXXFLAGS)
+])
+
 dnl -*- mode: autoconf -*-
 dnl Copyright 2009 Johan Dahlin
 dnl
 
=== modified file 'configure'
--- configure	2013-08-23 11:54:16 +0000
+++ configure	2013-10-27 19:56:01 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gjs 1.37.6.
+# Generated by GNU Autoconf 2.69 for gjs 1.38.1.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gjs>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='gjs'
 PACKAGE_TARNAME='gjs'
-PACKAGE_VERSION='1.37.6'
-PACKAGE_STRING='gjs 1.37.6'
+PACKAGE_VERSION='1.38.1'
+PACKAGE_STRING='gjs 1.38.1'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gjs'
 PACKAGE_URL=''
 
@@ -1394,7 +1394,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gjs 1.37.6 to adapt to many kinds of systems.
+\`configure' configures gjs 1.38.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1464,7 +1464,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gjs 1.37.6:";;
+     short | recursive ) echo "Configuration of gjs 1.38.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1608,7 +1608,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gjs configure 1.37.6
+gjs configure 1.38.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2098,7 +2098,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gjs $as_me 1.37.6, which was
+It was created by gjs $as_me 1.38.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2961,7 +2961,7 @@
 
 # Define the identity of the package.
  PACKAGE='gjs'
- VERSION='1.37.6'
+ VERSION='1.38.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3017,7 +3017,7 @@
 
 
 
-$as_echo "#define GJS_VERSION (1 * 100 + 37) * 100 + 6" >>confdefs.h
+$as_echo "#define GJS_VERSION (1 * 100 + 38) * 100 + 1" >>confdefs.h
 
 
 GETTEXT_PACKAGE=gjs
@@ -15666,6 +15666,8 @@
         -Werror=missing-include-dirs \
     "
 
+                additional_flags=""
+
     case "$enable_compile_warnings" in
     no)
         warning_flags=
@@ -15674,10 +15676,10 @@
         warning_flags="-Wall"
         ;;
     yes)
-        warning_flags="$base_warn_flags $base_error_flags"
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
         ;;
     maximum|error)
-        warning_flags="$base_warn_flags $base_error_flags"
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
         ;;
     *)
         as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
@@ -16046,20 +16048,20 @@
   as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
 fi
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.37.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.37.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.38.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.38.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   found_introspection=yes
 else
-  as_fn_error $? "You need to have gobject-introspection >= 1.37.1 installed to build gjs" "$LINENO" 5
+  as_fn_error $? "You need to have gobject-introspection >= 1.38.0 installed to build gjs" "$LINENO" 5
 fi
      ;; #(
       auto) :
             if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.37.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.37.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.38.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.38.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
@@ -17491,7 +17493,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gjs $as_me 1.37.6, which was
+This file was extended by gjs $as_me 1.38.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17557,7 +17559,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gjs config.status 1.37.6
+gjs config.status 1.38.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2013-08-23 11:54:16 +0000
+++ configure.ac	2013-10-27 19:56:01 +0000
@@ -2,14 +2,14 @@
 # Process this file with autoconf to produce a configure script.
 
 m4_define(pkg_major_version, 1)
-m4_define(pkg_minor_version, 37)
-m4_define(pkg_micro_version, 6)
+m4_define(pkg_minor_version, 38)
+m4_define(pkg_micro_version, 1)
 m4_define(pkg_version, pkg_major_version.pkg_minor_version.pkg_micro_version)
 m4_define(pkg_int_version, (pkg_major_version * 100 + pkg_minor_version) * 100 + pkg_micro_version)
 
 AC_PREREQ(2.61)
 AC_INIT([gjs], pkg_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=gjs])
-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([dist-xz no-dist-gzip])
 AC_CONFIG_SRCDIR([gjs/console.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -71,7 +71,7 @@
 AC_CHECK_HEADERS([malloc.h])
 AC_CHECK_FUNCS(mallinfo)
 
-GOBJECT_INTROSPECTION_REQUIRE([1.37.1])
+GOBJECT_INTROSPECTION_REQUIRE([1.38.0])
 
 common_packages="gmodule-2.0 gthread-2.0 gio-2.0 >= glib_required_version mozjs-17.0"
 gjs_packages="gobject-introspection-1.0 libffi $common_packages"
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-08-23 11:54:16 +0000
+++ debian/changelog	2013-10-27 19:56:01 +0000
@@ -1,3 +1,13 @@
+gjs (1.38.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches/git_fix_make_check.patch: Upstream patch to fix tests
+  * debian/rules: Make tests fatal again
+  * debian/control.in: add -tests package for installed tests
+  * debian/tests: Add autopkgtests
+
+ -- Tim Lunn <[e-mail]>  Wed, 23 Oct 2013 11:07:12 +1100
+
 gjs (1.37.6-0ubuntu1) saucy; urgency=low
 
   * New upstream release
 
=== modified file 'debian/control.in'
--- debian/control.in	2013-08-03 16:36:12 +0000
+++ debian/control.in	2013-10-27 19:56:01 +0000
@@ -23,6 +23,7 @@
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gjs
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gjs
 Homepage: https://wiki.gnome.org/Gjs
+XS-Testsuite: autopkgtest
 
 Package: gjs
 Architecture: any
@@ -35,6 +36,18 @@
  .
  This package contains the interactive console application.
 
+Package: gjs-tests
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Mozilla-based javascript bindings for the GNOME platform
+ Makes it possible for applications to use all of GNOME's platform
+ libraries using the Javascript language. It's mainly based on the
+ Mozilla javascript engine and the GObject introsepection framework.
+ .
+ This package contains test programs, designed to be run as part of a
+ regression testsuite.
+
 Package: libgjs0d
 Architecture: any
 Section: libs
 
=== added file 'debian/gjs-tests.install'
--- debian/gjs-tests.install	1970-01-01 00:00:00 +0000
+++ debian/gjs-tests.install	2013-10-27 19:56:01 +0000
@@ -0,0 +1,3 @@
+usr/share/installed-tests
+usr/lib/gjs/gjs/installed-tests
+usr/lib/gjs/lib*
 
=== added file 'debian/patches/git_fix_make_check.patch'
--- debian/patches/git_fix_make_check.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_fix_make_check.patch	2013-10-27 19:56:01 +0000
@@ -0,0 +1,47 @@
+From f87c38787640f639da5ebf73014bbcf3b98cd9fc Mon Sep 17 00:00:00 2001
+From: Colin Walters <[e-mail]>
+Date: Fri, 25 Oct 2013 15:56:37 +0000
+Subject: tests: Force generation of shared libraries
+
+If installed tests are disabled, we need to force libtool
+to generate .so files that can be dlopened by introspection.
+
+https://bugzilla.gnome.org/710697
+---
+diff --git a/Makefile-insttest.am b/Makefile-insttest.am
+index 2ebdc77..e63709f 100644
+--- a/Makefile-insttest.am
++++ b/Makefile-insttest.am
+@@ -37,10 +37,15 @@ else
+ check_LTLIBRARIES += libregress.la libwarnlib.la libgimarshallingtests.la
+ endif
+ 
++# This rpath /nowhere thing is the libtool upstream recommended way to
++# force generation of shared libraries, which we need in order for the
++# tests to work uninstalled.
++common_test_ldflags = -avoid-version -rpath /nowhere $(GJS_LIBS)
++
+ nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
+ libregress_la_CPPFLAGS = $(AM_CPPFLAGS)
+ libregress_la_CFLAGS = $(GJS_CFLAGS)
+-libregress_la_LDFLAGS = -avoid-version $(GJS_LIBS)
++libregress_la_LDFLAGS = $(common_test_ldflags)
+ libregress_scannerflags_includes = --include=Gio-2.0
+ if ENABLE_CAIRO
+ libregress_la_CFLAGS += $(GJS_CAIRO_CFLAGS)
+@@ -51,10 +56,10 @@ libregress_la_CPPFLAGS += -D_GI_DISABLE_CAIRO
+ endif
+ nodist_libwarnlib_la_SOURCES = $(GI_DATADIR)/tests/warnlib.c $(GI_DATADIR)/tests/warnlib.h
+ libwarnlib_la_CFLAGS = $(GJS_CFLAGS)
+-libwarnlib_la_LDFLAGS = -avoid-version $(GJS_LIBS)
++libwarnlib_la_LDFLAGS = $(common_test_ldflags)
+ nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
+ libgimarshallingtests_la_CFLAGS = $(GJS_CFLAGS)
+-libgimarshallingtests_la_LDFLAGS = -avoid-version $(GJS_LIBS)
++libgimarshallingtests_la_LDFLAGS = $(common_test_ldflags)
+ 
+ Regress-1.0.gir: libregress.la
+ Regress_1_0_gir_LIBS = libregress.la
+--
+cgit v0.9.2
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-28 03:08:20 +0000
+++ debian/patches/series	2013-10-27 19:56:01 +0000
@@ -0,0 +1,1 @@
+git_fix_make_check.patch
 
=== modified file 'debian/rules'
--- debian/rules	2013-07-30 09:15:40 +0000
+++ debian/rules	2013-10-27 19:56:01 +0000
@@ -7,12 +7,15 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+# configure flags
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-installed-tests
+
 # Use recursive variables since this variable must not be expanded until 
 # files have been installed.
 LIBMOZJS = $(shell objdump -p debian/tmp/usr/lib/libgjs.so | awk '$$1=="NEEDED" && $$2~/^libmozjs/ { print $$2 }' | sed s/\\.so\\./-/ )
 DEB_DH_MAKESHLIBS_ARGS_libgjs0d = -Xusr/lib/gjs-1.0/ -V'libgjs0d (>= $(DEB_UPSTREAM_VERSION)), libgjs0-$(LIBMOZJS)' -- -c4
 
-DEB_MAKE_CHECK_TARGET := check || true
+DEB_MAKE_CHECK_TARGET := check
 
 install/libgjs0d::
 	echo gjs:Provides=libgjs0-$(LIBMOZJS) >> debian/$(cdbs_curpkg).substvars
 
=== added directory 'debian/tests'
=== added file 'debian/tests/build'
--- debian/tests/build	1970-01-01 00:00:00 +0000
+++ debian/tests/build	2013-10-27 19:56:01 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+# autopkgtest check: Build and run a program against glib, to verify that the
+# headers and pkg-config file are installed correctly
+# (C) 2012 Canonical Ltd.
+# Author: Martin Pitt <[e-mail]>
+
+set -e
+
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+cat <<EOF > gjstest.c
+#include <gjs/gjs.h>
+
+int main()
+{
+    GjsContext* context;
+    context = gjs_context_new();
+    return 0;
+}
+EOF
+
+gcc -o gjstest gjstest.c `pkg-config --cflags --libs gjs-1.0`
+echo "build: OK"
+[ -x gjstest ]
+./gjstest
+echo "run: OK"
 
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-10-27 19:56:01 +0000
@@ -0,0 +1,5 @@
+Tests: build
+Depends: libgjs-dev, build-essential
+
+Tests: installed-tests
+Depends: gjs-tests, dbus-x11, xvfb, gnome-desktop-testing
 
=== added file 'debian/tests/installed-tests'
--- debian/tests/installed-tests	1970-01-01 00:00:00 +0000
+++ debian/tests/installed-tests	2013-10-27 19:56:01 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+# autopkgtest check: Run the installed-tests to verify glib works correctly
+# (C) 2013 Canonical Ltd.
+# Author: Iain Lane <[e-mail]>
+
+set -e
+
+export XDG_RUNTIME_DIR=$ADTTMP
+
+dbus-launch xvfb-run -a gnome-desktop-testing-runner gjs 
 
=== modified file 'gjs/console.c'
--- gjs/console.c	2013-07-30 09:15:40 +0000
+++ gjs/console.c	2013-10-27 19:56:01 +0000
@@ -74,13 +74,13 @@
         source_js_version = gjs_context_scan_buffer_for_js_version(script, 1024);
         len = strlen(script);
         filename = "<command line>";
-        program_name = NULL;
+        program_name = argv[0];
     } else if (argc <= 1) {
         source_js_version = NULL;
         script = g_strdup("const Console = imports.console; Console.interact();");
         len = strlen(script);
         filename = "<stdin>";
-        program_name = NULL;
+        program_name = argv[0];
     } else /*if (argc >= 2)*/ {
         error = NULL;
         if (!g_file_get_contents(argv[1], &script, &len, &error)) {
 
=== added file 'installed-tests/script.test.in'
--- installed-tests/script.test.in	1970-01-01 00:00:00 +0000
+++ installed-tests/script.test.in	2013-10-27 19:56:01 +0000
@@ -0,0 +1,3 @@
+[Test]
+Type=session
+Exec=gjs @pkglibexecdir@/installed-tests/scripts/@name@
 
=== added directory 'installed-tests/scripts'
=== added file 'installed-tests/scripts/testSystemExit.js'
--- installed-tests/scripts/testSystemExit.js	1970-01-01 00:00:00 +0000
+++ installed-tests/scripts/testSystemExit.js	2013-10-27 19:56:01 +0000
@@ -0,0 +1,5 @@
+// application/javascript;version=1.8
+
+const System = imports.system;
+
+System.exit(0);