Ubuntu
gjs package

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

  1. Trusty (14.04)
  2. 1.38.1
  3. Merge into trusty
Proposed by Tim Lunn
Status: Merged
Merged at revision: 73
Proposed branch: lp:~darkxst/ubuntu/trusty/gjs/1.38.1
Merge into: lp:ubuntu/trusty/gjs
Diff against target: 1124 lines (+448/-299)
17 files modified
Makefile-insttest.am (+4/-2)
Makefile.in (+53/-50)
aclocal.m4 (+237/-222)
configure (+20/-18)
configure.ac (+4/-4)
debian/changelog (+10/-0)
debian/control.in (+13/-0)
debian/gjs-tests.install (+3/-0)
debian/patches/git_fix_make_check.patch (+47/-0)
debian/patches/series (+1/-0)
debian/rules (+4/-1)
debian/tests/build (+27/-0)
debian/tests/control (+5/-0)
debian/tests/installed-tests (+10/-0)
gjs/console.c (+2/-2)
installed-tests/script.test.in (+3/-0)
installed-tests/scripts/testSystemExit.js (+5/-0)
To merge this branch: bzr merge lp:~darkxst/ubuntu/trusty/gjs/1.38.1
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+192274@code.launchpad.net
To post a comment you must log in.
lp:~darkxst/ubuntu/trusty/gjs/1.38.1 updated
69. By Tim Lunn

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

70. By Tim Lunn

debian/rules: Make tests fatal again

Revision history for this message
Jackson Doak (noskcaj) wrote :

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

Revision history for this message
Jackson Doak (noskcaj) wrote :

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

lp:~darkxst/ubuntu/trusty/gjs/1.38.1 updated
71. By Tim Lunn

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

72. By Tim Lunn

Actually run the gjs tests

73. By Tim Lunn

Actually run gjstest

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile-insttest.am'
2--- Makefile-insttest.am 2013-08-23 11:54:16 +0000
3+++ Makefile-insttest.am 2013-10-27 19:56:01 +0000
4@@ -1,5 +1,7 @@
5 EXTRA_DIST += \
6- installed-tests/jsunit.test.in
7+ installed-tests/jsunit.test.in \
8+ installed-tests/script.test.in \
9+ $(NULL)
10
11 installedtestmetadir = $(datadir)/installed-tests/gjs
12 installedtestmeta_DATA =
13@@ -120,6 +122,6 @@
14 sed -e s,@pkglibexecdir\@,$(pkglibexecdir), -e s,@name\@,$(notdir $<), < $(srcdir)/installed-tests/script.test.in > $@.tmp && mv $@.tmp $@
15
16 jsscripttestsdir = $(gjsinsttestdir)/scripts
17-jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
18+dist_jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
19 installedtestmeta_DATA += testSystemExit.test
20 endif
21
22=== modified file 'Makefile.in'
23--- Makefile.in 2013-08-23 11:54:16 +0000
24+++ Makefile.in 2013-10-27 19:56:01 +0000
25@@ -92,7 +92,8 @@
26 $(srcdir)/config.h.in $(srcdir)/gjs-1.0.pc.in \
27 $(srcdir)/gjs-internals-1.0.pc.in depcomp \
28 $(am__dist_gjsjs_DATA_DIST) $(dist_gjsoverride_DATA) \
29- $(dist_gjstweener_DATA) $(am__dist_jstests_DATA_DIST) \
30+ $(dist_gjstweener_DATA) $(am__dist_jsscripttests_DATA_DIST) \
31+ $(am__dist_jstests_DATA_DIST) \
32 $(nobase_gjs_module_include_HEADERS) \
33 $(nobase_gjs_public_include_HEADERS) $(noinst_HEADERS) COPYING \
34 compile config.guess config.sub install-sh missing ltmain.sh
35@@ -181,12 +182,11 @@
36 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(privlibdir)" \
37 "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gjsinsttestdir)" \
38 "$(DESTDIR)$(gjsjsdir)" "$(DESTDIR)$(gjsoverridedir)" \
39- "$(DESTDIR)$(gjstweenerdir)" "$(DESTDIR)$(jstestsdir)" \
40- "$(DESTDIR)$(gjsinsttestdir)" \
41+ "$(DESTDIR)$(gjstweenerdir)" "$(DESTDIR)$(jsscripttestsdir)" \
42+ "$(DESTDIR)$(jstestsdir)" "$(DESTDIR)$(gjsinsttestdir)" \
43 "$(DESTDIR)$(installedtestmetadir)" \
44- "$(DESTDIR)$(jsscripttestsdir)" "$(DESTDIR)$(pkgconfigdir)" \
45- "$(DESTDIR)$(tapsetdir)" "$(DESTDIR)$(typelibdir)" \
46- "$(DESTDIR)$(gjs_module_includedir)" \
47+ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(tapsetdir)" \
48+ "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(gjs_module_includedir)" \
49 "$(DESTDIR)$(gjs_public_includedir)"
50 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
51 $(privlib_LTLIBRARIES)
52@@ -374,6 +374,8 @@
53 am__dist_gjsjs_DATA_DIST = modules/gettext.js modules/lang.js \
54 modules/mainloop.js modules/jsUnit.js modules/signals.js \
55 modules/promise.js modules/format.js modules/cairo.js
56+am__dist_jsscripttests_DATA_DIST = \
57+ installed-tests/scripts/testSystemExit.js
58 am__dist_jstests_DATA_DIST = installed-tests/js/test0010basic.js \
59 installed-tests/js/test0020importer.js \
60 installed-tests/js/test0030basicBoxed.js \
61@@ -400,9 +402,9 @@
62 installed-tests/js/testUnicode.js \
63 installed-tests/js/testCairo.js
64 DATA = $(dist_gjsjs_DATA) $(dist_gjsoverride_DATA) \
65- $(dist_gjstweener_DATA) $(dist_jstests_DATA) \
66- $(gjsinsttest_DATA) $(installedtestmeta_DATA) \
67- $(jsscripttests_DATA) $(noinst_DATA) $(pkgconfig_DATA) \
68+ $(dist_gjstweener_DATA) $(dist_jsscripttests_DATA) \
69+ $(dist_jstests_DATA) $(gjsinsttest_DATA) \
70+ $(installedtestmeta_DATA) $(noinst_DATA) $(pkgconfig_DATA) \
71 $(tapset_DATA) $(typelib_DATA)
72 HEADERS = $(nobase_gjs_module_include_HEADERS) \
73 $(nobase_gjs_public_include_HEADERS) $(noinst_HEADERS)
74@@ -439,8 +441,8 @@
75 else :; fi
76 am__post_remove_distdir = $(am__remove_distdir)
77 GZIP_ENV = --best
78-DIST_ARCHIVES = $(distdir).tar.bz2
79-DIST_TARGETS = dist-bzip2
80+DIST_ARCHIVES = $(distdir).tar.xz
81+DIST_TARGETS = dist-xz
82 distuninstallcheck_listfiles = find . -type f -print
83 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
84 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
85@@ -614,7 +616,8 @@
86 $(tapset_in_files) examples/clutter.js examples/gio-cat.js \
87 examples/gtk.js examples/http-server.js examples/test.jpg \
88 test/run-with-dbus test/test-bus.conf \
89- installed-tests/jsunit.test.in autogen.sh COPYING.LGPL
90+ installed-tests/jsunit.test.in installed-tests/script.test.in \
91+ $(NULL) autogen.sh COPYING.LGPL
92 gjstest_files_with_tests = gjs/context.c gjs/jsapi-util-array.c \
93 gjs/jsapi-util-error.c gjs/jsapi-util-string.c gjs/stack.c \
94 util/glib.c
95@@ -863,7 +866,7 @@
96 jstestsdir = $(gjsinsttestdir)/js
97 dist_jstests_DATA = $(am__append_15) $(am__append_16)
98 @BUILDOPT_INSTALL_TESTS_TRUE@jsscripttestsdir = $(gjsinsttestdir)/scripts
99-@BUILDOPT_INSTALL_TESTS_TRUE@jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
100+@BUILDOPT_INSTALL_TESTS_TRUE@dist_jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
101
102 # Colin's handy Makefile bits for:
103 # 1) stuffing tarballs with pre-generated scripts from your workstation
104@@ -1825,6 +1828,27 @@
105 @list='$(dist_gjstweener_DATA)'; test -n "$(gjstweenerdir)" || list=; \
106 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
107 dir='$(DESTDIR)$(gjstweenerdir)'; $(am__uninstall_files_from_dir)
108+install-dist_jsscripttestsDATA: $(dist_jsscripttests_DATA)
109+ @$(NORMAL_INSTALL)
110+ @list='$(dist_jsscripttests_DATA)'; test -n "$(jsscripttestsdir)" || list=; \
111+ if test -n "$$list"; then \
112+ echo " $(MKDIR_P) '$(DESTDIR)$(jsscripttestsdir)'"; \
113+ $(MKDIR_P) "$(DESTDIR)$(jsscripttestsdir)" || exit 1; \
114+ fi; \
115+ for p in $$list; do \
116+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
117+ echo "$$d$$p"; \
118+ done | $(am__base_list) | \
119+ while read files; do \
120+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jsscripttestsdir)'"; \
121+ $(INSTALL_DATA) $$files "$(DESTDIR)$(jsscripttestsdir)" || exit $$?; \
122+ done
123+
124+uninstall-dist_jsscripttestsDATA:
125+ @$(NORMAL_UNINSTALL)
126+ @list='$(dist_jsscripttests_DATA)'; test -n "$(jsscripttestsdir)" || list=; \
127+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
128+ dir='$(DESTDIR)$(jsscripttestsdir)'; $(am__uninstall_files_from_dir)
129 install-dist_jstestsDATA: $(dist_jstests_DATA)
130 @$(NORMAL_INSTALL)
131 @list='$(dist_jstests_DATA)'; test -n "$(jstestsdir)" || list=; \
132@@ -1888,27 +1912,6 @@
133 @list='$(installedtestmeta_DATA)'; test -n "$(installedtestmetadir)" || list=; \
134 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
135 dir='$(DESTDIR)$(installedtestmetadir)'; $(am__uninstall_files_from_dir)
136-install-jsscripttestsDATA: $(jsscripttests_DATA)
137- @$(NORMAL_INSTALL)
138- @list='$(jsscripttests_DATA)'; test -n "$(jsscripttestsdir)" || list=; \
139- if test -n "$$list"; then \
140- echo " $(MKDIR_P) '$(DESTDIR)$(jsscripttestsdir)'"; \
141- $(MKDIR_P) "$(DESTDIR)$(jsscripttestsdir)" || exit 1; \
142- fi; \
143- for p in $$list; do \
144- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
145- echo "$$d$$p"; \
146- done | $(am__base_list) | \
147- while read files; do \
148- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jsscripttestsdir)'"; \
149- $(INSTALL_DATA) $$files "$(DESTDIR)$(jsscripttestsdir)" || exit $$?; \
150- done
151-
152-uninstall-jsscripttestsDATA:
153- @$(NORMAL_UNINSTALL)
154- @list='$(jsscripttests_DATA)'; test -n "$(jsscripttestsdir)" || list=; \
155- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
156- dir='$(DESTDIR)$(jsscripttestsdir)'; $(am__uninstall_files_from_dir)
157 install-pkgconfigDATA: $(pkgconfig_DATA)
158 @$(NORMAL_INSTALL)
159 @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
160@@ -2122,6 +2125,7 @@
161 dist-gzip: distdir
162 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
163 $(am__post_remove_distdir)
164+
165 dist-bzip2: distdir
166 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
167 $(am__post_remove_distdir)
168@@ -2129,7 +2133,6 @@
169 dist-lzip: distdir
170 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
171 $(am__post_remove_distdir)
172-
173 dist-xz: distdir
174 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
175 $(am__post_remove_distdir)
176@@ -2245,7 +2248,7 @@
177 install-binPROGRAMS: install-libLTLIBRARIES
178
179 installdirs:
180- 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 \
181+ 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 \
182 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
183 done
184 install: $(BUILT_SOURCES)
185@@ -2308,9 +2311,9 @@
186 info-am:
187
188 install-data-am: install-dist_gjsjsDATA install-dist_gjsoverrideDATA \
189- install-dist_gjstweenerDATA install-dist_jstestsDATA \
190- install-gjsinsttestDATA install-gjsinsttestPROGRAMS \
191- install-installedtestmetaDATA install-jsscripttestsDATA \
192+ install-dist_gjstweenerDATA install-dist_jsscripttestsDATA \
193+ install-dist_jstestsDATA install-gjsinsttestDATA \
194+ install-gjsinsttestPROGRAMS install-installedtestmetaDATA \
195 install-nobase_gjs_module_includeHEADERS \
196 install-nobase_gjs_public_includeHEADERS install-pkgconfigDATA \
197 install-privlibLTLIBRARIES install-tapsetDATA \
198@@ -2365,9 +2368,9 @@
199
200 uninstall-am: uninstall-binPROGRAMS uninstall-dist_gjsjsDATA \
201 uninstall-dist_gjsoverrideDATA uninstall-dist_gjstweenerDATA \
202- uninstall-dist_jstestsDATA uninstall-gjsinsttestDATA \
203- uninstall-gjsinsttestPROGRAMS uninstall-installedtestmetaDATA \
204- uninstall-jsscripttestsDATA uninstall-libLTLIBRARIES \
205+ uninstall-dist_jsscripttestsDATA uninstall-dist_jstestsDATA \
206+ uninstall-gjsinsttestDATA uninstall-gjsinsttestPROGRAMS \
207+ uninstall-installedtestmetaDATA uninstall-libLTLIBRARIES \
208 uninstall-nobase_gjs_module_includeHEADERS \
209 uninstall-nobase_gjs_public_includeHEADERS \
210 uninstall-pkgconfigDATA uninstall-privlibLTLIBRARIES \
211@@ -2389,11 +2392,11 @@
212 info-am install install-am install-binPROGRAMS install-data \
213 install-data-am install-dist_gjsjsDATA \
214 install-dist_gjsoverrideDATA install-dist_gjstweenerDATA \
215- install-dist_jstestsDATA install-dvi install-dvi-am \
216- install-exec install-exec-am install-exec-hook \
217- install-gjsinsttestDATA install-gjsinsttestPROGRAMS \
218- install-html install-html-am install-info install-info-am \
219- install-installedtestmetaDATA install-jsscripttestsDATA \
220+ install-dist_jsscripttestsDATA install-dist_jstestsDATA \
221+ install-dvi install-dvi-am install-exec install-exec-am \
222+ install-exec-hook install-gjsinsttestDATA \
223+ install-gjsinsttestPROGRAMS install-html install-html-am \
224+ install-info install-info-am install-installedtestmetaDATA \
225 install-libLTLIBRARIES install-man \
226 install-nobase_gjs_module_includeHEADERS \
227 install-nobase_gjs_public_includeHEADERS install-pdf \
228@@ -2405,9 +2408,9 @@
229 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
230 tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
231 uninstall-dist_gjsjsDATA uninstall-dist_gjsoverrideDATA \
232- uninstall-dist_gjstweenerDATA uninstall-dist_jstestsDATA \
233- uninstall-gjsinsttestDATA uninstall-gjsinsttestPROGRAMS \
234- uninstall-installedtestmetaDATA uninstall-jsscripttestsDATA \
235+ uninstall-dist_gjstweenerDATA uninstall-dist_jsscripttestsDATA \
236+ uninstall-dist_jstestsDATA uninstall-gjsinsttestDATA \
237+ uninstall-gjsinsttestPROGRAMS uninstall-installedtestmetaDATA \
238 uninstall-libLTLIBRARIES \
239 uninstall-nobase_gjs_module_includeHEADERS \
240 uninstall-nobase_gjs_public_includeHEADERS \
241
242=== modified file 'aclocal.m4'
243--- aclocal.m4 2013-07-30 09:15:40 +0000
244+++ aclocal.m4 2013-10-27 19:56:01 +0000
245@@ -1105,228 +1105,6 @@
246 AC_SUBST([am__untar])
247 ]) # _AM_PROG_TAR
248
249-# gnome-common.m4
250-#
251-# serial 3
252-#
253-
254-dnl GNOME_COMMON_INIT
255-
256-AU_DEFUN([GNOME_COMMON_INIT],
257-[
258- dnl this macro should come after AC_CONFIG_MACRO_DIR
259- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
260-
261- dnl ensure that when the Automake generated makefile calls aclocal,
262- dnl it honours the $ACLOCAL_FLAGS environment variable
263- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
264- if test -n "$ac_macro_dir"; then
265- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
266- fi
267-
268- AC_SUBST([ACLOCAL_AMFLAGS])
269-],
270-[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
271-in your top-level Makefile.am, instead, where "m4" is the macro directory set
272-with AC_CONFIG_MACRO_DIR() in your configure.ac]])
273-
274-AC_DEFUN([GNOME_DEBUG_CHECK],
275-[
276- AC_ARG_ENABLE([debug],
277- AC_HELP_STRING([--enable-debug],
278- [turn on debugging]),,
279- [enable_debug=no])
280-
281- if test x$enable_debug = xyes ; then
282- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
283- [Enable additional debugging at the expense of performance and size])
284- fi
285-])
286-
287-dnl GNOME_MAINTAINER_MODE_DEFINES ()
288-dnl define DISABLE_DEPRECATED
289-dnl
290-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
291-[
292- AC_REQUIRE([AM_MAINTAINER_MODE])
293-
294- DISABLE_DEPRECATED=""
295- if test $USE_MAINTAINER_MODE = yes; then
296- DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP"
297- for DOMAIN in $DOMAINS; do
298- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
299- done
300- fi
301-
302- AC_SUBST(DISABLE_DEPRECATED)
303-])
304-
305-dnl GNOME_COMPILE_WARNINGS
306-dnl Turn on many useful compiler warnings and substitute the result into
307-dnl WARN_CFLAGS
308-dnl For now, only works on GCC
309-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
310- dnl ******************************
311- dnl More compiler warnings
312- dnl ******************************
313-
314- AC_ARG_ENABLE(compile-warnings,
315- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
316- [Turn on compiler warnings]),,
317- [enable_compile_warnings="m4_default([$1],[yes])"])
318-
319- if test "x$GCC" != xyes; then
320- enable_compile_warnings=no
321- fi
322-
323- warning_flags=
324- realsave_CFLAGS="$CFLAGS"
325-
326- dnl These are warning flags that aren't marked as fatal. Can be
327- dnl overridden on a per-project basis with -Wno-foo.
328- base_warn_flags=" \
329- -Wall \
330- -Wstrict-prototypes \
331- -Wnested-externs \
332- "
333-
334- dnl These compiler flags typically indicate very broken or suspicious
335- dnl code. Some of them such as implicit-function-declaration are
336- dnl just not default because gcc compiles a lot of legacy code.
337- dnl We choose to make this set into explicit errors.
338- base_error_flags=" \
339- -Werror=missing-prototypes \
340- -Werror=implicit-function-declaration \
341- -Werror=pointer-arith \
342- -Werror=init-self \
343- -Werror=format-security \
344- -Werror=format=2 \
345- -Werror=missing-include-dirs \
346- "
347-
348- case "$enable_compile_warnings" in
349- no)
350- warning_flags=
351- ;;
352- minimum)
353- warning_flags="-Wall"
354- ;;
355- yes)
356- warning_flags="$base_warn_flags $base_error_flags"
357- ;;
358- maximum|error)
359- warning_flags="$base_warn_flags $base_error_flags"
360- ;;
361- *)
362- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
363- ;;
364- esac
365-
366- if test "$enable_compile_warnings" = "error" ; then
367- warning_flags="$warning_flags -Werror"
368- fi
369-
370- dnl Check whether GCC supports the warning options
371- for option in $warning_flags; do
372- save_CFLAGS="$CFLAGS"
373- CFLAGS="$CFLAGS $option"
374- AC_MSG_CHECKING([whether gcc understands $option])
375- AC_TRY_COMPILE([], [],
376- has_option=yes,
377- has_option=no,)
378- CFLAGS="$save_CFLAGS"
379- AC_MSG_RESULT([$has_option])
380- if test $has_option = yes; then
381- tested_warning_flags="$tested_warning_flags $option"
382- fi
383- unset has_option
384- unset save_CFLAGS
385- done
386- unset option
387- CFLAGS="$realsave_CFLAGS"
388- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
389- AC_MSG_RESULT($tested_warning_flags)
390-
391- AC_ARG_ENABLE(iso-c,
392- AC_HELP_STRING([--enable-iso-c],
393- [Try to warn if code is not ISO C ]),,
394- [enable_iso_c=no])
395-
396- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
397- complCFLAGS=
398- if test "x$enable_iso_c" != "xno"; then
399- if test "x$GCC" = "xyes"; then
400- case " $CFLAGS " in
401- *[\ \ ]-ansi[\ \ ]*) ;;
402- *) complCFLAGS="$complCFLAGS -ansi" ;;
403- esac
404- case " $CFLAGS " in
405- *[\ \ ]-pedantic[\ \ ]*) ;;
406- *) complCFLAGS="$complCFLAGS -pedantic" ;;
407- esac
408- fi
409- fi
410- AC_MSG_RESULT($complCFLAGS)
411-
412- WARN_CFLAGS="$tested_warning_flags $complCFLAGS"
413- AC_SUBST(WARN_CFLAGS)
414-])
415-
416-dnl For C++, do basically the same thing.
417-
418-AC_DEFUN([GNOME_CXX_WARNINGS],[
419- AC_ARG_ENABLE(cxx-warnings,
420- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
421- [Turn on compiler warnings.]),,
422- [enable_cxx_warnings="m4_default([$1],[minimum])"])
423-
424- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
425- warnCXXFLAGS=
426- if test "x$GXX" != xyes; then
427- enable_cxx_warnings=no
428- fi
429- if test "x$enable_cxx_warnings" != "xno"; then
430- if test "x$GXX" = "xyes"; then
431- case " $CXXFLAGS " in
432- *[\ \ ]-Wall[\ \ ]*) ;;
433- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
434- esac
435-
436- ## -W is not all that useful. And it cannot be controlled
437- ## with individual -Wno-xxx flags, unlike -Wall
438- if test "x$enable_cxx_warnings" = "xyes"; then
439- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
440- fi
441- fi
442- fi
443- AC_MSG_RESULT($warnCXXFLAGS)
444-
445- AC_ARG_ENABLE(iso-cxx,
446- AC_HELP_STRING([--enable-iso-cxx],
447- [Try to warn if code is not ISO C++ ]),,
448- [enable_iso_cxx=no])
449-
450- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
451- complCXXFLAGS=
452- if test "x$enable_iso_cxx" != "xno"; then
453- if test "x$GXX" = "xyes"; then
454- case " $CXXFLAGS " in
455- *[\ \ ]-ansi[\ \ ]*) ;;
456- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
457- esac
458-
459- case " $CXXFLAGS " in
460- *[\ \ ]-pedantic[\ \ ]*) ;;
461- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
462- esac
463- fi
464- fi
465- AC_MSG_RESULT($complCXXFLAGS)
466-
467- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
468- AC_SUBST(WARN_CXXFLAGS)
469-])
470-
471 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
472 #
473 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
474@@ -10118,6 +9896,243 @@
475 m4_popdef([pkg_description])
476 ]) dnl PKG_NOARCH_INSTALLDIR
477
478+# gnome-common.m4
479+#
480+# serial 3
481+#
482+
483+dnl GNOME_COMMON_INIT
484+
485+AU_DEFUN([GNOME_COMMON_INIT],
486+[
487+ dnl this macro should come after AC_CONFIG_MACRO_DIR
488+ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
489+
490+ dnl ensure that when the Automake generated makefile calls aclocal,
491+ dnl it honours the $ACLOCAL_FLAGS environment variable
492+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
493+ if test -n "$ac_macro_dir"; then
494+ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
495+ fi
496+
497+ AC_SUBST([ACLOCAL_AMFLAGS])
498+],
499+[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
500+in your top-level Makefile.am, instead, where "m4" is the macro directory set
501+with AC_CONFIG_MACRO_DIR() in your configure.ac]])
502+
503+AC_DEFUN([GNOME_DEBUG_CHECK],
504+[
505+ AC_ARG_ENABLE([debug],
506+ AC_HELP_STRING([--enable-debug],
507+ [turn on debugging]),,
508+ [enable_debug=no])
509+
510+ if test x$enable_debug = xyes ; then
511+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
512+ [Enable additional debugging at the expense of performance and size])
513+ fi
514+])
515+
516+dnl GNOME_MAINTAINER_MODE_DEFINES ()
517+dnl define DISABLE_DEPRECATED
518+dnl
519+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
520+[
521+ AC_REQUIRE([AM_MAINTAINER_MODE])
522+
523+ DISABLE_DEPRECATED=""
524+ if test $USE_MAINTAINER_MODE = yes; then
525+ DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP"
526+ for DOMAIN in $DOMAINS; do
527+ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
528+ done
529+ fi
530+
531+ AC_SUBST(DISABLE_DEPRECATED)
532+])
533+
534+# gnome-compiler-flags.m4
535+#
536+# serial 2
537+#
538+
539+dnl GNOME_COMPILE_WARNINGS
540+dnl Turn on many useful compiler warnings and substitute the result into
541+dnl WARN_CFLAGS
542+dnl For now, only works on GCC
543+dnl Pass the default value of the --enable-compile-warnings configure option as
544+dnl the first argument to the macro, defaulting to 'yes'.
545+dnl Additional warning/error flags can be passed as an optional second argument.
546+dnl
547+dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar])
548+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
549+ dnl ******************************
550+ dnl More compiler warnings
551+ dnl ******************************
552+
553+ AC_ARG_ENABLE(compile-warnings,
554+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
555+ [Turn on compiler warnings]),,
556+ [enable_compile_warnings="m4_default([$1],[yes])"])
557+
558+ if test "x$GCC" != xyes; then
559+ enable_compile_warnings=no
560+ fi
561+
562+ warning_flags=
563+ realsave_CFLAGS="$CFLAGS"
564+
565+ dnl These are warning flags that aren't marked as fatal. Can be
566+ dnl overridden on a per-project basis with -Wno-foo.
567+ base_warn_flags=" \
568+ -Wall \
569+ -Wstrict-prototypes \
570+ -Wnested-externs \
571+ "
572+
573+ dnl These compiler flags typically indicate very broken or suspicious
574+ dnl code. Some of them such as implicit-function-declaration are
575+ dnl just not default because gcc compiles a lot of legacy code.
576+ dnl We choose to make this set into explicit errors.
577+ base_error_flags=" \
578+ -Werror=missing-prototypes \
579+ -Werror=implicit-function-declaration \
580+ -Werror=pointer-arith \
581+ -Werror=init-self \
582+ -Werror=format-security \
583+ -Werror=format=2 \
584+ -Werror=missing-include-dirs \
585+ "
586+
587+ dnl Additional warning or error flags provided by the module author to
588+ dnl allow stricter standards to be imposed on a per-module basis.
589+ dnl The author can pass -W or -Werror flags here as they see fit.
590+ additional_flags="m4_default([$2],[])"
591+
592+ case "$enable_compile_warnings" in
593+ no)
594+ warning_flags=
595+ ;;
596+ minimum)
597+ warning_flags="-Wall"
598+ ;;
599+ yes)
600+ warning_flags="$base_warn_flags $base_error_flags $additional_flags"
601+ ;;
602+ maximum|error)
603+ warning_flags="$base_warn_flags $base_error_flags $additional_flags"
604+ ;;
605+ *)
606+ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
607+ ;;
608+ esac
609+
610+ if test "$enable_compile_warnings" = "error" ; then
611+ warning_flags="$warning_flags -Werror"
612+ fi
613+
614+ dnl Check whether GCC supports the warning options
615+ for option in $warning_flags; do
616+ save_CFLAGS="$CFLAGS"
617+ CFLAGS="$CFLAGS $option"
618+ AC_MSG_CHECKING([whether gcc understands $option])
619+ AC_TRY_COMPILE([], [],
620+ has_option=yes,
621+ has_option=no,)
622+ CFLAGS="$save_CFLAGS"
623+ AC_MSG_RESULT([$has_option])
624+ if test $has_option = yes; then
625+ tested_warning_flags="$tested_warning_flags $option"
626+ fi
627+ unset has_option
628+ unset save_CFLAGS
629+ done
630+ unset option
631+ CFLAGS="$realsave_CFLAGS"
632+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
633+ AC_MSG_RESULT($tested_warning_flags)
634+
635+ AC_ARG_ENABLE(iso-c,
636+ AC_HELP_STRING([--enable-iso-c],
637+ [Try to warn if code is not ISO C ]),,
638+ [enable_iso_c=no])
639+
640+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
641+ complCFLAGS=
642+ if test "x$enable_iso_c" != "xno"; then
643+ if test "x$GCC" = "xyes"; then
644+ case " $CFLAGS " in
645+ *[\ \ ]-ansi[\ \ ]*) ;;
646+ *) complCFLAGS="$complCFLAGS -ansi" ;;
647+ esac
648+ case " $CFLAGS " in
649+ *[\ \ ]-pedantic[\ \ ]*) ;;
650+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
651+ esac
652+ fi
653+ fi
654+ AC_MSG_RESULT($complCFLAGS)
655+
656+ WARN_CFLAGS="$tested_warning_flags $complCFLAGS"
657+ AC_SUBST(WARN_CFLAGS)
658+])
659+
660+dnl For C++, do basically the same thing.
661+
662+AC_DEFUN([GNOME_CXX_WARNINGS],[
663+ AC_ARG_ENABLE(cxx-warnings,
664+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
665+ [Turn on compiler warnings.]),,
666+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
667+
668+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
669+ warnCXXFLAGS=
670+ if test "x$GXX" != xyes; then
671+ enable_cxx_warnings=no
672+ fi
673+ if test "x$enable_cxx_warnings" != "xno"; then
674+ if test "x$GXX" = "xyes"; then
675+ case " $CXXFLAGS " in
676+ *[\ \ ]-Wall[\ \ ]*) ;;
677+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
678+ esac
679+
680+ ## -W is not all that useful. And it cannot be controlled
681+ ## with individual -Wno-xxx flags, unlike -Wall
682+ if test "x$enable_cxx_warnings" = "xyes"; then
683+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
684+ fi
685+ fi
686+ fi
687+ AC_MSG_RESULT($warnCXXFLAGS)
688+
689+ AC_ARG_ENABLE(iso-cxx,
690+ AC_HELP_STRING([--enable-iso-cxx],
691+ [Try to warn if code is not ISO C++ ]),,
692+ [enable_iso_cxx=no])
693+
694+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
695+ complCXXFLAGS=
696+ if test "x$enable_iso_cxx" != "xno"; then
697+ if test "x$GXX" = "xyes"; then
698+ case " $CXXFLAGS " in
699+ *[\ \ ]-ansi[\ \ ]*) ;;
700+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
701+ esac
702+
703+ case " $CXXFLAGS " in
704+ *[\ \ ]-pedantic[\ \ ]*) ;;
705+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
706+ esac
707+ fi
708+ fi
709+ AC_MSG_RESULT($complCXXFLAGS)
710+
711+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
712+ AC_SUBST(WARN_CXXFLAGS)
713+])
714+
715 dnl -*- mode: autoconf -*-
716 dnl Copyright 2009 Johan Dahlin
717 dnl
718
719=== modified file 'configure'
720--- configure 2013-08-23 11:54:16 +0000
721+++ configure 2013-10-27 19:56:01 +0000
722@@ -1,6 +1,6 @@
723 #! /bin/sh
724 # Guess values for system-dependent variables and create Makefiles.
725-# Generated by GNU Autoconf 2.69 for gjs 1.37.6.
726+# Generated by GNU Autoconf 2.69 for gjs 1.38.1.
727 #
728 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gjs>.
729 #
730@@ -591,8 +591,8 @@
731 # Identity of this package.
732 PACKAGE_NAME='gjs'
733 PACKAGE_TARNAME='gjs'
734-PACKAGE_VERSION='1.37.6'
735-PACKAGE_STRING='gjs 1.37.6'
736+PACKAGE_VERSION='1.38.1'
737+PACKAGE_STRING='gjs 1.38.1'
738 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gjs'
739 PACKAGE_URL=''
740
741@@ -1394,7 +1394,7 @@
742 # Omit some internal or obsolete options to make the list less imposing.
743 # This message is too long to be a string in the A/UX 3.1 sh.
744 cat <<_ACEOF
745-\`configure' configures gjs 1.37.6 to adapt to many kinds of systems.
746+\`configure' configures gjs 1.38.1 to adapt to many kinds of systems.
747
748 Usage: $0 [OPTION]... [VAR=VALUE]...
749
750@@ -1464,7 +1464,7 @@
751
752 if test -n "$ac_init_help"; then
753 case $ac_init_help in
754- short | recursive ) echo "Configuration of gjs 1.37.6:";;
755+ short | recursive ) echo "Configuration of gjs 1.38.1:";;
756 esac
757 cat <<\_ACEOF
758
759@@ -1608,7 +1608,7 @@
760 test -n "$ac_init_help" && exit $ac_status
761 if $ac_init_version; then
762 cat <<\_ACEOF
763-gjs configure 1.37.6
764+gjs configure 1.38.1
765 generated by GNU Autoconf 2.69
766
767 Copyright (C) 2012 Free Software Foundation, Inc.
768@@ -2098,7 +2098,7 @@
769 This file contains any messages produced by compilers while
770 running configure, to aid debugging if configure makes a mistake.
771
772-It was created by gjs $as_me 1.37.6, which was
773+It was created by gjs $as_me 1.38.1, which was
774 generated by GNU Autoconf 2.69. Invocation command line was
775
776 $ $0 $@
777@@ -2961,7 +2961,7 @@
778
779 # Define the identity of the package.
780 PACKAGE='gjs'
781- VERSION='1.37.6'
782+ VERSION='1.38.1'
783
784
785 cat >>confdefs.h <<_ACEOF
786@@ -3017,7 +3017,7 @@
787
788
789
790-$as_echo "#define GJS_VERSION (1 * 100 + 37) * 100 + 6" >>confdefs.h
791+$as_echo "#define GJS_VERSION (1 * 100 + 38) * 100 + 1" >>confdefs.h
792
793
794 GETTEXT_PACKAGE=gjs
795@@ -15666,6 +15666,8 @@
796 -Werror=missing-include-dirs \
797 "
798
799+ additional_flags=""
800+
801 case "$enable_compile_warnings" in
802 no)
803 warning_flags=
804@@ -15674,10 +15676,10 @@
805 warning_flags="-Wall"
806 ;;
807 yes)
808- warning_flags="$base_warn_flags $base_error_flags"
809+ warning_flags="$base_warn_flags $base_error_flags $additional_flags"
810 ;;
811 maximum|error)
812- warning_flags="$base_warn_flags $base_error_flags"
813+ warning_flags="$base_warn_flags $base_error_flags $additional_flags"
814 ;;
815 *)
816 as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
817@@ -16046,20 +16048,20 @@
818 as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
819 fi
820 if test -n "$PKG_CONFIG" && \
821- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.37.1\""; } >&5
822- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.37.1") 2>&5
823+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.38.0\""; } >&5
824+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.38.0") 2>&5
825 ac_status=$?
826 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
827 test $ac_status = 0; }; then
828 found_introspection=yes
829 else
830- as_fn_error $? "You need to have gobject-introspection >= 1.37.1 installed to build gjs" "$LINENO" 5
831+ as_fn_error $? "You need to have gobject-introspection >= 1.38.0 installed to build gjs" "$LINENO" 5
832 fi
833 ;; #(
834 auto) :
835 if test -n "$PKG_CONFIG" && \
836- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.37.1\""; } >&5
837- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.37.1") 2>&5
838+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.38.0\""; } >&5
839+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.38.0") 2>&5
840 ac_status=$?
841 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
842 test $ac_status = 0; }; then
843@@ -17491,7 +17493,7 @@
844 # report actual input values of CONFIG_FILES etc. instead of their
845 # values after options handling.
846 ac_log="
847-This file was extended by gjs $as_me 1.37.6, which was
848+This file was extended by gjs $as_me 1.38.1, which was
849 generated by GNU Autoconf 2.69. Invocation command line was
850
851 CONFIG_FILES = $CONFIG_FILES
852@@ -17557,7 +17559,7 @@
853 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
854 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
855 ac_cs_version="\\
856-gjs config.status 1.37.6
857+gjs config.status 1.38.1
858 configured by $0, generated by GNU Autoconf 2.69,
859 with options \\"\$ac_cs_config\\"
860
861
862=== modified file 'configure.ac'
863--- configure.ac 2013-08-23 11:54:16 +0000
864+++ configure.ac 2013-10-27 19:56:01 +0000
865@@ -2,14 +2,14 @@
866 # Process this file with autoconf to produce a configure script.
867
868 m4_define(pkg_major_version, 1)
869-m4_define(pkg_minor_version, 37)
870-m4_define(pkg_micro_version, 6)
871+m4_define(pkg_minor_version, 38)
872+m4_define(pkg_micro_version, 1)
873 m4_define(pkg_version, pkg_major_version.pkg_minor_version.pkg_micro_version)
874 m4_define(pkg_int_version, (pkg_major_version * 100 + pkg_minor_version) * 100 + pkg_micro_version)
875
876 AC_PREREQ(2.61)
877 AC_INIT([gjs], pkg_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=gjs])
878-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
879+AM_INIT_AUTOMAKE([dist-xz no-dist-gzip])
880 AC_CONFIG_SRCDIR([gjs/console.c])
881 AC_CONFIG_HEADER([config.h])
882
883@@ -71,7 +71,7 @@
884 AC_CHECK_HEADERS([malloc.h])
885 AC_CHECK_FUNCS(mallinfo)
886
887-GOBJECT_INTROSPECTION_REQUIRE([1.37.1])
888+GOBJECT_INTROSPECTION_REQUIRE([1.38.0])
889
890 common_packages="gmodule-2.0 gthread-2.0 gio-2.0 >= glib_required_version mozjs-17.0"
891 gjs_packages="gobject-introspection-1.0 libffi $common_packages"
892
893=== modified file 'debian/changelog'
894--- debian/changelog 2013-08-23 11:54:16 +0000
895+++ debian/changelog 2013-10-27 19:56:01 +0000
896@@ -1,3 +1,13 @@
897+gjs (1.38.1-0ubuntu1) UNRELEASED; urgency=low
898+
899+ * New upstream release.
900+ * debian/patches/git_fix_make_check.patch: Upstream patch to fix tests
901+ * debian/rules: Make tests fatal again
902+ * debian/control.in: add -tests package for installed tests
903+ * debian/tests: Add autopkgtests
904+
905+ -- Tim Lunn <tim@feathertop.org> Wed, 23 Oct 2013 11:07:12 +1100
906+
907 gjs (1.37.6-0ubuntu1) saucy; urgency=low
908
909 * New upstream release
910
911=== modified file 'debian/control.in'
912--- debian/control.in 2013-08-03 16:36:12 +0000
913+++ debian/control.in 2013-10-27 19:56:01 +0000
914@@ -23,6 +23,7 @@
915 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gjs
916 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gjs
917 Homepage: https://wiki.gnome.org/Gjs
918+XS-Testsuite: autopkgtest
919
920 Package: gjs
921 Architecture: any
922@@ -35,6 +36,18 @@
923 .
924 This package contains the interactive console application.
925
926+Package: gjs-tests
927+Architecture: any
928+Depends: ${shlibs:Depends},
929+ ${misc:Depends}
930+Description: Mozilla-based javascript bindings for the GNOME platform
931+ Makes it possible for applications to use all of GNOME's platform
932+ libraries using the Javascript language. It's mainly based on the
933+ Mozilla javascript engine and the GObject introsepection framework.
934+ .
935+ This package contains test programs, designed to be run as part of a
936+ regression testsuite.
937+
938 Package: libgjs0d
939 Architecture: any
940 Section: libs
941
942=== added file 'debian/gjs-tests.install'
943--- debian/gjs-tests.install 1970-01-01 00:00:00 +0000
944+++ debian/gjs-tests.install 2013-10-27 19:56:01 +0000
945@@ -0,0 +1,3 @@
946+usr/share/installed-tests
947+usr/lib/gjs/gjs/installed-tests
948+usr/lib/gjs/lib*
949
950=== added file 'debian/patches/git_fix_make_check.patch'
951--- debian/patches/git_fix_make_check.patch 1970-01-01 00:00:00 +0000
952+++ debian/patches/git_fix_make_check.patch 2013-10-27 19:56:01 +0000
953@@ -0,0 +1,47 @@
954+From f87c38787640f639da5ebf73014bbcf3b98cd9fc Mon Sep 17 00:00:00 2001
955+From: Colin Walters <walters@verbum.org>
956+Date: Fri, 25 Oct 2013 15:56:37 +0000
957+Subject: tests: Force generation of shared libraries
958+
959+If installed tests are disabled, we need to force libtool
960+to generate .so files that can be dlopened by introspection.
961+
962+https://bugzilla.gnome.org/710697
963+---
964+diff --git a/Makefile-insttest.am b/Makefile-insttest.am
965+index 2ebdc77..e63709f 100644
966+--- a/Makefile-insttest.am
967++++ b/Makefile-insttest.am
968+@@ -37,10 +37,15 @@ else
969+ check_LTLIBRARIES += libregress.la libwarnlib.la libgimarshallingtests.la
970+ endif
971+
972++# This rpath /nowhere thing is the libtool upstream recommended way to
973++# force generation of shared libraries, which we need in order for the
974++# tests to work uninstalled.
975++common_test_ldflags = -avoid-version -rpath /nowhere $(GJS_LIBS)
976++
977+ nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
978+ libregress_la_CPPFLAGS = $(AM_CPPFLAGS)
979+ libregress_la_CFLAGS = $(GJS_CFLAGS)
980+-libregress_la_LDFLAGS = -avoid-version $(GJS_LIBS)
981++libregress_la_LDFLAGS = $(common_test_ldflags)
982+ libregress_scannerflags_includes = --include=Gio-2.0
983+ if ENABLE_CAIRO
984+ libregress_la_CFLAGS += $(GJS_CAIRO_CFLAGS)
985+@@ -51,10 +56,10 @@ libregress_la_CPPFLAGS += -D_GI_DISABLE_CAIRO
986+ endif
987+ nodist_libwarnlib_la_SOURCES = $(GI_DATADIR)/tests/warnlib.c $(GI_DATADIR)/tests/warnlib.h
988+ libwarnlib_la_CFLAGS = $(GJS_CFLAGS)
989+-libwarnlib_la_LDFLAGS = -avoid-version $(GJS_LIBS)
990++libwarnlib_la_LDFLAGS = $(common_test_ldflags)
991+ nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
992+ libgimarshallingtests_la_CFLAGS = $(GJS_CFLAGS)
993+-libgimarshallingtests_la_LDFLAGS = -avoid-version $(GJS_LIBS)
994++libgimarshallingtests_la_LDFLAGS = $(common_test_ldflags)
995+
996+ Regress-1.0.gir: libregress.la
997+ Regress_1_0_gir_LIBS = libregress.la
998+--
999+cgit v0.9.2
1000+
1001
1002=== modified file 'debian/patches/series'
1003--- debian/patches/series 2013-03-28 03:08:20 +0000
1004+++ debian/patches/series 2013-10-27 19:56:01 +0000
1005@@ -0,0 +1,1 @@
1006+git_fix_make_check.patch
1007
1008=== modified file 'debian/rules'
1009--- debian/rules 2013-07-30 09:15:40 +0000
1010+++ debian/rules 2013-10-27 19:56:01 +0000
1011@@ -7,12 +7,15 @@
1012 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
1013 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
1014
1015+# configure flags
1016+DEB_CONFIGURE_EXTRA_FLAGS := --enable-installed-tests
1017+
1018 # Use recursive variables since this variable must not be expanded until
1019 # files have been installed.
1020 LIBMOZJS = $(shell objdump -p debian/tmp/usr/lib/libgjs.so | awk '$$1=="NEEDED" && $$2~/^libmozjs/ { print $$2 }' | sed s/\\.so\\./-/ )
1021 DEB_DH_MAKESHLIBS_ARGS_libgjs0d = -Xusr/lib/gjs-1.0/ -V'libgjs0d (>= $(DEB_UPSTREAM_VERSION)), libgjs0-$(LIBMOZJS)' -- -c4
1022
1023-DEB_MAKE_CHECK_TARGET := check || true
1024+DEB_MAKE_CHECK_TARGET := check
1025
1026 install/libgjs0d::
1027 echo gjs:Provides=libgjs0-$(LIBMOZJS) >> debian/$(cdbs_curpkg).substvars
1028
1029=== added directory 'debian/tests'
1030=== added file 'debian/tests/build'
1031--- debian/tests/build 1970-01-01 00:00:00 +0000
1032+++ debian/tests/build 2013-10-27 19:56:01 +0000
1033@@ -0,0 +1,27 @@
1034+#!/bin/sh
1035+# autopkgtest check: Build and run a program against glib, to verify that the
1036+# headers and pkg-config file are installed correctly
1037+# (C) 2012 Canonical Ltd.
1038+# Author: Martin Pitt <martin.pitt@ubuntu.com>
1039+
1040+set -e
1041+
1042+WORKDIR=$(mktemp -d)
1043+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
1044+cd $WORKDIR
1045+cat <<EOF > gjstest.c
1046+#include <gjs/gjs.h>
1047+
1048+int main()
1049+{
1050+ GjsContext* context;
1051+ context = gjs_context_new();
1052+ return 0;
1053+}
1054+EOF
1055+
1056+gcc -o gjstest gjstest.c `pkg-config --cflags --libs gjs-1.0`
1057+echo "build: OK"
1058+[ -x gjstest ]
1059+./gjstest
1060+echo "run: OK"
1061
1062=== added file 'debian/tests/control'
1063--- debian/tests/control 1970-01-01 00:00:00 +0000
1064+++ debian/tests/control 2013-10-27 19:56:01 +0000
1065@@ -0,0 +1,5 @@
1066+Tests: build
1067+Depends: libgjs-dev, build-essential
1068+
1069+Tests: installed-tests
1070+Depends: gjs-tests, dbus-x11, xvfb, gnome-desktop-testing
1071
1072=== added file 'debian/tests/installed-tests'
1073--- debian/tests/installed-tests 1970-01-01 00:00:00 +0000
1074+++ debian/tests/installed-tests 2013-10-27 19:56:01 +0000
1075@@ -0,0 +1,10 @@
1076+#!/bin/sh
1077+# autopkgtest check: Run the installed-tests to verify glib works correctly
1078+# (C) 2013 Canonical Ltd.
1079+# Author: Iain Lane <iain.lane@canonical.com>
1080+
1081+set -e
1082+
1083+export XDG_RUNTIME_DIR=$ADTTMP
1084+
1085+dbus-launch xvfb-run -a gnome-desktop-testing-runner gjs
1086
1087=== modified file 'gjs/console.c'
1088--- gjs/console.c 2013-07-30 09:15:40 +0000
1089+++ gjs/console.c 2013-10-27 19:56:01 +0000
1090@@ -74,13 +74,13 @@
1091 source_js_version = gjs_context_scan_buffer_for_js_version(script, 1024);
1092 len = strlen(script);
1093 filename = "<command line>";
1094- program_name = NULL;
1095+ program_name = argv[0];
1096 } else if (argc <= 1) {
1097 source_js_version = NULL;
1098 script = g_strdup("const Console = imports.console; Console.interact();");
1099 len = strlen(script);
1100 filename = "<stdin>";
1101- program_name = NULL;
1102+ program_name = argv[0];
1103 } else /*if (argc >= 2)*/ {
1104 error = NULL;
1105 if (!g_file_get_contents(argv[1], &script, &len, &error)) {
1106
1107=== added file 'installed-tests/script.test.in'
1108--- installed-tests/script.test.in 1970-01-01 00:00:00 +0000
1109+++ installed-tests/script.test.in 2013-10-27 19:56:01 +0000
1110@@ -0,0 +1,3 @@
1111+[Test]
1112+Type=session
1113+Exec=gjs @pkglibexecdir@/installed-tests/scripts/@name@
1114
1115=== added directory 'installed-tests/scripts'
1116=== added file 'installed-tests/scripts/testSystemExit.js'
1117--- installed-tests/scripts/testSystemExit.js 1970-01-01 00:00:00 +0000
1118+++ installed-tests/scripts/testSystemExit.js 2013-10-27 19:56:01 +0000
1119@@ -0,0 +1,5 @@
1120+// application/javascript;version=1.8
1121+
1122+const System = imports.system;
1123+
1124+System.exit(0);

Subscribers

People subscribed via source and target branches

to all changes: