X Strike Force X.Org X11 SVN commit: r320 - in trunk/debian: . patches po
Author: dnusinow
Date: 2005-07-10 13:26:56 -0500 (Sun, 10 Jul 2005)
New Revision: 320
Added:
trunk/debian/libglu1-xorg-dbg.install
trunk/debian/libglu1-xorg-dbg.links
trunk/debian/libglu1-xorg-dev.install
trunk/debian/libglu1-xorg-dev.links
trunk/debian/libglu1-xorg.install
trunk/debian/libglu1-xorg.links
trunk/debian/libglu1-xorg.postinst.in
trunk/debian/libglu1-xorg.shlibs
trunk/debian/patches/009_disable_Xprt.diff
trunk/debian/patches/024d_radeon_fix_gcc4_build.diff
trunk/debian/patches/915_disable_i915_debugging.diff
trunk/debian/patches/991_ubuntu_gcc_flags.diff
Removed:
trunk/debian/xlibmesa-glu-dbg.install
trunk/debian/xlibmesa-glu-dbg.links
trunk/debian/xlibmesa-glu-dev.install
trunk/debian/xlibmesa-glu-dev.links
trunk/debian/xlibmesa-glu.install
trunk/debian/xlibmesa-glu.links
trunk/debian/xlibmesa-glu.postinst.in
trunk/debian/xlibmesa-glu.postrm.in
trunk/debian/xlibmesa-glu.shlibs
trunk/debian/xprt.install
Modified:
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.arm.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.hurd-i386.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.m68k.in
trunk/debian/MANIFEST.mips.in
trunk/debian/MANIFEST.mipsel.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.s390.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/NEWS
trunk/debian/changelog
trunk/debian/control
trunk/debian/patches/099s_selinux_support.diff
trunk/debian/patches/600_amd64_support.diff
trunk/debian/po/POTFILES.in
trunk/debian/rules
Log:
Because svn access wasn't working for a while, this will have to be a big
commit...
- Add remainder of patch audit changes to changelog
- Pull the following from Ubuntu Breezy patches to allow gcc4 builds
- 024d_radeon_fix_gcc4_build.diff (to which I incorporated a one-line fix
from the 024a_radeon_benh_fixes.diff patch)
- 991_ubuntu_gcc_flags.diff
- Disable xprt. Thanks to Eugene Konev!
- Change x-window-system to depend on xprint (thanks to Drew
Parsons); Closes: #300974
- Change debian/po/POTFILES.in to use x11-common templates, not
xorg-common.templates. Thanks to Eugene Konev
- Package name changes for the C++ ABI transition: (Thanks to Eugene Konev,
Steve Langasek, and Daniel Stone)
- xlibmesa-glu renamed to libglu1-xorg; Provides: changed to
libglu1c2, libglu1c2 added to the Conflicts: and Replaces:
- libglu1-xorg shlibs changed to libglu1-xorg | libglu1c2
- xlibmesa-glu-dbg renamed to libglu1-xorg-dbg; xlibmesa-glu-dbg
added to Conflicts: and Replaces:
- xlibmesa-glu-dev renamed to libglu1-xorg-dev; depend on
libglu1-xorg instead of xlibmesa-glu, of course, and add
xlibmesa-glu-dev to the Conflicts/Replaces/Provides
- Update x-window-system-core to depend on libglu1-xorg instead of
xlibmesa-glu
- Update x-window-system-dev to depend on libglu1-xorg-{dev,dbg}
instead of xlibmesa-glu-{dev,dbg}
- Drop the xlibmesa3, xlibmesa3-dbg, and xlibmesa-dev transition
packages; these existed for the woody->sarge transition, and they
can't possibly provide a proper transition for anything that
relies on the C++ ABI, so better to get rid of them altogether
- Rename all xlibmesa-glu package files accordingly
- Remove libglu1-xorg-dev's dependency on "libstdc++5-3.3-dev |
libstdc++-dev": this doesn't actually ensure that the correct C++
headers are installed, and it's no longer the correct libstdc++
version anyway.
- Add patch 915_disable_i915_debugging.diff, to disable non-x86 debug
statements for this chip. Thanks to Aaron M. Ucko
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.alpha.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -438,7 +438,6 @@
usr/X11R6/bin/XFree86-debug
usr/X11R6/bin/Xmark
usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.amd64.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -454,7 +454,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1700,7 +1699,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.arm.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -438,7 +438,6 @@
usr/X11R6/bin/XFree86-debug
usr/X11R6/bin/Xmark
usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.hppa.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -454,7 +454,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1592,7 +1591,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
Modified: trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.hurd-i386.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -438,7 +438,6 @@
usr/X11R6/bin/XFree86-debug
usr/X11R6/bin/Xmark
usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.i386.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -454,7 +454,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1709,7 +1708,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.ia64.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -454,7 +454,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1702,7 +1701,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.m68k.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -438,7 +438,6 @@
usr/X11R6/bin/XFree86-debug
usr/X11R6/bin/Xmark
usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.mips.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -438,7 +438,6 @@
usr/X11R6/bin/XFree86-debug
usr/X11R6/bin/Xmark
usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.mipsel.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -438,7 +438,6 @@
usr/X11R6/bin/XFree86-debug
usr/X11R6/bin/Xmark
usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.powerpc.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -454,7 +454,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1682,7 +1681,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.s390.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -431,7 +431,6 @@
usr/X11R6/bin/X
usr/X11R6/bin/Xmark
usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/MANIFEST.sparc.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -457,7 +457,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1703,7 +1702,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/NEWS 2005-07-10 18:26:56 UTC (rev 320)
@@ -1,3 +1,15 @@
+xorg-x11 (6.8.2.dfsg.1-1) unstable; urgency=low
+
+ * Brand new upstream. We are now using http://www.x.org as our upstream
+ instead of xfree86 due to licensing issues.
+ * xlibs-static-* has been split in to various component libraries, each with
+ its own package.
+ * xlibmesa-glu* packages have been renamed to libglu1-xorg*
+ * We no longer build and ship the xprt package. Instead, the packages will
+ depend on xprt-xprintorg.
+
+ -- David Nusinow <dnusinow@debian.org> Fri, 24 Jun 2005 10:24:48 -0400
+
xfree86 (4.3.0-1) unstable; urgency=low
* The rstartd.real file, previously in /etc/X11/rstart, has been moved to
@@ -78,6 +90,6 @@
-- Branden Robinson <branden@debian.org> Sun, 24 Aug 2003 15:07:11 -0500
- $Id: NEWS 1612 2004-07-10 16:32:13Z branden $
+ $Id$
vim:set ai et sts=2 sw=2 tw=78:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/changelog 2005-07-10 18:26:56 UTC (rev 320)
@@ -1,4 +1,4 @@
-xorg-x11 (6.8.2.dfsg.1-0pre1v1+SVN) unstable; urgency=low
+xorg-x11 (6.8.2.dfsg.1-1) unstable; urgency=low
Changes by David Nusinow:
@@ -16,13 +16,56 @@
by config file. Thanks to Dan Christensen and Nathanael Nerode;
Closes: #315315
- - Remove svn comments from debian/local xpm pixmaps to unbreak xdm
+ - Remove svn comments from debian/local xpm pixmaps to unbreak xdm. Thanks
+ to Eugene Konev.
+ - Disable xprt. Thanks to Eugene Konev!
+ - Change x-window-system to depend on xprint (thanks to Drew
+ Parsons); Closes: #300974
+
+ - Change debian/po/POTFILES.in to use x11-common templates, not
+ xorg-common.templates. Thanks to Eugene Konev
+
+ - Pull the following from Ubuntu Breezy patches to allow gcc4 builds
+ - 024d_radeon_fix_gcc4_build.diff (to which I incorporated a one-line fix
+ from the 024a_radeon_benh_fixes.diff patch)
+ - 991_ubuntu_gcc_flags.diff
+
+ - Package name changes for the C++ ABI transition: (Thanks to Eugene Konev,
+ Steve Langasek, and Daniel Stone)
+ - xlibmesa-glu renamed to libglu1-xorg; Provides: changed to
+ libglu1c2, libglu1c2 added to the Conflicts: and Replaces:
+ - libglu1-xorg shlibs changed to libglu1-xorg | libglu1c2
+ - xlibmesa-glu-dbg renamed to libglu1-xorg-dbg; xlibmesa-glu-dbg
+ added to Conflicts: and Replaces:
+ - xlibmesa-glu-dev renamed to libglu1-xorg-dev; depend on
+ libglu1-xorg instead of xlibmesa-glu, of course, and add
+ xlibmesa-glu-dev to the Conflicts/Replaces/Provides
+ - Update x-window-system-core to depend on libglu1-xorg instead of
+ xlibmesa-glu
+ - Update x-window-system-dev to depend on libglu1-xorg-{dev,dbg}
+ instead of xlibmesa-glu-{dev,dbg}
+ - Drop the xlibmesa3, xlibmesa3-dbg, and xlibmesa-dev transition
+ packages; these existed for the woody->sarge transition, and they
+ can't possibly provide a proper transition for anything that
+ relies on the C++ ABI, so better to get rid of them altogether
+ - Rename all xlibmesa-glu package files accordingly
+
+ - Remove libglu1-xorg-dev's dependency on "libstdc++5-3.3-dev |
+ libstdc++-dev": this doesn't actually ensure that the correct C++
+ headers are installed, and it's no longer the correct libstdc++
+ version anyway.
+
+ - Add patch 915_disable_i915_debugging.diff, to disable non-x86 debug
+ statements for this chip. Thanks to Aaron M. Ucko
+
- Patch Audit
- 0000_backport_from_upstream.diff updated
- Thomas Winischhofer's post-6.8.2 fixes to MiscPassMessage();
Closes: #285807
+ - 000_backport_from_author_xterm.diff ported (Nathanael Nerode)
- 002_xdm_fixes.diff updated (Eugene Konev)
+ - 003b_xfs_fixes.diff ported (Eugene Konev, Nathanael Nerode)
- 005_rgb.txt_in_etc_X11.diff updated (Nathanael Nerode)
- 008_fix_xgetpw_macro.diff updated (Eugene Konev)
- 011_SECURITY_makedepend_safer.diff (Nathanael Nerode)
@@ -32,18 +75,30 @@
- 043_ati_r128_update_chip_identification.diff added (Nathanael Nerode)
- 047_mga_manpage_updates.diff updated
- 055_lnx_evdev_keyboard.diff updated
+ - 067_fix_X11_and_xdm_build_problems.diff ported (Eugene Konev)
- 089_xkb_fix_symbols_pc_lt.diff got ID tags back
+ - 093_xkb_fix_macintosh_problems.diff got macintosh equal key fix ported
- 099e_xorgconf_manpage_overhaul.diff ported
+ - 099h_mesa_tdfx_load_right_glide_library.diff patched to use
+ libglide_h3/5 as used in unstable packages.
- 099q_tdfx_improve_mode_rejection_diagnostics.diff added
- 099q_xkb_tr_fix_eacute.diff removed
- 099r_xlsfonts_do_not_spew_usage_on_connection_error.diff added
+ - 099s_selinux_support.diff ported
- 099s_xkb_tr_fix_eacute.diff added
+ - 099t_xkb_remove_hidden_attributes.diff ported
+ - 099u_mkdirhier_rewrite.diff ported (Eugene Konev, Nathanael Nerode)
+ - 099v_fontserver_fix_SEGV.diff ported
+ - 099x_xdm_support_logfile_rotation.diff ported
- 250_m68k_build_scanpci.diff updated
+ - 304_arm_Xlib.h_kludge_around_ARM_ABI_brain_damage.diff ported
- 910_debian_Xserver_RTFF.diff updated
- 913_debian_remove_code_ref_to_object_code_files.diff ported
- patch to xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c
re-added to comply with post-sarge SC
+ - Update debian/NEWS with a few things
+
-- David Nusinow <dnusinow@debian.org> Fri, 24 Jun 2005 10:24:48 -0400
xorg-x11 (6.8.2.dfsg.1-0pre1v1) experimental; urgency=low
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/control 2005-07-10 18:26:56 UTC (rev 320)
@@ -2312,13 +2312,13 @@
.
See the xlibmesa-gl package for further information.
-Package: xlibmesa-glu
+Package: libglu1-xorg
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu
-Provides: libglu1
-Replaces: libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu
+Conflicts: libglu1c2, libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu, xlibmesa-glu
+Provides: libglu1c2
+Replaces: libglu1c2, libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu, xlibmesa-glu
Description: Mesa OpenGL utility library [X.Org]
The OpenGL utility library (GLU) offers simple interfaces for building
mipmaps; checking for the presence of extensions in the OpenGL (or other
@@ -2330,15 +2330,15 @@
X.Org maintains its own version of the Mesa libraries; see the xlibmesa-gl
package for further information.
.
- This package was built using version 1.02 of the C++ ABI.
+ This package was built using version 2 of the C++ ABI.
-Package: xlibmesa-glu-dbg
+Package: libglu1-xorg-dbg
Section: libdevel
Priority: extra
Architecture: any
-Depends: xlibmesa-gl (= ${Source-Version}), ${misc:Depends}
-Conflicts: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg
-Replaces: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg
+Depends: libglu1-xorg (= ${Source-Version}), ${misc:Depends}
+Conflicts: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg, xlibmesa-glu-dbg
+Replaces: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg, xlibmesa-glu-dbg
Description: Mesa OpenGL utility library (unstripped) [X.Org]
This package is useful to provide a backtrace with symbol names in a
debugger; this facilitates interpretation of core dumps, and aids in finding
@@ -2348,20 +2348,20 @@
be debugged is executed.
.
Non-programmers will likely have little use for this package. See the
- xlibmesa-glu package for further information.
+ libglu1-xorg package for further information.
-Package: xlibmesa-glu-dev
+Package: libglu1-xorg-dev
Section: libdevel
Architecture: any
-Depends: xlibmesa-glu (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, libstdc++5-3.3-dev | libstdc++-dev, libc6-dev | libc-dev
-Conflicts: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5)
-Provides: libglu-dev
-Replaces: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5)
+Depends: libglu1-xorg (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, libstdc++6-4.0-dev | libstdc++6-dev, libc6-dev | libc-dev
+Conflicts: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5), xlibmesa-glu-dev
+Provides: libglu-dev, xlibmesa-glu-dev
+Replaces: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5), xlibmesa-glu-dev
Description: Mesa OpenGL utility library development files [X.Org]
- xlibmesa-glu-dev provides static versions of the libraries provided in
- xlibmesa-glu, as well as header files and manual pages.
+ libglu1-xorg-dev provides static versions of the libraries provided in
+ libglu1-xorg, as well as header files and manual pages.
.
- See the xlibmesa-glu package for further information.
+ See the libglu1-xorg package for further information.
Package: xlibosmesa4
Section: libs
@@ -2503,19 +2503,6 @@
.
Xnest relies upon its parent X server for font services.
-Package: xprt
-Architecture: any
-Depends: xprt-common, ${shlibs:Depends}, ${misc:Depends}
-Description: X print server
- Xprt provides an X server with the print extension and special DDX
- (Device-Dependent X) implementation.
- .
- Until recently, the Xprint server shipped with XFree86 and X.Org was out of
- date and buggy, and not recommended for general usage. Since then, the Xprint
- development team have merged their work (formerly hosted at xprint.org) into
- the X.Org tree, and now use it as their active development branch. This server
- is thus recommended for general Xprint usage.
-
Package: xserver-common
Architecture: any
Depends: debconf (>= 1.0.21), x11-common (>= 6.8.1), ${shlibs:Depends}, ${misc:Depends}
@@ -2762,7 +2749,7 @@
Package: x-window-system-core
Architecture: any
-Depends: ${F:XWSC-Special-Depends}xlibmesa-gl, xlibmesa-glu, xfonts-base (>> 4.0), xfonts-100dpi, xfonts-75dpi, xfonts-scalable, xbase-clients, xutils
+Depends: ${F:XWSC-Special-Depends}xlibmesa-gl, libglu1-xorg, xfonts-base (>> 4.0), xfonts-100dpi, xfonts-75dpi, xfonts-scalable, xbase-clients, xutils
Description: X Window System core components
This metapackage provides the essential components for a standalone
workstation running the X Window System. It provides the X libraries, an X
@@ -2779,7 +2766,7 @@
Package: x-window-system-dev
Priority: extra
Architecture: any
-Depends: libdps-dev, libdps1-dbg, libice-dev, libice6-dbg, libsm-dev, libsm6-dbg, libx11-6-dbg, libx11-dev, libxaw7-dbg, libxaw7-dev, libxext-dev, libxext6-dbg, libxi-dev, libxi6-dbg, libxmu-dev, libxmu6-dbg, libxmuu-dev, libxmuu1-dbg, libxp-dev, libxp6-dbg, libxpm-dev, libxpm4-dbg, libxrandr-dev, libxrandr2-dbg, libxt-dev, libxt6-dbg, libxtrap-dev, libxtrap6-dbg, libxtst-dev, libxtst6-dbg, libxv-dev, libxv1-dbg, pm-dev, x-dev, xlibmesa-gl-dev, xlibmesa-glu-dev, xlibmesa-gl-dbg, xlibmesa-glu-dbg, ${F:XWSD-Special-Depends}xlibs-static-dev, xlibs-static-pic, xspecs
+Depends: libdps-dev, libdps1-dbg, libice-dev, libice6-dbg, libsm-dev, libsm6-dbg, libx11-6-dbg, libx11-dev, libxaw7-dbg, libxaw7-dev, libxext-dev, libxext6-dbg, libxi-dev, libxi6-dbg, libxmu-dev, libxmu6-dbg, libxmuu-dev, libxmuu1-dbg, libxp-dev, libxp6-dbg, libxpm-dev, libxpm4-dbg, libxrandr-dev, libxrandr2-dbg, libxt-dev, libxt6-dbg, libxtrap-dev, libxtrap6-dbg, libxtst-dev, libxtst6-dbg, libxv-dev, libxv1-dbg, pm-dev, x-dev, xlibmesa-gl-dev, libglu1-xorg-dev, xlibmesa-gl-dbg, libglu1-xorg-dbg, ${F:XWSD-Special-Depends}xlibs-static-dev, xlibs-static-pic, xspecs
Description: X Window System development components
This metapackage provides the components of the X Window System as developed
by the X.Org Project which are most interesting to programmers.
@@ -2794,7 +2781,7 @@
Package: x-window-system
Architecture: all
-Depends: x-window-system-core, lbxproxy, proxymngr, twm, xdm, xfs, xfwp, xnest, xprt, xterm, xvfb
+Depends: x-window-system-core, lbxproxy, proxymngr, twm, xdm, xfs, xfwp, xnest, xprint, xterm, xvfb
Description: X Window System
This metapackage provides substantially all the components of the X Window
System as developed by the X.Org Project, as well as a set of historically
@@ -2811,40 +2798,6 @@
This transitional package is only depended upon by packages that install
files into /usr/X11R6 but have not yet corrected their dependencies.
-Package: xlibmesa3
-Section: oldlibs
-Architecture: any
-Depends: ${F:Xlibmesa-gl-Special-Depends}xlibmesa-gl, xlibmesa-glu
-Description: X.Org Mesa libraries transitional package
- This package smooths upgrades from Debian 3.0 by depending on xlibmesa-gl and
- xlibmesa-glu. This transitional package is only depended upon by packages that
- haven't yet been compiled against the newer Mesa libraries provided by
- X.Org.
- .
- This package also depends on xlibmesa-dri, if that package is available for
- your machine architecture.
-
-Package: xlibmesa3-dbg
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: xlibmesa-gl-dbg, xlibmesa-glu-dbg
-Description: X.Org Mesa unstripped libraries transitional package
- This package smooths upgrades from Debian 3.0 by depending on
- xlibmesa-gl-dbg and xlibmesa-glu-dbg. This transitional package should not be
- depended upon by any Debian packages; report bugs with the Debian Bug
- Tracking System if you encounter any that do so.
-
-Package: xlibmesa-dev
-Section: oldlibs
-Architecture: all
-Depends: xlibmesa-gl-dev, xlibmesa-glu-dev
-Description: X.Org Mesa development libraries transitional package
- This package smooths upgrades from Debian 3.0 by depending on xlibmesa-gl-dev
- and xlibmesa-glu-dev. This transitional package is only depended upon by
- packages that haven't yet corrected their dependencies to reflect the new
- library arrangement.
-
Package: xlibs-dbg
Section: oldlibs
Priority: extra
Added: trunk/debian/libglu1-xorg-dbg.install
===================================================================
--- trunk/debian/libglu1-xorg-dbg.install 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/libglu1-xorg-dbg.install 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1 @@
+usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/debug
Added: trunk/debian/libglu1-xorg-dbg.links
===================================================================
--- trunk/debian/libglu1-xorg-dbg.links 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/libglu1-xorg-dbg.links 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1,3 @@
+usr/X11R6/lib/debug/libGLU.so.1.3 usr/X11R6/lib/debug/libGLU.so.1
+usr/X11R6/lib/debug/libGLU.so.1.3 usr/lib/debug/libGLU.so.1.3
+usr/lib/debug/libGLU.so.1.3 usr/lib/debug/libGLU.so.1
Added: trunk/debian/libglu1-xorg-dev.install
===================================================================
--- trunk/debian/libglu1-xorg-dev.install 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/libglu1-xorg-dev.install 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1,54 @@
+usr/X11R6/include/GL/glu.h
+usr/X11R6/lib/libGLU.a
+usr/X11R6/man/man3/gluBeginCurve.3x
+usr/X11R6/man/man3/gluBeginPolygon.3x
+usr/X11R6/man/man3/gluBeginSurface.3x
+usr/X11R6/man/man3/gluBeginTrim.3x
+usr/X11R6/man/man3/gluBuild1DMipmaps.3x
+usr/X11R6/man/man3/gluBuild2DMipmaps.3x
+usr/X11R6/man/man3/gluCylinder.3x
+usr/X11R6/man/man3/gluDeleteNurbsRenderer.3x
+usr/X11R6/man/man3/gluDeleteQuadric.3x
+usr/X11R6/man/man3/gluDeleteTess.3x
+usr/X11R6/man/man3/gluDisk.3x
+usr/X11R6/man/man3/gluEndCurve.3x
+usr/X11R6/man/man3/gluEndPolygon.3x
+usr/X11R6/man/man3/gluEndSurface.3x
+usr/X11R6/man/man3/gluEndTrim.3x
+usr/X11R6/man/man3/gluErrorString.3x
+usr/X11R6/man/man3/gluGetNurbsProperty.3x
+usr/X11R6/man/man3/gluGetString.3x
+usr/X11R6/man/man3/gluGetTessProperty.3x
+usr/X11R6/man/man3/gluLoadSamplingMatrices.3x
+usr/X11R6/man/man3/gluLookAt.3x
+usr/X11R6/man/man3/gluNewNurbsRenderer.3x
+usr/X11R6/man/man3/gluNewQuadric.3x
+usr/X11R6/man/man3/gluNewTess.3x
+usr/X11R6/man/man3/gluNextContour.3x
+usr/X11R6/man/man3/gluNurbsCallback.3x
+usr/X11R6/man/man3/gluNurbsCallbackDataEXT.3x
+usr/X11R6/man/man3/gluNurbsCurve.3x
+usr/X11R6/man/man3/gluNurbsProperty.3x
+usr/X11R6/man/man3/gluNurbsSurface.3x
+usr/X11R6/man/man3/gluOrtho2D.3x
+usr/X11R6/man/man3/gluPartialDisk.3x
+usr/X11R6/man/man3/gluPerspective.3x
+usr/X11R6/man/man3/gluPickMatrix.3x
+usr/X11R6/man/man3/gluProject.3x
+usr/X11R6/man/man3/gluPwlCurve.3x
+usr/X11R6/man/man3/gluQuadricCallback.3x
+usr/X11R6/man/man3/gluQuadricDrawStyle.3x
+usr/X11R6/man/man3/gluQuadricNormals.3x
+usr/X11R6/man/man3/gluQuadricOrientation.3x
+usr/X11R6/man/man3/gluQuadricTexture.3x
+usr/X11R6/man/man3/gluScaleImage.3x
+usr/X11R6/man/man3/gluSphere.3x
+usr/X11R6/man/man3/gluTessBeginContour.3x
+usr/X11R6/man/man3/gluTessBeginPolygon.3x
+usr/X11R6/man/man3/gluTessCallback.3x
+usr/X11R6/man/man3/gluTessEndContour.3x
+usr/X11R6/man/man3/gluTessEndPolygon.3x
+usr/X11R6/man/man3/gluTessNormal.3x
+usr/X11R6/man/man3/gluTessProperty.3x
+usr/X11R6/man/man3/gluTessVertex.3x
+usr/X11R6/man/man3/gluUnProject.3x
Added: trunk/debian/libglu1-xorg-dev.links
===================================================================
--- trunk/debian/libglu1-xorg-dev.links 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/libglu1-xorg-dev.links 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1,4 @@
+usr/X11R6/include/GL/glu.h usr/include/GL/glu.h
+usr/X11R6/lib/libGLU.a usr/lib/libGLU.a
+usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/libGLU.so
+usr/lib/libGLU.so.1.3 usr/lib/libGLU.so
Added: trunk/debian/libglu1-xorg.install
===================================================================
--- trunk/debian/libglu1-xorg.install 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/libglu1-xorg.install 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1 @@
+usr/X11R6/lib/libGLU.so.1.3
Added: trunk/debian/libglu1-xorg.links
===================================================================
--- trunk/debian/libglu1-xorg.links 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/libglu1-xorg.links 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1,3 @@
+usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/libGLU.so.1
+usr/X11R6/lib/libGLU.so.1.3 usr/lib/libGLU.so.1.3
+usr/lib/libGLU.so.1.3 usr/lib/libGLU.so.1
Added: trunk/debian/libglu1-xorg.postinst.in
===================================================================
--- trunk/debian/libglu1-xorg.postinst.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/libglu1-xorg.postinst.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Debian libglu1-xorg package post-removal script
+# Copyright 1998-2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xlibmesa-glu.postrm.in 189 2005-06-11 00:04:27Z branden $
+
+set -e
+
+THIS_PACKAGE=libglu1-xorg
+THIS_SCRIPT=postrm
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "remove" ]; then
+ deregister_x_lib_dir_with_ld_so
+ ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Added: trunk/debian/libglu1-xorg.shlibs
===================================================================
--- trunk/debian/libglu1-xorg.shlibs 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/libglu1-xorg.shlibs 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1 @@
+libGLU 1 libglu1-xorg | libglu1c2
Added: trunk/debian/patches/009_disable_Xprt.diff
===================================================================
--- trunk/debian/patches/009_disable_Xprt.diff 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/patches/009_disable_Xprt.diff 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1,33 @@
+diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
+--- xc.orig/config/cf/linux.cf 2005-07-07 20:40:56.000000000 +0800
++++ xc/config/cf/linux.cf 2005-07-07 20:41:57.000000000 +0800
+@@ -233,6 +233,13 @@
+ # define FontLibSharedFreeType NO
+ # define HasLatex YES
+
++/*
++ * The XFree86 Debian package no longer builds the Xprt server, in favor
++ * of a separate xprt-xprintorg package. We do still build the library.
++ */
++# define XprtServer NO
++# define BuildXprintLib YES
++
+ # ifdef UseInstalled
+ # define RenderLibraryDir /usr
+ # define XftLibraryDir /usr
+diff -Nru xc.orig/programs/Xserver/Xprint/Imakefile xc/programs/Xserver/Xprint/Imakefile
+--- xc.orig/programs/Xserver/Xprint/Imakefile 2005-07-07 20:40:46.000000000 +0800
++++ xc/programs/Xserver/Xprint/Imakefile 2005-07-07 20:41:57.000000000 +0800
+@@ -125,12 +125,3 @@
+ #endif
+
+ DependTarget()
+-
+-InstallManPage(Xprt,$(MANDIR))
+-
+-#ifdef HasDocBookTools
+-all:: Xprt.man Xprt.html
+-
+-ConvertDocBookToManPage(Xprt.sgml, Xprt.man)
+-ConvertDocBookToHTML(Xprt.sgml, Xprt.html)
+-#endif /* HasDocBookTools */
Added: trunk/debian/patches/024d_radeon_fix_gcc4_build.diff
===================================================================
--- trunk/debian/patches/024d_radeon_fix_gcc4_build.diff 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/patches/024d_radeon_fix_gcc4_build.diff 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1,22 @@
+diff -ruN xc-old/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
+--- xc-old/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-07-08 10:15:56.000000000 -0400
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-07-08 10:23:59.000000000 -0400
+@@ -124,6 +124,7 @@
+ static void RADEONGetMergedFBOptions(ScrnInfoPtr pScrn);
+ static int RADEONValidateMergeModes(ScrnInfoPtr pScrn);
+ static void RADEONSetDynamicClock(ScrnInfoPtr pScrn, int mode);
++static void RADEONUpdatePanelSize(ScrnInfoPtr pScrn);
+
+ /* psuedo xinerama support */
+
+diff -ruN xc-old/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h
+--- xc-old/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h 2005-05-08 23:25:12.000000000 -0400
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h 2005-07-08 10:22:41.000000000 -0400
+@@ -146,7 +146,6 @@
+ extern Bool RADEONProbe
+ FunctionPrototype((DriverPtr, int));
+
+-extern SymTabRec RADEONChipsets[];
+ extern PciChipsets RADEONPciChipsets[];
+
+ /* radeon_driver.c */
Modified: trunk/debian/patches/099s_selinux_support.diff
===================================================================
--- trunk/debian/patches/099s_selinux_support.diff 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/patches/099s_selinux_support.diff 2005-07-10 18:26:56 UTC (rev 320)
@@ -61,7 +61,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2005-07-02 15:45:19.000000000 -0400
+++ xc/config/cf/linux.cf 2005-07-02 16:01:00.000000000 -0400
-@@ -1105,3 +1105,57 @@
+@@ -1112,3 +1112,57 @@
#ifndef XFree86ServerOSDefines
# define XFree86ServerOSDefines
#endif
Modified: trunk/debian/patches/600_amd64_support.diff
===================================================================
--- trunk/debian/patches/600_amd64_support.diff 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/patches/600_amd64_support.diff 2005-07-10 18:26:56 UTC (rev 320)
@@ -11,7 +11,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 14:39:52.737468000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 14:41:57.429512384 +0200
-@@ -631,7 +631,7 @@
+@@ -638,7 +638,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
Added: trunk/debian/patches/915_disable_i915_debugging.diff
===================================================================
--- trunk/debian/patches/915_disable_i915_debugging.diff 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/patches/915_disable_i915_debugging.diff 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1,18 @@
+Disable leftover debug statements for i915 on non-x86 systems. This patch
+stolen from Mesa HEAD.
+
+diff -ruN xc-old/extras/Mesa/src/mesa/drivers/dri/i915/intel_tris.c xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_tris.c
+--- xc-old/extras/Mesa/src/mesa/drivers/dri/i915/intel_tris.c 2005-05-08 23:39:10.000000000 -0400
++++ xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_tris.c 2005-07-09 16:53:28.000000000 -0400
+@@ -63,9 +63,9 @@
+ #else
+ #define COPY_DWORDS( j, vb, vertsize, v ) \
+ do { \
+- if (1) fprintf(stderr, "\n"); \
++ if (0) fprintf(stderr, "\n"); \
+ for ( j = 0 ; j < vertsize ; j++ ) { \
+- if (1) fprintf(stderr, " -- v(%d): %x/%f\n",j, \
++ if (0) fprintf(stderr, " -- v(%d): %x/%f\n",j, \
+ ((GLuint *)v)[j], \
+ ((GLfloat *)v)[j]); \
+ vb[j] = ((GLuint *)v)[j]; \
Added: trunk/debian/patches/991_ubuntu_gcc_flags.diff
===================================================================
--- trunk/debian/patches/991_ubuntu_gcc_flags.diff 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/patches/991_ubuntu_gcc_flags.diff 2005-07-10 18:26:56 UTC (rev 320)
@@ -0,0 +1,12 @@
+diff -ruN xc-old/programs/Xserver/fb/Imakefile xc/programs/Xserver/fb/Imakefile
+--- xc-old/programs/Xserver/fb/Imakefile 2005-02-17 00:34:48.000000000 +0000
++++ xc/programs/Xserver/fb/Imakefile 2005-05-17 17:35:58.060789960 +0000
+@@ -5,7 +5,7 @@
+
+ #if defined(i386Architecture) && defined(HasGcc34) && HasGcc34
+ MMXOPTIONS= -mmmx -Winline --param inline-unit-growth=10000 \
+- --param large-function-growth=10000 -DUSE_GCC34_MMX
++ --param large-function-growth=10000
+
+ SpecialCObjectRule(fbmmx,fbmmx.c,$(MMXOPTIONS))
+ SpecialCObjectRule(fbpict,fbpict.c,$(MMXOPTIONS))
Modified: trunk/debian/po/POTFILES.in
===================================================================
--- trunk/debian/po/POTFILES.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/po/POTFILES.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -1,6 +1,6 @@
[type: gettext/rfc822deb] libx11-6.templates
[type: gettext/rfc822deb] libxt6.templates
[type: gettext/rfc822deb] xdm.templates
-[type: gettext/rfc822deb] xorg-common.templates
+[type: gettext/rfc822deb] x11-common.templates
[type: gettext/rfc822deb] xserver-common.templates
[type: gettext/rfc822deb] xserver-xorg.templates
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/rules 2005-07-10 18:26:56 UTC (rev 320)
@@ -81,7 +81,7 @@
IMAKE_DEFINES:=-DXorgCustomVersion='\"Debian $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"'
# XXX: replace -DDefaultGcc2OptimizeOpt=-O0 with $(DEBUGFLAGS) when the time
# comes (see above)
-SERVERDEBUG_IMAKE_DEFINES:=-DXorgCustomVersion='\"Debian (static) $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES -DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DXprtServer=NO -DXdmxServer=NO -DDefaultGcc2OptimizeOpt=-O0
+SERVERDEBUG_IMAKE_DEFINES:=-DXorgCustomVersion='\"Debian (static) $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES -DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DXdmxServer=NO -DDefaultGcc2OptimizeOpt=-O0
# If this is an official build, set the BuilderEMailAddr that gets displayed in
# some error messages.
@@ -519,7 +519,7 @@
-Nlibxxf86rush1-dbg \
-Nlibxxf86vm1-dbg \
-Nxlibmesa-gl-dbg \
- -Nxlibmesa-glu-dbg \
+ -Nxlibglu1-xorg-dbg \
-Nxlibosmesa4-dbg \
-Nxserver-xorg-dbg
find debian/xserver-xorg/usr/X11R6/lib/modules -name "*_drv.o" | \
Deleted: trunk/debian/xlibmesa-glu-dbg.install
===================================================================
--- trunk/debian/xlibmesa-glu-dbg.install 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/xlibmesa-glu-dbg.install 2005-07-10 18:26:56 UTC (rev 320)
@@ -1 +0,0 @@
-usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/debug
Deleted: trunk/debian/xlibmesa-glu-dbg.links
===================================================================
--- trunk/debian/xlibmesa-glu-dbg.links 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/xlibmesa-glu-dbg.links 2005-07-10 18:26:56 UTC (rev 320)
@@ -1,3 +0,0 @@
-usr/X11R6/lib/debug/libGLU.so.1.3 usr/X11R6/lib/debug/libGLU.so.1
-usr/X11R6/lib/debug/libGLU.so.1.3 usr/lib/debug/libGLU.so.1.3
-usr/lib/debug/libGLU.so.1.3 usr/lib/debug/libGLU.so.1
Deleted: trunk/debian/xlibmesa-glu-dev.install
===================================================================
--- trunk/debian/xlibmesa-glu-dev.install 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/xlibmesa-glu-dev.install 2005-07-10 18:26:56 UTC (rev 320)
@@ -1,54 +0,0 @@
-usr/X11R6/include/GL/glu.h
-usr/X11R6/lib/libGLU.a
-usr/X11R6/man/man3/gluBeginCurve.3x
-usr/X11R6/man/man3/gluBeginPolygon.3x
-usr/X11R6/man/man3/gluBeginSurface.3x
-usr/X11R6/man/man3/gluBeginTrim.3x
-usr/X11R6/man/man3/gluBuild1DMipmaps.3x
-usr/X11R6/man/man3/gluBuild2DMipmaps.3x
-usr/X11R6/man/man3/gluCylinder.3x
-usr/X11R6/man/man3/gluDeleteNurbsRenderer.3x
-usr/X11R6/man/man3/gluDeleteQuadric.3x
-usr/X11R6/man/man3/gluDeleteTess.3x
-usr/X11R6/man/man3/gluDisk.3x
-usr/X11R6/man/man3/gluEndCurve.3x
-usr/X11R6/man/man3/gluEndPolygon.3x
-usr/X11R6/man/man3/gluEndSurface.3x
-usr/X11R6/man/man3/gluEndTrim.3x
-usr/X11R6/man/man3/gluErrorString.3x
-usr/X11R6/man/man3/gluGetNurbsProperty.3x
-usr/X11R6/man/man3/gluGetString.3x
-usr/X11R6/man/man3/gluGetTessProperty.3x
-usr/X11R6/man/man3/gluLoadSamplingMatrices.3x
-usr/X11R6/man/man3/gluLookAt.3x
-usr/X11R6/man/man3/gluNewNurbsRenderer.3x
-usr/X11R6/man/man3/gluNewQuadric.3x
-usr/X11R6/man/man3/gluNewTess.3x
-usr/X11R6/man/man3/gluNextContour.3x
-usr/X11R6/man/man3/gluNurbsCallback.3x
-usr/X11R6/man/man3/gluNurbsCallbackDataEXT.3x
-usr/X11R6/man/man3/gluNurbsCurve.3x
-usr/X11R6/man/man3/gluNurbsProperty.3x
-usr/X11R6/man/man3/gluNurbsSurface.3x
-usr/X11R6/man/man3/gluOrtho2D.3x
-usr/X11R6/man/man3/gluPartialDisk.3x
-usr/X11R6/man/man3/gluPerspective.3x
-usr/X11R6/man/man3/gluPickMatrix.3x
-usr/X11R6/man/man3/gluProject.3x
-usr/X11R6/man/man3/gluPwlCurve.3x
-usr/X11R6/man/man3/gluQuadricCallback.3x
-usr/X11R6/man/man3/gluQuadricDrawStyle.3x
-usr/X11R6/man/man3/gluQuadricNormals.3x
-usr/X11R6/man/man3/gluQuadricOrientation.3x
-usr/X11R6/man/man3/gluQuadricTexture.3x
-usr/X11R6/man/man3/gluScaleImage.3x
-usr/X11R6/man/man3/gluSphere.3x
-usr/X11R6/man/man3/gluTessBeginContour.3x
-usr/X11R6/man/man3/gluTessBeginPolygon.3x
-usr/X11R6/man/man3/gluTessCallback.3x
-usr/X11R6/man/man3/gluTessEndContour.3x
-usr/X11R6/man/man3/gluTessEndPolygon.3x
-usr/X11R6/man/man3/gluTessNormal.3x
-usr/X11R6/man/man3/gluTessProperty.3x
-usr/X11R6/man/man3/gluTessVertex.3x
-usr/X11R6/man/man3/gluUnProject.3x
Deleted: trunk/debian/xlibmesa-glu-dev.links
===================================================================
--- trunk/debian/xlibmesa-glu-dev.links 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/xlibmesa-glu-dev.links 2005-07-10 18:26:56 UTC (rev 320)
@@ -1,4 +0,0 @@
-usr/X11R6/include/GL/glu.h usr/include/GL/glu.h
-usr/X11R6/lib/libGLU.a usr/lib/libGLU.a
-usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/libGLU.so
-usr/lib/libGLU.so.1.3 usr/lib/libGLU.so
Deleted: trunk/debian/xlibmesa-glu.install
===================================================================
--- trunk/debian/xlibmesa-glu.install 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/xlibmesa-glu.install 2005-07-10 18:26:56 UTC (rev 320)
@@ -1 +0,0 @@
-usr/X11R6/lib/libGLU.so.1.3
Deleted: trunk/debian/xlibmesa-glu.links
===================================================================
--- trunk/debian/xlibmesa-glu.links 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/xlibmesa-glu.links 2005-07-10 18:26:56 UTC (rev 320)
@@ -1,3 +0,0 @@
-usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/libGLU.so.1
-usr/X11R6/lib/libGLU.so.1.3 usr/lib/libGLU.so.1.3
-usr/lib/libGLU.so.1.3 usr/lib/libGLU.so.1
Deleted: trunk/debian/xlibmesa-glu.postinst.in
===================================================================
--- trunk/debian/xlibmesa-glu.postinst.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/xlibmesa-glu.postinst.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Debian xlibmesa-glu package post-installation script
-# Copyright 1998-2001, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id$
-
-set -e
-
-THIS_PACKAGE=xlibmesa-glu
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-register_x_lib_dir_with_ld_so
-ldconfig
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
Deleted: trunk/debian/xlibmesa-glu.postrm.in
===================================================================
--- trunk/debian/xlibmesa-glu.postrm.in 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/xlibmesa-glu.postrm.in 2005-07-10 18:26:56 UTC (rev 320)
@@ -1,26 +0,0 @@
-#!/bin/sh
-# Debian xlibmesa-glu package post-removal script
-# Copyright 1998-2001, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id$
-
-set -e
-
-THIS_PACKAGE=xlibmesa-glu
-THIS_SCRIPT=postrm
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "remove" ]; then
- deregister_x_lib_dir_with_ld_so
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
Deleted: trunk/debian/xlibmesa-glu.shlibs
===================================================================
--- trunk/debian/xlibmesa-glu.shlibs 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/xlibmesa-glu.shlibs 2005-07-10 18:26:56 UTC (rev 320)
@@ -1 +0,0 @@
-libGLU 1 xlibmesa-glu | libglu1
Deleted: trunk/debian/xprt.install
===================================================================
--- trunk/debian/xprt.install 2005-07-06 17:13:08 UTC (rev 319)
+++ trunk/debian/xprt.install 2005-07-10 18:26:56 UTC (rev 320)
@@ -1,2 +0,0 @@
-usr/X11R6/bin/Xprt
-usr/X11R6/man/man1/Xprt.1x
Reply to: