xserver-xorg-video-r128: Changes to 'debian-unstable'
ChangeLog | 588 +++
Makefile.am | 5
Makefile.in | 6
README.ati | 828 ----
README.ati.sgml | 648 ---
aclocal.m4 | 14
config.h.in | 30
configure | 779 ----
configure.ac | 178 -
debian/NEWS | 8
debian/changelog | 38
debian/control | 48
debian/patches/01_gen_pci_ids.diff | 20
debian/rules | 6
debian/watch | 2
debian/xserver-xorg-video-ati.install | 3
debian/xserver-xorg-video-ati.links | 1
debian/xserver-xorg-video-ati.manpages | 1
debian/xserver-xorg-video-r128.install | 2
debian/xserver-xorg-video-r128.links | 1
debian/xserver-xorg-video-r128.manpages | 1
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 102
debian/xsfbs/xsfbs.sh | 394 +-
ltmain.sh | 2
man/Makefile.am | 4
man/Makefile.in | 5
man/ati.man | 34
man/radeon.man | 490 --
src/AtomBios/CD_Operations.c | 954 -----
src/AtomBios/Decoder.c | 235 -
src/AtomBios/hwserv_drv.c | 348 --
src/AtomBios/includes/CD_Common_Types.h | 154
src/AtomBios/includes/CD_Definitions.h | 49
src/AtomBios/includes/CD_Opcodes.h | 181 -
src/AtomBios/includes/CD_Structs.h | 464 --
src/AtomBios/includes/CD_binding.h | 46
src/AtomBios/includes/CD_hw_services.h | 318 -
src/AtomBios/includes/Decoder.h | 86
src/AtomBios/includes/ObjectID.h | 484 --
src/AtomBios/includes/atombios.h | 4436 -------------------------
src/AtomBios/includes/regsdef.h | 25
src/Makefile.am | 191 -
src/Makefile.in | 721 ----
src/ati.c | 348 --
src/ati.h | 34
src/ati_pciids_gen.h | 358 --
src/atiadjust.c | 134
src/atiadjust.h | 31
src/atiaudio.c | 50
src/atiaudio.h | 51
src/atibank.c | 114
src/atibank.h | 44
src/atibus.c | 123
src/atibus.h | 49
src/atichip.c | 271 -
src/atichip.h | 94
src/aticlock.c | 443 --
src/aticlock.h | 62
src/aticonfig.c | 506 --
src/aticonsole.c | 816 ----
src/aticonsole.h | 43
src/aticrtc.h | 42
src/aticursor.h | 42
src/atidac.c | 462 --
src/atidac.h | 99
src/atidecoder.c | 50
src/atidecoder.h | 51
src/atidga.c | 483 --
src/atidga.h | 36
src/atidri.c | 1640 ---------
src/atidri.h | 49
src/atidripriv.h | 57
src/atidsp.c | 302 -
src/atidsp.h | 35
src/atii2c.c | 399 --
src/atii2c.h | 48
src/atiload.c | 98
src/atiload.h | 32
src/atilock.c | 537 ---
src/atilock.h | 31
src/atimach64.c | 1341 -------
src/atimach64.h | 36
src/atimach64accel.c | 1068 ------
src/atimach64accel.h | 42
src/atimach64cursor.c | 426 --
src/atimach64exa.c | 696 ----
src/atimach64i2c.c | 469 --
src/atimach64i2c.h | 32
src/atimach64io.c | 103
src/atimach64io.h | 421 --
src/atimach64probe.c | 289 -
src/atimach64probe.h | 32
src/atimach64render.c | 898 -----
src/atimach64version.h | 59
src/atimach64xv.c | 1686 ---------
src/atimisc.c | 78
src/atimode.c | 1084 ------
src/atimode.h | 35
src/atimodule.c | 79
src/atioption.h | 98
src/atipciids.h | 46
src/atipreinit.c | 2509 --------------
src/atipreinit.h | 30
src/atiprint.c | 784 ----
src/atiprint.h | 34
src/atipriv.h | 30
src/atiprobe.c | 475 --
src/atiprobe.h | 30
src/atiregs.h | 2882 ----------------
src/atirgb514.c | 283 -
src/atirgb514.h | 35
src/atiscreen.c | 692 ----
src/atiscreen.h | 31
src/atistruct.h | 529 ---
src/atituner.c | 177 -
src/atituner.h | 69
src/atiutil.c | 117
src/atiutil.h | 67
src/ativalid.c | 161
src/ativalid.h | 30
src/ativersion.h | 54
src/ativga.c | 195 -
src/ativga.h | 40
src/ativgaio.c | 49
src/ativgaio.h | 56
src/atividmem.c | 483 --
src/atividmem.h | 73
src/atiwonder.c | 159
src/atiwonder.h | 38
src/atiwonderio.c | 66
src/atiwonderio.h | 46
src/atixv.h | 34
src/atombios_crtc.c | 426 --
src/atombios_output.c | 670 ---
src/generic_bus.h | 35
src/legacy_crtc.c | 1793 ----------
src/legacy_output.c | 1763 ----------
src/local_xf86Rename.h | 23
src/mach64_common.h | 130
src/mach64_dri.h | 125
src/mach64_sarea.h | 162
src/pcidb/ati_pciids.csv | 359 --
src/pcidb/parse_pci_ids.pl | 102
src/r128_driver.c | 11
src/r128_misc.c | 2
src/r128_probe.c | 2
src/radeon.h | 1185 ------
src/radeon_accel.c | 1254 -------
src/radeon_accelfuncs.c | 1346 -------
src/radeon_atombios.c | 2876 ----------------
src/radeon_atombios.h | 253 -
src/radeon_atomwrapper.c | 101
src/radeon_atomwrapper.h | 31
src/radeon_bios.c | 1469 --------
src/radeon_chipinfo_gen.h | 279 -
src/radeon_chipset_gen.h | 280 -
src/radeon_common.h | 494 --
src/radeon_commonfuncs.c | 309 -
src/radeon_crtc.c | 721 ----
src/radeon_cursor.c | 360 --
src/radeon_dga.c | 463 --
src/radeon_dri.c | 2216 ------------
src/radeon_dri.h | 100
src/radeon_dripriv.h | 63
src/radeon_driver.c | 5467 --------------------------------
src/radeon_exa.c | 542 ---
src/radeon_exa_funcs.c | 592 ---
src/radeon_exa_render.c | 1250 -------
src/radeon_macros.h | 163
src/radeon_misc.c | 78
src/radeon_mm_i2c.c | 642 ---
src/radeon_modes.c | 310 -
src/radeon_output.c | 2791 ----------------
src/radeon_pci_chipset_gen.h | 280 -
src/radeon_pci_device_match_gen.h | 280 -
src/radeon_probe.c | 227 -
src/radeon_probe.h | 594 ---
src/radeon_reg.h | 4025 -----------------------
src/radeon_render.c | 1052 ------
src/radeon_sarea.h | 231 -
src/radeon_tv.c | 1164 ------
src/radeon_tv.h | 51
src/radeon_version.h | 63
src/radeon_video.c | 3970 -----------------------
src/radeon_video.h | 103
src/radeon_vip.c | 362 --
src/theatre.c | 2209 ------------
src/theatre.h | 79
src/theatre200.c | 2275 -------------
src/theatre200.h | 140
src/theatre200_module.c | 33
src/theatre_detect.c | 129
src/theatre_detect.h | 46
src/theatre_detect_module.c | 37
src/theatre_module.c | 33
src/theatre_reg.h | 876 -----
197 files changed, 1001 insertions(+), 88916 deletions(-)
New commits:
commit 171283b9c4eb4736b1efb1f68d1f3ea4973120e7
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Jun 13 00:33:03 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 75788ff..a57d02a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-r128 (6.8.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-r128 (6.8.0-1) unstable; urgency=low
* New upstream release.
* Drop the useless epoch for the first upload to unstable.
@@ -7,7 +7,7 @@ xserver-xorg-video-r128 (6.8.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> Fri, 13 Jun 2008 00:30:56 +0200
+ -- Brice Goglin <bgoglin@debian.org> Fri, 13 Jun 2008 00:32:45 +0200
xserver-xorg-video-r128 (1:6.8.1~git20080301.d855d208-3) experimental; urgency=low
commit ab022134f87ee14d3aa6a2a24afaa2cc5e6a8d92
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Jun 13 00:31:23 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 8150bed..75788ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ xserver-xorg-video-r128 (6.8.0-1) UNRELEASED; urgency=low
* New upstream release.
* Drop the useless epoch for the first upload to unstable.
+ * 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> Fri, 13 Jun 2008 01:29:04 +0200
+ -- Brice Goglin <bgoglin@debian.org> Fri, 13 Jun 2008 00:30:56 +0200
xserver-xorg-video-r128 (1:6.8.1~git20080301.d855d208-3) experimental; urgency=low
diff --git a/debian/control b/debian/control
index f18fca8..a079c6e 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>, Drew Parsons <dparsons@debian.org>, Brice Goglin <bgoglin@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-xext-dev, x11proto-core-dev, x11proto-video-dev, x11proto-xinerama-dev, x11proto-xf86misc-dev, libgl1-mesa-dev | libgl-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, libdrm-dev (>> 2.2) [!hurd-i386], x11proto-xf86dri-dev, quilt
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-xext-dev, x11proto-core-dev, x11proto-video-dev, x11proto-xinerama-dev, x11proto-xf86misc-dev, libgl1-mesa-dev | libgl-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, libdrm-dev (>> 2.2) [!hurd-i386], x11proto-xf86dri-dev, quilt, dpkg-dev (>= 1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-r128
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-r128.git
diff --git a/debian/rules b/debian/rules
index d343605..ff1a93c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,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 b87183750f222e99f621c7bcd6c0567823eda4d3
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Jun 13 00:28:09 2008 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 5d4d376..4b70f47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+commit e65e95c8c44f47ef044980f59a2549684e6c9403
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Apr 28 10:24:50 2008 +1000
+
+ r128: fix bios size setting for pciaccess
+
+commit a4fafa97b31bb7da01dd92236b42a418ca482992
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Sun Mar 2 14:59:30 2008 -0500
+
+ [PATCH] Avoid usage of LoaderSymbol.
+
+ It can be dangerous. This patch is based on the previous one when r128
+ was in xf86-video-ati. The problem is that if gR128EntityIndex is not
+ explicitly marked as a public symbol, and weird things may happen when
+ compiling with hidden symbols.
+ Since the symbol is in the same shared binary of its callers, just use
+ it, instead of using LoaderSymbol. Could also just replace calls
+ getR128EntityIndex() to direct access to gR128EntityIndex.
+
commit d855d208f2749b6a9adb6165e08ef6523cdf892d
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Feb 27 19:07:45 2008 +0200
diff --git a/Makefile.in b/Makefile.in
index f26ff69..c09f762 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -682,6 +682,7 @@ uninstall-am:
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-recursive uninstall uninstall-am
+
@BUILD_LINUXDOC_TRUE@README.r128: README.r128.sgml
@BUILD_LINUXDOC_TRUE@ $(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128
diff --git a/aclocal.m4 b/aclocal.m4
index aa6547f..62b902b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -6876,7 +6876,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.5
+ [XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7025,7 +7025,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -7346,14 +7350,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
diff --git a/configure b/configure
index 785a13a..e8d23af 100755
--- a/configure
+++ b/configure
@@ -21959,7 +21959,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
@@ -21968,7 +21968,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -21982,7 +21982,10 @@ _ACEOF
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
echo $ECHO_N "checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6; }
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -22005,6 +22008,7 @@ if test `eval echo '${'$as_ac_File'}'` = yes; then
HAVE_DEFS_ENT=yes
fi
+fi
# Extract the first word of "linuxdoc", so it can be a program name with args.
set dummy linuxdoc; ac_word=$2
diff --git a/debian/changelog b/debian/changelog
index fa1a98b..8150bed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-r128 (6.8.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Drop the useless epoch for the first upload to unstable.
+
+ -- Brice Goglin <bgoglin@debian.org> Fri, 13 Jun 2008 01:29:04 +0200
+
xserver-xorg-video-r128 (1:6.8.1~git20080301.d855d208-3) experimental; urgency=low
* Add Conflicts with xserver-xorg-video-ati (<= 1:6.8.0-1) to ease switching
diff --git a/ltmain.sh b/ltmain.sh
index 5def351..0bf3848 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-1"
+VERSION="1.5.26 Debian 1.5.26-4"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
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 () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _conffile="$1"
+ conffile="$1"
shift
- # does the _conffile even exist?
- if [ -e "$_conffile" ]; then
+ # does the conffile even exist?
+ if [ -e "$conffile" ]; then
# calculate its checksum
- _current_checksum=$(md5sum < "$_conffile" | sed 's/[[:space:]].*//')
+ current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//')
# compare it to each supplied checksum
while [ -n "$1" ]; do
- if [ "$_current_checksum" = "$1" ]; then
+ if [ "$current_checksum" = "$1" ]; then
# we found a match; move the confffile and stop looking
- observe "preparing obsolete conffile $_conffile for removal"
- mv "$_conffile" "$_conffile.$THIS_PACKAGE-tmp"
+ observe "preparing obsolete conffile $conffile for removal"
+ mv "$conffile" "$conffile.$THIS_PACKAGE-tmp"
break
fi
shift
@@ -553,7 +553,7 @@ remove_conffile_commit () {
# Call this function from a postinst script after having used
# remove_conffile_prepare() in the preinst.
- #local conffile
+ local conffile
# validate arguments
if [ $# -ne 1 ]; then
@@ -562,12 +562,12 @@ remove_conffile_commit () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _conffile="$1"
+ conffile="$1"
# if the temporary file created by remove_conffile_prepare() exists, remove it
- if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then
- observe "committing removal of obsolete conffile $_conffile"
- rm "$_conffile.$THIS_PACKAGE-tmp"
+ if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then
+ observe "committing removal of obsolete conffile $conffile"
+ rm "$conffile.$THIS_PACKAGE-tmp"
fi
}
@@ -580,7 +580,7 @@ remove_conffile_rollback () {
# or "abort-install" is after having used remove_conffile_prepare() in the
# preinst.
- #local conffile
+ local conffile
# validate arguments
if [ $# -ne 1 ]; then
@@ -589,13 +589,13 @@ remove_conffile_rollback () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _conffile="$1"
+ conffile="$1"
# if the temporary file created by remove_conffile_prepare() exists, move it
# back
- if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then
- observe "rolling back removal of obsolete conffile $_conffile"
- mv "$_conffile.$THIS_PACKAGE-tmp" "$_conffile"
+ if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then
+ observe "rolling back removal of obsolete conffile $conffile"
+ mv "$conffile.$THIS_PACKAGE-tmp" "$conffile"
fi
}
@@ -615,7 +615,7 @@ replace_conffile_with_symlink_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 3 ]; then
@@ -624,16 +624,16 @@ replace_conffile_with_symlink_prepare () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _oldconffile="$1"
+ oldconffile="$1"
shift
- _newconffile="$1"
+ newconffile="$1"
shift
remove_conffile_prepare "$_oldconffile" "$@"
- # If $_oldconffile still exists, then md5sums didn't match.
+ # If $oldconffile still exists, then md5sums didn't match.
# Copy it to new one.
- if [ -f "$_oldconffile" ]; then
- cp "$_oldconffile" "$_newconffile"
+ if [ -f "$oldconffile" ]; then
+ cp "$oldconffile" "$newconffile"
fi
}
@@ -647,7 +647,7 @@ replace_conffile_with_symlink_commit () {
# Call this function from a postinst script after having used
# replace_conffile_with_symlink_prepare() in the preinst.
- #local conffile
+ local conffile
# validate arguments
if [ $# -ne 1 ]; then
@@ -656,9 +656,9 @@ replace_conffile_with_symlink_commit () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _conffile="$1"
+ conffile="$1"
- remove_conffile_commit "$_conffile"
+ remove_conffile_commit "$conffile"
}
replace_conffile_with_symlink_rollback () {
@@ -674,7 +674,7 @@ replace_conffile_with_symlink_rollback () {
# You should have used replace_conffile_with_symlink_prepare() in the
# preinst.
- #local conffile
+ local conffile
# validate arguments
if [ $# -ne 2 ]; then
@@ -683,12 +683,12 @@ replace_conffile_with_symlink_rollback () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _oldconffile="$1"
- _newconffile="$2"
+ oldconffile="$1"
+ newconffile="$2"
remove_conffile_rollback "$_oldconffile"
- if [ -f "$_newconffile" ]; then
- rm "$_newconffile"
+ if [ -f "$newconffile" ]; then
+ rm "$newconffile"
fi
}
@@ -703,7 +703,7 @@ run () {
# those cases the return value of the debconf command *must* be checked
# before the string returned by debconf is used for anything.
- #local retval
+ local retval
# validate arguments
if [ $# -lt 1 ]; then
@@ -712,10 +712,10 @@ run () {
exit $SHELL_LIB_USAGE_ERROR
fi
- "$@" || _retval=$?
+ "$@" || retval=$?
- if [ ${_retval:-0} -ne 0 ]; then
- observe "command \"$*\" exited with status $_retval"
+ if [ ${retval:-0} -ne 0 ]; then
+ observe "command \"$*\" exited with status $retval"
fi
}
@@ -728,15 +728,15 @@ register_x_lib_dir_with_ld_so () {
Reply to: