ChangeLog | 161 +++++++++++++++ debian/changelog | 9 debian/rules | 24 -- debian/xsfbs/xsfbs-autoreconf.mk | 150 -------------- debian/xsfbs/xsfbs.mk | 146 ++------------ debian/xsfbs/xsfbs.sh | 394 ++++++++++++++++++++------------------- 6 files changed, 409 insertions(+), 475 deletions(-)
New commits: commit 0feea5c0bd6fcca8ce21488d4a033c1b7c897071 Author: Julien Cristau <[email protected]> Date: Sun Jan 4 20:16:47 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 809163f..f750c22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-randr (1.2.99.3-1) UNRELEASED; urgency=low +x11proto-randr (1.2.99.3-1) experimental; urgency=low [ Timo Aaltonen ] * New upstream prerelease. @@ -8,7 +8,7 @@ x11proto-randr (1.2.99.3-1) UNRELEASED; urgency=low * debian/rules cleanup: we don't build anything, so no need to set CFLAGS and DEB_{HOST,BUILD}_*. - -- Timo Aaltonen <[email protected]> Wed, 03 Dec 2008 11:45:43 +0200 + -- Julien Cristau <[email protected]> Sun, 04 Jan 2009 20:15:27 +0100 x11proto-randr (1.2.2-1) unstable; urgency=low commit 970ce8ec04b3aad12ada4f0fd7366b49bdce3178 Author: Julien Cristau <[email protected]> Date: Sun Jan 4 20:13:11 2009 +0100 debian/rules cleanup we don't build anything, so no need to set CFLAGS and DEB_{HOST,BUILD}_*. diff --git a/debian/changelog b/debian/changelog index 4e9c6f9..809163f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ x11proto-randr (1.2.99.3-1) UNRELEASED; urgency=low + [ Timo Aaltonen ] * New upstream prerelease. * Build-depend on automake, run autoreconf on build. + [ Julien Cristau ] + * debian/rules cleanup: we don't build anything, so no need to set CFLAGS + and DEB_{HOST,BUILD}_*. + -- Timo Aaltonen <[email protected]> Wed, 03 Dec 2008 11:45:43 +0200 x11proto-randr (1.2.2-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 419b75f..fcbe4c4 100755 --- a/debian/rules +++ b/debian/rules @@ -11,25 +11,6 @@ PACKAGE = x11proto-randr-dev include debian/xsfbs/xsfbs.mk -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build=$(DEB_HOST_GNU_TYPE) -else - confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -endif - .PHONY: autogen autogen: autogen-stamp autogen-stamp: @@ -43,11 +24,10 @@ configure: configure-stamp configure-stamp: autogen-stamp dh_testdir - test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE) + mkdir -p obj-$(DEB_BUILD_GNU_TYPE) cd obj-$(DEB_BUILD_GNU_TYPE) && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info --disable-shared \ - $(confflags) CFLAGS="$(CFLAGS)" + --infodir=\$${prefix}/share/info --disable-shared touch configure-stamp build: build-stamp commit 7003c2593149a285b2389f8a21a30a1d5afbccb5 Author: Julien Cristau <[email protected]> Date: Sun Jan 4 20:07:43 2009 +0100 update the upstream changelog diff --git a/ChangeLog b/ChangeLog index c24c625..9cabd21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,141 @@ +commit 3fdbdc2b0a971db7497c6e03e215fd19ec400ce9 +Author: Matthias Hopf <[email protected]> +Date: Fri Dec 12 12:41:21 2008 +0100 + + Bump to 1.2.99.3 + +commit 0c1527d2e89a807e54c549e44798e2cf63fafca2 +Author: Matthias Hopf <[email protected]> +Date: Thu Dec 11 17:15:15 2008 +0100 + + Panning tracking areas describe full screen if set to 0. + +commit d904495a4cbd66850dc03d32f223aaaf8425f077 +Author: Adam Jackson <[email protected]> +Date: Wed Dec 10 11:15:48 2008 -0500 + + Add [GS]etOutputPrimary + +commit 1334866b4aa025bce745140aa0f71f6493408ffa +Merge: ad65017... e719120... +Author: Keith Packard <[email protected]> +Date: Tue Dec 9 20:59:47 2008 -0800 + + Merge commit 'origin/master' + +commit e71912062f3985dd2f4d7b37e415b4a614b51d9b +Author: Matthias Hopf <[email protected]> +Date: Mon Dec 8 14:40:07 2008 +0100 + + Add unicode art pictures for panning. + +commit 19a851fc85192906586138c5b17740ba28328eaa +Author: Matthias Hopf <[email protected]> +Date: Thu Dec 4 15:45:23 2008 +0100 + + Bump to 1.2.99.2 + +commit fb1f243716282f442235323834fec50aab7fe2f7 +Author: Matthias Hopf <[email protected]> +Date: Thu Dec 4 15:44:12 2008 +0100 + + Nuke config-timestamp for panning. Specifying panning update on screen size change. + +commit 425468e9a29071823316bfc027bc80eb20acc61e +Author: Matthias Hopf <[email protected]> +Date: Thu Dec 4 12:57:33 2008 +0100 + + Add panning to versioning information. + +commit 419a0f20746d9f3e8962ea3294568343d9877b2c +Author: Matthias Hopf <[email protected]> +Date: Fri Nov 28 18:30:22 2008 +0100 + + Panning protocol bits description + +commit 6b5d4ce8943c1d39392a0536d426fe27a9161b04 +Author: Matthias Hopf <[email protected]> +Date: Fri Nov 28 18:29:19 2008 +0100 + + Panning protocol description + +commit abe956221670598a5fd0f77107a3471c2fcf84df +Author: Matthias Hopf <[email protected]> +Date: Fri Nov 28 17:22:23 2008 +0100 + + Panning protocol extension + +commit 546906dbe29816adaa6a35277266d79fbe131d0c +Author: Adam Jackson <[email protected]> +Date: Wed Dec 3 13:36:00 2008 -0500 + + Indent CRTC transform docs to match the rest of the requests. + +commit 5d5e4cff8c69d36d10e682d59c9a9005a8b5ad18 +Author: Adam Jackson <[email protected]> +Date: Wed Dec 3 12:02:18 2008 -0500 + + More doc for CRTC transforms + +commit ad6501790bbaff528cf247df24ddb7de27576a11 +Author: Keith Packard <[email protected]> +Date: Wed Nov 26 15:47:18 2008 -0800 + + Remove duplicate GetScreenResourcesCurrent declarations + + Signed-off-by: Keith Packard <[email protected]> + +commit 10bff0be50cf5cf314960bb85c472f1c63d37755 +Author: Keith Packard <[email protected]> +Date: Wed Nov 26 09:24:36 2008 -0800 + + Update to version 1.2.99.1 + +commit 6c17940a7960885695aa6033de58c3cd2bb6fb79 +Merge: c998b46... 8793429... +Author: Keith Packard <[email protected]> +Date: Mon Nov 24 16:22:11 2008 -0800 + + Merge branch 'transform-proposal' + + Conflicts: + + randr.h + randrproto.h + randrproto.txt + +commit 8793429f3d9d7cdf16be118ce05a68af6531568e +Author: Keith Packard <[email protected]> +Date: Mon Nov 24 16:01:55 2008 -0800 + + Describe projective transform additions in Introduction + + Signed-off-by: Keith Packard <[email protected]> + +commit c998b4658d735e5b2d7aa6983d732d40cc802823 +Author: Adam Jackson <[email protected]> +Date: Mon Nov 24 16:29:58 2008 -0500 + + GSRC added in 1.3, not 1.2 + +commit 0d334c880396b9ef67ed899ad228cc693aad6a28 +Author: Adam Jackson <[email protected]> +Date: Mon Nov 24 16:19:43 2008 -0500 + + Fix RRNumberRequests + +commit 2c0635eed5ae418ca278d99e044f583d54273097 +Author: Adam Jackson <[email protected]> +Date: Mon Nov 24 15:54:09 2008 -0500 + + Add GetScreenResourcesCurrent + +commit 4a960ba3db3c3f8bdf3d519d263f910b6107b9ff +Author: Julien Cristau <[email protected]> +Date: Fri Jul 11 17:12:22 2008 +0200 + + spec: add missing list of clones to RRGetOutputInfo reply + commit 2be5a52d5f6bdd2aa70efcb06bd99a149c6db6ba Author: Adam Jackson <[email protected]> Date: Wed Jul 2 15:34:31 2008 -0400 @@ -12,6 +150,29 @@ Date: Mon Jun 23 14:52:12 2008 -0400 Thanks for the upward compatibility, Bjarne. +commit 2d09f9cac379c74f492b528a8aa2ac3b5997d617 +Author: Keith Packard <[email protected]> +Date: Tue Mar 18 16:01:10 2008 -0700 + + Eliminate inverse matrix from randr transform protocol + + It is easier, and potentially more precise, to compute the inverse in the + server where everything can eventually be kept in floating point form. + +commit aa5cd18a9f84aa075ffa7f70e6591b70b093119f +Author: Keith Packard <[email protected]> +Date: Sat Mar 15 00:32:35 2008 -0700 + + Add filters to CRTC transforms. + + This allows scaling transforms to use bilinear filtering if desired. + +commit 329b2068c1505dbc2eef7cc245b02c3bbf9c67ff +Author: Keith Packard <[email protected]> +Date: Fri Feb 15 15:49:35 2008 -0800 + + Add Transform request proposal for 1.3 + commit 2df8499d24d15bfca3c928b681f64b6e8a05f0af Author: James Cloos <[email protected]> Date: Thu Dec 6 16:39:05 2007 -0500 commit 86e7669f5d912824e341ea487a6257ec5433eb90 Author: Julien Cristau <[email protected]> Date: Thu Jul 17 15:44:45 2008 +0200 xsfbs.mk: make 'log' a separate target 'prepare' runs genscripts, and we don't want that in unpatch, so create stampdir/log in a separate target, and make unpatch depend on that instead of prepare. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 984e81c..f0f8953 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts - mkdir -p $(STAMP_DIR)/log +$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts >$@ +.PHONY: log +stampdir_targets+=log +log: $(STAMP_DIR)/log +$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir + mkdir -p $(STAMP_DIR)/log + # Apply all patches to the upstream source. .PHONY: patch stampdir_targets+=patch @@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/prepare +unpatch: $(STAMP_DIR)/log rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 50619e730fcaf422ffa4451468520526b2a830b8 Author: Julien Cristau <[email protected]> Date: Wed Jul 16 18:42:14 2008 +0200 xsfbs.mk: update the list of releases, and drop some unused code we haven't had a separate source tree since modularization. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 2350f80..984e81c 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$logn...@$$(cat /etc/mailname 2>/dev/null))}}) # Find out if this is an official build; an official build has nothing but -# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the +# digits, dots, and/or the codename of a release in the Debian part of the # version number. Anything else indicates an unofficial build. -OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) # Set up parameters for the Debian build environment. @@ -69,16 +69,6 @@ endif # $(STAMP_DIR) houses stamp files for complex targets. STAMP_DIR:=stampdir -# $(SOURCE_DIR) houses one or more source trees. -SOURCE_DIR:=build-tree - -# $(SOURCE_TREE) is the location of the source tree to be compiled. If there -# is more than one, others are found using this name plus a suffix to indicate -# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The -# "setup" target is responsible for creating such trees. -#SOURCE_TREE:=$(SOURCE_DIR)/xc -#FIXME We need to define this in our debian/rules file - # $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place # their files. DEBTREEDIR:=$(CURDIR)/debian/tmp commit 6c29758eb1a2798f6b77516b7a75dc399769d217 Author: Julien Cristau <[email protected]> Date: Wed Jul 16 18:22:01 2008 +0200 xsfbs.mk: more parallel make fixing diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index fa2431e..2350f80 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -119,8 +119,8 @@ $(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)/prepare: $(STAMP_DIR)/stampdir +prepare: $(STAMP_DIR)/prepare +$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts mkdir -p $(STAMP_DIR)/log >$@ commit 78b3958b14a5298165d8500d711342be1b7b6463 Author: Julien Cristau <[email protected]> Date: Wed Jul 16 18:22:01 2008 +0200 xsfbs.mk: fix the prepare target for parallel make diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index b871b3b..fa2431e 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -119,11 +119,9 @@ $(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)/log +prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir - if [ ! -e $(STAMP_DIR)/log ]; then \ - mkdir $(STAMP_DIR)/log; \ - fi; \ + mkdir -p $(STAMP_DIR)/log >$@ # Apply all patches to the upstream source. commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561 Author: Brice Goglin <[email protected]> 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 <[email protected]> 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" -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
