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

[toabctl-guest at users.alioth.debian.org]

Author: toabctl-guest
Date: Sat Mar 16 17:12:14 2013
New Revision: 36994

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36994
Log:
  - Build-Depends on python-gi-dev (>= 3.7.2) to pass testsuite.
  - Build-Depends on xvfb and xauth to run testsuite.
  - Build-Depends on libgjs-dev to build gjs loader.
  - Enable gjs loader.
  - Enable testsuite.

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=36994&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/changelog [utf-8] (original)
+++ desktop/experimental/libpeas/debian/changelog [utf-8] Sat Mar 16 17:12:14 2013
@@ -5,9 +5,14 @@
     - Bump Standards-Version to 3.9.4.
     - Build-Depends on python3-dev to build python3 loader.
     - Build-Depends on dh_autoreconf.
+    - Build-Depends on python-gi-dev (>= 3.7.2) to pass testsuite.
+    - Build-Depends on xvfb and xauth to run testsuite.
+    - Build-Depends on libgjs-dev to build gjs loader.
   * debian/rules:
     - Enable python3 loader (Closes: #678354).
+    - Enable gjs loader.
     - Include autoreconf.mk to run dh_autoreconf.
+    - Enable testsuite.
   * debian/patches:
     - Added 30_fix_python2-config.patch: Check for python-config binary.
     - Added 11-no-gettext.patch: Don't mix intltool and gettext macros.

Modified: desktop/experimental/libpeas/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/control?rev=36994&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/control [utf-8] (original)
+++ desktop/experimental/libpeas/debian/control [utf-8] Sat Mar 16 17:12:14 2013
@@ -19,10 +19,13 @@
                libgirepository1.0-dev (>= 0.10.1),
                libgtk-3-dev,
                libseed-gtk3-dev (>= 2.91.91) [!ia64 !mips],
+               libgjs-dev,
                python-dev (>= 2.5.2),
-               python-gi-dev (>= 3.0.0),
+               python-gi-dev (>= 3.7.2),
                python3-dev,
-               gnome-icon-theme
+               gnome-icon-theme,
+               xvfb,
+               xauth
 Standards-Version: 3.9.4
 Section: libs
 Homepage: http://live.gnome.org/Libpeas

Modified: desktop/experimental/libpeas/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/control.in?rev=36994&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/control.in [utf-8] (original)
+++ desktop/experimental/libpeas/debian/control.in [utf-8] Sat Mar 16 17:12:14 2013
@@ -14,10 +14,13 @@
                libgirepository1.0-dev (>= 0.10.1),
                libgtk-3-dev,
                libseed-gtk3-dev (>= 2.91.91) [!ia64 !mips],
+               libgjs-dev,
                python-dev (>= 2.5.2),
-               python-gi-dev (>= 3.0.0),
+               python-gi-dev (>= 3.7.2),
                python3-dev,
-               gnome-icon-theme
+               gnome-icon-theme,
+               xvfb,
+               xauth
 Standards-Version: 3.9.4
 Section: libs
 Homepage: http://live.gnome.org/Libpeas

Modified: desktop/experimental/libpeas/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/rules?rev=36994&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/rules [utf-8] (original)
+++ desktop/experimental/libpeas/debian/rules [utf-8] Sat Mar 16 17:12:14 2013
@@ -9,17 +9,16 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
                              --enable-python2 \
-                             --enable-python3 \
-                             --disable-gjs
+                             --enable-python3
 
 ifeq (,$(filter $(DEB_HOST_ARCH),ia64 mips))
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-seed
 endif
 
-# We clean the test directory before running check because we need to stop
-# -Bsymbolic-functions from being used when building the tests.  Else
-# the extension-c test fails.  And we want to avoid the gtk-requiring tests.
-DEB_MAKE_CHECK_TARGET = -C tests/libpeas clean all check LDFLAGS=""
+DEB_MAKE_CHECK_TARGET =
+
+common-build-arch::
+	xvfb-run $(MAKE) check
 
 DEB_DH_MAKESHLIBS_ARGS_libpeas-1.0-0 += -X/usr/lib/libpeas-1.0/