xorg-server: Changes to 'debian-experimental'
debian/changelog | 2 ++
debian/control | 6 +++++-
debian/rules | 14 ++++++++++++--
debian/xsfbs/xsfbs.mk | 17 ++---------------
debian/xsfbs/xsfbs.sh | 4 +---
5 files changed, 22 insertions(+), 21 deletions(-)
New commits:
commit 1a21d9f69c23e496cf8af3a95b25beb413bc4442
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 4 20:24:27 2009 +0200
Run unit tests when building the package
Add build-dep on libglib2.0-dev, xkb-data and x11-xkb-utils for unit
tests, and run the tests unless nocheck is in DEB_BUILD_OPTIONS.
diff --git a/debian/changelog b/debian/changelog
index c643712..ec60fb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg-server (2:1.7.0-2) UNRELEASED; urgency=low
necessary since the fall back to builtin fonts was added.
* Change the server's dependency on xserver-common to >= ${source:Version},
to allow installation of different versions of the various servers.
+ * Add build-dep on libglib2.0-dev, xkb-data and x11-xkb-utils for unit
+ tests, and run the tests unless nocheck is in DEB_BUILD_OPTIONS.
-- Julien Cristau <jcristau@debian.org> Sun, 04 Oct 2009 17:39:13 +0200
diff --git a/debian/control b/debian/control
index 8dfed7e..dcb7206 100644
--- a/debian/control
+++ b/debian/control
@@ -70,7 +70,11 @@ Build-Depends:
libxres-dev (>= 1:0.99.1),
libxfixes-dev (>= 1:3.0.0),
libxv-dev,
- libxinerama-dev
+ libxinerama-dev,
+# unit tests
+ libglib2.0-dev,
+ xkb-data,
+ x11-xkb-utils,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
diff --git a/debian/rules b/debian/rules
index 741cf5d..663a4e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,11 @@ else
dri = --enable-dri --enable-dri2
config_hal = --enable-config-hal
endif
+ifneq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
+ config_tests = --disable-unit-tests
+else
+ config_tests = --enable-unit-tests
+endif
INSTALL=/usr/bin/install
@@ -59,6 +64,7 @@ confflags += \
--without-dtrace \
--disable-werror \
--disable-debug \
+ $(config_tests) \
--with-int10=x86emu \
--with-os-vendor="$(VENDOR)" \
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" \
@@ -129,16 +135,20 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
CPPFLAGS="$(CPPFLAGS)"
-build: build-stamp
+build: build-stamp tests-stamp
build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
dh_testdir
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
>$@
+tests-stamp: build-stamp
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) check
+ >$@
+
clean: xsfclean
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp tests-stamp
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
Reply to: