--- libxcursor-1.1.14.orig/autogen.sh +++ libxcursor-1.1.14/autogen.sh @@ -0,0 +1,12 @@ +#! /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 "$@" --- libxcursor-1.1.14.orig/debian/libxcursor1-udeb.install +++ libxcursor-1.1.14/debian/libxcursor1-udeb.install @@ -0,0 +1 @@ +usr/lib/*/libXcursor.so.* usr/lib --- libxcursor-1.1.14.orig/debian/watch +++ libxcursor-1.1.14/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/lib/libXcursor +version=3 +http://xorg.freedesktop.org/releases/individual/lib/ libXcursor-(.*)\.tar\.gz --- libxcursor-1.1.14.orig/debian/copyright +++ libxcursor-1.1.14/debian/copyright @@ -0,0 +1,56 @@ +This package was debianized by ISHIKAWA Mutsumi on +Mon, 12 May 2003 05:14:45 +0900. + +It was downloaded from +http://xorg.freedesktop.org/releases/individual/lib/ + +Upstream copyright: + + Copyright © 2001,2003 Keith Packard + +Upstream license: + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting documentation, and + that the name of Keith Packard not be used in advertising or publicity + pertaining to distribution of the software without specific, written prior + permission. Keith Packard makes no representations about the suitability of + this software for any purpose. It is provided "as is" without express or + implied warranty. + + KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT + SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + +The Debian packaging infrastructure in the debian/ directory of the source +package is independently authored and copyrighted. + +Debian copyright: + + Copyright 2003 Software in the Public Interest, Inc. + +Debian license: + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting documentation, and + that the name of Software in the Public Interest, Inc. not be used in + advertising or publicity pertaining to distribution of the software without + specific, written prior permission. Software in the Public Interest, Inc. + makes no representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied warranty. + + SOFTWARE IN THE PUBLIC INTEREST, INC. DISCLAIMS ALL WARRANTIES WITH REGARD + TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- libxcursor-1.1.14.orig/debian/control +++ libxcursor-1.1.14/debian/control @@ -0,0 +1,85 @@ +Source: libxcursor +Section: devel +Priority: optional +Maintainer: Debian X Strike Force +Uploaders: Drew Parsons , Cyril Brulebois +Build-Depends: + debhelper (>= 8.1.3), +# dpkg-buildflags --export=configure + dpkg-dev (>= 1.16.1), + x11proto-core-dev (>= 6.2.1+cvs.20050722), + libx11-dev (>= 2:1.3.3-2), + libxrender-dev (>= 1:0.9.5-2), + libxfixes-dev (>= 1:4.0.4-2), + pkg-config, + quilt, + automake, + libtool, + xutils-dev (>= 1:7.5+4), +Standards-Version: 3.9.2 +Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxcursor +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxcursor.git + +Package: libxcursor1 +Section: libs +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Description: X cursor management library + Xcursor is a simple library designed to help locate and load cursors for the + X Window System. Cursors can be loaded from files or memory and can exist in + several sizes; the library automatically picks the best size. When using + images loaded from files, Xcursor prefers to use the Render extension's + CreateCursor request for rendering cursors. Where the Render extension is + not supported, Xcursor maps the cursor image to a standard X cursor and uses + the core X protocol CreateCursor request. + +Package: libxcursor1-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: + ${shlibs: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 +Multi-Arch: same +Depends: + libxcursor1 (= ${binary:Version}), + x11proto-core-dev, + libx11-dev, + libxrender-dev, + libxfixes-dev, + ${misc:Depends}, +Description: X cursor management library (development files) + Header files and a static version of the X cursor management library are + provided by this package. + . + See the libxcursor1 package for further information. --- libxcursor-1.1.14.orig/debian/changelog +++ libxcursor-1.1.14/debian/changelog @@ -0,0 +1,439 @@ +libxcursor (1:1.1.14-1) unstable; urgency=low + + * New upstream release. + * Bump debhelper compat level to 7. + * Simplify installing the manpage. No need to go through dh_installmanpages + when dh_install does the job. + * Disable silent rules. + * Use dpkg-buildflags. + + -- Julien Cristau Sun, 23 Jun 2013 19:55:42 +0200 + +libxcursor (1:1.1.13-1+deb7u1) wheezy-security; urgency=high + + * signedness bug & integer overflow in _XcursorFileHeaderCreate() + [CVE-2013-2003] + + -- Julien Cristau Tue, 14 May 2013 00:38:17 +0200 + +libxcursor (1:1.1.13-1) unstable; urgency=low + + * New upstream release. + * Mark libxcursor-dev multi-arch: same. + * Don't require root for debian/rules clean. + + -- Julien Cristau Fri, 13 Apr 2012 20:47:26 +0200 + +libxcursor (1:1.1.12-1) unstable; urgency=low + + * New upstream release. + + -- Cyril Brulebois Thu, 30 Jun 2011 12:48:34 +0200 + +libxcursor (1:1.1.11-3) unstable; urgency=low + + * Team upload. + * Don't put debugging symbols for the udeb in libxcursor1-dbg. + * Add build-arch and build-indep debian/rules target, and fix dependency for + build-stamp. + + -- Julien Cristau Sat, 11 Jun 2011 23:59:05 +0200 + +libxcursor (1:1.1.11-2) unstable; urgency=low + + * Team upload. + + [ Steve Langasek ] + * Build for multiarch. + + [ Julien Cristau ] + * Remove David Nusinow from Uploaders. + * Bump Standards-Version to 3.9.2. + + -- Julien Cristau Sat, 11 Jun 2011 15:26:06 +0200 + +libxcursor (1:1.1.11-1) unstable; urgency=low + + * New upstream release. + * Bump xutils-dev build-dep for new macros. + + -- Cyril Brulebois Sat, 06 Nov 2010 14:19:32 +0100 + +libxcursor (1:1.1.10-2) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Cyril Brulebois ] + * Add udeb needed for the graphical installer: libxcursor1-udeb. + * Version/Bump some B-D to make sure the udeb gets its dependencies on + the (recently-added) udebs rather than on the libraries: + - libx11-dev + - libxfixes-dev + - libxrender-dev + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + * Add myself to Uploaders. + * Add ${misc:Depends} to non-udeb binaries, and wrap Depends. + + -- Cyril Brulebois Thu, 11 Mar 2010 05:05:33 +0100 + +libxcursor (1:1.1.10-1) unstable; urgency=low + + [ Julien Cristau ] + * Drop the -1 debian revisions from build-depends. + * Bump Standards-Version to 3.7.3. + * Drop the XS- prefix from Vcs-* control fields. + * Remove /usr/X11R6/lib/X11/icons from the cursor path (closes: #557292). + * Kill vim modeline from debian changelog, it makes lintian angry. + + [ Brice Goglin ] + * Add README.source, bump Standards-Version to 3.8.2. + * Use updated xsfbs, closes: #538582. + * Move -dbg package to section debug. + + [ Timo Aaltonen ] + * New upstream release (closes: #554238). + * Run autoreconf on build. Add build-deps on automake, libtool + and xutils-dev. + * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N. + * Bump Standards-Version to 3.8.3. + * Drop pre-dependency on x11-common from libxcursor-dev. This was needed + for upgrades from sarge. + + -- Julien Cristau Wed, 25 Nov 2009 15:30:10 +0100 + +libxcursor (1:1.1.9-1) unstable; urgency=low + + * New upstream release. + * Update URL in debian/copyright. + * Add myself to Uploaders, and remove ISHIKAWA Mutsumi and Branden. + * Replace deprecated Source-Version with binary:Version. + + -- Julien Cristau Sat, 25 Aug 2007 11:37:23 +0200 + +libxcursor (1:1.1.8-2) unstable; urgency=low + + * Upload to unstable. + * Add XS-Vcs-Browser to debian/control. + + -- Julien Cristau Wed, 11 Apr 2007 12:39:57 +0200 + +libxcursor (1:1.1.8-1) experimental; urgency=low + + * New upstream release. + + drop patch applied upstream. + * Add XS-Vcs-Git in debian/control. + + -- Julien Cristau Tue, 13 Feb 2007 10:07:38 +0100 + +libxcursor (1.1.7-4) unstable; urgency=low + + * Pull leak fixes from upstream (01_leak_fixes.diff) + + -- David Nusinow Wed, 30 Aug 2006 16:41:34 -0400 + +libxcursor (1.1.7-3) unstable; urgency=low + + * Recompile for unstable's libxfixes3 3.0.1. + + -- Drew Parsons Sat, 26 Aug 2006 09:31:19 +1000 + +libxcursor (1.1.7-2) unstable; urgency=low + + * Bring X11R7.1 into unstable. + + -- Drew Parsons Sat, 26 Aug 2006 09:17:06 +1000 + +libxcursor (1.1.7-1) experimental; urgency=low + + * New upstream version (X11R7.1). + * Install man pages with dh_installman. + * Exclude .la and man files from dh_install. + * Remove libxcursor1-dbg.install. Somehow debhelper just knows where + to put the files (ooh, spooky). + + -- Drew Parsons Sat, 12 Aug 2006 22:39:03 +1000 + +libxcursor (1.1.5.2-6) UNRELEASED; urgency=low + + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + * Bump standards version to 3.7.2.0. + * Version x11-common pre-dep in -dev package to 1:7.0.0 to match + the rest of Debian. + * Bump debhelper compat to 5. + * Fix dh_strip call to skip the -dbg package. + * Remove daniels from uploaders. + + -- Andres Salomon Mon, 17 Jul 2006 01:20:47 -0400 + +libxcursor (1.1.5.2-5) unstable; urgency=low + + * Reorder makeshlib command in rules file so that ldconfig is run + properly. Thanks Drew Parsons and Steve Langasek. + + -- David Nusinow Wed, 19 Apr 2006 00:06:24 -0400 + +libxcursor (1.1.5.2-4) UNRELEASED; urgency=low + + * Append /usr/X11R6/lib/X11/icons to the icon search path for + backwards compatibility. + + -- Steve Langasek Tue, 18 Apr 2006 16:27:59 -0700 + +libxcursor (1.1.5.2-3) unstable; urgency=low + + * Add libxfixes-dev to the depends of libxcursor-dev + + -- David Nusinow Wed, 12 Apr 2006 20:52:24 -0400 + +libxcursor (1.1.5.2-2) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Thu, 23 Mar 2006 22:44:31 -0500 + +libxcursor (1.1.5.2-1) experimental; urgency=low + + * First upload to Debian + + -- David Nusinow Mon, 23 Jan 2006 22:43:51 -0500 + +libxcursor (1.1.5.2-0ubuntu2) dapper; urgency=low + + * Change dependency on x-common to x11-common. + + -- Daniel Stone Thu, 19 Jan 2006 18:24:22 +1100 + +libxcursor (1.1.5.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Repackage in line with all the other X libraries. + + -- Daniel Stone Mon, 12 Dec 2005 15:14:52 +1100 + +xcursor (1.1.5-0ubuntu1) breezy; urgency=low + + * New upstream release. + + -- Daniel Stone Wed, 16 Nov 2005 10:09:16 +1100 + +xcursor (1.1.4-0ubuntu5) breezy; urgency=low + + * Bump Build-Depends on x11proto-core-dev, libx11-dev and libxfixes-dev + high enough that we don't see _XOPEN_SOURCE again. + * Remove libc6-dev | libc-dev dependency from libxcursor-dev (???), change + x-dev to x11proto-core-dev. + * Stop installing libXcursor.la. + * Clean up libxcursor-dev.install. + + -- Daniel Stone Fri, 22 Jul 2005 23:48:13 +1000 + +xcursor (1.1.4-0ubuntu4) breezy; urgency=low + + * Make the xrender build-dep versioned, to rid us of libXrender.la. + + -- Adam Conrad Tue, 19 Jul 2005 14:54:02 +1000 + +xcursor (1.1.4-0ubuntu3) breezy; urgency=low + + * Rebuild with the current libXrender. + + -- Sebastien Bacher Fri, 15 Jul 2005 15:52:32 +0200 + +xcursor (1.1.4-0ubuntu2) breezy; urgency=low + + * Add missing build-deps on libxfixes-dev and make it correctly + versioned so we will have the xfixes.pc file in the correct place. + + -- Tollef Fog Heen Thu, 30 Jun 2005 16:54:15 +0200 + +xcursor (1.1.4-0ubuntu1) breezy; urgency=low + + * New upstream release. + + -- Daniel Stone Thu, 30 Jun 2005 04:36:17 +1000 + +xcursor (1.1.3-1ubuntu2) breezy; urgency=low + + * Add Pre-Depends on x-common to libxcursor-dev to avoid files getting stuck + in /usr/X11R6 thanks to symlink treachery. + + -- Daniel Stone Thu, 19 May 2005 00:50:18 +1000 + +xcursor (1.1.3-1ubuntu1) breezy; urgency=low + + * Move files from /usr/X11R6 to /usr. + + -- Fabio M. Di Nitto Tue, 17 May 2005 19:20:26 +0200 + +xcursor (1.1.3-1) unstable; urgency=medium + + * Urgency due to fix for release-critical bug. + + * New upstream version. + + Invokes AC_SUBST() on X_CFLAGS and X_LIBS, unbreaking xcursor.pc file. + (Closes: #241249) + + * Add versioning to libxcursor1's shlibs information, since Xcursor 1.1.2 + added a member to the XcursorImages structure and added the + XcursorImagesSetName() and XcursorLibraryPath() functions. + + * Disable upstream autoconf check for the XFIXES library, as this library is + not packaged for Debian yet, and upstream supports no option to the + configure script to avoid checking (neverthless, the source is designed to + be buildable without it). Regenerate related files with autogen.sh + script. + + * Modify AC_PATH_XTRA invocation to take advantage of Debian's enhancements + (from autoconf 2.59-3); don't use the macro's defaults, which look for the + Xt library which we don't use. Instead search for the X11 library, the + Xlib.h header file, and the XInternAtom() function, all of which are + actually used by the Xcursor library. Regenerate related files with the + autogen.sh script. + + * Update config.guess, config.sub, and ltmain.sh with libtoolize --force + --copy. + + * Update package descriptions. + + -- Branden Robinson Mon, 19 Apr 2004 15:39:41 -0500 + +xcursor (1.0.2-5) unstable; urgency=low + + * Make package compatible with the XFree86 4.3.0 package reorganization. + - debian/control + + package build-depends on x-dev and libx11-dev instead of xlibs-dev + + libxcursor-dev depends on x-dev and libx11-dev instead of xlibs-dev + + * Remove README.Debian; the release of xfree86 4.3.0-1 to unstable renders + advice about installing these xcursor packages in conjunction with + experimental XFree86 4.3.0 packages unecessary. + - debian/README.Debian + + * Give source package a section ("devel", just like xft) to shut up + complaints from dpkg-genchanges. + - debian/control + + * Remove AC_PATH_X and subsequent bailout logic from configure.ac; the + mechanism used to find the Xrender suffices to configure the build + environment. Run aclocal && automake --foreign && autoconf. + - configure + - Makefile.in + - config.h.in + - configure.ac + - aclocal.m4 + + -- Branden Robinson Fri, 12 Mar 2004 12:51:55 -0500 + +xcursor (1.0.2-4) unstable; urgency=medium + + * urgency due to fix for FTBFS + + * Set priority of libxcursor1-dbg package to extra (resolves override + disparity). + - debian/control + + * Restore build-dependency on pkg-config; AM_MAINTAINER_MODE doesn't prevent + the ./configure script from running during a package build, and the + ./configure script does indeed invoke pkg-config (fixes FTBFS). + (Closes: #225433) + - debian/control + + -- Branden Robinson Tue, 30 Dec 2003 11:46:15 -0500 + +xcursor (1.0.2-3) unstable; urgency=low + + * Update copyright file to refer to new canonical upstream URL for source + archive. + - debian/copyright + + * Elaborate and clarify README.Debian as regards Daniel Stone's experimental + xfree86 packages. + - debian/README.Debian + + * Set AM_MAINTAINER_MODE because we do not want automake running during + Debian package builds. + - configure.ac + + * Run aclocal && automake --foreign && autoconf to resynchronize with + change to configure.ac. + - Makefile.in + - aclocal.m4 + - configure + + * Stop passing arguments to dh_makeshlibs; there has not yet been a version + of xcursor released to Debian that has not been forwards-compatible. + - debian/rules + + * Bump package's standards-version to 3.6.1; no changes necessary. + - debian/control + + * Clean up package's build-dependencies and -dev package's dependencies. + - debian/control: + + add versioning of (>= 0.4.12) to build-dependency on cdbs for proper + support of debugging libraries + + tweak versioned build-dependency on debhelper (>> 4.0.0) to be a >= + instead + + drop versioning of build-dependency on xlibs-dev; libXcursor1 links + only against libX11, thus no versioning is necessary + + drop build-dependencies on autotools-dev and pkg-config since we now + use AM_MAINTAINER_MODE + + drop libxcursor-dev's dependency on ${shlibs:Depends}; it's not + necessary + + add dependencies on xlibs-dev and libxrender-dev to libxcursor-dev + + * Remove extraneous and possibly misleading wording in libxcursor1-dbg's + extended description. + - debian/control + + * Add Daniel Stone to list of uploaders. + - debian/control + + -- Branden Robinson Mon, 13 Oct 2003 00:12:31 -0500 + +xcursor (1.0.2-2) unstable; urgency=low + + * add missing Build-Depends: pkg-config, closes: #198584 + + -- ISHIKAWA Mutsumi Tue, 24 Jun 2003 16:05:57 +0900 + +xcursor (1.0.2-1) unstable; urgency=low + + * I'm back and Initial official upload release. + * libraries moved into /usr/lib/{,debug} instead of + /usr/X11R6/lib/{,debug} (adapt Debian policy section 12.8.7.) + * drop conflicts: xlibs* (>> 4.3.0-0), xlibs* (<< 4.3.0-0pre1v1) + because versioned AND conflicts are not supported. + + -- ISHIKAWA Mutsumi Tue, 3 Jun 2003 00:35:13 +0900 + +xcursor (1.0.2-0beta4) unstable; urgency=low + + * only conflicts: xlibs* (>> 4.3.0-0), xlibs* (<< 4.3.0-0pre1v1) + + -- ISHIKAWA Mutsumi Fri, 30 May 2003 01:35:26 +0900 + +xcursor (1.0.2-0beta3) unstable; urgency=low + + * migrate to use cdbs + * add Build-Depends: cdbs + * remove Daniel Stone from uploaders (because he is not DD, yet) + * Bump Standards-Version: 3.5.10 + + -- ISHIKAWA Mutsumi Wed, 28 May 2003 03:10:50 +0900 + +xcursor (1.0.2-0beta2) unstable; urgency=low + + * fix to install Xcursor.h into correct place + + -- ISHIKAWA Mutsumi Sat, 24 May 2003 03:55:44 +0900 + +xcursor (1.0.2-0beta1) unstable; urgency=low + + * Initial Beta Release. + + -- ISHIKAWA Mutsumi Thu, 22 May 2003 02:31:37 +0900 --- libxcursor-1.1.14.orig/debian/libxcursor-dev.install +++ libxcursor-1.1.14/debian/libxcursor-dev.install @@ -0,0 +1,5 @@ +usr/include/X11/Xcursor/Xcursor.h +usr/lib/*/libXcursor.a +usr/lib/*/libXcursor.so +usr/lib/*/pkgconfig/*.pc +usr/share/man --- libxcursor-1.1.14.orig/debian/rules +++ libxcursor-1.1.14/debian/rules @@ -0,0 +1,97 @@ +#!/usr/bin/make -f +# debian/rules for the Debian libxcursor package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# 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 \ + --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 + rm -f build-stamp + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf build + rm -f aclocal.m4 config.guess config.h.in config.sub configure + rm -f depcomp install-sh ltmain.sh missing mkinstalldirs + 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 + 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 --- libxcursor-1.1.14.orig/debian/README.source +++ libxcursor-1.1.14/debian/README.source @@ -0,0 +1,73 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. + +quilt is actually invoked by the Debian X packaging through a larger +set of scripts called XSFBS. XSFBS brings some other X specific +features such as managing dependencies and conflicts due to the video +and input driver ABIs. +XSFBS itself is maintained in a separate repository at + git://git.debian.org/pkg-xorg/xsfbs.git +and it is pulled inside the other Debian X repositories when needed. + +The XSFBS patching system requires a build dependency on quilt. Also +a dependency on $(STAMP_DIR)/patch has to be added to debian/rules +so that the XSFBS patching occurs before the actual build. So the +very first target of the build (likely the one running autoreconf) +should depend on $(STAMP_DIR)/patch. It should also not depend on +anything so that parallel builds are correctly supported (nothing +should probably run while patching is being done). And finally, the +clean target should depend on the xsfclean target so that patches +are unapplied on clean. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. --- libxcursor-1.1.14.orig/debian/compat +++ libxcursor-1.1.14/debian/compat @@ -0,0 +1 @@ +7 --- libxcursor-1.1.14.orig/debian/libxcursor1.install +++ libxcursor-1.1.14/debian/libxcursor1.install @@ -0,0 +1 @@ +usr/lib/*/libXcursor.so.* --- libxcursor-1.1.14.orig/debian/xsfbs/repack.sh +++ libxcursor-1.1.14/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 --- libxcursor-1.1.14.orig/debian/xsfbs/xsfbs.sh +++ libxcursor-1.1.14/debian/xsfbs/xsfbs.sh @@ -0,0 +1,622 @@ +# 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 < 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 < 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 " \ + " 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 " \ + " 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 + if [ $# -ne 1 ]; then + usage_error "remove_conffile_rollback() 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, move it + # back + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "rolling back removal of obsolete conffile $conffile" + mv "$conffile.$THIS_PACKAGE-tmp" "$conffile" + fi +} + +replace_conffile_with_symlink_prepare () { + # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ + # official_md5sum ... + # + # Check a conffile "oldfilename" 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. Otherwise copy it + # to newfilename and let dpkg handle it through conffiles mechanism. + # + # 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 3 ]; then + usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ + " number of arguments; expected at least 3, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + shift + newconffile="$1" + shift + + remove_conffile_prepare "$_oldconffile" "$@" + # If $oldconffile still exists, then md5sums didn't match. + # Copy it to new one. + if [ -f "$oldconffile" ]; then + cp "$oldconffile" "$newconffile" + fi + +} + +replace_conffile_with_symlink_commit () { + # syntax: replace_conffile_with_symlink_commit oldfilename + # + # Complete the removal of a conffile "oldfilename" that has been + # replaced by a symlink. + # + # Call this function from a postinst script after having used + # replace_conffile_with_symlink_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "replace_conffile_with_symlink_commit() called with wrong" \ + "number of arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + remove_conffile_commit "$conffile" +} + +replace_conffile_with_symlink_rollback () { + # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename + # + # Roll back the replacing of a conffile "oldfilename" with symlink to + # "newfilename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" and verify $2 to ensure the package failed to upgrade + # from a version (or install over a version removed-but-not-purged) prior + # to the one in which the conffile was obsoleted. + # You should have used replace_conffile_with_symlink_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ + "number of arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + newconffile="$2" + + remove_conffile_rollback "$_oldconffile" + if [ -f "$newconffile" ]; then + rm "$newconffile" + fi +} + +run () { + # syntax: run command [ argument ... ] + # + # Run specified command with optional arguments and report its exit status. + # Useful for commands whose exit status may be nonzero, but still acceptable, + # or commands whose failure is not fatal to us. + # + # NOTE: Do *not* use this function with db_get or db_metaget commands; in + # those cases the return value of the debconf command *must* be checked + # before the string returned by debconf is used for anything. + + local retval + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "run() called with wrong number of arguments; expected at" \ + "least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + "$@" || retval=$? + + if [ ${retval:-0} -ne 0 ]; then + observe "command \"$*\" exited with status $retval" + fi +} + +make_symlink_sane () { + # syntax: make_symlink_sane symlink target + # + # Ensure that the symbolic link symlink exists, and points to target. + # + # If symlink does not exist, create it and point it at target. + # + # If symlink exists but is not a symbolic link, back it up. + # + # If symlink exists, is a symbolic link, but points to the wrong location, fix + # it. + # + # If symlink exists, is a symbolic link, and already points to target, do + # nothing. + # + # This function wouldn't be needed if ln had an -I, --idempotent option. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "make_symlink_sane() called with wrong number of arguments;" \ + "expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local symlink target + + symlink="$1" + target="$2" + + if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then + observe "link from $symlink to $target already exists" + else + observe "creating symbolic link from $symlink to $target" + mkdir -p "${target%/*}" "${symlink%/*}" + ln -s -b -S ".dpkg-old" "$target" "$symlink" + fi +} + +migrate_dir_to_symlink () { + # syntax: migrate_dir_to_symlink old_location new_location + # + # Per Debian Policy section 6.5.4, "A directory will never be replaced by a + # symbolic link to a directory or vice versa; instead, the existing state + # (symlink or not) will be left alone and dpkg will follow the symlink if + # there is one." + # + # We have to do it ourselves. + # + # This function moves the contents of old_location, a directory, into + # new_location, a directory, then makes old_location a symbolic link to + # new_location. + # + # old_location need not exist, but if it does, it must be a directory (or a + # symlink to a directory). If it is not, it is backed up. If new_location + # exists already and is not a directory, it is backed up. + # + # This function should be called from a package's preinst so that other + # packages unpacked after this one --- but before this package's postinst runs + # --- are unpacked into new_location even if their payloads contain + # old_location filespecs. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "migrate_dir_to_symlink() called with wrong number of" + "arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local new old + + old="$1" + new="$2" + + # Is old location a symlink? + if [ -L "$old" ]; then + # Does it already point to new location? + if [ "$(readlink "$old")" = "$new" ]; then + # Nothing to do; migration has already been done. + observe "migration of $old to $new already done" + return 0 + else + # Back it up. + warn "backing up symbolic link $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + fi + + # Does old location exist, but is not a directory? + if [ -e "$old" ] && ! [ -d "$old" ]; then + # Back it up. + warn "backing up non-directory $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + + observe "migrating $old to $new" + + # Is new location a symlink? + if [ -L "$new" ]; then + # Does it point the wrong way, i.e., back to where we're migrating from? + if [ "$(readlink "$new")" = "$old" ]; then + # Get rid of it. + observe "removing symbolic link $new which points to $old" + rm "$new" + else + # Back it up. + warn "backing up symbolic link $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + fi + + # Does new location exist, but is not a directory? + if [ -e "$new" ] && ! [ -d "$new" ]; then + warn "backing up non-directory $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + + # Create new directory if it does not yet exist. + if ! [ -e "$new" ]; then + observe "creating $new" + mkdir -p "$new" + fi + + # Copy files in old location to new location. Back up any filenames that + # already exist in the new location with the extension ".dpkg-old". + observe "copying files from $old to $new" + if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then + die "error(s) encountered while copying files from $old to $new" + fi + + # Remove files at old location. + observe "removing $old" + rm -r "$old" + + # Create symlink from old location to new location. + make_symlink_sane "$old" "$new" +} + +# vim:set ai et sw=2 ts=2 tw=80: + +# GOBSTOPPER: The X Strike Force shell library ends here. --- libxcursor-1.1.14.orig/debian/xsfbs/xsfbs.mk +++ libxcursor-1.1.14/debian/xsfbs/xsfbs.mk @@ -0,0 +1,285 @@ +#!/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 . + +# Originally by Stephen Early +# Modified by Mark W. Eichin +# Modified by Adam Heath +# Modified by Branden Robinson +# Modified by Fabio Massimo Di Nitto +# Modified by David Nusinow +# 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: