Author: branden Date: 2003-08-02 14:39:50 -0500 (Sat, 02 Aug 2003) New Revision: 358
Modified: branches/4.3.0/sid/debian/control branches/4.3.0/sid/debian/rules branches/4.3.0/sid/debian/scripts/vars.alpha branches/4.3.0/sid/debian/scripts/vars.i386 branches/4.3.0/sid/debian/scripts/vars.ia64 branches/4.3.0/sid/debian/scripts/vars.powerpc branches/4.3.0/sid/debian/scripts/vars.sparc Log: Address xlibmesa* package upgrade issues from woody and 4.2.1 packages in sarge/sid. debian/scripts/vars.{alpha,i386,ia64,powerpc,sparc}: - add xlibmesa-dri to dependencies of x-window-system-core on architectures where xlibmesa-dri exists - add new variable, XLIBMESA_GL_SPECIAL_DEPENDS, which adds xlibmesa-dri to dependencies of xlibmesa3 on architectures where xlibmesa-dri exists debian/rules: - pass expansion of XLIBMESA_GL_SPECIAL_DEPENDS to dpkg-gencontrol - report expansion of XLIBMESA_GL_SPECIAL_DEPENDS in "environment" target to aid debugging debian/control: - change Architecture: of xlibmesa-dri from "any" to only those architectures which actually ship this package (alpha, i386, ia64, powerpc, sparc) - xlibmesa-dri conflicts/replaces xlibmesa3-gl and non-pseudo versions of xlibmesa3 (this was effectively a package split on 5 architectures) - tweak xlibmesa-dri's description to mention the Linux kernel specifically (poor unloved Hurd and *BSD folks get no respect, I tell you) - xlibmesa-gl conflicts/replaces xlibmesa3-gl and non-pseudo versions of xlibmesa3 - xlibmesa-gl-dbg conflicts/replaces xlibmesa3-gl-dbg and non-psuedo versions of xlibmesa3-dbg - xlibmesa-gl-dev conflicts/replaces non-pseudo versions of xlibmesa-dev - update xlibmesa-gl-dev's description to refer to itself correctly - xlibmesa-glu conflicts/replaces xlibmesa3-glu and non-pseudo versions of xlibmesa3 - xlibmesa-glu-dbg conflicts/replaces xlibmesa3-glu-dbg and non-psuedo versions of xlibmesa3-dbg - xlibmesa-glu-dev conflicts/replaces non-pseudo versions of xlibmesa-dev - update xlibmesa-glu-dev's description to refer to itself correctly - add xlibmesa3, xlibmesa3-dbg, and xlibmesa-dev pseudopackages (merged from trunk and updated) to smooth upgrades from woody Modified: branches/4.3.0/sid/debian/control ============================================================================== --- branches/4.3.0/sid/debian/control 2003-08-01 22:49:40 UTC (rev 357) +++ branches/4.3.0/sid/debian/control 2003-08-02 19:39:50 UTC (rev 358) @@ -529,8 +529,10 @@ Internet hosts will be allowed inbound access to local X servers. Package: xlibmesa-dri -Architecture: any +Architecture: alpha i386 ia64 powerpc sparc Depends: xlibmesa-gl +Conflicts: xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl +Replaces: xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl Description: Mesa 3D graphics library modules [XFree86] Chipset-specific DRI modules for the Mesa library, if available for your machine architecture, are provided in this package. (Unlike the modules in @@ -540,21 +542,22 @@ Package: xlibmesa-drm-src Architecture: all Suggests: kernel-source-2.4 -Description: XFree86 4.3 DRM kernel module source snapshot - This package contains a source archive for DRI kernel modules. DRI is - the Direct Rendering Infrastructure, a framework for allowing direct access - to graphics hardware in a safe and efficient manner. The source code in this - package enables the compilation of kernel-side direct rendering modules which - correspond to the DRI implementation in XFree86 4.3. +Description: XFree86 4.3 DRM Linux kernel module source snapshot + This package contains a source archive for Linux kernel direct rendering + modules (DRM), which are the kernel side of DRI. DRI is the Direct Rendering + Infrastructure, a framework for allowing direct access to graphics hardware + in a safe and efficient manner. The source code in this package enables the + compilation of kernel-side direct rendering modules which correspond to the + DRI implementation in XFree86 4.3. Package: xlibmesa-gl Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: xlibmesa-dri -Conflicts: libgl1 +Conflicts: libgl1, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl Provides: libgl1 -Replaces: mesag3, xlibmesa3, xlibmesa3-gl +Replaces: mesag3, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl Description: Mesa 3D graphics library [XFree86] Mesa is a 3D graphics library which presents an API intended to be compatible with OpenGL. XFree86 maintains its own version of the Mesa library (which is @@ -571,8 +574,8 @@ Priority: extra Architecture: any Depends: xlibmesa-gl (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: xlibmesa3-dbg -Replaces: xlibmesa3-dbg +Conflicts: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-gl-dbg +Replaces: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-gl-dbg Description: Mesa 3D graphics library (unstripped) [XFree86] This package is useful to provide a backtrace with symbol names in a debugger; this facilitates interpretation of core dumps, and aids in finding @@ -588,20 +591,20 @@ Section: libdevel Architecture: any Depends: xlibmesa-gl, xlibs-dev, libc6-dev | libc-dev -Conflicts: libgl-dev +Conflicts: libgl-dev, xlibmesa-dev (<< 4.2.1-5) Provides: libgl-dev -Replaces: mesag-dev, xlibmesa-dev +Replaces: mesag-dev, xlibmesa-dev (<< 4.2.1-5) Description: Mesa 3D graphics library development files [XFree86] - xlibmesa-dev provides static versions of the libraries provided in + xlibmesa-gl-dev provides static versions of the libraries provided in xlibmesa-gl, as well as header files and manual pages. Package: xlibmesa-glu Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libglu1 +Conflicts: libglu1, xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu Provides: libglu1 -Replaces: mesag3 (<< 5.0.0-1), xlibmesa3 +Replaces: mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu Description: Mesa OpenGL utility library [XFree86] The OpenGL utility library (GLU) offers simple interfaces for building mipmaps; checking for the presence of extensions in the OpenGL (or other @@ -620,8 +623,8 @@ Priority: extra Architecture: any Depends: xlibmesa-gl (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: xlibmesa3-dbg -Replaces: xlibmesa3-dbg +Conflicts: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg +Replaces: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg Description: Mesa OpenGL utility library (unstripped) [XFree86] This package is useful to provide a backtrace with symbol names in a debugger; this facilitates interpretation of core dumps, and aids in finding @@ -637,11 +640,11 @@ Section: libdevel Architecture: any Depends: xlibmesa-glu, xlibmesa-gl-dev | libgl-dev, libstdc++5-dev | libstdc++-dev, libc6-dev | libc-dev -Conflicts: libglu-dev +Conflicts: libglu-dev, xlibmesa-dev (<< 4.2.1-5) Provides: libglu-dev -Replaces: mesag-dev (>> 5.0.0-1), xlibmesa-dev +Replaces: mesag-dev (>> 5.0.0-1), xlibmesa-dev (<< 4.2.1-5) Description: Mesa OpenGL utility library development files [XFree86] - xlibmesa-dev provides static versions of the libraries provided in + xlibmesa-glu-dev provides static versions of the libraries provided in xlibmesa-glu, as well as header files and manual pages. Package: xlibosmesa4 @@ -1148,3 +1151,37 @@ popular accessory programs. . The development and debugging libraries are not provided by this metapackage. + +Package: xlibmesa3 +Section: oldlibs +Architecture: all +Depends: ${F:Xlibmesa-gl-Special-Depends}xlibmesa-gl, xlibmesa-glu +Description: XFree86 Mesa libraries pseudopackage + This package smooths upgrades from Debian 3.0 by depending on xlibmesa-gl and + xlibmesa-glu. This pseudopackage is only depended upon by packages that + haven't yet been compiled against the newer Mesa libraries provided by + XFree86. + . + 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: XFree86 Mesa unstripped libraries pseudopackage + This package smooths upgrades from Debian 3.0 by depending on + xlibmesa-gl-dbg and xlibmesa-glu-dbg. This pseudopackage 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: XFree86 Mesa development libraries pseudopackage + This package smooths upgrades from Debian 3.0 by depending on xlibmesa-gl-dev + and xlibmesa-glu-dev. This pseudopackage is only depended upon by packages + that haven't yet corrected their dependencies to reflect the new library + arrangement. Modified: branches/4.3.0/sid/debian/rules ============================================================================== --- branches/4.3.0/sid/debian/rules 2003-08-01 22:49:40 UTC (rev 357) +++ branches/4.3.0/sid/debian/rules 2003-08-02 19:39:50 UTC (rev 358) @@ -436,7 +436,7 @@ # xlibs needs to be given a special shlibs file so that dpkg-shlibdeps # doesn't try to make it depend on itself DH_OPTIONS= dh_shlibdeps -l$(DEBTREEDIR)/usr/X11R6/lib -pxlibs --exclude=libxrx.so -- -Ldebian/xlibs.shlibs.dummy - dh_gencontrol -- -VF:XWSC-Special-Depends=$(XWSC_SPECIAL_DEPENDS) + dh_gencontrol -- -VF:XWSC-Special-Depends=$(XWSC_SPECIAL_DEPENDS) -VF:Xlibmesa-gl-Special-Depends=$(XLIBMESA_GL_SPECIAL_DEPENDS) dh_md5sums dh_builddeb touch $@ @@ -457,6 +457,7 @@ @echo '$$(BUILD_ARCH)' is \"$(BUILD_ARCH)\" @echo '$$(CURDIR)' is \"$(CURDIR)\" @echo '$$(XWSC_SPECIAL_DEPENDS)' is \"$(XWSC_SPECIAL_DEPENDS)\" + @echo '$$(XLIBMESA_GL_SPECIAL_DEPENDS)' is \"$(XLIBMESA_GL_SPECIAL_DEPENDS)\" ifdef NOT_BUILDING_X_SERVER @echo '*** This architecture does not build any X server packages.' else Modified: branches/4.3.0/sid/debian/scripts/vars.alpha ============================================================================== --- branches/4.3.0/sid/debian/scripts/vars.alpha 2003-08-01 22:49:40 UTC (rev 357) +++ branches/4.3.0/sid/debian/scripts/vars.alpha 2003-08-02 19:39:50 UTC (rev 358) @@ -2,4 +2,5 @@ # # This file gets included by both debian/rules (make) AND the scripts in # debian/scripts (Bourne shell). -XWSC_SPECIAL_DEPENDS="xserver-xfree86, " +XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, " +XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, " Modified: branches/4.3.0/sid/debian/scripts/vars.i386 ============================================================================== --- branches/4.3.0/sid/debian/scripts/vars.i386 2003-08-01 22:49:40 UTC (rev 357) +++ branches/4.3.0/sid/debian/scripts/vars.i386 2003-08-02 19:39:50 UTC (rev 358) @@ -2,4 +2,5 @@ # # This file gets included by both debian/rules (make) AND the scripts in # debian/scripts (Bourne shell). -XWSC_SPECIAL_DEPENDS="xserver-xfree86, " +XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, " +XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, " Modified: branches/4.3.0/sid/debian/scripts/vars.ia64 ============================================================================== --- branches/4.3.0/sid/debian/scripts/vars.ia64 2003-08-01 22:49:40 UTC (rev 357) +++ branches/4.3.0/sid/debian/scripts/vars.ia64 2003-08-02 19:39:50 UTC (rev 358) @@ -2,4 +2,5 @@ # # This file gets included by both debian/rules (make) AND the scripts in # debian/scripts (Bourne shell). -XWSC_SPECIAL_DEPENDS="xserver-xfree86, " +XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, " +XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, " Modified: branches/4.3.0/sid/debian/scripts/vars.powerpc ============================================================================== --- branches/4.3.0/sid/debian/scripts/vars.powerpc 2003-08-01 22:49:40 UTC (rev 357) +++ branches/4.3.0/sid/debian/scripts/vars.powerpc 2003-08-02 19:39:50 UTC (rev 358) @@ -2,4 +2,5 @@ # # This file gets included by both debian/rules (make) AND the scripts in # debian/scripts (Bourne shell). -XWSC_SPECIAL_DEPENDS="xserver-xfree86, " +XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, " +XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, " Modified: branches/4.3.0/sid/debian/scripts/vars.sparc ============================================================================== --- branches/4.3.0/sid/debian/scripts/vars.sparc 2003-08-01 22:49:40 UTC (rev 357) +++ branches/4.3.0/sid/debian/scripts/vars.sparc 2003-08-02 19:39:50 UTC (rev 358) @@ -2,4 +2,5 @@ # # This file gets included by both debian/rules (make) AND the scripts in # debian/scripts (Bourne shell). -XWSC_SPECIAL_DEPENDS="xserver-xfree86, " +XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, " +XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, "