xserver-xorg-video-glint: Changes to 'debian-unstable'
.cvsignore | 19
.gitignore | 20
ChangeLog | 509 ++++++++++++--
DRI.txt | 407 -----------
Makefile.in | 31
aclocal.m4 | 265 ++++---
config.guess | 60 +
config.sub | 66 +
configure | 979 +++++++++++++++++++++------
configure.ac | 15
debian/changelog | 18
debian/compat | 2
debian/control | 8
debian/patches/02_implicit_declarations.diff | 40 -
debian/patches/03_gen_pci_ids.diff | 14
debian/patches/series | 1
debian/prune/non-free | 1
debian/rules | 2
debian/xsfbs/xsfbs-autoreconf.mk | 150 ----
debian/xsfbs/xsfbs.mk | 102 --
debian/xsfbs/xsfbs.sh | 394 +++++-----
depcomp | 93 ++
install-sh | 514 +++++++++-----
ltmain.sh | 277 +++++--
man/.cvsignore | 2
man/.gitignore | 2
man/Makefile.am | 1
man/Makefile.in | 9
missing | 61 -
mkinstalldirs | 5
src/.cvsignore | 6
src/.gitignore | 6
src/Makefile.am | 1
src/Makefile.in | 52 -
src/glint.h | 17
src/glint_dri.c | 11
src/glint_driver.c | 166 ++--
src/glint_regs.h | 42 -
src/glintpcirename.h | 122 +++
src/pm2_video.c | 16
src/pm3_dac.c | 24
src/tx_dac.c | 6
42 files changed, 2783 insertions(+), 1753 deletions(-)
New commits:
commit 5754a053ffce85dcdafab84d6c5af1a9bb143005
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 20:50:22 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 35dd54c..3b9a98b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-glint (1:1.2.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-glint (1:1.2.0-1) unstable; urgency=low
[ Brice Goglin ]
* Add upstream URL to debian/copyright.
@@ -16,7 +16,7 @@ xserver-xorg-video-glint (1:1.2.0-1) UNRELEASED; urgency=low
dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
dpkg-dev >= 1.14.17.
- -- Brice Goglin <bgoglin@debian.org> Sat, 15 Sep 2007 01:52:59 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2008 20:50:12 +0200
xserver-xorg-video-glint (1:1.1.1-8) unstable; urgency=low
commit 2e768196ae2cdcccb16114340438154914a87a04
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 17:24:07 2008 +0200
Run dpkg-shlibdeps with --warnings=6.
Drivers reference symbols from /usr/bin/Xorg and other modules,
and that's not a bug, so we want dpkg-shlibdeps to shut up about
symbols it can't find. Build-depend on dpkg-dev >= 1.14.17.
diff --git a/debian/changelog b/debian/changelog
index cf64427..35dd54c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ xserver-xorg-video-glint (1:1.2.0-1) UNRELEASED; urgency=low
* Drop the XS- prefix from Vcs-* control fields.
* Bump debhelper compat level to 5.
* Remove non-free DRI.txt file (only verbatim copies are allowed).
+ * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
+ /usr/bin/Xorg and other modules, and that's not a bug, so we want
+ dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
+ dpkg-dev >= 1.14.17.
-- Brice Goglin <bgoglin@debian.org> Sat, 15 Sep 2007 01:52:59 +0200
diff --git a/debian/control b/debian/control
index 27a58a3..f095cc6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, libgl1-mesa-dev | libgl-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, libgl1-mesa-dev | libgl-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev, dpkg-dev (>= 1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glint
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glint.git
diff --git a/debian/rules b/debian/rules
index 96ace05..ca36fd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps
+ dh_shlibdeps -- --warnings=6
dh_gencontrol
dh_md5sums
dh_builddeb
commit 7ae6469b92eb0952e65953dbfcf96fbb560a211a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 17:19:34 2008 +0200
Remove non-free DRI.txt file (only verbatim copies are allowed).
diff --git a/DRI.txt b/DRI.txt
deleted file mode 100644
index 5bac4f3..0000000
--- a/DRI.txt
+++ /dev/null
@@ -1,407 +0,0 @@
-
- GLINT State Transition Strategy
-
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is granted to make and distribute verbatim copies
-of this document provided the copyright notice and this permission
-notice are preserved on all copies.
-
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.2 2000/02/23 04:47:06 martin Exp $
-
-GLINT State Transition Strategy
-
-Direct Rendering requires a coordinated method of state management
-across all drivers accessing this device. This document defines the
-expected behavior of all drivers participating in direct rendering with
-this device.
-
-Currently only the GMX2000 supports direct rendering.
-
-
-Section 1) State Transition Types
-
-The direct rendering document entitled "state-mgmt.txt" gives a device
-independent overview on the different types of state transitions. This
-section gives a more detailed description of GLINT specific hardware state.
-
-No context switch--no state saves or restores will be done for transitions,
-however the device can be busy executing commands from previous accesses to
-the device.
-
-X context switch--the intersection of 2D and 3D state will be saved
-and restored. This is the state marked as DDX/3DClient in Appendix A.
-The device will be synced and idle after this switch.
-
-3D context switch--all 3D state will be saved and restored. 3D state is
-defined as all registered owned by the 3DClient driver. See Appendix A
-for more details. The device will be synced and idle after this switch.
-
-The registers owned by the DRM kernel module and submodules are not
-managed by context switches.
-
-
-Section 2) VT Switching and DGA Access
-
-VT Switching away from the X Server or client access to the device
-framebuffer via DGA require the device to be locked away from 3D direct
-rendering accesses. The X Server will hold the lock on behalf of these
-services until access is restored.
-
-
-Section 3) Potential Optimizations
-
-Lighten the number of registers required for context switches by using a
-mechanism to determine whether stipple or pattern registers need to be
-saved/restored. This optimization has not been done for the initial
-direct rendering infrastructure sample implementation.
-
-
-Appendix A: GMX2000 Register Ownership
-
-driver column contains:
- DDX - DDX driver manages register
- DRM - DRM or DRM subdriver manages register
- 3DClient - 3D Client Driver manges register
- DDX/3DClient, DDX/DRM, 3DClient/DRM - register access is shared
-
-if the RO (read only) column is marked with a *, then no writes are
-permitted to this register, and thus no drivers own it.
-
-primary and secondary columns contain the default values after
-initialization. primary is the master rasterizer, secondary is the
-slave rasterizer.
-
-
-Name offset primary secondary RO driver
-------------------------------------------------------------------------------
-ResetStatus o=0000 0x00000000 0x00000000 DDX/DRM
-IntEnable o=0008 0x00000000 0x00000000 DRM
-IntFlags o=0010 0x00000000 0x00000018 DRM
-InFIFOSpace o=0018 0x00000000 0x00000021 *
-OutFIFOWords o=0020 0x00000000 0x00000000 *
-DMAAddress o=0028 0x00000000 0x00000000 DRM
-DMACount o=0030 0x00000000 0x00000000 DRM
-ErrorFlags o=0038 0x00000000 0x00000002 DRM
-VClkCtl o=0040 0x00000000 0x00000000 DDX
-TestRegister o=0048 0x00000000 0x00000000 DDX
-Aperture0 o=0050 0x00000000 0x00000000 DDX
-Aperture1 o=0058 0x00000000 0x00000000 DDX
-DMAControl o=0060 0x00000000 0x00000000 DRM
-FIFODis o=0068 0x00000000 0x00000001 DDX
-LBMemoryCtl o=1000 0x00000000 0x770883ff DDX
-LBMemoryEDO o=1008 0x00000000 0x77080000 DDX
-FBMemoryCtl o=1800 0x00000000 0x63c00800 DDX
-FBModeSel o=1808 0x00000000 0x00000907 DDX
-FBGCWrMask o=1810 0x00000000 0xffffffff *
-FBGCColorLower o=1818 0x00000000 0x00828282 *
-FBTXMemCtl o=1820 0x00000000 0x00000002 DDX
-FBWrMask o=1830 0x00000000 0xffffffff *
-FBGCColorUpper o=1838 0x00000000 0x00828282 *
-VTGHLimit o=3000 0x00000000 0x000000c8 DDX
-VTGHSyncStart o=3008 0x00ffffff 0x00000006 DDX
-VTGHSyncEnd o=3010 0x00000000 0x00000016 DDX
-VTGHBlankEnd o=3018 0x00ffffff 0x00000028 DDX
-VTGVLimit o=3020 0x00000000 0x000001fb DDX
-VTGVSyncStart o=3028 0x00ffffff 0x00000004 DDX
-VTGVSyncEnd o=3030 0x00000000 0x0000000a DDX
-VTGVBlankEnd o=3038 0x00ffffff 0x0000001b DDX
-VTGHGateStart o=3040 0x00000000 0x00000027 DDX
-VTGHGateEnd o=3048 0x00ffffff 0x000000c7 DDX
-VTGVGateStart o=3050 0x00000000 0x0000001a DDX
-VTGVGateEnd o=3058 0x00ffffff 0x0000001b DDX
-VTGPolarity o=3060 0x00000000 0x000000ba DDX
-VTGFrameRowAddr o=3068 0x00ffffff 0x00000000 DDX
-VTGVLineNumber o=3070 0x00000000 0x00000079 DDX
-VTGSerialClk o=3078 0x00ffffff 0x00000002 DDX
-VTGModeCtl o=3080 0x00000000 0x00000000 DDX
-GInFIFOSpace o=0018 0x00000000 *
-GDMAAddress o=0028 0x00000000 DRM
-GDMACount o=0030 0x00000000 DRM
-GDMAControl o=0060 0x00000000 DRM
-GOutDMA o=0080 0x00000000 DRM
-GOutDMACount o=0088 0x00000000 DRM
-GResetStatus o=0800 0x00000000 DRM
-GIntEnable o=0808 0x00000000 DRM
-GIntFlags o=0810 0x00000000 DRM
-GErrorFlags o=0838 0x00000000 DRM
-GTestRegister o=0848 0x00000000 DDX
-GFIFODis o=0868 0x00000000 DDX
-GChipConfig o=0870 0x00000000 DDX
-GCSRAperture o=0878 0x00000000 DDX
-GPageTableAddr o=0c00 0x00000000 DRM
-GPageTableLength o=0c08 0x00000000 DRM
-GDelayTimer o=0c38 0x00000000 DRM
-GCommandMode o=0c40 0x00000000 DRM
-GCommandIntEnable o=0c48 0x00000000 DRM
-GCommandIntFlags o=0c50 0x00000000 DRM
-GCommandErrorFlags o=0c58 0x00000000 DRM
-GCommandStatus o=0c60 0x00000000 *
-GCommandFaultingAddr o=0c68 0x00000000 *
-GVertexFaultingAddr o=0c70 0x00000000 *
-GWriteFaultingAddr o=0c88 0x00000000 *
-GFeedbackSelectCount o=0c98 0x00000000 *
-GGammaProcessorMode o=0cb8 0x00000000 DDX
-GVGAShadow o=0d00 0x00000000 DDX
-GMultGLINTAperture o=0d08 0x00000000 DDX
-GMultGLINT1 o=0d10 0x00000000 DDX
-GMultGLINT2 o=0d18 0x00000000 DDX
-StartXDom t=0000 undefined undefined DDX/3DClient
-dXDom t=0001 undefined undefined DDX/3DClient
-StartXSub t=0002 undefined undefined DDX/3DClient
-dXSub t=0003 undefined undefined DDX/3DClient
-StartY t=0004 undefined undefined DDX/3DClient
-dY t=0005 undefined undefined DDX/3DClient
-GLINTCount t=0006 undefined undefined DDX/3DClient
-PointTable0 t=0010 undefined undefined DDX/3DClient
-PointTable1 t=0011 undefined undefined DDX/3DClient
-PointTable2 t=0012 undefined undefined DDX/3DClient
-PointTable3 t=0013 undefined undefined DDX/3DClient
-RasterizerMode t=0014 undefined undefined DDX/3DClient
-YLimits t=0015 undefined undefined DDX/3DClient
-ScanLineOwnership t=0016 0x00000001 0x00000005 DDX
-PixelSize t=0018 undefined undefined DDX/3DClient
-ScissorMode t=0030 undefined undefined DDX/3DClient
-ScissorMinXY t=0031 undefined undefined DDX/3DClient
-ScissorMaxXY t=0032 undefined undefined DDX/3DClient
-ScreenSize t=0033 undefined undefined DDX/3DClient
-AreaStippleMode t=0034 undefined undefined DDX/3DClient
-LineStippleMode t=0035 undefined undefined DDX/3DClient
-LoadLineStippleCounters t=0036 undefined undefined DDX/3DClient
-WindowOrigin t=0039 undefined undefined DDX/3DClient
-AreaStipplePattern0 t=0040 undefined undefined DDX/3DClient
-AreaStipplePattern1 t=0041 undefined undefined DDX/3DClient
-AreaStipplePattern2 t=0042 undefined undefined DDX/3DClient
-AreaStipplePattern3 t=0043 undefined undefined DDX/3DClient
-AreaStipplePattern4 t=0044 undefined undefined DDX/3DClient
-AreaStipplePattern5 t=0045 undefined undefined DDX/3DClient
-AreaStipplePattern6 t=0046 undefined undefined DDX/3DClient
-AreaStipplePattern7 t=0047 undefined undefined DDX/3DClient
-AreaStipplePattern8 t=0048 undefined undefined DDX/3DClient
-AreaStipplePattern9 t=0049 undefined undefined DDX/3DClient
-AreaStipplePattern10 t=004a undefined undefined DDX/3DClient
-AreaStipplePattern11 t=004b undefined undefined DDX/3DClient
-AreaStipplePattern12 t=004c undefined undefined DDX/3DClient
-AreaStipplePattern13 t=004d undefined undefined DDX/3DClient
-AreaStipplePattern14 t=004e undefined undefined DDX/3DClient
-AreaStipplePattern15 t=004f undefined undefined DDX/3DClient
-AreaStipplePattern16 t=0050 undefined undefined DDX/3DClient
-AreaStipplePattern17 t=0051 undefined undefined DDX/3DClient
-AreaStipplePattern18 t=0052 undefined undefined DDX/3DClient
-AreaStipplePattern19 t=0053 undefined undefined DDX/3DClient
-AreaStipplePattern20 t=0054 undefined undefined DDX/3DClient
-AreaStipplePattern21 t=0055 undefined undefined DDX/3DClient
-AreaStipplePattern22 t=0056 undefined undefined DDX/3DClient
-AreaStipplePattern23 t=0057 undefined undefined DDX/3DClient
-AreaStipplePattern24 t=0058 undefined undefined DDX/3DClient
-AreaStipplePattern25 t=0059 undefined undefined DDX/3DClient
-AreaStipplePattern26 t=005a undefined undefined DDX/3DClient
-AreaStipplePattern27 t=005b undefined undefined DDX/3DClient
-AreaStipplePattern28 t=005c undefined undefined DDX/3DClient
-AreaStipplePattern29 t=005d undefined undefined DDX/3DClient
-AreaStipplePattern30 t=005e undefined undefined DDX/3DClient
-AreaStipplePattern31 t=005f undefined undefined DDX/3DClient
-RouterMode t=0108 undefined undefined DDX/3DClient
-TextureAddressMode t=0070 undefined undefined DDX/3DClient
-SStart t=0071 undefined undefined 3DClient
-dSdx t=0072 undefined undefined 3DClient
-dSdyDom t=0073 undefined undefined 3DClient
-TStart t=0074 undefined undefined 3DClient
-dTdx t=0075 undefined undefined 3DClient
-dTdyDom t=0076 undefined undefined 3DClient
-QStart t=0077 undefined undefined 3DClient
-dQdx t=0078 undefined undefined 3DClient
-dQdyDom t=0079 undefined undefined 3DClient
-LOD t=007a undefined undefined 3DClient
-dSdy t=007b undefined undefined 3DClient
-dTdy t=007c undefined undefined 3DClient
-dQdy t=007d undefined undefined 3DClient
-TextureReadMode t=0090 undefined undefined DDX/3DClient
-TextureFormat t=0091 undefined undefined 3DClient
-TextureCacheControl t=0092 undefined undefined 3DClient
-GLINTBorderColor t=0095 undefined undefined 3DClient
-TexelLUTIndex t=0098 undefined undefined 3DClient
-TexelLUTData t=0099 undefined undefined 3DClient
-TexelLUTAddress t=009a undefined undefined 3DClient
-TexelLUTTransfer t=009b undefined undefined 3DClient
-TextureFilterMode t=009c undefined undefined 3DClient
-TextureChromaUpper t=009d undefined undefined 3DClient
-TextureChromaLower t=009e undefined undefined 3DClient
-TxBaseAddr0 t=00a0 undefined undefined 3DClient
-TxBaseAddr1 t=00a1 undefined undefined 3DClient
-TxBaseAddr2 t=00a2 undefined undefined 3DClient
-TxBaseAddr3 t=00a3 undefined undefined 3DClient
-TxBaseAddr4 t=00a4 undefined undefined 3DClient
-TxBaseAddr5 t=00a5 undefined undefined 3DClient
-TxBaseAddr6 t=00a6 undefined undefined 3DClient
-TxBaseAddr7 t=00a7 undefined undefined 3DClient
-TxBaseAddr8 t=00a8 undefined undefined 3DClient
-TxBaseAddr9 t=00a9 undefined undefined 3DClient
-TxBaseAddr10 t=00aa undefined undefined 3DClient
-TxBaseAddr11 t=00ab undefined undefined 3DClient
-TexelLUT0 t=01d0 undefined undefined 3DClient
-TexelLUT1 t=01d1 undefined undefined 3DClient
-TexelLUT2 t=01d2 undefined undefined 3DClient
-TexelLUT3 t=01d3 undefined undefined 3DClient
-TexelLUT4 t=01d4 undefined undefined 3DClient
-TexelLUT5 t=01d5 undefined undefined 3DClient
-TexelLUT6 t=01d6 undefined undefined 3DClient
-TexelLUT7 t=01d7 undefined undefined 3DClient
-TexelLUT8 t=01d8 undefined undefined 3DClient
-TexelLUT9 t=01d9 undefined undefined 3DClient
-TexelLUT10 t=01da undefined undefined 3DClient
-TexelLUT11 t=01db undefined undefined 3DClient
-TexelLUT12 t=01dc undefined undefined 3DClient
-TexelLUT13 t=01dd undefined undefined 3DClient
-TexelLUT14 t=01de undefined undefined 3DClient
-TexelLUT15 t=01df undefined undefined 3DClient
-Texel0 t=00c0 undefined undefined 3DClient
-Texel1 t=00c1 undefined undefined 3DClient
-Texel2 t=00c2 undefined undefined 3DClient
-Texel3 t=00c3 undefined undefined 3DClient
-Texel4 t=00c4 undefined undefined 3DClient
-Texel5 t=00c5 undefined undefined 3DClient
-Texel6 t=00c6 undefined undefined 3DClient
-Texel7 t=00c7 undefined undefined 3DClient
-Interp0 t=00c8 undefined undefined 3DClient
-Interp1 t=00c9 undefined undefined 3DClient
-Interp2 t=00ca undefined undefined 3DClient
-Interp3 t=00cb undefined undefined 3DClient
-Interp4 t=00cc undefined undefined 3DClient
-TextureFilter t=00cd undefined undefined 3DClient
-TextureColorMode t=00d0 undefined undefined DDX/3DClient
-TextureEnvColor t=00d1 undefined undefined 3DClient
-FogMode t=00d2 undefined undefined DDX/3DClient
-FogColor t=00d3 undefined undefined 3DClient
-FStart t=00d4 undefined undefined 3DClient
-dFdx t=00d5 undefined undefined 3DClient
-dFdyDom t=00d6 undefined undefined 3DClient
-KsStart t=00d9 undefined undefined 3DClient
-dKsdx t=00da undefined undefined 3DClient
-dKsdyDom t=00db undefined undefined 3DClient
-KdStart t=00dc undefined undefined 3DClient
-dKdStart t=00dd undefined undefined 3DClient
-dKddyDom t=00de undefined undefined 3DClient
-RStart t=00f0 undefined undefined 3DClient
-dRdx t=00f1 undefined undefined 3DClient
-dRdyDom t=00f2 undefined undefined 3DClient
-GStart t=00f3 undefined undefined 3DClient
-dGdx t=00f4 undefined undefined 3DClient
-dGdyDom t=00f5 undefined undefined 3DClient
-BStart t=00f6 undefined undefined 3DClient
-dBdx t=00f7 undefined undefined 3DClient
-dBdyDom t=00f8 undefined undefined 3DClient
-AStart t=00f9 undefined undefined 3DClient
-dAdx t=00fa undefined undefined 3DClient
-dAdyDom t=00fb undefined undefined 3DClient
-ColorDDAMode t=00fc undefined undefined DDX/3DClient
-ConstantColor t=00fd undefined undefined 3DClient
-GLINTColor t=00fe undefined undefined DDX/3DClient
-AlphaTestMode t=0100 undefined undefined DDX/3DClient
-AntialiasMode t=0101 undefined undefined DDX/3DClient
-AlphaBlendMode t=0102 undefined undefined DDX/3DClient
-ChromaUpper t=01e1 undefined undefined 3DClient
-ChromaLower t=01e2 undefined undefined 3DClient
-ChromaTestMode t=01e3 undefined undefined 3DClient
-DitherMode t=0103 undefined undefined DDX/3DClient
-FBSoftwareWriteMask t=0104 undefined undefined DDX/3DClient
-LogicalOpMode t=0105 undefined undefined DDX/3DClient
-FBWriteData t=0106 undefined undefined DDX/3DClient
-LBReadMode t=0110 undefined undefined DDX/3DClient
- Partial Product bit 0-5 need by 3DClient
-LBReadFormat t=0111 set by DDX set by DDX DDX
-LBSourceOffset t=0112 undefined undefined DDX/3DClient
-LBStencil t=0115 undefined undefined *
-LBDepth t=0116 undefined undefined *
-LBWindowBase t=0117 undefined undefined DDX/3DClient
-LBWriteMode t=0118 undefined undefined DDX/3DClient
-LBWriteFormat t=0119 set by DDX set by DDX DDX
-TextureDownloadOffset t=011e undefined undefined DDX/3DClient
-LBWindowOffset t=011f undefined undefined DDX/3DClient
-GLINTWindow t=0130 undefined undefined DDX/3DClient
-StencilMode t=0131 undefined undefined DDX/3DClient
-StencilData t=0132 undefined undefined 3DClient
-GLINTStencil t=0133 undefined undefined 3DClient
-DepthMode t=0134 undefined undefined DDX/3DClient
-GLINTDepth t=0135 undefined undefined DDX/3DClient
-ZStartU t=0136 undefined undefined 3DClient
-ZStartL t=0137 undefined undefined 3DClient
-dZdxU t=0138 undefined undefined 3DClient
-dZdxL t=0139 undefined undefined 3DClient
-dZdyDomU t=013a undefined undefined 3DClient
-dZdyDomL t=013b undefined undefined 3DClient
-FastClearDepth t=013c undefined undefined 3DClient
-FBReadMode t=0150 set by DDX set by DDX DDX/3DClient
- Partial Product bit 0-5 need by 3DClient
-LBReadFormat t=0111 set by DDX set by DDX DDX
-FBSourceOffset t=0151 undefined undefined DDX/3DClient
-FBPixelOffset t=0152 undefined undefined DDX/3DClient
-FBWindowBase t=0156 undefined undefined DDX/3DClient
-FBWriteMode t=0157 undefined undefined DDX/3DClient
-FBHardwareWriteMask t=0158 undefined undefined DDX/3DClient
-FBBlockColor t=0159 undefined undefined DDX/3DClient
-PatternRamMode t=015f undefined undefined DDX/3DClient
-PatternRamData0 t=0160 undefined undefined DDX/3DClient
-PatternRamData1 t=0161 undefined undefined DDX/3DClient
-PatternRamData2 t=0162 undefined undefined DDX/3DClient
-PatternRamData3 t=0163 undefined undefined DDX/3DClient
-PatternRamData4 t=0164 undefined undefined DDX/3DClient
-PatternRamData5 t=0165 undefined undefined DDX/3DClient
-PatternRamData6 t=0166 undefined undefined DDX/3DClient
-PatternRamData7 t=0167 undefined undefined DDX/3DClient
-PatternRamData8 t=0168 undefined undefined DDX/3DClient
-PatternRamData9 t=0169 undefined undefined DDX/3DClient
-PatternRamData10 t=016a undefined undefined DDX/3DClient
-PatternRamData11 t=016b undefined undefined DDX/3DClient
-PatternRamData12 t=016c undefined undefined DDX/3DClient
-PatternRamData13 t=016d undefined undefined DDX/3DClient
-PatternRamData14 t=016e undefined undefined DDX/3DClient
-PatternRamData15 t=016f undefined undefined DDX/3DClient
-PatternRamData16 t=0170 undefined undefined DDX/3DClient
-PatternRamData17 t=0171 undefined undefined DDX/3DClient
-PatternRamData18 t=0172 undefined undefined DDX/3DClient
-PatternRamData19 t=0173 undefined undefined DDX/3DClient
-PatternRamData20 t=0174 undefined undefined DDX/3DClient
-PatternRamData21 t=0175 undefined undefined DDX/3DClient
-PatternRamData22 t=0176 undefined undefined DDX/3DClient
-PatternRamData23 t=0177 undefined undefined DDX/3DClient
-PatternRamData24 t=0178 undefined undefined DDX/3DClient
-PatternRamData25 t=0179 undefined undefined DDX/3DClient
-PatternRamData26 t=017a undefined undefined DDX/3DClient
-PatternRamData27 t=017b undefined undefined DDX/3DClient
-PatternRamData28 t=017c undefined undefined DDX/3DClient
-PatternRamData29 t=017d undefined undefined DDX/3DClient
-PatternRamData30 t=017e undefined undefined DDX/3DClient
-PatternRamData31 t=017f undefined undefined DDX/3DClient
-FBBlockColorU t=018d undefined undefined DDX/3DClient
-FBBlockColorL t=018e undefined undefined DDX/3DClient
-FilterMode t=0180 undefined undefined DDX/3DClient
-StatisticMode t=0181 undefined undefined DDX/3DClient
-MinRegion t=0182 undefined undefined 3DClient
-MaxRegion t=0183 undefined undefined 3DClient
-KsRStart t=0190 undefined undefined 3DClient
-dKsRdx t=0191 undefined undefined 3DClient
-dKsRdyDom t=0192 undefined undefined 3DClient
-KsGStart t=0193 undefined undefined 3DClient
-dKsGdx t=0194 undefined undefined 3DClient
-dKsGdyDom t=0195 undefined undefined 3DClient
-KsBStart t=0196 undefined undefined 3DClient
-dKsBdx t=0197 undefined undefined 3DClient
-dKsBdyDom t=0198 undefined undefined 3DClient
-KdRStart t=01a0 undefined undefined 3DClient
-dKdRdx t=01a1 undefined undefined 3DClient
-dKdRdyDom t=01a2 undefined undefined 3DClient
-KdGStart t=01a3 undefined undefined 3DClient
-dKdGdx t=01a4 undefined undefined 3DClient
-dKdGdyDom t=01a5 undefined undefined 3DClient
-KdBStart t=01a6 undefined undefined 3DClient
-dKdBdx t=01a7 undefined undefined 3DClient
-dKdBdyDom t=01a8 undefined undefined 3DClient
-
-All Gamma State is undefined and owned by 3DClient driver except for:
-
-BroadcastMask o=026f 0x00000003 DDX/3DClient
-
-All TI RAMDAC State is owned by DDX driver.
diff --git a/debian/changelog b/debian/changelog
index c66d83c..cf64427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-glint (1:1.2.0-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
* Bump debhelper compat level to 5.
+ * Remove non-free DRI.txt file (only verbatim copies are allowed).
-- Brice Goglin <bgoglin@debian.org> Sat, 15 Sep 2007 01:52:59 +0200
diff --git a/debian/prune/non-free b/debian/prune/non-free
new file mode 100644
index 0000000..4921e3d
--- /dev/null
+++ b/debian/prune/non-free
@@ -0,0 +1 @@
+DRI.txt
commit 49d327f3180eb26f92a99a96bb44c55b1db758c7
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 17:18:07 2008 +0200
Bump debhelper compat level to 5.
diff --git a/debian/changelog b/debian/changelog
index bfb36ab..c66d83c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-glint (1:1.2.0-1) UNRELEASED; urgency=low
* Refresh 03_gen_pci_ids.diff.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
+ * Bump debhelper compat level to 5.
-- Brice Goglin <bgoglin@debian.org> Sat, 15 Sep 2007 01:52:59 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 91388f6..27a58a3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, libgl1-mesa-dev | libgl-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, libgl1-mesa-dev | libgl-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glint
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glint.git
commit a80ca82ba8d1c4b253c2af65fc84d9a05db6a153
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 17:15:49 2008 +0200
Revert to building against xserver 1.4
diff --git a/debian/changelog b/debian/changelog
index dfc3272..bfb36ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ xserver-xorg-video-glint (1:1.2.0-1) UNRELEASED; urgency=low
* New upstream release.
* Drop patch 02_implicit_declarations.diff, applied upstream.
* Refresh 03_gen_pci_ids.diff.
- * Build against xserver 1.5 rc1.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/control b/debian/control
index af525f6..91388f6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4.99.901), x11proto-gl-dev, x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, libgl1-mesa-dev | libgl-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev, libpciaccess-dev
+Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, libgl1-mesa-dev | libgl-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glint
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glint.git
commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat May 31 13:23:24 2008 +0200
Update xsfbs/quilt patching rules to be compatible with the
"3.0 (quilt)" source package.
Thanks to Raphael Hertzog.
See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index c11923f..b871b3b 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,10 +21,8 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
-# force quilt to not use ~/.quiltrc
-QUILT = quilt --quiltrc /dev/null
-# force QUILT_PATCHES to the default in case it is exported in the environment
-QUILT_PATCHES = patches/
+# force quilt to not use ~/.quiltrc and to use debian/patches
+QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
# Set up parameters for the upstream build environment.
@@ -121,19 +119,11 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/patches ]; then \
- mkdir $(STAMP_DIR)/patches; \
- ln -s $(STAMP_DIR)/patches .pc; \
- echo 2 >$(STAMP_DIR)/patches/.version; \
- fi; \
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ -e debian/patches ] && [ ! -e patches ]; then \
- ln -s debian/patches patches; \
- fi; \
>$@
# Apply all patches to the upstream source.
@@ -162,10 +152,10 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch:
+unpatch: $(STAMP_DIR)/prepare
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
- if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
+ if $(QUILT) applied >/dev/null 2>/dev/null; then \
if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
@@ -192,7 +182,7 @@ cleanscripts:
.PHONY: xsfclean
xsfclean: cleanscripts unpatch
dh_testdir
- rm -rf .pc patches
+ rm -rf .pc
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
commit dcf4204d5328834172df80951a18de014b0f74ef
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 30 12:26:18 2008 +0200
xsfbs.sh: use 'local' now that policy allows it
Policy 3.7.3 allows /bin/sh scripts to use 'local'.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 0c7607a..72efa95 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -238,19 +238,19 @@ analyze_path () {
# analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
# Thanks to Randolph Chung for this clever hack.
- #local f g
+ local f g
while [ -n "$1" ]; do
reject_whitespace "$1"
- _g=
+ g=
message "Analyzing $1:"
- for _f in $(echo "$1" | tr / \ ); do
- if [ -e /$_g$_f ]; then
- ls -dl /$_g$_f /$_g$_f.dpkg-* 2> /dev/null || true
- _g=$_g$_f/
+ for f in $(echo "$1" | tr / \ ); do
+ if [ -e /$g$f ]; then
+ ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
+ g=$g$f/
else
- message "/$_g$_f: nonexistent; directory contents of /$_g:"
- ls -l /$_g
+ message "/$g$f: nonexistent; directory contents of /$g:"
+ ls -l /$g
break
fi
done
@@ -259,27 +259,27 @@ analyze_path () {
}
find_culprits () {
- #local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- # msg
+ local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
+ msg
reject_whitespace "$1"
message "Searching for overlapping packages..."
- _dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $_dpkg_info_dir ]; then
- if [ "$(echo $_dpkg_info_dir/*.list)" != "$_dpkg_info_dir/*.list" ]; then
- _possible_culprits=$(ls -1 $_dpkg_info_dir/*.list | egrep -v \
+ dpkg_info_dir=/var/lib/dpkg/info
+ if [ -d $dpkg_info_dir ]; then
+ if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
+ possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
"(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$_possible_culprits" ]; then
- _smoking_guns=$(grep -l "$1" $_possible_culprits || true)
- if [ -n "$_smoking_guns" ]; then
- _bad_packages=$(printf "\\n")
- for f in $_smoking_guns; do
+ if [ -n "$possible_culprits" ]; then
+ smoking_guns=$(grep -l "$1" $possible_culprits || true)
+ if [ -n "$smoking_guns" ]; then
+ bad_packages=$(printf "\\n")
+ for f in $smoking_guns; do
# too bad you can't nest parameter expansion voodoo
p=${f%*.list} # strip off the trailing ".list"
- _package=${p##*/} # strip off the directories
- _bad_packages=$(printf "%s\n%s" "$_bad_packages" "$_package")
+ package=${p##*/} # strip off the directories
+ bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
done
- _msg=$(cat <<EOF
+ msg=$(cat <<EOF
The following packages appear to have file overlaps with the X.Org packages;
these packages are either very old, or in violation of Debian Policy. Try
upgrading each of these packages to the latest available version if possible:
@@ -291,17 +291,17 @@ Tracking System. You may want to refer the package maintainer to section 12.8
of the Debian Policy manual.
EOF
)
- message "$_msg"
- message "The overlapping packages are: $_bad_packages"
+ message "$msg"
+ message "The overlapping packages are: $bad_packages"
else
message "no overlaps found."
fi
fi
else
- message "cannot search; no matches for $_dpkg_info_dir/*.list."
+ message "cannot search; no matches for $dpkg_info_dir/*.list."
fi
else
- message "cannot search; $_dpkg_info_dir does not exist."
+ message "cannot search; $dpkg_info_dir does not exist."
fi
}
@@ -323,7 +323,7 @@ check_symlink () {
#
# Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
- #local symlink
+ local symlink
# validate arguments
if [ $# -ne 1 ]; then
@@ -332,9 +332,9 @@ check_symlink () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _symlink="$1"
+ symlink="$1"
- if [ "$(maplink "$_symlink")" = "$(readlink "$_symlink")" ]; then
+ if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then
return 0
else
return 1
@@ -349,7 +349,7 @@ check_symlinks_and_warn () {
# Call this function from a preinst script in the event $1 is "upgrade" or
# "install".
- #local errmsg symlink
+ local errmsg symlink
# validate arguments
if [ $# -lt 1 ]; then
@@ -359,25 +359,25 @@ check_symlinks_and_warn () {
fi
while [ -n "$1" ]; do
- _symlink="$1"
- if [ -L "$_symlink" ]; then
- if ! check_symlink "$_symlink"; then
- observe "$_symlink symbolic link points to wrong location" \
- "$(readlink "$_symlink"); removing"
- rm "$_symlink"
+ symlink="$1"
+ if [ -L "$symlink" ]; then
+ if ! check_symlink "$symlink"; then
+ observe "$symlink symbolic link points to wrong location" \
+ "$(readlink "$symlink"); removing"
+ rm "$symlink"
fi
- elif [ -e "$_symlink" ]; then
- _errmsg="$_symlink exists and is not a symbolic link; this package cannot"
- _errmsg="$_errmsg be installed until this"
- if [ -f "$_symlink" ]; then
- _errmsg="$_errmsg file"
- elif [ -d "$_symlink" ]; then
- _errmsg="$_errmsg directory"
+ elif [ -e "$symlink" ]; then
+ errmsg="$symlink exists and is not a symbolic link; this package cannot"
+ errmsg="$errmsg be installed until this"
+ if [ -f "$symlink" ]; then
+ errmsg="$errmsg file"
+ elif [ -d "$symlink" ]; then
+ errmsg="$errmsg directory"
else
- _errmsg="$_errmsg thing"
+ errmsg="$errmsg thing"
fi
- _errmsg="$_errmsg is removed"
- die "$_errmsg"
+ errmsg="$errmsg is removed"
+ die "$errmsg"
fi
shift
done
@@ -390,7 +390,7 @@ check_symlinks_and_bomb () {
#
# Call this function from a postinst script.
- #local problem symlink
+ local problem symlink
# validate arguments
if [ $# -lt 1 ]; then
@@ -400,24 +400,24 @@ check_symlinks_and_bomb () {
fi
while [ -n "$1" ]; do
- _problem=
- _symlink="$1"
- if [ -L "$_symlink" ]; then
- if ! check_symlink "$_symlink"; then
- _problem=yes
- warn "$_symlink symbolic link points to wrong location" \
- "$(readlink "$_symlink")"
+ problem=
+ symlink="$1"
+ if [ -L "$symlink" ]; then
+ if ! check_symlink "$symlink"; then
+ problem=yes
+ warn "$symlink symbolic link points to wrong location" \
+ "$(readlink "$symlink")"
fi
- elif [ -e "$_symlink" ]; then
- _problem=yes
- warn "$_symlink is not a symbolic link"
+ elif [ -e "$symlink" ]; then
+ problem=yes
+ warn "$symlink is not a symbolic link"
else
- _problem=yes
- warn "$_symlink symbolic link does not exist"
+ problem=yes
+ warn "$symlink symbolic link does not exist"
fi
- if [ -n "$_problem" ]; then
- analyze_path "$_symlink" "$(readlink "$_symlink")"
- find_culprits "$_symlink"
+ if [ -n "$problem" ]; then
+ analyze_path "$symlink" "$(readlink "$symlink")"
+ find_culprits "$symlink"
die "bad symbolic links on system"
fi
shift
@@ -427,9 +427,9 @@ check_symlinks_and_bomb () {
font_update () {
# run $UPDATECMDS in $FONTDIRS
- #local dir cmd shortcmd x_font_dir_prefix
+ local dir cmd shortcmd x_font_dir_prefix
- _x_font_dir_prefix="/usr/share/fonts/X11"
+ x_font_dir_prefix="/usr/share/fonts/X11"
if [ -z "$UPDATECMDS" ]; then
usage_error "font_update() called but \$UPDATECMDS not set"
@@ -441,32 +441,32 @@ font_update () {
reject_unlikely_path_chars "$UPDATECMDS"
reject_unlikely_path_chars "$FONTDIRS"
- for _dir in $FONTDIRS; do
- if [ -d "$_x_font_dir_prefix/$_dir" ]; then
- for _cmd in $UPDATECMDS; do
- if which "$_cmd" > /dev/null 2>&1; then
- _shortcmd=${_cmd##*/}
- observe "running $_shortcmd in $_dir font directory"
- _cmd_opts=
- if [ "$_shortcmd" = "update-fonts-alias" ]; then
- _cmd_opts=--x11r7-layout
+ for dir in $FONTDIRS; do
+ if [ -d "$x_font_dir_prefix/$dir" ]; then
+ for cmd in $UPDATECMDS; do
+ if which "$cmd" > /dev/null 2>&1; then
+ shortcmd=${cmd##*/}
+ observe "running $shortcmd in $dir font directory"
+ cmd_opts=
+ if [ "$shortcmd" = "update-fonts-alias" ]; then
+ cmd_opts=--x11r7-layout
fi
- if [ "$_shortcmd" = "update-fonts-dir" ]; then
- _cmd_opts=--x11r7-layout
+ if [ "$shortcmd" = "update-fonts-dir" ]; then
+ cmd_opts=--x11r7-layout
fi
- if [ "$_shortcmd" = "update-fonts-scale" ]; then
- _cmd_opts=--x11r7-layout
+ if [ "$shortcmd" = "update-fonts-scale" ]; then
+ cmd_opts=--x11r7-layout
fi
- $_cmd $_cmd_opts $_dir || warn "$_cmd $_cmd_opts $_dir" \
+ $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \
"failed; font directory data may not" \
"be up to date"
else
- warn "$_cmd not found; not updating corresponding $_dir font" \
+ warn "$cmd not found; not updating corresponding $dir font" \
"directory data"
fi
done
else
- warn "$_dir is not a directory; not updating font directory data"
+ warn "$dir is not a directory; not updating font directory data"
fi
done
}
@@ -485,7 +485,7 @@ remove_conffile_prepare () {
# version (or installed over a version removed-but-not-purged) prior to the
# one in which the conffile was obsoleted.
- #local conffile current_checksum
+ local conffile current_checksum
# validate arguments
if [ $# -lt 2 ]; then
@@ -494,19 +494,19 @@ remove_conffile_prepare () {
Reply to: