r40875 - in /desktop/experimental/libpeas/debian: changelog control control.in rules

[ah at users.alioth.debian.org]

Author: ah
Date: Mon Mar 10 22:38:32 2014
New Revision: 40875

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40875
Log:
* export NOCONFIGURE in debian/rules to avoid double-configure.
* Add --disable-gjs configure flag for now.
  - the gjs support has been dropped upstream
  - it causes test failures (see 1.9.0-1 changelog entry)
  - doesn't build with gjs >= 1.39 (mozjs24)
* Make test-suite fatal again.
* Bump Standards-Version to 3.9.5

Modified:
    desktop/experimental/libpeas/debian/changelog
    desktop/experimental/libpeas/debian/control
    desktop/experimental/libpeas/debian/control.in
    desktop/experimental/libpeas/debian/rules

Modified: desktop/experimental/libpeas/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/changelog?rev=40875&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/changelog	[utf-8] (original)
+++ desktop/experimental/libpeas/debian/changelog	[utf-8] Mon Mar 10 22:38:32 2014
@@ -1,3 +1,15 @@
+libpeas (1.9.0-2) UNRELEASED; urgency=medium
+
+  * export NOCONFIGURE in debian/rules to avoid double-configure.
+  * Add --disable-gjs configure flag for now.
+    - the gjs support has been dropped upstream
+    - it causes test failures (see 1.9.0-1 changelog entry)
+    - doesn't build with gjs >= 1.39 (mozjs24)
+  * Make test-suite fatal again.
+  * Bump Standards-Version to 3.9.5
+
+ -- Andreas Henriksson <andreas at fatal.se>  Mon, 10 Mar 2014 22:48:35 +0100
+
 libpeas (1.9.0-1) experimental; urgency=low
 
   * New upstream release

Modified: desktop/experimental/libpeas/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/control?rev=40875&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/control	[utf-8] (original)
+++ desktop/experimental/libpeas/debian/control	[utf-8] Mon Mar 10 22:38:32 2014
@@ -26,7 +26,7 @@
                gnome-icon-theme,
                xvfb,
                xauth
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Section: libs
 Homepage: https://wiki.gnome.org/Libpeas
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libpeas/

Modified: desktop/experimental/libpeas/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/control.in?rev=40875&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/control.in	[utf-8] (original)
+++ desktop/experimental/libpeas/debian/control.in	[utf-8] Mon Mar 10 22:38:32 2014
@@ -21,7 +21,7 @@
                gnome-icon-theme,
                xvfb,
                xauth
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Section: libs
 Homepage: https://wiki.gnome.org/Libpeas
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libpeas/

Modified: desktop/experimental/libpeas/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/rules?rev=40875&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/rules	[utf-8] (original)
+++ desktop/experimental/libpeas/debian/rules	[utf-8] Mon Mar 10 22:38:32 2014
@@ -7,11 +7,15 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+# To avoid running configure twice (because gnome-autogen.sh)
+export NOCONFIGURE=yes
+
 DEB_DH_AUTORECONF_ARGS = gnome-autogen.sh
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
                              --enable-python2 \
-                             --enable-python3
+                             --enable-python3 \
+                             --disable-gjs
 
 ifeq (,$(filter $(DEB_HOST_ARCH),mips))
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-seed
@@ -20,7 +24,7 @@
 DEB_MAKE_CHECK_TARGET =
 
 build/libpeas-1.0-0::
-	HOME=$(CURDIR) xvfb-run $(MAKE) check || true
+	HOME=$(CURDIR) xvfb-run $(MAKE) check
 
 DEB_DH_MAKESHLIBS_ARGS_libpeas-1.0-0 += -X/usr/lib/libpeas-1.0/