autogen.sh | 12 debian/changelog | 14 debian/compat | 2 debian/control | 27 - debian/patches/autogen.sh-install | 22 + debian/patches/series | 1 debian/rules | 84 ----- debian/source/format | 1 debian/xsfbs/repack.sh | 32 - debian/xsfbs/xsfbs.mk | 285 ----------------- debian/xsfbs/xsfbs.sh | 622 -------------------------------------- 11 files changed, 50 insertions(+), 1052 deletions(-)
New commits: commit 1d6dc277e12581549d7b5598949eb5643e582edc Author: Drew Parsons <[email protected]> Date: Sun Aug 20 13:26:00 2017 +0800 upload 1:1.1.14-2 to unstable diff --git a/debian/changelog b/debian/changelog index 4f5b452..f98363a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxcursor (1:1.1.14-2) UNRELEASED; urgency=medium +libxcursor (1:1.1.14-2) unstable; urgency=medium * Team upload. - remove Drew Parsons as Uploader. @@ -10,7 +10,7 @@ libxcursor (1:1.1.14-2) UNRELEASED; urgency=medium * debhelper compatibility level 10 * Remove libxcursor1-dbg: symbols are now provided by libxcursor1-dbgsym - -- Drew Parsons <[email protected]> Sun, 20 Aug 2017 12:46:42 +0800 + -- Drew Parsons <[email protected]> Sun, 20 Aug 2017 13:25:32 +0800 libxcursor (1:1.1.14-1) unstable; urgency=low commit b619d8b4d6af4415837c111fe7003ea371a91a01 Author: Drew Parsons <[email protected]> Date: Sun Aug 20 13:25:19 2017 +0800 Team upload: remove Drew Parsons as Uploader. diff --git a/debian/changelog b/debian/changelog index db78546..4f5b452 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxcursor (1:1.1.14-2) UNRELEASED; urgency=medium * Team upload. + - remove Drew Parsons as Uploader. * Standards-Version: 4.0.1 * Debian source format 3.0 (quilt) - remove debian/xsfbs (quilt patch functionality now standard) diff --git a/debian/control b/debian/control index 6094fd6..c851ce4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libxcursor Section: devel Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: Drew Parsons <[email protected]>, Cyril Brulebois <[email protected]> +Uploaders: Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 10), # dpkg-buildflags --export=configure commit fd8ed8a7523aaf9476c9cfe81c3c55240b6c2e08 Author: Drew Parsons <[email protected]> Date: Sun Aug 20 13:22:31 2017 +0800 Remove libxcursor1-dbg: symbols are now provided by libxcursor1-dbgsym diff --git a/debian/changelog b/debian/changelog index 112d810..db78546 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libxcursor (1:1.1.14-2) UNRELEASED; urgency=medium - update autogen.sh as debian patch, take from upstream git repo * Convert debian build system to dh * debhelper compatibility level 10 + * Remove libxcursor1-dbg: symbols are now provided by libxcursor1-dbgsym -- Drew Parsons <[email protected]> Sun, 20 Aug 2017 12:46:42 +0800 diff --git a/debian/control b/debian/control index 8183df8..6094fd6 100644 --- a/debian/control +++ b/debian/control @@ -46,27 +46,6 @@ Depends: Description: X cursor management library This is a udeb, or a microdeb, for the debian-installer. -Package: libxcursor1-dbg -Section: debug -Priority: extra -Architecture: any -Depends: - libxcursor1 (= ${binary:Version}), - ${shlibs:Depends}, - ${misc:Depends}, -Multi-Arch: same -Description: X cursor management library (unstripped) - This package provides an unstripped shared object with debugging symbols, - useful to provide a backtrace with symbol names in a debugger; this - facilitates interpretation of core dumps, and aids in finding logic errors in - programs using this library (or the library itself). The library is - installed in /usr/lib/debug and can be used by placing that directory in the - LD_LIBRARY_PATH environment variable when the code to be debugged is - executed. Non-programmers will likely have little use for this package. - . - Non-programmers will likely have little use for this package. See the - libxcursor1 package for further information. - Package: libxcursor-dev Section: libdevel Architecture: any commit d4aa2098ffa299064352d750c5590827c3e47948 Author: Drew Parsons <[email protected]> Date: Sun Aug 20 13:18:09 2017 +0800 update autogen.sh as debian patch take update from upstream git repo ( https://cgit.freedesktop.org/xorg/lib/libXcursor/plain/autogen.sh ) autogen.sh is not in the tarball, so it has to be provided as a debian patch Also, fix tabs in dh line in debian/rules diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 904cd67..0000000 --- a/autogen.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff --git a/debian/changelog b/debian/changelog index 88570e3..112d810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libxcursor (1:1.1.14-2) UNRELEASED; urgency=medium * Standards-Version: 4.0.1 * Debian source format 3.0 (quilt) - remove debian/xsfbs (quilt patch functionality now standard) + - update autogen.sh as debian patch, take from upstream git repo * Convert debian build system to dh * debhelper compatibility level 10 diff --git a/debian/patches/autogen.sh-install b/debian/patches/autogen.sh-install new file mode 100644 index 0000000..d5dee25 --- /dev/null +++ b/debian/patches/autogen.sh-install @@ -0,0 +1,22 @@ +Index: libxcursor/autogen.sh +=================================================================== +--- /dev/null ++++ libxcursor/autogen.sh +@@ -0,0 +1,17 @@ ++#! /bin/sh ++ ++srcdir=`dirname "$0"` ++test -z "$srcdir" && srcdir=. ++ ++ORIGDIR=`pwd` ++cd "$srcdir" ++ ++autoreconf -v --install || exit 1 ++cd "$ORIGDIR" || exit $? ++ ++git config --local --get format.subjectPrefix >/dev/null 2>&1 || ++ git config --local format.subjectPrefix "PATCH libXcursor" ++ ++if test -z "$NOCONFIGURE"; then ++ exec "$srcdir"/configure "$@" ++fi diff --git a/debian/patches/series b/debian/patches/series index e69de29..a45425d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +autogen.sh-install diff --git a/debian/rules b/debian/rules index 538d720..61ad145 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ override_dh_auto_configure: dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man \ commit f26250629a445b1e6e9eed8a5a97462430bb80b4 Author: Drew Parsons <[email protected]> Date: Sun Aug 20 13:02:15 2017 +0800 debhelper compatibility level 10 diff --git a/debian/changelog b/debian/changelog index c6ae19e..88570e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libxcursor (1:1.1.14-2) UNRELEASED; urgency=medium * Debian source format 3.0 (quilt) - remove debian/xsfbs (quilt patch functionality now standard) * Convert debian build system to dh + * debhelper compatibility level 10 -- Drew Parsons <[email protected]> Sun, 20 Aug 2017 12:46:42 +0800 diff --git a/debian/compat b/debian/compat index 7f8f011..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/debian/control b/debian/control index 57546eb..8183df8 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: Drew Parsons <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: - debhelper (>= 8.1.3), + debhelper (>= 10), # dpkg-buildflags --export=configure dpkg-dev (>= 1.16.1), x11proto-core-dev (>= 6.2.1+cvs.20050722), commit c1641dc1647df931e850bb7aaf1b11d949adbbe2 Author: Drew Parsons <[email protected]> Date: Sun Aug 20 13:01:10 2017 +0800 Convert debian build system to dh diff --git a/debian/changelog b/debian/changelog index adbde62..c6ae19e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libxcursor (1:1.1.14-2) UNRELEASED; urgency=medium * Standards-Version: 4.0.1 * Debian source format 3.0 (quilt) - remove debian/xsfbs (quilt patch functionality now standard) + * Convert debian build system to dh -- Drew Parsons <[email protected]> Sun, 20 Aug 2017 12:46:42 +0800 diff --git a/debian/rules b/debian/rules index c19108f..538d720 100755 --- a/debian/rules +++ b/debian/rules @@ -1,54 +1,16 @@ #!/usr/bin/make -f -# debian/rules for the Debian libxcursor package. -# Copyright © 2004 Scott James Remnant <[email protected]> -# Copyright © 2005 Daniel Stone <[email protected]> -# Copyright © 2005 David Nusinow <[email protected]> +%: + dh $@ -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# set this to the name of the main shlib's binary package -PACKAGE = libxcursor1 - -include debian/xsfbs/xsfbs.mk - -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif - -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -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 -confflags += $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure) - -build: build-indep build-arch -build-indep: -build-arch: build-stamp -.PHONY: build build-indep build-arch - -build-stamp: $(STAMP_DIR)/patch - dh_testdir - autoreconf -vfi - mkdir -p build - cd build && \ - ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ +override_dh_auto_configure: + dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man \ --with-cursorpath=~/.icons:\$${datadir}/icons:/usr/share/pixmaps \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --infodir=\$${prefix}/share/info \ --disable-silent-rules \ $(confflags) - cd build && $(MAKE) - >$@ -clean: xsfclean - dh_testdir +override_dh_clean: rm -f build-stamp rm -f config.cache config.log config.status rm -f */config.cache */config.log */config.status @@ -60,38 +22,8 @@ clean: xsfclean find -name Makefile.in -delete dh_clean -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - - dh_installdocs +override_dh_install: dh_install --list-missing --exclude=libXcursor.la - dh_installman - dh_installchangelogs - dh_link - dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg - dh_strip -N$(PACKAGE) - dh_compress - dh_fixperms - dh_makeshlibs -V "libxcursor1 (>> 1.1.2)" --add-udeb=$(PACKAGE)-udeb - dh_shlibdeps - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-independent files here. -binary-indep: build install -# Nothing to do -binary: binary-indep binary-arch -.PHONY: clean binary-indep binary-arch binary install +override_dh_makeshlibs: + dh_makeshlibs -V "libxcursor1 (>> 1.1.2)" --add-udeb=$(PACKAGE)-udeb commit 4be6ac64e6db07b13c594a7277e523de4af88a6e Author: Drew Parsons <[email protected]> Date: Sun Aug 20 12:59:25 2017 +0800 Debian source format 3.0 (quilt) - remove debian/xsfbs (quilt patch functionality now standard) diff --git a/debian/changelog b/debian/changelog index 13abdb1..adbde62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libxcursor (1:1.1.14-2) UNRELEASED; urgency=medium * Team upload. * Standards-Version: 4.0.1 + * Debian source format 3.0 (quilt) + - remove debian/xsfbs (quilt patch functionality now standard) -- Drew Parsons <[email protected]> Sun, 20 Aug 2017 12:46:42 +0800 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) 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 3c59c20..0000000 --- a/debian/xsfbs/xsfbs.mk +++ /dev/null @@ -1,285 +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)/logdir $(STAMP_DIR)/genscripts - >$@ - -.PHONY: logdir -stampdir_targets+=logdir -logdir: $(STAMP_DIR)/logdir -$(STAMP_DIR)/logdir: $(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)/logdir - 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 - >$@ - -# Compute dependencies for drivers -# -VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) -INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) - -# these two can be removed post-squeeze -VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input - -ifeq ($(PACKAGE),) -PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -endif - -.PHONY: serverabi -serverabi: install -ifeq ($(VIDEODEP),) - @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' - @exit 1 -else - echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars - # the following is there for compatibility... - echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> 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:]].*//')
