X Strike Force X.Org X11 SVN commit: r4188 - in tags/xserver/xorg-server: . 2:1.1.1-14/debian 2:1.1.1-14/debian/patches
Author: vorlon
Date: 2007-01-07 18:21:19 -0500 (Sun, 07 Jan 2007)
New Revision: 4188
Added:
tags/xserver/xorg-server/2:1.1.1-14/
tags/xserver/xorg-server/2:1.1.1-14/debian/changelog
tags/xserver/xorg-server/2:1.1.1-14/debian/control
tags/xserver/xorg-server/2:1.1.1-14/debian/patches/39_alpha_build_flags.patch
tags/xserver/xorg-server/2:1.1.1-14/debian/patches/series
Removed:
tags/xserver/xorg-server/2:1.1.1-14/debian/changelog
tags/xserver/xorg-server/2:1.1.1-14/debian/control
tags/xserver/xorg-server/2:1.1.1-14/debian/patches/series
Log:
Create the release tag
Copied: tags/xserver/xorg-server/2:1.1.1-14 (from rev 4183, trunk/xserver/xorg-server)
Deleted: tags/xserver/xorg-server/2:1.1.1-14/debian/changelog
===================================================================
--- trunk/xserver/xorg-server/debian/changelog 2007-01-07 17:38:51 UTC (rev 4183)
+++ tags/xserver/xorg-server/2:1.1.1-14/debian/changelog 2007-01-07 23:21:19 UTC (rev 4188)
@@ -1,425 +0,0 @@
-xorg-server (2:1.1.1-13) unstable; urgency=medium
-
- [ Julien Cristau ]
- * xserver-xorg-core recommends xfonts-base and suggests xfonts-100dpi |
- xfonts-75dpi and xfonts-scalable. Also add explanation about fonts to the
- long description, stolen from the old xserver-common package (closes:
- #400654).
-
- [ David Nusinow ]
- * This is important for upgrades to etch, and has no notable risk, so bump
- priority to medium.
-
- -- David Nusinow <dnusinow@debian.org> Fri, 29 Dec 2006 19:57:51 -0500
-
-xorg-server (2:1.1.1-12) unstable; urgency=low
-
- [ Julien Cristau ]
- * Delete hw/xfree86/common/xf86Build.h in debian/rules clean, since it's
- wrongly included in the upstream tarball.
-
- [ David Nusinow ]
- * Pull fix for the ignore_abi.diff patch. This one's a major brown bag on my
- part. Thanks Michel Dänzer.
- * Add 38_wait_for_something_force_timer_reset.diff which forces the server
- to reset timers when they've overrun in some cases rather than wait
- forever. Patch by Daniel Stone. Thanks Michel Dänzer for pointing the
- changes out. Closes: #374026
-
- -- David Nusinow <dnusinow@debian.org> Tue, 12 Dec 2006 21:13:20 -0500
-
-xorg-server (2:1.1.1-11) unstable; urgency=low
-
- [ Drew Parsons ]
- * Patches 33_Xserver_man_typos.patch and 34_xorg.conf_man_typos.patch
- fix minor typos in Xserver and xorg.conf man pages.
- Closes: #364556, #308899.
- * Add patch 35_randr_byteswap.patch from upstream. Fixes a client/server
- byteswapping problem. Closes: #291100.
-
- [ Julien Cristau ]
- * Don't build-depend on libdrm-dev on hurd-i386 (closes: #358015). Thanks,
- Samuel Thibault.
- * Update hurd support patch (closes: #356300). Thanks, Samuel Thibault.
- * Add reportbug script stolen from the monolith, to add the user's config
- and log file in every bug report.
- * Delete hw/xfree86/common/xf86Build.h from our source tree, so that the
- build date is correctly calculated at build time, and not hardcoded to
- 07 July 2006. Thanks to Jurij Smakov for noticing.
- * Add patch 36_fix_ffs.patch by Jurij Smakov to fix infinite loop in ffs()
- if called with an argument of 0 (closes: #395564).
- * Add patch 37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms
- from upstream git to fix color issue on big endian platforms
- (closes: #392453). Thanks to Michel Dänzer for the patch!
- * Fix typo in xvfb-run (closes: #337703).
- * Install xdmxconfig and its manpage in xdmx-tools (closes: #393991).
- * Add Replaces: xdmx (<= 2:1.1.1-10) to xdmx-tools because of the xmdxconfig
- manpage move.
-
- -- David Nusinow <dnusinow@debian.org> Fri, 24 Nov 2006 15:44:52 -0500
-
-xorg-server (2:1.1.1-10) unstable; urgency=low
-
- [ Denis Barbier ]
- * Fix video mode switching. Closes: #391052
- * Fix FTBFS on kfreebsd-i386 and kfreebsd-amd64. Thanks Petr Salinger.
- Closes: #363517
-
- [ David Nusinow ]
- * Add depends on xserver-xorg so that /etc/X11/X gets installed. Thanks
- Frans Pop. Closes: #392295
- * Add 31_blocksigio.diff. This patch by Alan Hourihane, and it prevents a
- race condition when a driver tries to set the cursor state when the server
- is in the middle of switching resolution. Thanks to Frans Pop for
- reporting the bug, Michel Dänzer for reading through the backtrace and
- diagnosing the problem, and Alan for the final patch. Closes: #390646.
-
- [ Jurij Smakov ]
- * Add 32_disable_sparc_pci_bridge.diff. Disable PCI bridge handling on
- sparc, which is broken and causes filesystem corruption (by poking
- the PCI bus in the wrong places) on some machines. Closes: #392312.
-
- [ Drew Parsons ]
- * Use __appmansuffix__ not __mansuffix__ in
- 03_xnest_manpage_overhaul.diff. Closes: #390599.
- * Install upstream ChangeLog. Closes: #365274.
-
- -- David Nusinow <dnusinow@debian.org> Mon, 16 Oct 2006 21:59:51 -0400
-
-xorg-server (2:1.1.1-9) unstable; urgency=low
-
- [ Jurij Smakov ]
- * Add 21_glx_align_fixes.patch to reintroduce the setting of __GLX_ALIGN64
- variable, lost during the modular transition. This setting is essential
- for architectures with strong alignment requirements. Patch affects
- alpha, sparc, amd64, ia64 and s390, mimicking the behaviour of the
- monolithic build. Closes: #388125.
-
- [ Denis Barbier ]
- * Add 22_xkb_cycle_3layouts.diff to fix layout switching when 3 layouts
- are present. Thanks Ivan Pascal for the patch. Closes: #345803
-
- [ David Nusinow ]
- * Add kFreeBSD support patch (23). Thanks to Robert Millan, Petr Salinger,
- Daniel Stone, and Michael Banck for input and patch writing.
- Closes: #363517
- * Add hurd support patch (24). Thanks Samuel Thibault, Daniel Stone, and
- Michael Banck. Closes: #356300
- * Disable the explicit enabling of dri in the configure. The configure
- script autodetects whether or not to use this anyway, and enabling it
- explicitly breaks the build on hurd. Thanks Samuel Thibault and Michael
- Banck. Closes: #358015
- * Add several patches written by Kristian Høgsberg for allowing compiz to
- work with AIGLX. These patches were vetted by Theirry Reding with valuable
- advice from Michel Dänzer, and feedback from Kristian himself.
- - 25_tfp_damage.diff
- - 26_aiglx_happy_vt_switch.diff
- - 27_aiglx_locking.diff
- - 28_mesa_copy_sub_buffer.diff
- - 29_mesa_reseed_makefile.diff
- - update of 20_mesa_6.5.1.diff
- * Remove bizarre wholesale inclusion of another patch in the 23_kbsd patch
-
- [ Eugene Konev ]
- * Use --with-default-font-path instead of --with-fontdir.
- * Set RGBPath through --with-rgb-path.
- * Drop 11_debian_always_use_default_font_path.diff.
- * Drop 14_debian_always_look_in_our_module_path.diff.
- * Ship SecurityPolicy in xserver-xorg-core.
-
- -- David Nusinow <dnusinow@debian.org> Thu, 28 Sep 2006 23:59:35 -0400
-
-xorg-server (2:1.1.1-8) unstable; urgency=low
-
- * Update mesa symlink patch to the latest from HEAD
- * Add 20_mesa_6.5.1.diff to allow the server to build with mesa 6.5.1
- * Bump build-dep versions on x11proto-gl to 1.4.8, and mesa to 6.5.1
-
- -- David Nusinow <dnusinow@debian.org> Mon, 25 Sep 2006 22:21:37 -0400
-
-xorg-server (2:1.1.1-7) unstable; urgency=low
-
- * Fix s390 build issue. Thanks Bastian Blank for the report and Eugene Konev
- for the patch. Closes: #388628.
- * Disable build of various utilities that we don't ship anyway. Patch thanks
- to Eugene Konev.
-
- -- David Nusinow <dnusinow@debian.org> Thu, 21 Sep 2006 23:07:16 -0400
-
-xorg-server (2:1.1.1-6) unstable; urgency=low
-
- * Upload 7.1 to unstable.
-
- [ Drew Parsons ]
- * Added SGI FreeB licence to debian/copyright. Closes: #368563.
- * Apply upstream patches 18_execinfo_only_for_backtrace.patch, to use
- execinfo.h for and only for backtrace. Applied git patch
- 5a3488ccac8e5dabd9fc98bc41ef178ead1b2faf directly into configure scripts,
- activated with autoreconf. Closes: #363218.
- * Only requires build-depends version of x11proto-gl-dev on 1.4.6.
-
- [ Steve Langasek ]
- * Add versioned build-depends on x11proto-fixes-dev (>= 4.0), to
- ensure the package is built against the right protocol version.
- Closes: #383778.
-
- -- David Nusinow <dnusinow@debian.org> Mon, 18 Sep 2006 18:30:07 -0400
-
-xorg-server (2:1.1.1-5) experimental; urgency=low
-
- * Fix error in 16_s390_fix.diff caused by my idiot copying. Thanks Yannick
- Roehlly and Daniel Stone.
-
- -- David Nusinow <dnusinow@debian.org> Sun, 27 Aug 2006 23:25:21 +0000
-
-xorg-server (2:1.1.1-4) experimental; urgency=low
-
- [ Drew Parsons ]
- * Tighten dependencies between X11R7.1 server and video drivers.
- xserver-xorg-core no longer Depends: xserver-xorg-video-all
- | xserver-xorg-video but instead Conflicts: xserver-xorg-video.
- (closes: #383873)
- The dependency on xserver-xorg-video-all | xserver-xorg-video-1.0 is
- managed by the xserver-xorg binary package (not included here in
- order to avoid circular dependencies). (closes: #362313)
- * Likewise remove Depends: xserver-xorg-input-all | xserver-xorg-input
- (again, handled by xserver-xorg) to avoid circular dependency with drivers.
-
- [ David Nusinow ]
- * Epoch bump
- * Add 17_ignoreabi.diff to allow users to simply set a value in xorg.conf
- rather than pass -ignoreABI to the server every time it starts
-
- -- David Nusinow <dnusinow@debian.org> Wed, 23 Aug 2006 22:03:06 +0000
-
-xorg-server (1:1.1.1-3) unstable; urgency=low
-
- * Add 16_s390_fix.diff to fix FTBFS on s390. Thanks Bastian Blank.
- (closes: #362641)
- * Bump build-depends version of libgl1-mesa-dev to 6.5.x package we have in
- experimental currently
- * Bump build-depends version of x11proto-gl-dev to 1.4.7 or greater
-
- -- David Nusinow <dnusinow@debian.org> Tue, 22 Aug 2006 00:57:31 +0000
-
-xorg-server (1:1.1.1-2) experimental; urgency=low
-
- [ Drew Parsons ]
- * Updated mesa-swx11-source build-depends to (>> 6.5.0), required
- for xserver 1.1.1. (closes: #383334)
-
- [ David Nusinow ]
- * Enable and ship xephyr
- * Hack off the 'x' manpage suffix
- * Install Xnest manpage
- * Bump policy version to 3.7.2.0. No changes necessary.
-
- -- David Nusinow <dnusinow@debian.org> Wed, 16 Aug 2006 21:14:44 +0000
-
-xorg-server (1:1.1.1-1) experimental; urgency=low
-
- [ David Nusinow ]
- * New upstream release
- * Move patch target call so that we don't try and build twice
- * Remove obsolete 15_security_allocate_local.diff and
- 16_SECURITY_setuid.diff
- * Add 15_symlink_mesa.diff
-
- -- David Nusinow <dnusinow@debian.org> Sun, 6 Aug 2006 16:12:25 +0000
-
-xorg-server (2:1.0.2-10) unstable; urgency=low
-
- * Upload to unstable to fixed messed up last upload which was supposed to go
- to experimental. Brown bag o' joy.
-
- -- David Nusinow <dnusinow@debian.org> Tue, 22 Aug 2006 19:31:08 +0000
-
-xorg-server (1:1.0.2-9) UNRELEASED; urgency=high
-
- [ Denis Barbier ]
- * Fix 13_debian_add_xkbpath_env_variable.diff, XKBPATH environment
- variable was not always taken into account.
-
- [ David Nusinow ]
- * Remove two Ubuntu packaging holdovers. Have xvfb recommend xbase-clients
- rather than xauth, and have xserver-xorg-core recommend xkb-data rather
- than xkeyboard-config. Thanks Sterling MacNay.
- * Security update. Fix for setuid privledge escalation vulernabilities.
- See http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for
- the full advisory.
-
- [ Jurij Smakov ]
- * Stop including the non-existent asm/kbio.h header file in
- hw/xfree86/os-support/linux/lnx_{io,kbd}.c to avoid the build failure
- on sparc.
-
- -- David Nusinow <dnusinow@debian.org> Sat, 1 Jul 2006 17:20:45 -0400
-
-xorg-server (1:1.0.2-8) unstable; urgency=low
-
- * Move xserverrc back to xbase-clients. Thanks Benjamin Mesing.
- * Add 15_security_allocate_local.diff. This fixes Bug fd.o bug #6642.
- Fix buffer overflow in Render. (CVE 2006-1526). Patch by Eric Anholt.
-
- -- David Nusinow <dnusinow@debian.org> Tue, 2 May 2006 21:47:17 -0400
-
-xorg-server (1:1.0.2-7) unstable; urgency=low
-
- * Ship xserverrc again in /etc/X11/xinit. Thanks Bastian Kleineidam and
- Vasilis Vasaitis. (closes: #357713)
-
- -- David Nusinow <dnusinow@debian.org> Wed, 26 Apr 2006 00:01:16 -0400
-
-xorg-server (1:1.0.2-6) unstable; urgency=low
-
- [ David Nusinow ]
- * Use -DNO_INLINE on s390. Thanks Bastian Blank and Julien Cristau.
- (closes: #362641)
- * Re-add xvfb-run and manpage to xvfb package. Thanks Josselin Mouette and
- Jamie Wilkinson. (closes: #363494)
- * Add 014_debian_always_look_in_our_module_path.diff. This will cause the
- server to always look in the default module path even if they've specified
- an alternate path in their xorg.conf file via the ModulePath option. A
- note to users: you should remove this part of your xorg.conf unless you
- need it, as the server will look in the right place for modules if you
- don't specify a location.
- * Run dh_install with --list-missing
- * Add missing manpages all around. Thanks Roland Mas and Jan Hudec.
- (closes: #362489, #364199)
- * Actually install apps to xdmx-tools. Thanks Xavier Bestel.
- (closes: #356813)
-
- [ Denis Barbier ]
- * Add 13_debian_add_xkbpath_env_variable.diff so that the server takes
- the XKBPATH environment variable into account. (closes: #363229)
-
- -- David Nusinow <dnusinow@debian.org> Sat, 22 Apr 2006 17:06:23 -0400
-
-xorg-server (1:1.0.2-5) unstable; urgency=low
-
- * Add 11_debian_always_use_default_font_path.diff from Eugene Konev. This
- patch causes the server to add the default font path to whatever the user
- has specified. Right now, that's /usr/share/fonts/X11, as defined on
- configure in debian/rules. Thanks Eugene, this will definitely go a long
- way.
- * Document how to get rid of error loading glcore (and other modules) in
- NEWS.Debian. Thanks Matej Vela and others.
- * Provide the virtual 'xserver' package. Thanks Steve Langasek and Daniel
- Stone. (closes: #362750)
- * Add 12_security_policy_in_etc.diff from Eugene Konev. This will allow us
- to tell the server on configure to look in /etc/X11/xserver for the
- SecurityPolicy file. Thanks Joey Hess and Eugene. (closes: #362246)
-
- -- David Nusinow <dnusinow@debian.org> Mon, 17 Apr 2006 00:34:08 -0400
-
-xorg-server (1:1.0.2-4) unstable; urgency=low
-
- * Document the need to update paths in xserver-xorg-core's NEWS file.
- (closes: #362077, #362244, #362431)
- * Make xserver-xorg-core Architecture: any. (closes: #362150)
- * Build with --with-fontdir=/usr/share/fonts/X11. Remove
- --with-default-font-path option to make this work. Thanks Eugene Konev.
-
- -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 23:54:06 -0400
-
-xorg-server (1:1.0.2-3) unstable; urgency=low
-
- * Add build-conflicts on xlibs-static-dev. Thanks Zephaniah E. Hull.
-
- -- David Nusinow <dnusinow@debian.org> Tue, 11 Apr 2006 18:44:51 -0400
-
-xorg-server (1:1.0.2-2) unstable; urgency=low
-
- * Upload to unstable
- * Add versioned build-dep on libdmx-dev. Thanks Frank Lichtenheld.
- (closes: #361752)
-
- -- David Nusinow <dnusinow@debian.org> Mon, 10 Apr 2006 19:34:04 -0400
-
-xorg-server (1:1.0.2-1) experimental; urgency=low
-
- [ David Nusinow ]
- * New upstream release. Fixes CVE-2006-0745
-
- [ Denis Barbier ]
- * Set XKB base path to /usr/share/X11/xkb.
-
- -- David Nusinow <dnusinow@debian.org> Mon, 20 Mar 2006 21:41:04 -0500
-
-xorg-server (1:1.0.1-2) experimental; urgency=low
-
- [ David Nusinow ]
- * Add versioned dependency on x11-common
- * Remove old cruft in our patches directory
- * Port patches from trunk
- + 030_libvgahw_gcc4_volatile_fix.diff
- + general/026_xc_programs_manpage_overhaul.diff
- + arm/303_arm_cache_flush.diff
- + arm/315_arm_is_not_x86_and_has_no_vga.diff
- + general/099e_xorgconf_manpage_overhaul.diff
- + s390/500_s390_support.diff
- + debian/910_debian_Xserver_RTFF.diff
- * add 04_read_rom_in_chunks.diff. This reads PCI ROM in large chunks rather
- than one byte at a time. This patch by Alex Williamson and forwarded to us
- by Dann Frazier. Thanks to both of them. (closes: #353168)
- * Don't build xserver-xorg-core on s390. This means putting all the other
- arches as being explicitly listed. Damn !s390.
- * Version the conflict with xserver-xfree86 to allow for the transition
- package to be installed
- * Remove README.DRI, as it is non-free. Add it to prune list.
- * Add 10_dont_look_in_home_for_config.diff to prevent looking in a user's
- home directory for xorg.conf. Thanks Daniel Stone for the patch.
-
- -- David Nusinow <dnusinow@debian.org> Sun, 12 Mar 2006 16:18:13 -0500
-
-xorg-server (1:1.0.1-1) experimental; urgency=low
-
- * First upload to Debian
- * Add bison and flex to the build-depends
- * Define INSTALL in debian/rules
- * Add xserver-xorg-core dependency xserver-xorg-video-all |
- xserver-xorg-video. The former is a metapackage that depends on all the
- video drivers we ship and the latter is a virtual package that each video
- driver provides. This scheme will install the metapackage by default but
- will permit any single video driver to satsify the dependency. Do the same
- thing for the input drivers.
- * switch dpatch build-dependency to quilt
- * Deal with mesa packaging rename: build-dep on mesa-swrast-source ->
- mesa-swx11-source
- * Change xserver-core depends to be on x11-common rather than xorg-common
- * Have xserver-xorg-dev install the files in /usr/share/aclocal so we get
- xorg-server.m4
- * Manually set permissions on serverabiver installation
- * Set the default font path to /usr/share/fonts/X11 instead of
- /usr/share/X11/fonts. Thanks Eugene Konev.
-
- -- David Nusinow <dnusinow@debian.org> Mon, 20 Feb 2006 00:18:45 -0500
-
-xorg-server (1:0.99.2+cvs.20051025-3) dapper; urgency=low
-
- * Version mesa-swrast-source Build-Dep to 6.4.0 or higher, so GLcore is a
- little less crash-happy (e.g. when moving your glxgears window).
- * Export /usr/share/xserver-xorg/serverabiver to xserver-xorg-dev, which
- describes the relationship needed from a driver on xserver-xorg-core.
-
- -- Daniel Stone <daniel.stone@ubuntu.com> Fri, 28 Oct 2005 13:00:26 +1000
-
-xorg-server (1:0.99.2+cvs.20051025-2) dapper; urgency=low
-
- * Add Build-Deps on libxaw7-dev, libxmu-dev, libxt-dev, libxpm-dev,
- libx11-dev, libxtst-dev, and libxres-dev for DMX utils.
-
- -- Daniel Stone <daniel.stone@ubuntu.com> Wed, 26 Oct 2005 14:34:40 +1000
-
-xorg-server (1:0.99.2+cvs.20051025-1) dapper; urgency=low
-
- * Update to new upstream version.
- * All applicable patches have been committed upstream, bar #989 and #990.
-
- -- Daniel Stone <daniel.stone@ubuntu.com> Thu, 20 Oct 2005 10:26:33 +1000
-
-xorg-server (1:0.99.0+cvs.20050901-1) breezy; urgency=low
-
- * First xorg-server release.
-
- -- Daniel Stone <daniel.stone@ubuntu.com> Wed, 6 Jul 2005 15:48:17 +1000
Copied: tags/xserver/xorg-server/2:1.1.1-14/debian/changelog (from rev 4187, trunk/xserver/xorg-server/debian/changelog)
===================================================================
--- tags/xserver/xorg-server/2:1.1.1-14/debian/changelog (rev 0)
+++ tags/xserver/xorg-server/2:1.1.1-14/debian/changelog 2007-01-07 23:21:19 UTC (rev 4188)
@@ -0,0 +1,436 @@
+xorg-server (2:1.1.1-14) unstable; urgency=high
+
+ * The "let's drop 20 years of build logic and replace it with autoconf in a
+ single release, trust me, what could go wrong? <gibber, gibber>" release
+ * High-urgency upload for RC bugfix
+ * New patch 39_alpha_build_flags.patch: no really, when they said
+ lnx_ev56.c should be built with -mcpu=ev56, they really meant it.
+ Closes: #392500.
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 7 Jan 2007 15:19:08 -0800
+
+xorg-server (2:1.1.1-13) unstable; urgency=medium
+
+ [ Julien Cristau ]
+ * xserver-xorg-core recommends xfonts-base and suggests xfonts-100dpi |
+ xfonts-75dpi and xfonts-scalable. Also add explanation about fonts to the
+ long description, stolen from the old xserver-common package (closes:
+ #400654).
+
+ [ David Nusinow ]
+ * This is important for upgrades to etch, and has no notable risk, so bump
+ priority to medium.
+
+ -- David Nusinow <dnusinow@debian.org> Fri, 29 Dec 2006 19:57:51 -0500
+
+xorg-server (2:1.1.1-12) unstable; urgency=low
+
+ [ Julien Cristau ]
+ * Delete hw/xfree86/common/xf86Build.h in debian/rules clean, since it's
+ wrongly included in the upstream tarball.
+
+ [ David Nusinow ]
+ * Pull fix for the ignore_abi.diff patch. This one's a major brown bag on my
+ part. Thanks Michel Dänzer.
+ * Add 38_wait_for_something_force_timer_reset.diff which forces the server
+ to reset timers when they've overrun in some cases rather than wait
+ forever. Patch by Daniel Stone. Thanks Michel Dänzer for pointing the
+ changes out. Closes: #374026
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 12 Dec 2006 21:13:20 -0500
+
+xorg-server (2:1.1.1-11) unstable; urgency=low
+
+ [ Drew Parsons ]
+ * Patches 33_Xserver_man_typos.patch and 34_xorg.conf_man_typos.patch
+ fix minor typos in Xserver and xorg.conf man pages.
+ Closes: #364556, #308899.
+ * Add patch 35_randr_byteswap.patch from upstream. Fixes a client/server
+ byteswapping problem. Closes: #291100.
+
+ [ Julien Cristau ]
+ * Don't build-depend on libdrm-dev on hurd-i386 (closes: #358015). Thanks,
+ Samuel Thibault.
+ * Update hurd support patch (closes: #356300). Thanks, Samuel Thibault.
+ * Add reportbug script stolen from the monolith, to add the user's config
+ and log file in every bug report.
+ * Delete hw/xfree86/common/xf86Build.h from our source tree, so that the
+ build date is correctly calculated at build time, and not hardcoded to
+ 07 July 2006. Thanks to Jurij Smakov for noticing.
+ * Add patch 36_fix_ffs.patch by Jurij Smakov to fix infinite loop in ffs()
+ if called with an argument of 0 (closes: #395564).
+ * Add patch 37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms
+ from upstream git to fix color issue on big endian platforms
+ (closes: #392453). Thanks to Michel Dänzer for the patch!
+ * Fix typo in xvfb-run (closes: #337703).
+ * Install xdmxconfig and its manpage in xdmx-tools (closes: #393991).
+ * Add Replaces: xdmx (<= 2:1.1.1-10) to xdmx-tools because of the xmdxconfig
+ manpage move.
+
+ -- David Nusinow <dnusinow@debian.org> Fri, 24 Nov 2006 15:44:52 -0500
+
+xorg-server (2:1.1.1-10) unstable; urgency=low
+
+ [ Denis Barbier ]
+ * Fix video mode switching. Closes: #391052
+ * Fix FTBFS on kfreebsd-i386 and kfreebsd-amd64. Thanks Petr Salinger.
+ Closes: #363517
+
+ [ David Nusinow ]
+ * Add depends on xserver-xorg so that /etc/X11/X gets installed. Thanks
+ Frans Pop. Closes: #392295
+ * Add 31_blocksigio.diff. This patch by Alan Hourihane, and it prevents a
+ race condition when a driver tries to set the cursor state when the server
+ is in the middle of switching resolution. Thanks to Frans Pop for
+ reporting the bug, Michel Dänzer for reading through the backtrace and
+ diagnosing the problem, and Alan for the final patch. Closes: #390646.
+
+ [ Jurij Smakov ]
+ * Add 32_disable_sparc_pci_bridge.diff. Disable PCI bridge handling on
+ sparc, which is broken and causes filesystem corruption (by poking
+ the PCI bus in the wrong places) on some machines. Closes: #392312.
+
+ [ Drew Parsons ]
+ * Use __appmansuffix__ not __mansuffix__ in
+ 03_xnest_manpage_overhaul.diff. Closes: #390599.
+ * Install upstream ChangeLog. Closes: #365274.
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 16 Oct 2006 21:59:51 -0400
+
+xorg-server (2:1.1.1-9) unstable; urgency=low
+
+ [ Jurij Smakov ]
+ * Add 21_glx_align_fixes.patch to reintroduce the setting of __GLX_ALIGN64
+ variable, lost during the modular transition. This setting is essential
+ for architectures with strong alignment requirements. Patch affects
+ alpha, sparc, amd64, ia64 and s390, mimicking the behaviour of the
+ monolithic build. Closes: #388125.
+
+ [ Denis Barbier ]
+ * Add 22_xkb_cycle_3layouts.diff to fix layout switching when 3 layouts
+ are present. Thanks Ivan Pascal for the patch. Closes: #345803
+
+ [ David Nusinow ]
+ * Add kFreeBSD support patch (23). Thanks to Robert Millan, Petr Salinger,
+ Daniel Stone, and Michael Banck for input and patch writing.
+ Closes: #363517
+ * Add hurd support patch (24). Thanks Samuel Thibault, Daniel Stone, and
+ Michael Banck. Closes: #356300
+ * Disable the explicit enabling of dri in the configure. The configure
+ script autodetects whether or not to use this anyway, and enabling it
+ explicitly breaks the build on hurd. Thanks Samuel Thibault and Michael
+ Banck. Closes: #358015
+ * Add several patches written by Kristian Høgsberg for allowing compiz to
+ work with AIGLX. These patches were vetted by Theirry Reding with valuable
+ advice from Michel Dänzer, and feedback from Kristian himself.
+ - 25_tfp_damage.diff
+ - 26_aiglx_happy_vt_switch.diff
+ - 27_aiglx_locking.diff
+ - 28_mesa_copy_sub_buffer.diff
+ - 29_mesa_reseed_makefile.diff
+ - update of 20_mesa_6.5.1.diff
+ * Remove bizarre wholesale inclusion of another patch in the 23_kbsd patch
+
+ [ Eugene Konev ]
+ * Use --with-default-font-path instead of --with-fontdir.
+ * Set RGBPath through --with-rgb-path.
+ * Drop 11_debian_always_use_default_font_path.diff.
+ * Drop 14_debian_always_look_in_our_module_path.diff.
+ * Ship SecurityPolicy in xserver-xorg-core.
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 28 Sep 2006 23:59:35 -0400
+
+xorg-server (2:1.1.1-8) unstable; urgency=low
+
+ * Update mesa symlink patch to the latest from HEAD
+ * Add 20_mesa_6.5.1.diff to allow the server to build with mesa 6.5.1
+ * Bump build-dep versions on x11proto-gl to 1.4.8, and mesa to 6.5.1
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 25 Sep 2006 22:21:37 -0400
+
+xorg-server (2:1.1.1-7) unstable; urgency=low
+
+ * Fix s390 build issue. Thanks Bastian Blank for the report and Eugene Konev
+ for the patch. Closes: #388628.
+ * Disable build of various utilities that we don't ship anyway. Patch thanks
+ to Eugene Konev.
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 21 Sep 2006 23:07:16 -0400
+
+xorg-server (2:1.1.1-6) unstable; urgency=low
+
+ * Upload 7.1 to unstable.
+
+ [ Drew Parsons ]
+ * Added SGI FreeB licence to debian/copyright. Closes: #368563.
+ * Apply upstream patches 18_execinfo_only_for_backtrace.patch, to use
+ execinfo.h for and only for backtrace. Applied git patch
+ 5a3488ccac8e5dabd9fc98bc41ef178ead1b2faf directly into configure scripts,
+ activated with autoreconf. Closes: #363218.
+ * Only requires build-depends version of x11proto-gl-dev on 1.4.6.
+
+ [ Steve Langasek ]
+ * Add versioned build-depends on x11proto-fixes-dev (>= 4.0), to
+ ensure the package is built against the right protocol version.
+ Closes: #383778.
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 18 Sep 2006 18:30:07 -0400
+
+xorg-server (2:1.1.1-5) experimental; urgency=low
+
+ * Fix error in 16_s390_fix.diff caused by my idiot copying. Thanks Yannick
+ Roehlly and Daniel Stone.
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 27 Aug 2006 23:25:21 +0000
+
+xorg-server (2:1.1.1-4) experimental; urgency=low
+
+ [ Drew Parsons ]
+ * Tighten dependencies between X11R7.1 server and video drivers.
+ xserver-xorg-core no longer Depends: xserver-xorg-video-all
+ | xserver-xorg-video but instead Conflicts: xserver-xorg-video.
+ (closes: #383873)
+ The dependency on xserver-xorg-video-all | xserver-xorg-video-1.0 is
+ managed by the xserver-xorg binary package (not included here in
+ order to avoid circular dependencies). (closes: #362313)
+ * Likewise remove Depends: xserver-xorg-input-all | xserver-xorg-input
+ (again, handled by xserver-xorg) to avoid circular dependency with drivers.
+
+ [ David Nusinow ]
+ * Epoch bump
+ * Add 17_ignoreabi.diff to allow users to simply set a value in xorg.conf
+ rather than pass -ignoreABI to the server every time it starts
+
+ -- David Nusinow <dnusinow@debian.org> Wed, 23 Aug 2006 22:03:06 +0000
+
+xorg-server (1:1.1.1-3) unstable; urgency=low
+
+ * Add 16_s390_fix.diff to fix FTBFS on s390. Thanks Bastian Blank.
+ (closes: #362641)
+ * Bump build-depends version of libgl1-mesa-dev to 6.5.x package we have in
+ experimental currently
+ * Bump build-depends version of x11proto-gl-dev to 1.4.7 or greater
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 22 Aug 2006 00:57:31 +0000
+
+xorg-server (1:1.1.1-2) experimental; urgency=low
+
+ [ Drew Parsons ]
+ * Updated mesa-swx11-source build-depends to (>> 6.5.0), required
+ for xserver 1.1.1. (closes: #383334)
+
+ [ David Nusinow ]
+ * Enable and ship xephyr
+ * Hack off the 'x' manpage suffix
+ * Install Xnest manpage
+ * Bump policy version to 3.7.2.0. No changes necessary.
+
+ -- David Nusinow <dnusinow@debian.org> Wed, 16 Aug 2006 21:14:44 +0000
+
+xorg-server (1:1.1.1-1) experimental; urgency=low
+
+ [ David Nusinow ]
+ * New upstream release
+ * Move patch target call so that we don't try and build twice
+ * Remove obsolete 15_security_allocate_local.diff and
+ 16_SECURITY_setuid.diff
+ * Add 15_symlink_mesa.diff
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 6 Aug 2006 16:12:25 +0000
+
+xorg-server (2:1.0.2-10) unstable; urgency=low
+
+ * Upload to unstable to fixed messed up last upload which was supposed to go
+ to experimental. Brown bag o' joy.
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 22 Aug 2006 19:31:08 +0000
+
+xorg-server (1:1.0.2-9) UNRELEASED; urgency=high
+
+ [ Denis Barbier ]
+ * Fix 13_debian_add_xkbpath_env_variable.diff, XKBPATH environment
+ variable was not always taken into account.
+
+ [ David Nusinow ]
+ * Remove two Ubuntu packaging holdovers. Have xvfb recommend xbase-clients
+ rather than xauth, and have xserver-xorg-core recommend xkb-data rather
+ than xkeyboard-config. Thanks Sterling MacNay.
+ * Security update. Fix for setuid privledge escalation vulernabilities.
+ See http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for
+ the full advisory.
+
+ [ Jurij Smakov ]
+ * Stop including the non-existent asm/kbio.h header file in
+ hw/xfree86/os-support/linux/lnx_{io,kbd}.c to avoid the build failure
+ on sparc.
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 1 Jul 2006 17:20:45 -0400
+
+xorg-server (1:1.0.2-8) unstable; urgency=low
+
+ * Move xserverrc back to xbase-clients. Thanks Benjamin Mesing.
+ * Add 15_security_allocate_local.diff. This fixes Bug fd.o bug #6642.
+ Fix buffer overflow in Render. (CVE 2006-1526). Patch by Eric Anholt.
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 2 May 2006 21:47:17 -0400
+
+xorg-server (1:1.0.2-7) unstable; urgency=low
+
+ * Ship xserverrc again in /etc/X11/xinit. Thanks Bastian Kleineidam and
+ Vasilis Vasaitis. (closes: #357713)
+
+ -- David Nusinow <dnusinow@debian.org> Wed, 26 Apr 2006 00:01:16 -0400
+
+xorg-server (1:1.0.2-6) unstable; urgency=low
+
+ [ David Nusinow ]
+ * Use -DNO_INLINE on s390. Thanks Bastian Blank and Julien Cristau.
+ (closes: #362641)
+ * Re-add xvfb-run and manpage to xvfb package. Thanks Josselin Mouette and
+ Jamie Wilkinson. (closes: #363494)
+ * Add 014_debian_always_look_in_our_module_path.diff. This will cause the
+ server to always look in the default module path even if they've specified
+ an alternate path in their xorg.conf file via the ModulePath option. A
+ note to users: you should remove this part of your xorg.conf unless you
+ need it, as the server will look in the right place for modules if you
+ don't specify a location.
+ * Run dh_install with --list-missing
+ * Add missing manpages all around. Thanks Roland Mas and Jan Hudec.
+ (closes: #362489, #364199)
+ * Actually install apps to xdmx-tools. Thanks Xavier Bestel.
+ (closes: #356813)
+
+ [ Denis Barbier ]
+ * Add 13_debian_add_xkbpath_env_variable.diff so that the server takes
+ the XKBPATH environment variable into account. (closes: #363229)
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 22 Apr 2006 17:06:23 -0400
+
+xorg-server (1:1.0.2-5) unstable; urgency=low
+
+ * Add 11_debian_always_use_default_font_path.diff from Eugene Konev. This
+ patch causes the server to add the default font path to whatever the user
+ has specified. Right now, that's /usr/share/fonts/X11, as defined on
+ configure in debian/rules. Thanks Eugene, this will definitely go a long
+ way.
+ * Document how to get rid of error loading glcore (and other modules) in
+ NEWS.Debian. Thanks Matej Vela and others.
+ * Provide the virtual 'xserver' package. Thanks Steve Langasek and Daniel
+ Stone. (closes: #362750)
+ * Add 12_security_policy_in_etc.diff from Eugene Konev. This will allow us
+ to tell the server on configure to look in /etc/X11/xserver for the
+ SecurityPolicy file. Thanks Joey Hess and Eugene. (closes: #362246)
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 17 Apr 2006 00:34:08 -0400
+
+xorg-server (1:1.0.2-4) unstable; urgency=low
+
+ * Document the need to update paths in xserver-xorg-core's NEWS file.
+ (closes: #362077, #362244, #362431)
+ * Make xserver-xorg-core Architecture: any. (closes: #362150)
+ * Build with --with-fontdir=/usr/share/fonts/X11. Remove
+ --with-default-font-path option to make this work. Thanks Eugene Konev.
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 23:54:06 -0400
+
+xorg-server (1:1.0.2-3) unstable; urgency=low
+
+ * Add build-conflicts on xlibs-static-dev. Thanks Zephaniah E. Hull.
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 11 Apr 2006 18:44:51 -0400
+
+xorg-server (1:1.0.2-2) unstable; urgency=low
+
+ * Upload to unstable
+ * Add versioned build-dep on libdmx-dev. Thanks Frank Lichtenheld.
+ (closes: #361752)
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 10 Apr 2006 19:34:04 -0400
+
+xorg-server (1:1.0.2-1) experimental; urgency=low
+
+ [ David Nusinow ]
+ * New upstream release. Fixes CVE-2006-0745
+
+ [ Denis Barbier ]
+ * Set XKB base path to /usr/share/X11/xkb.
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 20 Mar 2006 21:41:04 -0500
+
+xorg-server (1:1.0.1-2) experimental; urgency=low
+
+ [ David Nusinow ]
+ * Add versioned dependency on x11-common
+ * Remove old cruft in our patches directory
+ * Port patches from trunk
+ + 030_libvgahw_gcc4_volatile_fix.diff
+ + general/026_xc_programs_manpage_overhaul.diff
+ + arm/303_arm_cache_flush.diff
+ + arm/315_arm_is_not_x86_and_has_no_vga.diff
+ + general/099e_xorgconf_manpage_overhaul.diff
+ + s390/500_s390_support.diff
+ + debian/910_debian_Xserver_RTFF.diff
+ * add 04_read_rom_in_chunks.diff. This reads PCI ROM in large chunks rather
+ than one byte at a time. This patch by Alex Williamson and forwarded to us
+ by Dann Frazier. Thanks to both of them. (closes: #353168)
+ * Don't build xserver-xorg-core on s390. This means putting all the other
+ arches as being explicitly listed. Damn !s390.
+ * Version the conflict with xserver-xfree86 to allow for the transition
+ package to be installed
+ * Remove README.DRI, as it is non-free. Add it to prune list.
+ * Add 10_dont_look_in_home_for_config.diff to prevent looking in a user's
+ home directory for xorg.conf. Thanks Daniel Stone for the patch.
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 12 Mar 2006 16:18:13 -0500
+
+xorg-server (1:1.0.1-1) experimental; urgency=low
+
+ * First upload to Debian
+ * Add bison and flex to the build-depends
+ * Define INSTALL in debian/rules
+ * Add xserver-xorg-core dependency xserver-xorg-video-all |
+ xserver-xorg-video. The former is a metapackage that depends on all the
+ video drivers we ship and the latter is a virtual package that each video
+ driver provides. This scheme will install the metapackage by default but
+ will permit any single video driver to satsify the dependency. Do the same
+ thing for the input drivers.
+ * switch dpatch build-dependency to quilt
+ * Deal with mesa packaging rename: build-dep on mesa-swrast-source ->
+ mesa-swx11-source
+ * Change xserver-core depends to be on x11-common rather than xorg-common
+ * Have xserver-xorg-dev install the files in /usr/share/aclocal so we get
+ xorg-server.m4
+ * Manually set permissions on serverabiver installation
+ * Set the default font path to /usr/share/fonts/X11 instead of
+ /usr/share/X11/fonts. Thanks Eugene Konev.
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 20 Feb 2006 00:18:45 -0500
+
+xorg-server (1:0.99.2+cvs.20051025-3) dapper; urgency=low
+
+ * Version mesa-swrast-source Build-Dep to 6.4.0 or higher, so GLcore is a
+ little less crash-happy (e.g. when moving your glxgears window).
+ * Export /usr/share/xserver-xorg/serverabiver to xserver-xorg-dev, which
+ describes the relationship needed from a driver on xserver-xorg-core.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Fri, 28 Oct 2005 13:00:26 +1000
+
+xorg-server (1:0.99.2+cvs.20051025-2) dapper; urgency=low
+
+ * Add Build-Deps on libxaw7-dev, libxmu-dev, libxt-dev, libxpm-dev,
+ libx11-dev, libxtst-dev, and libxres-dev for DMX utils.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Wed, 26 Oct 2005 14:34:40 +1000
+
+xorg-server (1:0.99.2+cvs.20051025-1) dapper; urgency=low
+
+ * Update to new upstream version.
+ * All applicable patches have been committed upstream, bar #989 and #990.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Thu, 20 Oct 2005 10:26:33 +1000
+
+xorg-server (1:0.99.0+cvs.20050901-1) breezy; urgency=low
+
+ * First xorg-server release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Wed, 6 Jul 2005 15:48:17 +1000
Deleted: tags/xserver/xorg-server/2:1.1.1-14/debian/control
===================================================================
--- trunk/xserver/xorg-server/debian/control 2007-01-07 17:38:51 UTC (rev 4183)
+++ tags/xserver/xorg-server/2:1.1.1-14/debian/control 2007-01-07 23:21:19 UTC (rev 4188)
@@ -1,151 +0,0 @@
-Source: xorg-server
-Section: x11
-Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-# all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg
-# server, and common dependencies for the DIX.
-# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.
-# everything on is for the DMX and Xnest servers.
-Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-core-dev, x11proto-damage-dev, x11proto-evie-dev, x11proto-fixes-dev (>= 4.0), x11proto-kb-dev (>= 1.0.1-1), x11proto-xinerama-dev, x11proto-randr-dev, x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev, x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0-1), x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev, x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1-1), libxdmcp-dev (>= 1:0.99.1-1), libxfont-dev, libfontenc-dev, libxkbfile-dev (>= 1:0.99.1-1), x11proto-xf86dri-dev, libdrm-dev [!hurd-i386], mesa-swx11-source (>= 6.5.1), x11proto-gl-dev (>= 1.4.8), libgl1-mesa-dev(>= 6.5.1), libxmuu-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1), libx11-dev (>= 1:0.99.2-1), libxrender-dev (>= 1:0.9.0-1), libxi-dev (>= 1:0.99.1-1), x11proto-dmx-dev, quilt, libdmx-dev (>= 1:1.0.1-1), libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>= 1:0.99.1-1), libxt-dev (>= 1:0.99.1-1), libxmu-dev (>= 1:0.99.1-1), libxtst-dev (>= 1:0.99.1-1), libxres-dev (>= 1:0.99.1-1)
-Build-Conflicts: xlibs-static-dev
-Standards-Version: 3.7.2.0
-
-Package: xserver-xorg-core
-Architecture: any
-Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
-Recommends: xkb-data, xfonts-base
-Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
-Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video
-Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
-Provides: xserver
-Description: X.Org X server -- core server
- The X.Org X server is an X server for several architectures and operating
- systems, which is derived from the XFree86 4.x series of X servers.
- .
- The X.Org server supports most modern graphics hardware from most vendors,
- and supersedes all XFree86 X servers.
- .
- The X.Org 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://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'xserver/xorg' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
-
-Package: xserver-xorg-dev
-Architecture: any
-Depends: ${misc:Depends}
-Description: X.Org X server -- development files
- This package provides development files for the X.Org ('Xorg') X server.
- This is not quite the same as the DDK (Driver Development Kit) from the
- XFree86 4.x and X.Org 6.7, 6.8 and 6.9 series of servers; it provides
- headers and a pkg-config file for drivers using autotools to build
- against.
- .
- Unless you are developing or building a driver, you probably want
- xserver-xorg and/or xserver-xorg-core instead.
- .
- More information about X.Org can be found at:
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'xserver/xorg' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
-
-Package: xdmx
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Distributed Multihead X server
- Xdmx is a proxy X server that uses one or more other X servers as its
- display device(s). It provides multi-head X functionality for displays that
- might be located on different machines. Xdmx functions as a front-end X server
- that acts as a proxy to a set of back-end X servers. All of the visible
- rendering is passed to the back-end X servers. Clients connect to the Xdmx
- front-end, and everything appears as it would in a regular multi-head
- configuration. If Xinerama is enabled (e.g., with +xinerama on the command
- line), the clients see a single large screen.
- .
- More information about X.Org can be found at:
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'xserver/xorg' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
-
-Package: xdmx-tools
-Architecture: any
-Depends: xdmx, ${shlibs:Depends}, ${misc:Depends}
-Replaces: xdmx (<= 2:1.1.1-10)
-Description: Distributed Multihead X tools
- This package provides a collection of tools used for administration of
- the Xdmx server; see the xdmx package for more information.
- .
- More information about X.Org can be found at:
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'xserver/xorg' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
-
-Package: xnest
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nested X server
- Xnest is a nested X server that simply relays all its requests to another
- X server, where it runs as a client. This means that it appears as another
- window in your current X session. Xnest relies upon its parent X server
- for font services.
- .
- Use of the Xephyr X server instead of Xnest is recommended.
- .
- More information about X.Org can be found at:
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'xserver/xorg' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
-
-Package: xvfb
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: xbase-clients
-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
- memory. The primary use of this server was intended to be server testing,
- but other novel uses for it have been found, including testing clients
- against unusual depths and screen configurations, doing batch processing with
- Xvfb as a background rendering engine, load testing, as an aid to porting the
- X server to a new platform, and providing an unobtrusive way to run
- applications that don't really need an X server but insist on having one
- anyway.
- .
- This package also contains a convenience script called xvfb-run which
- simplifies the automated execution of X clients in a virtual server
- environment. This convenience script requires the use of the xauth
- program.
- .
- More information about X.Org can be found at:
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'xserver/xorg' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
-
-Package: xserver-xephyr
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: xbase-clients
-Description: Next Generation Nested X Server
- xserver-xephyr is an X server that can be run inside another X server,
- much like xnest. xephyr though, is based on the kdrive X server, and as a
- result it supports newer extensions than xnest, including render and
- composite.
Copied: tags/xserver/xorg-server/2:1.1.1-14/debian/control (from rev 4186, trunk/xserver/xorg-server/debian/control)
===================================================================
--- tags/xserver/xorg-server/2:1.1.1-14/debian/control (rev 0)
+++ tags/xserver/xorg-server/2:1.1.1-14/debian/control 2007-01-07 23:21:19 UTC (rev 4188)
@@ -0,0 +1,151 @@
+Source: xorg-server
+Section: x11
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>, Steve Langasek <vorlon@debian.org>
+# all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg
+# server, and common dependencies for the DIX.
+# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.
+# everything on is for the DMX and Xnest servers.
+Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-core-dev, x11proto-damage-dev, x11proto-evie-dev, x11proto-fixes-dev (>= 4.0), x11proto-kb-dev (>= 1.0.1-1), x11proto-xinerama-dev, x11proto-randr-dev, x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev, x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0-1), x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev, x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1-1), libxdmcp-dev (>= 1:0.99.1-1), libxfont-dev, libfontenc-dev, libxkbfile-dev (>= 1:0.99.1-1), x11proto-xf86dri-dev, libdrm-dev [!hurd-i386], mesa-swx11-source (>= 6.5.1), x11proto-gl-dev (>= 1.4.8), libgl1-mesa-dev(>= 6.5.1), libxmuu-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1), libx11-dev (>= 1:0.99.2-1), libxrender-dev (>= 1:0.9.0-1), libxi-dev (>= 1:0.99.1-1), x11proto-dmx-dev, quilt, libdmx-dev (>= 1:1.0.1-1), libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>= 1:0.99.1-1), libxt-dev (>= 1:0.99.1-1), libxmu-dev (>= 1:0.99.1-1), libxtst-dev (>= 1:0.99.1-1), libxres-dev (>= 1:0.99.1-1)
+Build-Conflicts: xlibs-static-dev
+Standards-Version: 3.7.2.0
+
+Package: xserver-xorg-core
+Architecture: any
+Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
+Recommends: xkb-data, xfonts-base
+Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
+Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video
+Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
+Provides: xserver
+Description: X.Org X server -- core server
+ The X.Org X server is an X server for several architectures and operating
+ systems, which is derived from the XFree86 4.x series of X servers.
+ .
+ The X.Org server supports most modern graphics hardware from most vendors,
+ and supersedes all XFree86 X servers.
+ .
+ The X.Org 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://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'xserver/xorg' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: xserver-xorg-dev
+Architecture: any
+Depends: ${misc:Depends}
+Description: X.Org X server -- development files
+ This package provides development files for the X.Org ('Xorg') X server.
+ This is not quite the same as the DDK (Driver Development Kit) from the
+ XFree86 4.x and X.Org 6.7, 6.8 and 6.9 series of servers; it provides
+ headers and a pkg-config file for drivers using autotools to build
+ against.
+ .
+ Unless you are developing or building a driver, you probably want
+ xserver-xorg and/or xserver-xorg-core instead.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'xserver/xorg' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: xdmx
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Distributed Multihead X server
+ Xdmx is a proxy X server that uses one or more other X servers as its
+ display device(s). It provides multi-head X functionality for displays that
+ might be located on different machines. Xdmx functions as a front-end X server
+ that acts as a proxy to a set of back-end X servers. All of the visible
+ rendering is passed to the back-end X servers. Clients connect to the Xdmx
+ front-end, and everything appears as it would in a regular multi-head
+ configuration. If Xinerama is enabled (e.g., with +xinerama on the command
+ line), the clients see a single large screen.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'xserver/xorg' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: xdmx-tools
+Architecture: any
+Depends: xdmx, ${shlibs:Depends}, ${misc:Depends}
+Replaces: xdmx (<= 2:1.1.1-10)
+Description: Distributed Multihead X tools
+ This package provides a collection of tools used for administration of
+ the Xdmx server; see the xdmx package for more information.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'xserver/xorg' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: xnest
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Nested X server
+ Xnest is a nested X server that simply relays all its requests to another
+ X server, where it runs as a client. This means that it appears as another
+ window in your current X session. Xnest relies upon its parent X server
+ for font services.
+ .
+ Use of the Xephyr X server instead of Xnest is recommended.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'xserver/xorg' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: xvfb
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: xbase-clients
+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
+ memory. The primary use of this server was intended to be server testing,
+ but other novel uses for it have been found, including testing clients
+ against unusual depths and screen configurations, doing batch processing with
+ Xvfb as a background rendering engine, load testing, as an aid to porting the
+ X server to a new platform, and providing an unobtrusive way to run
+ applications that don't really need an X server but insist on having one
+ anyway.
+ .
+ This package also contains a convenience script called xvfb-run which
+ simplifies the automated execution of X clients in a virtual server
+ environment. This convenience script requires the use of the xauth
+ program.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'xserver/xorg' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: xserver-xephyr
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: xbase-clients
+Description: Next Generation Nested X Server
+ xserver-xephyr is an X server that can be run inside another X server,
+ much like xnest. xephyr though, is based on the kdrive X server, and as a
+ result it supports newer extensions than xnest, including render and
+ composite.
Copied: tags/xserver/xorg-server/2:1.1.1-14/debian/patches/39_alpha_build_flags.patch (from rev 4184, trunk/xserver/xorg-server/debian/patches/39_alpha_build_flags.patch)
===================================================================
--- tags/xserver/xorg-server/2:1.1.1-14/debian/patches/39_alpha_build_flags.patch (rev 0)
+++ tags/xserver/xorg-server/2:1.1.1-14/debian/patches/39_alpha_build_flags.patch 2007-01-07 23:21:19 UTC (rev 4188)
@@ -0,0 +1,173 @@
+Index: hw/xfree86/os-support/linux/Makefile.in
+===================================================================
+--- hw/xfree86/os-support/linux/Makefile.in (revision 3907)
++++ hw/xfree86/os-support/linux/Makefile.in (working copy)
+@@ -36,8 +36,9 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@LNXACPI_TRUE@am__append_1 = -DHAVE_ACPI
+-@LNXAPM_TRUE@am__append_2 = -DHAVE_APM
++@LINUX_ALPHA_TRUE@am__append_1 = libev56.la
++@LNXACPI_TRUE@am__append_2 = -DHAVE_ACPI
++@LNXAPM_TRUE@am__append_3 = -DHAVE_APM
+ subdir = hw/xfree86/os-support/linux
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -56,7 +57,11 @@
+ $(top_builddir)/include/kdrive-config.h
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+-liblinux_la_LIBADD =
++libev56_la_LIBADD =
++am__libev56_la_SOURCES_DIST = lnx_ev56.c
++@LINUX_ALPHA_TRUE@am_libev56_la_OBJECTS = libev56_la-lnx_ev56.lo
++libev56_la_OBJECTS = $(am_libev56_la_OBJECTS)
++@LINUX_ALPHA_TRUE@am_libev56_la_rpath =
+ am__liblinux_la_SOURCES_DIST = lnx_init.c lnx_video.c lnx_io.c \
+ lnx_kbd.c lnx_mouse.c lnx_pci.c lnx_agp.c lnx_kmod.c \
+ lnx_KbdMap.c $(srcdir)/../shared/bios_mmap.c \
+@@ -65,12 +70,12 @@
+ $(srcdir)/../shared/sigio.c $(srcdir)/../shared/stdResource.c \
+ $(srcdir)/../shared/libc_wrapper.c \
+ $(srcdir)/../shared/at_scancode.c lnx_acpi.c lnx_apm.c \
+- lnx_ev56.c $(srcdir)/lnx_axp.c $(srcdir)/../shared/xf86Axp.c \
++ $(srcdir)/lnx_axp.c $(srcdir)/../shared/xf86Axp.c \
+ $(srcdir)/../shared/ia64Pci.c
+ @LNXACPI_TRUE@am__objects_1 = lnx_acpi.lo lnx_apm.lo
+ @LNXAPM_TRUE@am__objects_2 = lnx_apm.lo
+ @LINUX_ALPHA_FALSE@@LINUX_IA64_TRUE@am__objects_3 = ia64Pci.lo
+-@LINUX_ALPHA_TRUE@am__objects_3 = lnx_ev56.lo lnx_axp.lo xf86Axp.lo
++@LINUX_ALPHA_TRUE@am__objects_3 = lnx_axp.lo xf86Axp.lo
+ am_liblinux_la_OBJECTS = lnx_init.lo lnx_video.lo lnx_io.lo lnx_kbd.lo \
+ lnx_mouse.lo lnx_pci.lo lnx_agp.lo lnx_kmod.lo lnx_KbdMap.lo \
+ bios_mmap.lo VTsw_usl.lo std_kbdEv.lo posix_tty.lo vidmem.lo \
+@@ -88,8 +93,9 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(liblinux_la_SOURCES)
+-DIST_SOURCES = $(am__liblinux_la_SOURCES_DIST)
++SOURCES = $(libev56_la_SOURCES) $(liblinux_la_SOURCES)
++DIST_SOURCES = $(am__libev56_la_SOURCES_DIST) \
++ $(am__liblinux_la_SOURCES_DIST)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -209,7 +215,6 @@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+ FREETYPE_LIBS = @FREETYPE_LIBS@
+ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@
+-GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
+ GLX_DEFINES = @GLX_DEFINES@
+ GLX_FALSE = @GLX_FALSE@
+ GLX_TRUE = @GLX_TRUE@
+@@ -236,8 +241,6 @@
+ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
+ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
+ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+-KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+-KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
+ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
+ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
+ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
+@@ -290,8 +293,6 @@
+ MESA_SOURCE = @MESA_SOURCE@
+ MFB_FALSE = @MFB_FALSE@
+ MFB_TRUE = @MFB_TRUE@
+-MISCUTILS_FALSE = @MISCUTILS_FALSE@
+-MISCUTILS_TRUE = @MISCUTILS_TRUE@
+ MISC_MAN_DIR = @MISC_MAN_DIR@
+ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+ MITSHM_FALSE = @MITSHM_FALSE@
+@@ -332,7 +333,6 @@
+ RGB_DB = @RGB_DB@
+ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
+ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+-SERVERCONFIGdir = @SERVERCONFIGdir@
+ SERVER_DEFINES = @SERVER_DEFINES@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -430,7 +430,7 @@
+ XORG_BUS_SPARCPCI_TRUE = @XORG_BUS_SPARCPCI_TRUE@
+ XORG_BUS_SPARC_FALSE = @XORG_BUS_SPARC_FALSE@
+ XORG_BUS_SPARC_TRUE = @XORG_BUS_SPARC_TRUE@
+-XORG_CFLAGS = @XORG_CFLAGS@ $(am__append_1) $(am__append_2)
++XORG_CFLAGS = @XORG_CFLAGS@ $(am__append_2) $(am__append_3)
+ XORG_CORE_LIBS = @XORG_CORE_LIBS@
+ XORG_FALSE = @XORG_FALSE@
+ XORG_INCS = @XORG_INCS@
+@@ -552,12 +552,16 @@
+ target_alias = @target_alias@
+ xglmoduledir = @xglmoduledir@
+ xpconfigdir = @xpconfigdir@
+-noinst_LTLIBRARIES = liblinux.la
+-@LINUX_ALPHA_TRUE@PLATFORM_PCI_SUPPORT = lnx_ev56.c \
++noinst_LTLIBRARIES = liblinux.la $(am__append_1)
++@LINUX_ALPHA_TRUE@PLATFORM_PCI_SUPPORT = \
+ @LINUX_ALPHA_TRUE@ $(srcdir)/lnx_axp.c \
+ @LINUX_ALPHA_TRUE@ $(srcdir)/../shared/xf86Axp.c
+
+ @LINUX_IA64_TRUE@PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c
++@LINUX_ALPHA_TRUE@libev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56
++@LINUX_ALPHA_TRUE@libev56_la_SOURCES = lnx_ev56.c
++@LINUX_ALPHA_TRUE@liblinux_la_LIBADD = libev56.la
++@LINUX_ALPHA_TRUE@liblinux_la_DEPENDENCIES = libev56.la
+ @LNXACPI_TRUE@ACPI_SOURCES = lnx_acpi.c lnx_apm.c
+ @LNXAPM_TRUE@APM_SOURCES = lnx_apm.c
+ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \
+@@ -634,6 +638,8 @@
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
++libev56.la: $(libev56_la_OBJECTS) $(libev56_la_DEPENDENCIES)
++ $(LINK) $(am_libev56_la_rpath) $(libev56_la_LDFLAGS) $(libev56_la_OBJECTS) $(libev56_la_LIBADD) $(LIBS)
+ liblinux.la: $(liblinux_la_OBJECTS) $(liblinux_la_DEPENDENCIES)
+ $(LINK) $(liblinux_la_LDFLAGS) $(liblinux_la_OBJECTS) $(liblinux_la_LIBADD) $(LIBS)
+
+@@ -648,12 +654,12 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bios_mmap.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64Pci.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libc_wrapper.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libev56_la-lnx_ev56.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_KbdMap.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_acpi.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_agp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_apm.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_axp.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_ev56.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_init.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_io.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_kbd.Plo@am__quote@
+@@ -689,6 +695,13 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
++libev56_la-lnx_ev56.lo: lnx_ev56.c
++@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libev56_la_CFLAGS) $(CFLAGS) -MT libev56_la-lnx_ev56.lo -MD -MP -MF "$(DEPDIR)/libev56_la-lnx_ev56.Tpo" -c -o libev56_la-lnx_ev56.lo `test -f 'lnx_ev56.c' || echo '$(srcdir)/'`lnx_ev56.c; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libev56_la-lnx_ev56.Tpo" "$(DEPDIR)/libev56_la-lnx_ev56.Plo"; else rm -f "$(DEPDIR)/libev56_la-lnx_ev56.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lnx_ev56.c' object='libev56_la-lnx_ev56.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libev56_la_CFLAGS) $(CFLAGS) -c -o libev56_la-lnx_ev56.lo `test -f 'lnx_ev56.c' || echo '$(srcdir)/'`lnx_ev56.c
++
+ bios_mmap.lo: $(srcdir)/../shared/bios_mmap.c
+ @am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bios_mmap.lo -MD -MP -MF "$(DEPDIR)/bios_mmap.Tpo" -c -o bios_mmap.lo `test -f '$(srcdir)/../shared/bios_mmap.c' || echo '$(srcdir)/'`$(srcdir)/../shared/bios_mmap.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bios_mmap.Tpo" "$(DEPDIR)/bios_mmap.Plo"; else rm -f "$(DEPDIR)/bios_mmap.Tpo"; exit 1; fi
+Index: hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- hw/xfree86/os-support/linux/Makefile.am (revision 3907)
++++ hw/xfree86/os-support/linux/Makefile.am (working copy)
+@@ -4,7 +4,12 @@
+ PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c
+ endif
+ if LINUX_ALPHA
+-PLATFORM_PCI_SUPPORT = lnx_ev56.c \
++noinst_LTLIBRARIES += libev56.la
++libev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56
++libev56_la_SOURCES = lnx_ev56.c
++liblinux_la_LIBADD = libev56.la
++liblinux_la_DEPENDENCIES = libev56.la
++PLATFORM_PCI_SUPPORT = \
+ $(srcdir)/lnx_axp.c \
+ $(srcdir)/../shared/xf86Axp.c
+ endif
Deleted: tags/xserver/xorg-server/2:1.1.1-14/debian/patches/series
===================================================================
--- trunk/xserver/xorg-server/debian/patches/series 2007-01-07 17:38:51 UTC (rev 4183)
+++ tags/xserver/xorg-server/2:1.1.1-14/debian/patches/series 2007-01-07 23:21:19 UTC (rev 4188)
@@ -1,36 +0,0 @@
-001_ubuntu_add_extra_modelines_from_xorg.patch -p1
-02_libvgahw_gcc4_volatile_fix.diff
-03_xnest_manpage_overhaul.diff
-04_read_rom_in_chunks.diff
-05_arm_cache_flush.diff -p3
-06_arm_is_not_x86_and_has_no_vga.diff
-07_xorgconf_manpage_overhaul.diff -p0
-08_s390_servermd.diff -p3
-09_debian_xserver_rtff.diff -p0
-10_dont_look_in_home_for_config.diff -p0
-12_security_policy_in_etc.diff
-13_debian_add_xkbpath_env_variable.diff
-15_symlink_mesa.diff
-16_s390_fix.diff
-17_ignoreabi.diff
-18_execinfo_only_for_backtrace.patch
-19_configurable_misc_utils.patch
-20_mesa_6.5.1.diff
-21_glx_align_fixes.patch
-22_xkb_cycle_3layouts.diff
-23_kfreebsd_support.diff
-24_hurd_support.diff
-25_tfp_damage.diff -p0
-26_aiglx_happy_vt_switch.diff
-27_aiglx_locking.diff
-28_mesa_copy_sub_buffer.diff -p0
-29_mesa_reseed_makefile.diff -p0
-30_fix_vmode_switch.diff
-31_blocksigio.diff
-32_disable_sparc_pci_bridge.diff
-33_Xserver_man_typos.patch
-34_xorg.conf_man_typos.patch
-35_randr_byteswap.patch
-36_fix_ffs.patch
-37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms.diff
-38_wait_for_something_force_timer_reset.diff
Copied: tags/xserver/xorg-server/2:1.1.1-14/debian/patches/series (from rev 4184, trunk/xserver/xorg-server/debian/patches/series)
===================================================================
--- tags/xserver/xorg-server/2:1.1.1-14/debian/patches/series (rev 0)
+++ tags/xserver/xorg-server/2:1.1.1-14/debian/patches/series 2007-01-07 23:21:19 UTC (rev 4188)
@@ -0,0 +1,37 @@
+001_ubuntu_add_extra_modelines_from_xorg.patch -p1
+02_libvgahw_gcc4_volatile_fix.diff
+03_xnest_manpage_overhaul.diff
+04_read_rom_in_chunks.diff
+05_arm_cache_flush.diff -p3
+06_arm_is_not_x86_and_has_no_vga.diff
+07_xorgconf_manpage_overhaul.diff -p0
+08_s390_servermd.diff -p3
+09_debian_xserver_rtff.diff -p0
+10_dont_look_in_home_for_config.diff -p0
+12_security_policy_in_etc.diff
+13_debian_add_xkbpath_env_variable.diff
+15_symlink_mesa.diff
+16_s390_fix.diff
+17_ignoreabi.diff
+18_execinfo_only_for_backtrace.patch
+19_configurable_misc_utils.patch
+20_mesa_6.5.1.diff
+21_glx_align_fixes.patch
+22_xkb_cycle_3layouts.diff
+23_kfreebsd_support.diff
+24_hurd_support.diff
+25_tfp_damage.diff -p0
+26_aiglx_happy_vt_switch.diff
+27_aiglx_locking.diff
+28_mesa_copy_sub_buffer.diff -p0
+29_mesa_reseed_makefile.diff -p0
+30_fix_vmode_switch.diff
+31_blocksigio.diff
+32_disable_sparc_pci_bridge.diff
+33_Xserver_man_typos.patch
+34_xorg.conf_man_typos.patch
+35_randr_byteswap.patch
+36_fix_ffs.patch
+37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms.diff
+38_wait_for_something_force_timer_reset.diff
+39_alpha_build_flags.patch -p0
Reply to: