debian/changelog | 11 ++++++++ debian/control | 17 +++---------- debian/rules | 70 +++++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 66 insertions(+), 32 deletions(-)
New commits: commit 08417bc9b8bf552fac7311d01180bf6edb2309f5 Author: Julien Cristau <jcris...@debian.org> Date: Mon Jun 1 23:49:32 2009 +0200 Don't recommend xfonts-base libXfont provides builtin versions of the fixed and cursor fonts, which are the only required ones. Keep xfonts-* packages in Suggests for xserver-xorg-core. diff --git a/debian/changelog b/debian/changelog index 9a447cd..c9262e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ xorg-server (2:1.6.1.901-3) UNRELEASED; urgency=low + use --disable-config-hal and --disable-dri on hurd-i386 + reorder options to match configure.ac, and use explicit --enable/--disable instead of using the defaults / autodetection + * Don't recommend xfonts-base. libXfont provides builtin versions of the + fixed and cursor fonts, which are the only required ones. Keep xfonts-* + packages in Suggests for xserver-xorg-core. [ David Nusinow ] * Add README.source diff --git a/debian/control b/debian/control index 412c669..1b3ba00 100644 --- a/debian/control +++ b/debian/control @@ -80,8 +80,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git Package: xserver-xorg-core Architecture: any Depends: xserver-common (>> 7), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg -Recommends: xkb-data, xfonts-base, libgl1-mesa-dri (>= 7.1~rc1) -Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable +Recommends: xkb-data, libgl1-mesa-dri (>= 7.1~rc1) +Suggests: xfonts-base, xfonts-100dpi | xfonts-75dpi, xfonts-scalable Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-common (<< 7), xserver-xorg-video-1.0, xserver-xorg-input, xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8), @@ -97,13 +97,6 @@ Description: Xorg X server - core server The Xorg server supports most modern graphics hardware from most vendors, and supersedes all XFree86 X servers. . - The Xorg server either needs fonts installed on the local host, or needs to - know of a remote hosts that provides font services (with xfs, for instance). - The former means that fonts packages are mandatory. The latter means that - font packages may be gratuitous. To err on the side of caution, install at - least the xfonts-base, xfonts-100dpi or xfonts-75dpi, and xfonts-scalable - packages. - . More information about X.Org can be found at: <URL:http://www.X.org> <URL:http://xorg.freedesktop.org> @@ -198,7 +191,7 @@ Description: Nested X server Package: xvfb Architecture: any Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends} -Recommends: xauth, xfonts-base +Recommends: xauth Description: Virtual Framebuffer 'fake' X server Xvfb provides an X server that can run on machines with no display hardware and no physical input devices. It emulates a dumb framebuffer using virtual @@ -225,7 +218,7 @@ Description: Virtual Framebuffer 'fake' X server Package: xserver-xephyr Architecture: any Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends} -Recommends: xbase-clients, xfonts-base, libgl1-mesa-dri (>= 7.1~rc1) +Recommends: xbase-clients, libgl1-mesa-dri (>= 7.1~rc1) Description: nested X server Xephyr is an X server that can be run inside another X server, much like Xnest. It is based on the kdrive X server, and as a @@ -242,7 +235,7 @@ Description: nested X server Package: xserver-xfbdev Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh3 sh3eb sh4 sh4eb sparc Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends} -Recommends: xbase-clients, xfonts-base +Recommends: xbase-clients Description: Linux framebuffer device tiny X server xserver-xfbdev is a Linux framebuffer device tiny X server based on the kdrive X server. commit e1b49093d68f1a5441cdc53d871c517d4cdf29d4 Author: Julien Cristau <jcris...@debian.org> Date: Sun May 31 00:21:30 2009 +0200 debian/rules: update configure options + use --enable-xvfb instead of --enable-vfb + drop --disable-builtin-fonts, --enable-xtrap, --disable-kdrive-vesa, --disable-lbx, --disable-xprint, --disable-xorgconfig, --disable-xorgcfg which don't exist anymore + use --disable-config-hal and --disable-dri on hurd-i386 + reorder options to match configure.ac, and use explicit --enable/--disable instead of using the defaults / autodetection diff --git a/debian/changelog b/debian/changelog index 1d0468a..9a447cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,14 @@ xorg-server (2:1.6.1.901-3) UNRELEASED; urgency=low Previously if there was more than one VGA device and the config didn't specify BusIDs, the server would just fail to start, so this hack should improve things. + * Update configure options: + + use --enable-xvfb instead of --enable-vfb + + drop --disable-builtin-fonts, --enable-xtrap, --disable-kdrive-vesa, + --disable-lbx, --disable-xprint, --disable-xorgconfig, --disable-xorgcfg + which don't exist anymore + + use --disable-config-hal and --disable-dri on hurd-i386 + + reorder options to match configure.ac, and use explicit + --enable/--disable instead of using the defaults / autodetection [ David Nusinow ] * Add README.source diff --git a/debian/rules b/debian/rules index aa2941a..fb017ab 100755 --- a/debian/rules +++ b/debian/rules @@ -41,9 +41,11 @@ else endif ifeq ($(DEB_HOST_ARCH), hurd-i386) - dri2 = --disable-dri2 + dri = --disable-dri --disable-dri2 + config_hal = --disable-config-hal else - dri2 = --enable-dri2 + dri = --enable-dri --enable-dri2 + config_hal = --enable-config-hal endif INSTALL=/usr/bin/install @@ -52,33 +54,61 @@ VENDOR = $(shell lsb_release -i -s) # disable-static is so we don't get libfoo.a for modules. now if only we could # kill the .las. -confflags += --disable-static \ - --enable-xorg \ +confflags += \ + --disable-static \ + --without-dtrace \ + --disable-werror \ + --disable-debug \ + --with-int10=x86emu \ + --with-os-vendor="$(VENDOR)" \ + --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" \ --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" \ - --disable-builtin-fonts \ - --enable-xtrap \ + --with-xkb-path=/usr/share/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --disable-builddocs \ + --disable-install-libxf86config \ + --disable-null-root-cursor \ + --enable-aiglx \ + --enable-glx-tls \ + --enable-registry \ + --enable-composite \ + --enable-mitshm \ + --enable-xres \ --enable-record \ + --enable-xv \ + --enable-xvmc \ + --enable-dga \ + --enable-screensaver \ + --enable-xdmcp \ + --enable-xdm-auth-1 \ + --enable-glx \ + $(dri) \ + --enable-xinerama \ + --enable-xf86vidmode \ + --enable-xace \ $(selinux) \ - --enable-glx-tls \ + --disable-xcsecurity \ + --disable-xcalibrate \ + --disable-tslib \ + --disable-multibuffer \ + --enable-dbe \ + --disable-xf86bigfont \ + --enable-dpms \ + --disable-config-dbus \ + $(config_hal) \ + --enable-xfree86-utils \ + --enable-xorg \ --enable-dmx \ - --enable-vfb \ + --enable-xvfb \ + --enable-xnest \ + --disable-xquartz \ + --disable-xwin \ --enable-kdrive \ --enable-xephyr \ --disable-xsdl \ --disable-xfake \ $(build_xfbdev) \ - --disable-kdrive-vesa \ - --disable-lbx \ - --disable-xprint \ - --disable-xorgconfig \ - --disable-xorgcfg \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --enable-xfree86-utils \ - --with-os-vendor="$(VENDOR)" \ - --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" \ - --with-int10=x86emu \ - $(dri2) + --disable-install-setuid configure: $(STAMP_DIR)/patch dh_testdir -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org