debian/changelog | 31 + debian/control | 7 debian/patches/remove-wrongly-registered-katakana-glyphs | 97 +++ debian/patches/series | 1 debian/rules | 4 debian/watch | 17 debian/xsfbs/repack.sh | 32 + debian/xsfbs/xsfbs-autoreconf.mk | 150 ----- debian/xsfbs/xsfbs.mk | 127 ---- debian/xsfbs/xsfbs.sh | 412 ++++++--------- 10 files changed, 382 insertions(+), 496 deletions(-)
New commits: commit d5850684908c66341332d20f4566a3ced58c1c09 Author: Julien Cristau <[email protected]> Date: Wed Apr 8 09:31:44 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index e80fc2f..d10f012 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xfonts-base (1:1.0.0-6) UNRELEASED; urgency=low +xfonts-base (1:1.0.0-6) unstable; urgency=low * Drop paragraph about xfonts-base-transcoded from the description. That package has been dropped in the modular packaging, and the fonts it used @@ -10,7 +10,7 @@ xfonts-base (1:1.0.0-6) UNRELEASED; urgency=low - use dh_clean -k in the install target, not plain dh_clean * Update xsfbs. - -- Julien Cristau <[email protected]> Tue, 24 Jul 2007 19:58:47 +0200 + -- Julien Cristau <[email protected]> Wed, 08 Apr 2009 09:31:28 +0100 xfonts-base (1:1.0.0-5.1) unstable; urgency=low commit e492e3509e4f0a29209f0875ff6945c050fc650c Author: Julien Cristau <[email protected]> Date: Wed Apr 8 09:26:47 2009 +0100 Fix rules dependencies diff --git a/debian/rules b/debian/rules index 79646ae..7b1be15 100755 --- a/debian/rules +++ b/debian/rules @@ -50,8 +50,8 @@ else endif -build: prepare build-stamp -build-stamp: patch +build: build-stamp +build-stamp: $(STAMP_DIR)/patch dh_testdir for FILE in "$(SUBDIRS)"; do \ echo "$$FILE"; \ commit 93dfe8f3663b151ec483516727b292cab544fd55 Author: Julien Cristau <[email protected]> Date: Wed Apr 8 09:23:33 2009 +0100 Revert inappropriate NMU changes - change debian/compat back to 5 - the download page is not a homepage - use dh_clean -k in the install target, not plain dh_clean diff --git a/debian/changelog b/debian/changelog index ea2ddbf..2526462 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ xfonts-base (1:1.0.0-6) UNRELEASED; urgency=low * Drop paragraph about xfonts-base-transcoded from the description. That package has been dropped in the modular packaging, and the fonts it used to contain are now in xfonts-base. Thanks again to Josip Rodin! + * Import 1:1.0.0-5.1 NMU from Hideki Yamane. + * Revert inappropriate NMU changes: + - change debian/compat back to 5 + - the download page is not a homepage + - use dh_clean -k in the install target, not plain dh_clean -- Julien Cristau <[email protected]> Tue, 24 Jul 2007 19:58:47 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +5 diff --git a/debian/control b/debian/control index 32837e8..493cd65 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,9 @@ Section: fonts Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Branden Robinson <[email protected]>, Julien Cristau <[email protected]> -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper Build-Depends-Indep: pkg-config, xfonts-utils, quilt Standards-Version: 3.8.1 -Homepage: http://xorg.freedesktop.org/releases/individual/font/ Package: xfonts-base Architecture: all diff --git a/debian/rules b/debian/rules index 3a26ab8..79646ae 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ build-stamp: patch done >$@ -clean: unpatch xsfclean +clean: xsfclean dh_testdir dh_testroot rm -f build-stamp @@ -81,7 +81,7 @@ clean: unpatch xsfclean install: build dh_testdir dh_testroot - dh_clean + dh_clean -k dh_installdirs for FILE in "$(SUBDIRS)"; do \ cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) \ commit e9155523994a7fb14922540486f82f4c878698ca Author: Julien Cristau <[email protected]> Date: Wed Apr 8 09:17:28 2009 +0100 Import 1:1.0.0-5.1 NMU diff --git a/debian/changelog b/debian/changelog index fff03c2..cc78f90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +xfonts-base (1:1.0.0-5.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: + - Standards-Version: 3.8.1 + - new section "fonts" + - Build-Depends: debhelper (>=7) + - add "Homepage:" field + - fix "I: xfonts-base source: build-depends-without-arch-dep" + so "Build-Depends-Indep: pkg-config, xfonts-utils", and add quilt + * debian/compat: set 7 + * debian/patches: + - add "remove-wrongly-registered-katakana-glyphs" (Closes: #423315) + * debian/rules: + - fix "W: xfonts-base source: dh-clean-k-is-deprecated" + * debian/watch: add it. + + -- Hideki Yamane (Debian-JP) <[email protected]> Tue, 31 Mar 2009 00:23:45 +0900 + xfonts-base (1:1.0.0-5) unstable; urgency=low [ Branden Robinson ] diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 2fe9211..915a6d3 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,12 @@ Source: xfonts-base -Section: x11 +Section: fonts Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Branden Robinson <[email protected]>, Julien Cristau <[email protected]> -Build-Depends: debhelper (>= 5.0.31), pkg-config, xfonts-utils -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 7) +Build-Depends-Indep: pkg-config, xfonts-utils, quilt +Standards-Version: 3.8.1 +Homepage: http://xorg.freedesktop.org/releases/individual/font/ Package: xfonts-base Architecture: all diff --git a/debian/patches/remove-wrongly-registered-katakana-glyphs b/debian/patches/remove-wrongly-registered-katakana-glyphs new file mode 100644 index 0000000..5c54828 --- /dev/null +++ b/debian/patches/remove-wrongly-registered-katakana-glyphs @@ -0,0 +1,97 @@ +fix wrong glyphs in Katakana font +Index: xfonts-base-1.0.0/font-schumacher-misc-X11R7.0-1.0.0/clR6x12.bdf +=================================================================== +--- xfonts-base-1.0.0.orig/font-schumacher-misc-X11R7.0-1.0.0/clR6x12.bdf 2009-03-30 15:55:54.000000000 +0900 ++++ xfonts-base-1.0.0/font-schumacher-misc-X11R7.0-1.0.0/clR6x12.bdf 2009-03-30 15:56:00.000000000 +0900 +@@ -46,7 +46,7 @@ + CAP_HEIGHT 8 + X_HEIGHT 5 + ENDPROPERTIES +-CHARS 1197 ++CHARS 1193 + STARTCHAR char0 + ENCODING 0 + SWIDTH 480 0 +@@ -22657,82 +22657,6 @@ + 08 + 00 + ENDCHAR +-STARTCHAR uni30D0 +-ENCODING 12496 +-SWIDTH 480 0 +-DWIDTH 6 0 +-BBX 6 12 0 -3 +-BITMAP +-40 +-F8 +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-ENDCHAR +-STARTCHAR uni30D1 +-ENCODING 12497 +-SWIDTH 480 0 +-DWIDTH 6 0 +-BBX 6 12 0 -3 +-BITMAP +-10 +-F8 +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-ENDCHAR +-STARTCHAR uni30D2 +-ENCODING 12498 +-SWIDTH 480 0 +-DWIDTH 6 0 +-BBX 6 12 0 -3 +-BITMAP +-20 +-20 +-20 +-20 +-20 +-20 +-20 +-20 +-20 +-20 +-20 +-20 +-ENDCHAR +-STARTCHAR uni30D3 +-ENCODING 12499 +-SWIDTH 480 0 +-DWIDTH 6 0 +-BBX 6 12 0 -3 +-BITMAP +-00 +-00 +-20 +-20 +-20 +-20 +-20 +-20 +-20 +-20 +-00 +-00 +-ENDCHAR + STARTCHAR fi + ENCODING 64257 + SWIDTH 480 0 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e93cf6c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +remove-wrongly-registered-katakana-glyphs diff --git a/debian/rules b/debian/rules index bbcd9bb..3a26ab8 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ endif build: prepare build-stamp -build-stamp: +build-stamp: patch dh_testdir for FILE in "$(SUBDIRS)"; do \ echo "$$FILE"; \ @@ -66,7 +66,7 @@ build-stamp: done >$@ -clean: xsfclean +clean: unpatch xsfclean dh_testdir dh_testroot rm -f build-stamp @@ -81,7 +81,7 @@ clean: xsfclean install: build dh_testdir dh_testroot - dh_clean -k + dh_clean dh_installdirs for FILE in "$(SUBDIRS)"; do \ cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) \ diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..1907b54 --- /dev/null +++ b/debian/watch @@ -0,0 +1,17 @@ +# Compulsory line, this is a version 3 file +version=3 + +http://xorg.freedesktop.org/releases/individual/font/font-sun-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-jis-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-arabic-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-micro-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-cursor-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-misc-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-daewoo-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-mutt-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-dec-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-schumacher-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-isas-misc-(.*)\.tar\.gz +http://xorg.freedesktop.org/releases/individual/font/font-sony-misc-(.*)\.tar\.gz + + commit 2ed171f9f390de4e97141c0016d3ba615e8c943e Author: Julien Cristau <[email protected]> Date: Tue Feb 17 17:20:42 2009 +0100 xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so libx11's postinst was the only post-sarge user, and it's gone now. diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 72efa95..8840ff9 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -719,72 +719,6 @@ run () { fi } -register_x_lib_dir_with_ld_so () { - # syntax: register_x_lib_dir_with_ld_so - # - # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared - # libraries. - # - # 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 - - 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" - fi -} - -deregister_x_lib_dir_with_ld_so () { - # syntax: deregister_x_lib_dir_with_ld_so - # - # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared - # libraries, if and only if no shared libaries remain there. - # - # Call this function from the postrm script of a package that places a shared - # library in /usr/X11R6/lib, in the event "$1" is "remove", and before - # invoking ldconfig. - - local dir ldsoconf fgrep_status cmp_status - - dir="/usr/X11R6/lib" - ldsoconf="/etc/ld.so.conf" - - # is the line present? - if fgrep -qsx "$dir" "$ldsoconf"; then - # are there any shared objects in the directory? - 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" - # rewrite the file (very carefully) - set +e - fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp" - fgrep_status=$? - set -e - 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" ;; - esac - set +e - 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" ;; - esac - fi - fi -} - make_symlink_sane () { # syntax: make_symlink_sane symlink target # commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d Author: Julien Cristau <[email protected]> Date: Sun Feb 1 01:31:31 2009 +0100 xsfbs: add a repack script for uscan This will automatically prune upstream tarballs diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh new file mode 100644 index 0000000..5935cc9 --- /dev/null +++ b/debian/xsfbs/repack.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +if ! [ -d debian/prune ]; then + exit 0 +fi + +if [ "x$1" != x--upstream-version ]; then + exit 1 +fi + +version="$2" +filename="$3" + +if [ -z "$version" ] || ! [ -f "$filename" ]; then + exit 1 +fi + +dir="$(pwd)" +tempdir="$(mktemp -d)" + +cd "$tempdir" +tar xf "$dir/$filename" +cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done + +tar czf "$dir/$filename" * +cd "$dir" +rm -rf "$tempdir" +echo "Done pruning upstream tarball" + +exit 0 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 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
