xorg-server: Changes to 'debian-experimental'
debian/changelog | 2 ++
debian/rules | 18 +++++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 23517a299b9a77f72c60032dd1fbfa0bc153305f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 26 00:20:59 2008 +0100
Use dh_* -s instead of -a in binary-arch, to fix FTBFS on s390
debhelper's -s option is smarter, and knows not to act on a package
if the current arch isn't listed in the Architecture field.
diff --git a/debian/changelog b/debian/changelog
index 4ff9ff9..28831a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.4.99.901-3) UNRELEASED; urgency=low
* Add postrm script for xserver-xorg-core, to remove
/var/log/Xorg.*.log{,.old} on purge (closes: #343384).
+ * Use dh_* -s instead of -a in binary-arch, to fix FTBFS on s390 (which
+ doesn't build xserver-xfbdev).
-- Julien Cristau <jcristau@debian.org> Sun, 23 Mar 2008 15:39:16 +0100
diff --git a/debian/rules b/debian/rules
index 32006d7..d1b0b69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,11 +145,11 @@ binary-deb:
# Build architecture-dependent files here.
binary-arch: build install
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-initial
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-initial
- dh_installdocs -a
- dh_installchangelogs -a ChangeLog
- dh_install -a --sourcedir=debian/tmp --list-missing -Xusr/share/man/man1/Xprt -Xusr/lib/X11/xserver -Xetc/X11/Xsession.d/92xprint-xpserverlist
+ dh_installdocs -s
+ dh_installchangelogs -s ChangeLog
+ dh_install -s --sourcedir=debian/tmp --list-missing -Xusr/share/man/man1/Xprt -Xusr/lib/X11/xserver -Xetc/X11/Xsession.d/92xprint-xpserverlist
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
$(INSTALL) -m644 $(CURDIR)/debian/videoabiver \
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/videoabiver
@@ -159,16 +159,16 @@ binary-arch: build install
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverminver
$(INSTALL) -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
$(INSTALL) -m 755 debian/xserver-xorg-core.bug.script debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
- dh_installdebconf -a
- dh_installman -a
+ dh_installdebconf -s
+ dh_installman -s
ifeq ($(BUILD_XPRINT), true)
$(INSTALL) -m 644 $(CURDIR)/debian/xprint-overrides $(CURDIR)/debian/xprint/usr/share/lintian/overrides/xprint
# xprint docs are linked to xprint-common
rm -rf debian/xprint/usr/share/doc/xprint
endif
- dh_link -a
- dh_strip -a --exclude=usr/lib/xorg/modules \
+ dh_link -s
+ dh_strip -s --exclude=usr/lib/xorg/modules \
--dbg-package=xserver-xorg-core
for i in $$(find debian/xserver-xorg-core/usr/lib/xorg/modules -name "lib*.so"); do \
mkdir -p $$(dirname debian/xserver-xorg-core-dbg/usr/lib/debug/$${i#*debian/xserver-xorg-core/}) && \
@@ -180,7 +180,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
xargs --no-run-if-empty \
strip --strip-debug --remove-section=.note --remove-section=.comment
endif
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-deb
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-deb
# Build architecture-independent files here (xprint-common)
Reply to: