diffstat for xorg-server_1.7.7-7 xorg-server_1.7.7-7stormos1 changelog | 12 ++++++++++++ rules | 5 +++++ xserver-xorg-core.install | 6 +++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff -u xorg-server-1.7.7/debian/changelog xorg-server-1.7.7/debian/changelog --- xorg-server-1.7.7/debian/changelog +++ xorg-server-1.7.7/debian/changelog @@ -1,3 +1,15 @@ +xorg-server (2:1.7.7-7stormos1) unstable; urgency=low + + * Rebuild against zlib from StormOS. + + -- Andrew Stormont (astormont) Wed, 06 Oct 2010 07:50:39 +0200 + +xorg-server (2:1.7.7-7stormos0) unstable; urgency=low + + * Package for StormOS. + + -- Andrew Stormont (astormont) Sat, 02 Oct 2010 07:21:08 +0200 + xorg-server (2:1.7.7-7) unstable; urgency=low * Use linux-any instead of a list of architecture names for restrictions of diff -u xorg-server-1.7.7/debian/rules xorg-server-1.7.7/debian/rules --- xorg-server-1.7.7/debian/rules +++ xorg-server-1.7.7/debian/rules @@ -32,6 +32,11 @@ confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif +# Shave breaks the build on solaris +ifeq ($(DEB_HOST_ARCH_OS),solaris) + confflags += --enable-shave=no +endif + # udeb is arch-dependent... ifneq (, $(filter %-udeb, $(shell dh_listpackages -s))) udeb = yes diff -u xorg-server-1.7.7/debian/xserver-xorg-core.install xorg-server-1.7.7/debian/xserver-xorg-core.install --- xorg-server-1.7.7/debian/xserver-xorg-core.install +++ xorg-server-1.7.7/debian/xserver-xorg-core.install @@ -1,9 +1,9 @@ main/usr/lib/xorg/modules usr/lib/xorg main/usr/bin/Xorg usr/bin main/usr/share/man/man1/Xorg.1 usr/share/man/man1 -main/usr/share/man/man4/exa.4 usr/share/man/man4 -main/usr/share/man/man4/fbdevhw.4 usr/share/man/man4 -main/usr/share/man/man5/xorg.conf.5 usr/share/man/man5 +main/usr/share/man/man7/exa.7 usr/share/man/man7 +main/usr/share/man/man7/fbdevhw.7 usr/share/man/man7 +main/usr/share/man/man4/xorg.conf.4 usr/share/man/man4 main/usr/bin/cvt usr/bin main/usr/bin/gtf usr/bin main/usr/share/man/man1/cvt.1 usr/share/man/man1