xserver-xorg-video-mach64: Changes to 'debian-experimental'
ChangeLog | 19 +
aclocal.m4 | 14 -
configure | 10
debian/changelog | 17 +
debian/control | 2
debian/rules | 2
debian/xsfbs/xsfbs-autoreconf.mk | 150 --------------
debian/xsfbs/xsfbs.mk | 102 ----------
debian/xsfbs/xsfbs.sh | 394 ++++++++++++++++++++-------------------
ltmain.sh | 2
src/atimach64accel.h | 12 +
src/atividmem.c | 20 +
12 files changed, 298 insertions(+), 446 deletions(-)
New commits:
commit 6d2f99196cf2ea1d3a3a7371c1478beebe14f133
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 21 02:09:50 2008 +0200
Build against xserver 1.5 rc5
diff --git a/debian/changelog b/debian/changelog
index 1331839..3d82f32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-mach64 (6.8.0-2) experimental; urgency=low
+
+ * Build against xserver 1.5 rc5.
+
+ -- Brice Goglin <bgoglin@debian.org> Mon, 21 Jul 2008 01:59:38 +0200
+
xserver-xorg-video-mach64 (6.8.0-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index c5f810c..bf876b3 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, dpkg-dev (>= 1.14.17)
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4.99.905), 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-mach64
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mach64.git
commit 96da82d40d88c43592f323d2e6add3e724f0cba0
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Jun 13 00:42:26 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 2647fbd..1331839 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mach64 (6.8.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-mach64 (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-mach64 (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:40:29 +0200
+ -- Brice Goglin <bgoglin@debian.org> Fri, 13 Jun 2008 00:42:10 +0200
xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-3) experimental; urgency=low
commit 58050b93ca7866fe3818d0901dc7c7b04ad0f7a0
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Jun 13 00:41:25 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 cff9a1e..2647fbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ xserver-xorg-video-mach64 (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 00:39:00 +0200
+ -- Brice Goglin <bgoglin@debian.org> Fri, 13 Jun 2008 00:40:29 +0200
xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-3) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 9dcedf1..c5f810c 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-mach64
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mach64.git
diff --git a/debian/rules b/debian/rules
index f3b7566..446ae8e 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 c141b1e0c4e4ad8457e6ead82f22f5bf6f41fe8d
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Jun 13 00:39:58 2008 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 4a7dfbe..74e6192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+commit 89a9ad75f3e50e25275b803617d5e74709ead269
+Author: Yi Zhan <yi.zhan@intel.com>
+Date: Wed Mar 26 16:13:08 2008 +1000
+
+ mach64: on IA64 systems the pciaccess page size mapping was getting E2BIG
+
+ As the ia64 pagesize was 16k, and aperture was only 4k, this was messing up
+ on ia64 machines.
+
+ Modified fix from RH BZ 438947 - airlied
+
+commit 6127349c9625ae3b50c40fd3641847be3ca18795
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Wed Mar 19 17:42:23 2008 -0400
+
+ [PATCH] Compile warning fixes.
+
+ Add missing prototypes to atimach64accel.h.
+
commit 56a1c9f07886d40c25baa31b6d02f5ee0efd749a
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Feb 27 18:49:50 2008 +0200
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 3b52552..bd96a8e 100755
--- a/configure
+++ b/configure
@@ -22285,7 +22285,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
@@ -22294,7 +22294,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
@@ -22308,7 +22308,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
@@ -22331,6 +22334,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 f134cda..cff9a1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-mach64 (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 00:39:00 +0200
+
xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-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 () {
# Call this function from the postinst script of a package that places a
# shared library in /usr/X11R6/lib, before invoking ldconfig.
- #local dir ldsoconf
+ local dir ldsoconf
- _dir="/usr/X11R6/lib"
- _ldsoconf="/etc/ld.so.conf"
+ dir="/usr/X11R6/lib"
+ ldsoconf="/etc/ld.so.conf"
# is the line not already present?
- if ! fgrep -qsx "$_dir" "$_ldsoconf"; then
- observe "adding $_dir directory to $_ldsoconf"
- echo "$_dir" >> "$_ldsoconf"
+ if ! fgrep -qsx "$dir" "$ldsoconf"; then
+ observe "adding $dir directory to $ldsoconf"
+ echo "$dir" >> "$ldsoconf"
fi
}
@@ -750,36 +750,36 @@ deregister_x_lib_dir_with_ld_so () {
# library in /usr/X11R6/lib, in the event "$1" is "remove", and before
# invoking ldconfig.
- #local dir ldsoconf fgrep_status cmp_status
+ local dir ldsoconf fgrep_status cmp_status
- _dir="/usr/X11R6/lib"
- _ldsoconf="/etc/ld.so.conf"
+ dir="/usr/X11R6/lib"
+ ldsoconf="/etc/ld.so.conf"
# is the line present?
- if fgrep -qsx "$_dir" "$_ldsoconf"; then
+ if fgrep -qsx "$dir" "$ldsoconf"; then
# are there any shared objects in the directory?
- if [ "$(echo "$_dir"/lib*.so.*.*)" = "$_dir/lib*.so.*.*" ]; then
+ if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then
# glob expansion produced nothing, so no shared libraries are present
- observe "removing $_dir directory from $_ldsoconf"
+ observe "removing $dir directory from $ldsoconf"
# rewrite the file (very carefully)
set +e
- fgrep -svx "$_dir" "$_ldsoconf" > "$_ldsoconf.dpkg-tmp"
- _fgrep_status=$?
+ fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
+ fgrep_status=$?
set -e
- case $_fgrep_status in
+ case $fgrep_status in
0|1) ;; # we don't actually care if any lines matched or not
- *) die "error reading \"$_ldsoconf\"; fgrep exited with status" \
- "$_fgrep_status" ;;
+ *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
+ "$fgrep_status" ;;
esac
set +e
- cmp -s "$_ldsoconf.dpkg-tmp" "$_ldsoconf"
- _cmp_status=$?
+ cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
+ cmp_status=$?
set -e
- case $_cmp_status in
- 0) rm "$_ldsoconf.dpkg-tmp" ;; # files are identical
- 1) mv "$_ldsoconf.dpkg-tmp" "$_ldsoconf" ;; # files differ
- *) die "error comparing \"$_ldsoconf.dpkg-tmp\" to \"$_ldsoconf\";" \
- "cmp exited with status $_cmp_status" ;;
+ case $cmp_status in
+ 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
+ 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
+ *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \
+ "cmp exited with status $cmp_status" ;;
esac
fi
fi
@@ -811,17 +811,17 @@ make_symlink_sane () {
# We could just use the positional parameters as-is, but that makes things
# harder to follow.
- #local symlink target
+ local symlink target
- _symlink="$1"
- _target="$2"
+ symlink="$1"
+ target="$2"
- if [ -L "$_symlink" ] && [ "$(readlink "$_symlink")" = "$_target" ]; then
- observe "link from $_symlink to $_target already exists"
+ if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then
+ observe "link from $symlink to $target already exists"
else
- observe "creating symbolic link from $_symlink to $_target"
- mkdir -p "${_target%/*}" "${_symlink%/*}"
- ln -s -b -S ".dpkg-old" "$_target" "$_symlink"
+ observe "creating symbolic link from $symlink to $target"
+ mkdir -p "${target%/*}" "${symlink%/*}"
+ ln -s -b -S ".dpkg-old" "$target" "$symlink"
fi
}
@@ -857,73 +857,73 @@ migrate_dir_to_symlink () {
# We could just use the positional parameters as-is, but that makes things
# harder to follow.
- local _new _old
+ local new old
- _old="$1"
- _new="$2"
+ old="$1"
+ new="$2"
# Is old location a symlink?
- if [ -L "$_old" ]; then
+ if [ -L "$old" ]; then
# Does it already point to new location?
- if [ "$(readlink "$_old")" = "$_new" ]; then
+ if [ "$(readlink "$old")" = "$new" ]; then
# Nothing to do; migration has already been done.
- observe "migration of $_old to $_new already done"
+ observe "migration of $old to $new already done"
return 0
else
# Back it up.
- warn "backing up symbolic link $_old as $_old.dpkg-old"
- mv -b "$_old" "$_old.dpkg-old"
+ warn "backing up symbolic link $old as $old.dpkg-old"
+ mv -b "$old" "$old.dpkg-old"
fi
fi
# Does old location exist, but is not a directory?
- if [ -e "$_old" ] && ! [ -d "$_old" ]; then
+ if [ -e "$old" ] && ! [ -d "$old" ]; then
# Back it up.
- warn "backing up non-directory $_old as $_old.dpkg-old"
- mv -b "$_old" "$_old.dpkg-old"
+ warn "backing up non-directory $old as $old.dpkg-old"
+ mv -b "$old" "$old.dpkg-old"
fi
- observe "migrating $_old to $_new"
+ observe "migrating $old to $new"
# Is new location a symlink?
- if [ -L "$_new" ]; then
+ if [ -L "$new" ]; then
# Does it point the wrong way, i.e., back to where we're migrating from?
- if [ "$(readlink "$_new")" = "$_old" ]; then
+ if [ "$(readlink "$new")" = "$old" ]; then
# Get rid of it.
- observe "removing symbolic link $_new which points to $_old"
- rm "$_new"
+ observe "removing symbolic link $new which points to $old"
+ rm "$new"
else
# Back it up.
- warn "backing up symbolic link $_new as $_new.dpkg-old"
- mv -b "$_new" "$_new.dpkg-old"
+ warn "backing up symbolic link $new as $new.dpkg-old"
+ mv -b "$new" "$new.dpkg-old"
fi
Reply to: