ChangeLog | 95 ++++++ Makefile.am | 6 configure.ac | 84 ++--- debian/changelog | 12 debian/control | 35 +- debian/libfontenc-dev.install | 6 debian/libfontenc1-udeb.install | 2 debian/libfontenc1.install | 2 debian/rules | 17 - debian/xsfbs/repack.sh | 32 -- debian/xsfbs/xsfbs.mk | 276 ----------------- debian/xsfbs/xsfbs.sh | 622 ---------------------------------------- src/encparse.c | 40 +- src/fontenc.c | 56 +-- 14 files changed, 239 insertions(+), 1046 deletions(-)
New commits: commit ee707678d6110dfefa39f27aa534b20805b46b9b Author: Julien Cristau <[email protected]> Date: Sun Mar 25 16:48:16 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 0a1cac7..f265e61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libfontenc (1:1.1.1-1) UNRELEASED; urgency=low +libfontenc (1:1.1.1-1) unstable; urgency=low * New upstream release. * Remove David Nusinow from Uploaders. @@ -8,7 +8,7 @@ libfontenc (1:1.1.1-1) UNRELEASED; urgency=low * Don't require fakeroot for debian/rules clean. * Bump Standards-Version to 3.9.3. - -- Julien Cristau <[email protected]> Sun, 25 Mar 2012 16:29:31 +0200 + -- Julien Cristau <[email protected]> Sun, 25 Mar 2012 16:48:07 +0200 libfontenc (1:1.1.0-1) unstable; urgency=low commit e3f3d042607579d043e184004fc52ddcbd854deb Author: Julien Cristau <[email protected]> Date: Sun Mar 25 16:46:44 2012 +0200 Bump Standards-Version to 3.9.3. diff --git a/debian/changelog b/debian/changelog index cbac128..0a1cac7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ libfontenc (1:1.1.1-1) UNRELEASED; urgency=low * Add build-{arch,indep} debian/rules targets. * Build for multiarch. * Don't require fakeroot for debian/rules clean. + * Bump Standards-Version to 3.9.3. -- Julien Cristau <[email protected]> Sun, 25 Mar 2012 16:29:31 +0200 diff --git a/debian/control b/debian/control index 4d1568f..9f11311 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: dpkg-dev (>= 1.16), # misc:Pre-Depends debhelper (>= 8.1.3), -Standards-Version: 3.8.4 +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libfontenc Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libfontenc.git commit 0959ad912cd78fbcbea383c3e888e6ac2ce2d1b1 Author: Julien Cristau <[email protected]> Date: Sun Mar 25 16:41:47 2012 +0200 Don't require fakeroot for debian/rules clean. diff --git a/debian/changelog b/debian/changelog index 7602e8d..cbac128 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libfontenc (1:1.1.1-1) UNRELEASED; urgency=low * Delete debian/xsfbs/, it's no longer used in this package. * Add build-{arch,indep} debian/rules targets. * Build for multiarch. + * Don't require fakeroot for debian/rules clean. -- Julien Cristau <[email protected]> Sun, 25 Mar 2012 16:29:31 +0200 diff --git a/debian/rules b/debian/rules index 69ab21b..2159068 100755 --- a/debian/rules +++ b/debian/rules @@ -50,7 +50,6 @@ build-stamp: clean: dh_testdir - dh_testroot rm -f build-stamp rm -f config.cache config.log config.status commit c8b9fcd1de8bf16920cf3968f53ae1f5f72bba1a Author: Julien Cristau <[email protected]> Date: Sun Mar 25 16:41:32 2012 +0200 Build for multiarch. diff --git a/debian/changelog b/debian/changelog index ce42ea1..7602e8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libfontenc (1:1.1.1-1) UNRELEASED; urgency=low * Remove David Nusinow from Uploaders. * Delete debian/xsfbs/, it's no longer used in this package. * Add build-{arch,indep} debian/rules targets. + * Build for multiarch. -- Julien Cristau <[email protected]> Sun, 25 Mar 2012 16:29:31 +0200 diff --git a/debian/control b/debian/control index e97ee66..4d1568f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: Cyril Brulebois <[email protected]> Build-Depends: - debhelper (>= 5.0.0), x11proto-core-dev (>= 6.8.99.15+cvs.20050722), zlib1g-dev, pkg-config, @@ -12,6 +11,10 @@ Build-Depends: libtool, xutils-dev (>= 1:7.5~1), xfonts-utils (>= 1:7.5+1), +# DEB_HOST_MULTIARCH + dpkg-dev (>= 1.16), +# misc:Pre-Depends + debhelper (>= 8.1.3), Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libfontenc Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libfontenc.git @@ -19,7 +22,12 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libfontenc.git Package: libfontenc1 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: X11 font encoding library libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts. @@ -34,7 +42,9 @@ Package: libfontenc1-udeb XC-Package-Type: udeb Section: debian-installer Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: X11 font encoding library This is a udeb, or a microdeb, for the debian-installer. @@ -42,7 +52,13 @@ Package: libfontenc1-dbg Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libfontenc1 (= ${binary:Version}) +Multi-Arch: same +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libfontenc1 (= ${binary:Version}), Description: X11 font encoding library (debug package) libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts. @@ -59,7 +75,12 @@ Description: X11 font encoding library (debug package) Package: libfontenc-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libfontenc1 (= ${binary:Version}), zlib1g-dev +Multi-Arch: same +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libfontenc1 (= ${binary:Version}), + zlib1g-dev, Description: X11 font encoding library (development headers) libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts. diff --git a/debian/libfontenc-dev.install b/debian/libfontenc-dev.install index fd2e598..9929f91 100644 --- a/debian/libfontenc-dev.install +++ b/debian/libfontenc-dev.install @@ -1,4 +1,4 @@ usr/include/X11/* -usr/lib/libfontenc.a -usr/lib/libfontenc.so -usr/lib/pkgconfig/fontenc.pc +usr/lib/*/libfontenc.a +usr/lib/*/libfontenc.so +usr/lib/*/pkgconfig/fontenc.pc diff --git a/debian/libfontenc1-udeb.install b/debian/libfontenc1-udeb.install index c3876f6..43e8a8d 100644 --- a/debian/libfontenc1-udeb.install +++ b/debian/libfontenc1-udeb.install @@ -1 +1 @@ -usr/lib/libfontenc.so.1* +usr/lib/*/libfontenc.so.1* usr/lib diff --git a/debian/libfontenc1.install b/debian/libfontenc1.install index c3876f6..16b37f9 100644 --- a/debian/libfontenc1.install +++ b/debian/libfontenc1.install @@ -1 +1 @@ -usr/lib/libfontenc.so.1* +usr/lib/*/libfontenc.so.1* diff --git a/debian/rules b/debian/rules index 06354ed..69ab21b 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,7 @@ 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) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build=$(DEB_HOST_GNU_TYPE) else @@ -40,6 +41,7 @@ build-stamp: mkdir -p build cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --infodir=\$${prefix}/share/info $(confflags) \ --with-encodingsdir=\$${datadir}/fonts/X11/encodings \ CFLAGS="$(CFLAGS)" @@ -79,7 +81,8 @@ binary-arch: build install dh_install --sourcedir=debian/tmp --fail-missing -Xlibfontenc.la dh_installchangelogs ChangeLog dh_link - dh_strip --dbg-package=$(PACKAGE)-dbg + dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg + dh_strip -N$(PACKAGE) dh_compress dh_fixperms dh_makeshlibs --add-udeb=$(PACKAGE)-udeb commit 2b99007e62e592255f8f02c23be5d090098304ed Author: Julien Cristau <[email protected]> Date: Sun Mar 25 16:35:19 2012 +0200 Add build-{arch,indep} debian/rules targets. diff --git a/debian/changelog b/debian/changelog index 29c126f..ce42ea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libfontenc (1:1.1.1-1) UNRELEASED; urgency=low * New upstream release. * Remove David Nusinow from Uploaders. * Delete debian/xsfbs/, it's no longer used in this package. + * Add build-{arch,indep} debian/rules targets. -- Julien Cristau <[email protected]> Sun, 25 Mar 2012 16:29:31 +0200 diff --git a/debian/rules b/debian/rules index 67449ea..06354ed 100755 --- a/debian/rules +++ b/debian/rules @@ -30,8 +30,10 @@ else confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif - -build: build-stamp +build: build-arch +build-indep: + # Nothing to do +build-arch: build-stamp build-stamp: dh_testdir autoreconf -vfi @@ -92,4 +94,5 @@ binary-indep: build install # Nothing to do binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build build-arch build-indep +.PHONY: clean binary-indep binary-arch binary install commit f4773b83b5f404059d981d6a95ef6bf176f5a01a Author: Julien Cristau <[email protected]> Date: Sun Mar 25 16:33:29 2012 +0200 Delete debian/xsfbs/, it's no longer used in this package. diff --git a/debian/changelog b/debian/changelog index 4212f60..29c126f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libfontenc (1:1.1.1-1) UNRELEASED; urgency=low * New upstream release. * Remove David Nusinow from Uploaders. + * Delete debian/xsfbs/, it's no longer used in this package. -- Julien Cristau <[email protected]> Sun, 25 Mar 2012 16:29:31 +0200 diff --git a/debian/rules b/debian/rules index 8c867eb..67449ea 100755 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,6 @@ # set this to the name of the main shlib's binary package PACKAGE = libfontenc1 -include debian/xsfbs/xsfbs.mk - CFLAGS = -Wall -g ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh deleted file mode 100755 index 5935cc9..0000000 --- a/debian/xsfbs/repack.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/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 diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk deleted file mode 100755 index 5e16b10..0000000 --- a/debian/xsfbs/xsfbs.mk +++ /dev/null @@ -1,276 +0,0 @@ -#!/usr/bin/make -f - -# Debian X Strike Force Build System (XSFBS): Make portion - -# Copyright 1996 Stephen Early -# Copyright 1997 Mark Eichin -# Copyright 1998-2005, 2007 Branden Robinson -# Copyright 2005 David Nusinow -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. - -# Originally by Stephen Early <[email protected]> -# Modified by Mark W. Eichin <[email protected]> -# Modified by Adam Heath <[email protected]> -# Modified by Branden Robinson <[email protected]> -# Modified by Fabio Massimo Di Nitto <[email protected]> -# Modified by David Nusinow <[email protected]> -# Acknowledgements to Manoj Srivastava. - -# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. -export DH_OPTIONS - -# 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. - -# Determine (source) package name from Debian changelog. -SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Source:' | awk '{print $$2}') - -# Determine package version from Debian changelog. -SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Version:' | awk '{print $$2}') - -# Determine upstream version number. -UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') - -# Determine the source version without the epoch for make-orig-tar-gz -NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') - -# Figure out who's building this package. -BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(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 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\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) - -# Set up parameters for the Debian build environment. - -# Determine our architecture. -BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -# Work around some old-time dpkg braindamage. -BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) -# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. -ifdef DEB_HOST_ARCH - ARCH:=$(DEB_HOST_ARCH) -else - # dpkg-cross sets the ARCH environment variable; if set, use it. - ifdef ARCH - ARCH:=$(ARCH) - else - ARCH:=$(BUILD_ARCH) - endif -endif - -# $(STAMP_DIR) houses stamp files for complex targets. -STAMP_DIR:=stampdir - -# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place -# their files. -DEBTREEDIR:=$(CURDIR)/debian/tmp - -# All "important" targets have four lines: -# 1) A target name that is invoked by a package-building tool or the user. -# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. -# 2) A line delcaring 1) as a phony target (".PHONY:"). -# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may -# depend on other targets. -# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the -# "$(STAMP_DIR)/" prefix is omitted. -# -# This indirection is needed so that the "stamp" files that signify when a rule -# is done can be located in a separate "stampdir". Recall that make has no way -# to know when a goal has been met for a phony target (like "build" or -# "install"). -# -# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" -# so that the target will not be run again. Removing the file will make Make -# run the target over. - -# All phony targets should be declared as dependencies of .PHONY, even if they -# do not have "($STAMP_DIR)/"-prefixed counterparts. - -# Define a harmless default rule to keep things from going nuts by accident. -.PHONY: default -default: - -# Set up the $(STAMP_DIR) directory. -.PHONY: stampdir -stampdir_targets+=stampdir -stampdir: $(STAMP_DIR)/stampdir -$(STAMP_DIR)/stampdir: - mkdir $(STAMP_DIR) - >$@ - -# Set up the package build directory as quilt expects to find it. -.PHONY: prepare -stampdir_targets+=prepare -prepare: $(STAMP_DIR)/prepare -$(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 -patch: $(STAMP_DIR)/patch -$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare - if ! [ `which quilt` ]; then \ - echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ - exit 1; \ - fi; \ - if $(QUILT) next >/dev/null 2>&1; then \ - echo -n "Applying patches..."; \ - if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ - cat $(STAMP_DIR)/log/patch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/patch; \ - echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "No patches to apply"; \ - fi; \ - >$@ - -# Revert all patches to the upstream source. -.PHONY: unpatch -unpatch: $(STAMP_DIR)/log - rm -f $(STAMP_DIR)/patch - @echo -n "Unapplying patches..."; \ - 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."; \ - else \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "nothing to do."; \ - fi - -# Clean the generated maintainer scripts. -.PHONY: cleanscripts -cleanscripts: - rm -f $(STAMP_DIR)/genscripts - rm -f debian/*.config \ - debian/*.postinst \ - debian/*.postrm \ - debian/*.preinst \ - debian/*.prerm - -# Clean the package build tree. -.PHONY: xsfclean -xsfclean: cleanscripts unpatch - dh_testdir - rm -rf .pc - rm -rf $(STAMP_DIR) - dh_clean - -# Remove files from the upstream source tree that we don't need, or which have -# licensing problems. It must be run before creating the .orig.tar.gz. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: prune-upstream-tree -prune-upstream-tree: - # Ensure we're in the correct directory. - dh_testdir - grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf - -# Verify that there are no offsets or fuzz in the patches we apply. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: patch-audit -patch-audit: prepare unpatch - @echo -n "Auditing patches..."; \ - >$(STAMP_DIR)/log/patch; \ - FUZZY=; \ - while [ -n "$$($(QUILT) next)" ]; do \ - RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ - case "$$RESULT" in \ - succeeded) \ - echo "fuzzy patch: $$($(QUILT) top)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ - FUZZY=yes; \ - ;; \ - FAILED) \ - echo "broken patch: $$($(QUILT) next)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ - exit 1; \ - ;; \ - esac; \ - done; \ - if [ -n "$$FUZZY" ]; then \ - echo "there were fuzzy patches; please fix."; \ - exit 1; \ - else \ - echo "done."; \ - fi - -# Generate the maintainer scripts. -.PHONY: genscripts -stampdir_targets+=genscripts -genscripts: $(STAMP_DIR)/genscripts -$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir - for FILE in debian/*.config.in \ - debian/*.postinst.in \ - debian/*.postrm.in \ - debian/*.preinst.in \ - debian/*.prerm.in; do \ - if [ -e "$$FILE" ]; then \ - MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ - sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ - cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ - sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ - sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ - -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ - rm $$MAINTSCRIPT.tmp; \ - fi; \ - done - # Validate syntax of generated shell scripts. - #sh debian/scripts/validate-posix-sh debian/*.config \ - # debian/*.postinst \ - # debian/*.postrm \ - # debian/*.preinst \ - # debian/*.prerm - >$@ - -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) -VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) -ifeq ($(PACKAGE),) -PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -endif - -.PHONY: serverabi -serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed - @exit 1 -else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars - echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars -endif - -# vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh deleted file mode 100644 index 813fd8d..0000000 --- a/debian/xsfbs/xsfbs.sh +++ /dev/null @@ -1,622 +0,0 @@ -# This is the X Strike Force shell library for X Window System package -# maintainer scripts. It serves to define shell functions commonly used by -# such packages, and performs some error checking necessary for proper operation -# of those functions. By itself, it does not "do" much; the maintainer scripts -# invoke the functions defined here to accomplish package installation and -# removal tasks. - -# If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can -# skip past this library by scanning forward in this file to the string -# "GOBSTOPPER". - -SOURCE_VERSION=@SOURCE_VERSION@ -OFFICIAL_BUILD=@OFFICIAL_BUILD@ - -# Use special abnormal exit codes so that problems with this library are more -# easily tracked down. -SHELL_LIB_INTERNAL_ERROR=86 -SHELL_LIB_THROWN_ERROR=74 -SHELL_LIB_USAGE_ERROR=99 - -# old -> new variable names -if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then - DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" -fi -if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then - DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" -fi - -# initial sanity checks -if [ -z "$THIS_PACKAGE" ]; then - cat >&2 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_PACKAGE shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of this package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ -z "$THIS_SCRIPT" ]; then - cat >&2 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_SCRIPT shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of the -"$THIS_PACKAGE" package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then - RECONFIGURE="true" -else - RECONFIGURE= -fi - -if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then - FIRSTINST="yes" -fi - -if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then - UPGRADE="yes" -fi - -trap "message;\ - message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ - message;\ - exit 1" HUP INT QUIT TERM - -reject_nondigits () { - # syntax: reject_nondigits [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters other than decimal digits and barf if any are found - while [ -n "$1" ]; do - # does the operand contain anything but digits? - if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then - # can't use die(), because it wraps message() which wraps this function - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -reject_unlikely_path_chars () { - # syntax: reject_unlikely_path_chars [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters unlikely to be seen in a path and which the shell might - # interpret and barf if any are found - while [ -n "$1" ]; do - # does the operand contain any funny characters? - if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ - "encountered possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the -# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while -# the script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -message () { - # pretty-print messages of arbitrary length - reject_nondigits "$COLUMNS" - echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 -} - -observe () { - # syntax: observe message ... - # - # issue observational message suitable for logging someday when support for - # it exists in dpkg - if [ -n "$DEBUG_XORG_PACKAGE" ]; then - message "$THIS_PACKAGE $THIS_SCRIPT note: $*" - fi -} - -warn () { - # syntax: warn message ... - # - # issue warning message suitable for logging someday when support for - # it exists in dpkg; also send to standard error - message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" -} - -die () { - # syntax: die message ... - # - # exit script with error message - message "$THIS_PACKAGE $THIS_SCRIPT error: $*" - exit $SHELL_LIB_THROWN_ERROR -} - -internal_error () { - # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message - message "internal error: $*" - if [ -n "$OFFICIAL_BUILD" ]; then - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - fi - exit $SHELL_LIB_INTERNAL_ERROR -} - -usage_error () { - message "usage error: $*" - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - exit $SHELL_LIB_USAGE_ERROR -} - -font_update () { - # run $UPDATECMDS in $FONTDIRS - - local dir cmd shortcmd x_font_dir_prefix - - x_font_dir_prefix="/usr/share/fonts/X11" - - if [ -z "$UPDATECMDS" ]; then - usage_error "font_update() called but \$UPDATECMDS not set" - fi - if [ -z "$FONTDIRS" ]; then - usage_error "font_update() called but \$FONTDIRS not set" - fi - - 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 - fi - if [ "$shortcmd" = "update-fonts-dir" ]; then - cmd_opts=--x11r7-layout - fi - if [ "$shortcmd" = "update-fonts-scale" ]; then - cmd_opts=--x11r7-layout - fi - $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" \ - "directory data" - fi - done - else - warn "$dir is not a directory; not updating font directory data" - fi - done -} - -remove_conffile_prepare () { - # syntax: remove_conffile_prepare filename official_md5sum ... - # - # Check a conffile "filename" against a list of canonical MD5 checksums. - # If the file's current MD5 checksum matches one of the "official_md5sum" - # operands provided, then prepare the conffile for removal from the system. - # We defer actual deletion until the package is configured so that we can - # roll this operation back if package installation fails. - # - # Call this function from a preinst script in the event $1 is "upgrade" or - # "install" and verify $2 to ensure the package is being upgraded from a - # version (or installed over a version removed-but-not-purged) prior to the - # one in which the conffile was obsoleted. - - local conffile current_checksum - - # validate arguments - if [ $# -lt 2 ]; then - usage_error "remove_conffile_prepare() called with wrong number of" \ - "arguments; expected at least 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - shift - - # does the conffile even exist? - if [ -e "$conffile" ]; then - # calculate its checksum - current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//') - # compare it to each supplied checksum - while [ -n "$1" ]; do - 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" - break - fi - shift - done - fi -} - -remove_conffile_lookup () { - # syntax: remove_conffile_lookup package filename - # - # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal - # if it matches the actual file's md5sum. - # - # Call this function when you would call remove_conffile_prepare but only - # want to check against dpkg's status database instead of known checksums. - - local package conffile old_md5sum - - # validate arguments - if [ $# -ne 2 ]; then - usage_error "remove_conffile_lookup() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - package="$1" - conffile="$2" - - if ! [ -e "$conffile" ]; then - return - fi - old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \ - awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')" - if [ -n "$old_md5sum" ]; then - remove_conffile_prepare "$conffile" "$old_md5sum" - fi -} - -remove_conffile_commit () { - # syntax: remove_conffile_commit filename - # - # Complete the removal of a conffile "filename" that has become obsolete. - # - # Call this function from a postinst script after having used - # remove_conffile_prepare() in the preinst. - - local conffile - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "remove_conffile_commit() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - 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" - fi -} - -remove_conffile_rollback () { - # syntax: remove_conffile_rollback filename - # - # Roll back the removal of a conffile "filename". - # - # Call this function from a postrm script in the event $1 is "abort-upgrade" - # or "abort-install" is after having used remove_conffile_prepare() in the - # preinst. - - local conffile - - # validate arguments -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
