--- libxi-1.1.3.orig/src/config.h.in +++ libxi-1.1.3/src/config.h.in @@ -30,6 +30,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE --- libxi-1.1.3.orig/debian/xsfbs/xsfbs-autoreconf.mk +++ libxi-1.1.3/debian/xsfbs/xsfbs-autoreconf.mk @@ -0,0 +1,150 @@ +#!/usr/bin/make -f +# $Id$ + +# Automagical conversion of autoreconf results into quilt patches. + +# Copyright 2006 Eugene Konev +# +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# The idea behind this is storing changes produced by autoreconf as a +# separate patch on quilt stack (on top of stack actually). +# The only usable target here is 'autoreconf`. Other targets are not +# supposed to be called directly. DO NOT invoke them, unless you know what +# you are doing. +# The autoreconf target will check if files with names in $(RECONF_CHECKFILES) +# were changed during patching (from upstream version or from previously +# autoreconfed version) and call actual autoreconfing if they were. +# The actual autoreconfing target (doautoreconf) WILL FAIL after +# calling autoreconf and pushing changes into quilt stack by design. It +# should never be invoked by automatic build process. +# The proposed use is adding autoreconf into clean's prerequisites before +# xsfclean like: +# - clean: xsfclean +# + clean: autoreconf xsfclean +# This will ensure it is called when you build package with dpkg-buildpackage. + +# This dir will be used for producing diff of autoreconfed tree +RECONF_DIR := xsfautoreconf + +# This files will be checked for changes +RECONF_CHECKFILES += configure.ac Makefile.am + +# This files will not be hardlinked but copied +RECONF_NOLINKFILES += aclocal.m4 + +# This files/dirs will be pruned after autoreconf run +RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~ + +# Internal target. Never invoke directly. +stampdir_target+=check.md5sum +$(STAMP_DIR)/check.md5sum: + dh_testdir + $(MAKE) -f debian/rules prepare + for F in $(RECONF_CHECKFILES); do \ + find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \ + LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \ + done + +# Internal target. Never invoke directly. +$(STAMP_DIR)/clean.md5sum: + dh_testdir + $(MAKE) -f debian/rules unpatch + rm -f $(STAMP_DIR)/check.md5sum + $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum + mv $(STAMP_DIR)/check.md5sum $@ + +# Internal target. Never invoke directly. +debian/patches/patched.md5sum: + dh_testdir + [ -f $(STAMP_DIR)/clean.md5sum ] || \ + $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum + + $(MAKE) -f debian/rules patch + rm -f $(STAMP_DIR)/check.md5sum + $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum + if ! diff $(STAMP_DIR)/clean.md5sum \ + $(STAMP_DIR)/check.md5sum > /dev/null; then \ + $(MAKE) -f debian/rules doautoreconf; \ + else \ + mv $(STAMP_DIR)/check.md5sum $@; \ + fi + +# Internal target. Never invoke directly. +,PHONY: doautoreconf +doautoreconf: patch + quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true + if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \ + quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \ + quilt rename -p autoreconf.diff autoreconf-old.diff \ + >>$(STAMP_DIR)/log/autoreconf 2>&1; \ + quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \ + quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \ + fi + + if [ -e $(RECONF_DIR) ]; then \ + echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \ + exit 1; \ + fi + + mkdir -p $(RECONF_DIR)/before + find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \ + -a ! -wholename ./debian -a ! -wholename ./patches \ + -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \ + xargs -i{} cp -al {} $(RECONF_DIR)/before/ + + for F in $(RECONF_PRUNEFILES); do \ + find $(RECONF_DIR)/before -name $$F -print | \ + xargs --no-run-if-empty rm -r; \ + done + + cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after + + for F in $(RECONF_NOLINKFILES); do \ + find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \ + -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \ + -print | \ + xargs --no-run-if-empty -i{} cp --remove-destination {} \ + $(RECONF_DIR)/after/{}; \ + done + + cd $(RECONF_DIR)/after && autoreconf -v --install && \ + for F in $(RECONF_PRUNEFILES); do \ + find . -name $$F -print | \ + xargs --no-run-if-empty rm -r; \ + done + + cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true + + quilt import $(RECONF_DIR)/autoreconf.diff \ + >>$(STAMP_DIR)/log/autoreconf 2>&1 + + mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum + + rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff + + @echo + @echo "****************************************************************" + @echo " This target is made to fail INTENTIONALLY. It should NEVER " + @echo " be invoked during automatic builds. " + @echo + @echo " This target was invoked because you added/removed/changed " + @echo " patches which modify either configure.ac or Makefile.am and, " + @echo " thus, require autoreconf run. And all autoreconfing should " + @echo " happen before uploading. " + @echo + @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) " + @echo + @echo " If you see this message, autoreconfing actually SUCCEEDED, " + @echo " and your build should finish successfully, when rerun. " + @echo "****************************************************************" + @echo + exit 1; + +.PHONY: autoreconf +autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum + if ! diff $(STAMP_DIR)/check.md5sum \ + debian/patches/patched.md5sum > /dev/null; then \ + $(MAKE) -f debian/rules doautoreconf; \ + fi --- libxi-1.1.3.orig/debian/xsfbs/xsfbs.sh +++ libxi-1.1.3/debian/xsfbs/xsfbs.sh @@ -0,0 +1,907 @@ +# $Id$ + +# 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 + +ARCHITECTURE="$(dpkg --print-installation-architecture)" + +LAPTOP="" +if [ -n "$(which laptop-detect)" ]; then + if laptop-detect >/dev/null; then + LAPTOP=true + fi +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_whitespace () { + # syntax: reject_whitespace [ operand ] + # + # scan operand (typically a shell variable whose value cannot be trusted) for + # whitespace characters and barf if any are found + if [ -n "$1" ]; then + # does the operand contain any whitespace? + if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then + # can't use die(), because I want to avoid forward references + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \ + "possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + fi +} + +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 +} + + +maplink () { + # returns what symlink should point to; i.e., what the "sane" answer is + # Keep this in sync with the debian/*.links files. + # This is only needed for symlinks to directories. + # + # XXX: Most of these look wrong in the X11R7 world and need to be fixed. + # If we've stopped using this function, fixing it might enable us to re-enable + # it again and catch more errors. + case "$1" in + /etc/X11/xkb/compiled) echo /var/lib/xkb ;; + /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;; + /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;; + /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;; + /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;; + /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;; + /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;; + /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;; + /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;; + /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;; + /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;; + /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;; + /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;; + /usr/bin/X11) echo ../X11R6/bin ;; + /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;; + /usr/include/X11) echo ../X11R6/include/X11 ;; + /usr/lib/X11) echo ../X11R6/lib/X11 ;; + *) internal_error "maplink() called with unknown path \"$1\"" ;; + esac +} + +analyze_path () { + # given a supplied set of pathnames, break each one up by directory and do an + # ls -dl on each component, cumulatively; i.e. + # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin + # Thanks to Randolph Chung for this clever hack. + + #local f g + + while [ -n "$1" ]; do + reject_whitespace "$1" + _g= + message "Analyzing $1:" + for _f in $(echo "$1" | tr / \ ); do + if [ -e /$_g$_f ]; then + ls -dl /$_g$_f /$_g$_f.dpkg-* 2> /dev/null || true + _g=$_g$_f/ + else + message "/$_g$_f: nonexistent; directory contents of /$_g:" + ls -l /$_g + break + fi + done + shift + done +} + +find_culprits () { + #local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ + # msg + + reject_whitespace "$1" + message "Searching for overlapping packages..." + _dpkg_info_dir=/var/lib/dpkg/info + if [ -d $_dpkg_info_dir ]; then + if [ "$(echo $_dpkg_info_dir/*.list)" != "$_dpkg_info_dir/*.list" ]; then + _possible_culprits=$(ls -1 $_dpkg_info_dir/*.list | egrep -v \ + "(xbase-clients|x11-common|xfs|xlibs)") + if [ -n "$_possible_culprits" ]; then + _smoking_guns=$(grep -l "$1" $_possible_culprits || true) + if [ -n "$_smoking_guns" ]; then + _bad_packages=$(printf "\\n") + for f in $_smoking_guns; do + # too bad you can't nest parameter expansion voodoo + p=${f%*.list} # strip off the trailing ".list" + _package=${p##*/} # strip off the directories + _bad_packages=$(printf "%s\n%s" "$_bad_packages" "$_package") + done + _msg=$(cat < /dev/null 2>&1; then + message "The readlink command was not found. Please install version" \ + "1.13.1 or later of the debianutils package." + readlink () { + # returns what symlink in $1 actually points to + perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" + } +fi + +check_symlink () { + # syntax: check_symlink symlink + # + # See if specified symlink points where it is supposed to. Return 0 if it + # does, and 1 if it does not. + # + # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb(). + + #local symlink + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "check_symlink() called with wrong number of arguments;" \ + "expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + _symlink="$1" + + if [ "$(maplink "$_symlink")" = "$(readlink "$_symlink")" ]; then + return 0 + else + return 1 + fi +} + +check_symlinks_and_warn () { + # syntax: check_symlinks_and_warn symlink ... + # + # For each argument, check for symlink sanity, and warn if it isn't sane. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install". + + #local errmsg symlink + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "check_symlinks_and_warn() called with wrong number of" \ + "arguments; expected at least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + while [ -n "$1" ]; do + _symlink="$1" + if [ -L "$_symlink" ]; then + if ! check_symlink "$_symlink"; then + observe "$_symlink symbolic link points to wrong location" \ + "$(readlink "$_symlink"); removing" + rm "$_symlink" + fi + elif [ -e "$_symlink" ]; then + _errmsg="$_symlink exists and is not a symbolic link; this package cannot" + _errmsg="$_errmsg be installed until this" + if [ -f "$_symlink" ]; then + _errmsg="$_errmsg file" + elif [ -d "$_symlink" ]; then + _errmsg="$_errmsg directory" + else + _errmsg="$_errmsg thing" + fi + _errmsg="$_errmsg is removed" + die "$_errmsg" + fi + shift + done +} + +check_symlinks_and_bomb () { + # syntax: check_symlinks_and_bomb symlink ... + # + # For each argument, check for symlink sanity, and bomb if it isn't sane. + # + # Call this function from a postinst script. + + #local problem symlink + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "check_symlinks_and_bomb() called with wrong number of" + "arguments; expected at least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + while [ -n "$1" ]; do + _problem= + _symlink="$1" + if [ -L "$_symlink" ]; then + if ! check_symlink "$_symlink"; then + _problem=yes + warn "$_symlink symbolic link points to wrong location" \ + "$(readlink "$_symlink")" + fi + elif [ -e "$_symlink" ]; then + _problem=yes + warn "$_symlink is not a symbolic link" + else + _problem=yes + warn "$_symlink symbolic link does not exist" + fi + if [ -n "$_problem" ]; then + analyze_path "$_symlink" "$(readlink "$_symlink")" + find_culprits "$_symlink" + die "bad symbolic links on system" + fi + shift + done +} + +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_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 +} + +register_x_lib_dir_with_ld_so () { + # syntax: register_x_lib_dir_with_ld_so + # + # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared + # libraries. + # + # Call this function from the postinst script of a package that places a + # shared library in /usr/X11R6/lib, before invoking ldconfig. + + #local dir ldsoconf + + _dir="/usr/X11R6/lib" + _ldsoconf="/etc/ld.so.conf" + + # is the line not already present? + if ! fgrep -qsx "$_dir" "$_ldsoconf"; then + observe "adding $_dir directory to $_ldsoconf" + echo "$_dir" >> "$_ldsoconf" + fi +} + +deregister_x_lib_dir_with_ld_so () { + # syntax: deregister_x_lib_dir_with_ld_so + # + # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared + # libraries, if and only if no shared libaries remain there. + # + # Call this function from the postrm script of a package that places a shared + # library in /usr/X11R6/lib, in the event "$1" is "remove", and before + # invoking ldconfig. + + #local dir ldsoconf fgrep_status cmp_status + + _dir="/usr/X11R6/lib" + _ldsoconf="/etc/ld.so.conf" + + # is the line present? + if fgrep -qsx "$_dir" "$_ldsoconf"; then + # are there any shared objects in the directory? + if [ "$(echo "$_dir"/lib*.so.*.*)" = "$_dir/lib*.so.*.*" ]; then + # glob expansion produced nothing, so no shared libraries are present + observe "removing $_dir directory from $_ldsoconf" + # rewrite the file (very carefully) + set +e + fgrep -svx "$_dir" "$_ldsoconf" > "$_ldsoconf.dpkg-tmp" + _fgrep_status=$? + set -e + case $_fgrep_status in + 0|1) ;; # we don't actually care if any lines matched or not + *) die "error reading \"$_ldsoconf\"; fgrep exited with status" \ + "$_fgrep_status" ;; + esac + set +e + cmp -s "$_ldsoconf.dpkg-tmp" "$_ldsoconf" + _cmp_status=$? + set -e + case $_cmp_status in + 0) rm "$_ldsoconf.dpkg-tmp" ;; # files are identical + 1) mv "$_ldsoconf.dpkg-tmp" "$_ldsoconf" ;; # files differ + *) die "error comparing \"$_ldsoconf.dpkg-tmp\" to \"$_ldsoconf\";" \ + "cmp exited with status $_cmp_status" ;; + esac + fi + fi +} + +make_symlink_sane () { + # syntax: make_symlink_sane symlink target + # + # 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. --- libxi-1.1.3.orig/debian/xsfbs/xsfbs.mk +++ libxi-1.1.3/debian/xsfbs/xsfbs.mk @@ -0,0 +1,388 @@ +#!/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 +QUILT = quilt --quiltrc /dev/null +# force QUILT_PATCHES to the default in case it is exported in the environment +QUILT_PATCHES = patches/ + +# 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 strings "woody" or "sarge" in the Debian part of the +# version number. Anything else indicates an unofficial build. +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) + +# 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 + +# $(SOURCE_DIR) houses one or more source trees. +SOURCE_DIR:=build-tree + +# $(SOURCE_TREE) is the location of the source tree to be compiled. If there +# is more than one, others are found using this name plus a suffix to indicate +# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The +# "setup" target is responsible for creating such trees. +#SOURCE_TREE:=$(SOURCE_DIR)/xc +#FIXME We need to define this in our debian/rules file + +# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place +# their files. +DEBTREEDIR:=$(CURDIR)/debian/tmp + +# 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)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches $(STAMP_DIR)/log +$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir + if [ ! -e $(STAMP_DIR)/patches ]; then \ + mkdir $(STAMP_DIR)/patches; \ + ln -s $(STAMP_DIR)/patches .pc; \ + echo 2 >$(STAMP_DIR)/patches/.version; \ + fi; \ + if [ ! -e $(STAMP_DIR)/log ]; then \ + mkdir $(STAMP_DIR)/log; \ + fi; \ + if [ -e debian/patches ] && [ ! -e patches ]; then \ + ln -s debian/patches patches; \ + fi; \ + >$@ + +# Apply all patches to the upstream source. +.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: + rm -f $(STAMP_DIR)/patch + @echo -n "Unapplying patches..."; \ + if [ -e $(STAMP_DIR)/patches/applied-patches ]; 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 -f .pc patches + rm -rf $(STAMP_DIR) $(SOURCE_DIR) + rm -rf imports + dh_clean debian/shlibs.local \ + debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \ + debian/po/pothead + +# Generate the debconf templates POT file header. +debian/po/pothead: debian/po/pothead.in + sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ + -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ + +# Update POT and PO files. +.PHONY: updatepo +updatepo: debian/po/pothead + debian/scripts/debconf-updatepo --pot-header=pothead --verbose + +# Use the MANIFEST files to determine whether we're shipping everything we +# expect to ship, and not shipping anything we don't expect to ship. +.PHONY: check-manifest +stampdir_targets+=check-manifest +check-manifest: $(STAMP_DIR)/check-manifest +$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install + # Compare manifests. + (cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) \ + >debian/MANIFEST.$(ARCH).new + # Construct MANIFEST files from MANIFEST.$(ARCH).in and + # MANIFEST.$(ARCH).all or MANIFEST.all. + if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" \ + : "-DBuildFonts=NO" >/dev/null 2>&1; then \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); \ + else \ + if [ -e debian/MANIFEST.$(ARCH).all ]; then \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \ + else \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all >debian/MANIFEST.$(ARCH); \ + fi; \ + fi + # Confirm that the installed file list has not changed. + if [ -e debian/MANIFEST.$(ARCH) ]; then \ + if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then \ + diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new || DIFFSTATUS=$$?; \ + case $${DIFFSTATUS:-0} in \ + 0) ;; \ + 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \ + echo 'MANIFEST check failed; ignoring problem because \$$IGNORE_MANIFEST_CHANGES set' >&2; \ + echo 'Please ensure that the package maintainer has an up-to-date version of the' >&2; \ + echo 'MANIFEST.$(ARCH).in file.' >&2; \ + else \ + echo 'MANIFEST check failed; please see debian/README' >&2; \ + exit 1; \ + fi; \ + ;; \ + *) echo "diff reported unexpected exit status $$DIFFSTATUS when performing MANIFEST check" >&2; \ + exit 1; \ + ;; \ + esac; \ + fi; \ + fi + >$@ + +# Because we build (and install) different files depending on whether or not +# any architecture-independent packages are being created, the list of files we +# expect to see will differ; see the discussion of the "build" target above. +.PHONY: check-manifest-arch check-manifest-indep +check-manifest-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO -DInstallHardcopyDocs=NO +check-manifest-arch: check-manifest +check-manifest-indep: check-manifest + +# 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 + +# Change to what should be the correct directory, ensure it is, and if +# so, create the .orig.tar.gz file. Exclude the debian directory and its +# contents, and any .svn directories and their contents (so that we can safely +# build an .orig.tar.gz from SVN checkout, not just an export). +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +# +# This rule *IS* the recommended method for creating a new .orig.tar.gz file, +# for the rare situations when one is needed. +.PHONY: make-orig-tar-gz +make-orig-tar-gz: clean prune-upstream-tree + ( cd .. \ + && if [ $(shell basename $(CURDIR)) != $(SOURCE_NAME)-$(NO_EPOCH_VER) ]; then \ + echo "Our current working directory has the wrong name. Renaming..." >&2; \ + mv $(CURDIR) $(SOURCE_NAME)-$(NO_EPOCH_VER); \ + fi; \ + tar --exclude=debian --exclude=debian/* \ + --exclude=.svn --exclude=.svn/* \ + -cf - $(SOURCE_NAME)-$(NO_EPOCH_VER) \ + | gzip -9 >$(SOURCE_NAME)_$(NO_EPOCH_VER).orig.tar.gz; \ + ) + +# 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)/' \ + -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ + <$$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 + >$@ + +# Generate the shlibs.local file. +debian/shlibs.local: + cat debian/*.shlibs >$@ + +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: +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 + +include debian/xsfbs/xsfbs-autoreconf.mk + +# vim:set noet ai sts=8 sw=8 tw=0: --- libxi-1.1.3.orig/debian/control +++ libxi-1.1.3/debian/control @@ -0,0 +1,79 @@ +Source: libxi +Section: x11 +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: David Nusinow , Drew Parsons , Jamey Sharp , Josh Triplett , Julien Cristau +Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxext-dev (>= 1:0.99.1-1), x11proto-input-dev (>= 1.4.3-2ubuntu4), pkg-config, quilt, xutils-dev, automake, libtool +Standards-Version: 3.7.2 +XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi +XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxi.git + +Package: libxi6 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common +Breaks: gnome-control-center (<= 1:2.24.0.1-0ubuntu3), + gnome-settings-daemon (<= 2.24.0-0ubuntu1), + xinput (<= 1.3.0-1ubuntu2) +Description: X11 Input extension library + libXi provides an X Window System client interface to the XINPUT + extension to the X protocol. + . + The Input extension allows setup and configuration of multiple input devices, + and will soon allow hotplugging of input devices; to be added and removed on + the fly. + . + More information about X.Org can be found at: + + + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libXi + +Package: libxi6-dbg +Section: libdevel +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxi6 (= ${binary:Version}) +Description: X11 Input extension library (debug package) + libXi provides an X Window System client interface to the XINPUT + extension to the X protocol. + . + The Input extension allows setup and configuration of multiple input devices, + and will soon allow hotplugging of input devices; to be added and removed on + the fly. + . + This package contains the debug versions of the library found in libxi6. + Non-developers likely have little use for this package. + . + More information about X.Org can be found at: + + + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libXi + +Package: libxi-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version}), libx11-dev, libxext-dev, x11proto-input-dev (>= 1.4.3-2ubuntu1) +Pre-Depends: x11-common (>= 1:7.0.0) +Replaces: x11proto-input-dev (<= 1.4.3-2) +Description: X11 Input extension library (development headers) + libXi provides an X Window System client interface to the XINPUT + extension to the X protocol. + . + The Input extension allows setup and configuration of multiple input devices, + and will soon allow hotplugging of input devices; to be added and removed on + the fly. + . + This package contains the development headers for the library found in + libxi6. Non-developers likely have little use for this package. + . + More information about X.Org can be found at: + + + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libXi --- libxi-1.1.3.orig/debian/patches/102_input_properties.patch +++ libxi-1.1.3/debian/patches/102_input_properties.patch @@ -0,0 +1,482 @@ +Index: libxi-1.1.3/src/Makefile.am +=================================================================== +--- libxi-1.1.3.orig/src/Makefile.am 2008-09-26 13:02:19.000000000 +0300 ++++ libxi-1.1.3/src/Makefile.am 2008-09-26 13:18:32.000000000 +0300 +@@ -4,6 +4,7 @@ + + libXi_la_SOURCES = \ + XAllowDv.c \ ++ XChDProp.c \ + XChgDCtl.c \ + XChgFCtl.c \ + XChgKbd.c \ +@@ -11,10 +12,12 @@ + XChgPnt.c \ + XChgProp.c \ + XCloseDev.c \ ++ XDelDProp.c \ + XDevBell.c \ + XExtToWire.c \ + XGetBMap.c \ + XGetDCtl.c \ ++ XGetDProp.c \ + XGetFCtl.c \ + XGetKMap.c \ + XGetMMap.c \ +@@ -27,6 +30,7 @@ + XGtFocus.c \ + XGtSelect.c \ + XListDev.c \ ++ XListDProp.c \ + XOpenDev.c \ + XQueryDv.c \ + XSelect.c \ +Index: libxi-1.1.3/src/XChDProp.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libxi-1.1.3/src/XChDProp.c 2008-09-26 13:02:20.000000000 +0300 +@@ -0,0 +1,106 @@ ++/************************************************************ ++ ++Copyright 2008 Peter Hutterer ++ ++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. ++ ++The above copyright notice and this permission notice shall be included in ++all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++Except as contained in this notice, the name of the author shall not be ++used in advertising or otherwise to promote the sale, use or other dealings ++in this Software without prior written authorization from the author. ++ ++*/ ++ ++/*********************************************************************** ++ * XChangeDeviceProperties - change an input device's properties. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include "XIint.h" ++ ++void ++XChangeDeviceProperty(Display* dpy, XDevice* dev, ++ Atom property, Atom type, ++ int format, int mode, ++ _Xconst unsigned char *data, int nelements) ++{ ++ xChangeDevicePropertyReq *req; ++ int len; ++ ++ XExtDisplayInfo *info = XInput_find_display(dpy); ++ ++ LockDisplay(dpy); ++ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) ++ return; ++ ++ GetReq(ChangeDeviceProperty, req); ++ req->reqType = info->codes->major_opcode; ++ req->ReqType = X_ChangeDeviceProperty; ++ req->deviceid = dev->device_id; ++ req->property = property; ++ req->type = type; ++ req->mode = mode; ++ if (nelements < 0) { ++ req->nUnits = 0; ++ req->format = 0; /* ask for garbage, get garbage */ ++ } else { ++ req->nUnits = nelements; ++ req->format = format; ++ } ++ ++ switch (req->format) { ++ case 8: ++ len = ((long)nelements + 3) >> 2; ++ if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) { ++ SetReqLen(req, len, len); ++ Data (dpy, (char *)data, nelements); ++ } /* else force BadLength */ ++ break; ++ ++ case 16: ++ len = ((long)nelements + 1) >> 1; ++ if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) { ++ SetReqLen(req, len, len); ++ len = (long)nelements << 1; ++ Data16 (dpy, (short *) data, len); ++ } /* else force BadLength */ ++ break; ++ ++ case 32: ++ len = nelements; ++ if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) { ++ SetReqLen(req, len, len); ++ len = (long)nelements << 2; ++ Data32 (dpy, (long *) data, len); ++ } /* else force BadLength */ ++ break; ++ ++ default: ++ /* BadValue will be generated */ ; ++ } ++ ++ UnlockDisplay(dpy); ++ SyncHandle(); ++} ++ +Index: libxi-1.1.3/src/XDelDProp.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libxi-1.1.3/src/XDelDProp.c 2008-09-26 13:02:20.000000000 +0300 +@@ -0,0 +1,64 @@ ++/************************************************************ ++ ++Copyright 2008 Peter Hutterer ++ ++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. ++ ++The above copyright notice and this permission notice shall be included in ++all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++Except as contained in this notice, the name of the author shall not be ++used in advertising or otherwise to promote the sale, use or other dealings ++in this Software without prior written authorization from the author. ++ ++*/ ++ ++/*********************************************************************** ++ * XDeleteDeviceProperties - delete an input device's properties. ++ * ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include "XIint.h" ++ ++void ++XDeleteDeviceProperty(Display* dpy, XDevice* dev, Atom property) ++{ ++ xDeleteDevicePropertyReq *req; ++ ++ XExtDisplayInfo *info = XInput_find_display(dpy); ++ ++ LockDisplay(dpy); ++ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) ++ return; ++ ++ GetReq(DeleteDeviceProperty, req); ++ req->reqType = info->codes->major_opcode; ++ req->ReqType = X_DeleteDeviceProperty; ++ req->deviceid = dev->device_id; ++ req->property = property; ++ ++ UnlockDisplay(dpy); ++ SyncHandle(); ++ return; ++} ++ +Index: libxi-1.1.3/src/XGetDProp.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libxi-1.1.3/src/XGetDProp.c 2008-09-26 13:19:40.000000000 +0300 +@@ -0,0 +1,139 @@ ++/************************************************************ ++ ++Copyright 2008 Peter Hutterer ++ ++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. ++ ++The above copyright notice and this permission notice shall be included in ++all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++Except as contained in this notice, the name of the author shall not be ++used in advertising or otherwise to promote the sale, use or other dealings ++in this Software without prior written authorization from the author. ++ ++*/ ++ ++/*********************************************************************** ++ * XGetDeviceProperties - get an input device's properties. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include "XIint.h" ++ ++int ++XGetDeviceProperty(Display* dpy, XDevice* dev, ++ Atom property, long offset, long length, Bool delete, ++ Atom req_type, Atom *actual_type, int *actual_format, ++ unsigned long *nitems, unsigned long *bytes_after, ++ unsigned char **prop) ++{ ++ xGetDevicePropertyReq *req; ++ xGetDevicePropertyReply rep; ++ long nbytes, rbytes; ++ ++ XExtDisplayInfo *info = XInput_find_display(dpy); ++ ++ LockDisplay(dpy); ++ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) ++ return 1; ++ ++ GetReq(GetDeviceProperty, req); ++ req->reqType = info->codes->major_opcode; ++ req->ReqType = X_GetDeviceProperty; ++ req->deviceid = dev->device_id; ++ req->property = property; ++ req->type = req_type; ++ req->longOffset = offset; ++ req->longLength = length; ++ req->delete = delete; ++ ++ if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) ++ { ++ UnlockDisplay (dpy); ++ SyncHandle (); ++ return 1; ++ } ++ ++ *prop = (unsigned char *) NULL; ++ ++ if (rep.propertyType != None) { ++ /* ++ * One extra byte is malloced than is needed to contain the property ++ * data, but this last byte is null terminated and convenient for ++ * returning string properties, so the client doesn't then have to ++ * recopy the string to make it null terminated. ++ */ ++ switch (rep.format) { ++ case 8: ++ nbytes = rep.nItems; ++ rbytes = rep.nItems + 1; ++ if (rbytes > 0 && ++ (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) ++ _XReadPad (dpy, (char *) *prop, nbytes); ++ break; ++ ++ case 16: ++ nbytes = rep.nItems << 1; ++ rbytes = rep.nItems * sizeof (short) + 1; ++ if (rbytes > 0 && ++ (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) ++ _XRead16Pad (dpy, (short *) *prop, nbytes); ++ break; ++ ++ case 32: ++ nbytes = rep.nItems << 2; ++ rbytes = rep.nItems * sizeof (long) + 1; ++ if (rbytes > 0 && ++ (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) ++ _XRead32 (dpy, (long *) *prop, nbytes); ++ break; ++ ++ default: ++ /* ++ * This part of the code should never be reached. If it is, ++ * the server sent back a property with an invalid format. ++ */ ++ nbytes = rep.length << 2; ++ _XEatData(dpy, (unsigned long) nbytes); ++ UnlockDisplay(dpy); ++ SyncHandle(); ++ return(BadImplementation); ++ } ++ if (! *prop) { ++ _XEatData(dpy, (unsigned long) nbytes); ++ UnlockDisplay(dpy); ++ SyncHandle(); ++ return(BadAlloc); ++ } ++ (*prop)[rbytes - 1] = '\0'; ++ } ++ ++ *actual_type = rep.propertyType; ++ *actual_format = rep.format; ++ *nitems = rep.nItems; ++ *bytes_after = rep.bytesAfter; ++ UnlockDisplay (dpy); ++ SyncHandle (); ++ ++ return Success; ++} ++ +Index: libxi-1.1.3/src/XListDProp.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libxi-1.1.3/src/XListDProp.c 2008-09-26 13:02:20.000000000 +0300 +@@ -0,0 +1,84 @@ ++/************************************************************ ++ ++Copyright 2008 Peter Hutterer ++ ++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. ++ ++The above copyright notice and this permission notice shall be included in ++all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++Except as contained in this notice, the name of the author shall not be ++used in advertising or otherwise to promote the sale, use or other dealings ++in this Software without prior written authorization from the author. ++ ++*/ ++ ++/*********************************************************************** ++ * XListDeviceProperties - List an input device's properties. ++ */ ++ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include "XIint.h" ++ ++Atom* ++XListDeviceProperties(Display* dpy, XDevice* dev, int *nprops_return) ++{ ++ xListDevicePropertiesReq *req; ++ xListDevicePropertiesReply rep; ++ XExtDisplayInfo *info = XInput_find_display(dpy); ++ Atom *props = NULL; ++ ++ LockDisplay(dpy); ++ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) ++ return (NoSuchExtension); ++ ++ GetReq(ListDeviceProperties, req); ++ req->reqType = info->codes->major_opcode; ++ req->ReqType = X_ListDeviceProperties; ++ req->deviceid = dev->device_id; ++ ++ if (!_XReply(dpy, (xReply*)&rep, 0, xFalse)) { ++ *nprops_return = 0; ++ goto cleanup; ++ } ++ ++ *nprops_return = rep.nAtoms; ++ ++ if (rep.nAtoms) { ++ props = (Atom*)Xmalloc(rep.nAtoms * sizeof(Atom)); ++ if (!props) ++ { ++ _XEatData(dpy, rep.nAtoms << 2); ++ *nprops_return = 0; ++ goto cleanup; ++ } ++ ++ _XRead32(dpy, props, rep.nAtoms << 2); ++ } ++ ++cleanup: ++ UnlockDisplay(dpy); ++ SyncHandle(); ++ return props; ++} ++ +Index: libxi-1.1.3/src/XExtInt.c +=================================================================== +--- libxi-1.1.3.orig/src/XExtInt.c 2008-09-26 13:00:13.000000000 +0300 ++++ libxi-1.1.3/src/XExtInt.c 2008-09-26 13:02:20.000000000 +0300 +@@ -121,7 +121,9 @@ + {XI_Present, XI_Add_XChangeDeviceControl_Major, + XI_Add_XChangeDeviceControl_Minor}, + {XI_Present, XI_Add_DevicePresenceNotify_Major, +- XI_Add_DevicePresenceNotify_Minor} ++ XI_Add_DevicePresenceNotify_Minor}, ++ {XI_Present, XI_Add_DeviceProperties_Major, ++ XI_Add_DeviceProperties_Minor}, + }; + + /*********************************************************************** +@@ -697,6 +699,20 @@ + } + break; + ++ case XI_DevicePropertyNotify: ++ { ++ XDevicePropertyNotifyEvent* ev = (XDevicePropertyNotifyEvent*)re; ++ devicePropertyNotify *ev2 = (devicePropertyNotify*)event; ++ ++ *ev = *(XDevicePropertyNotifyEvent*)save; ++ ev->time = ev2->time; ++ ev->deviceid = ev2->deviceid; ++ ev->atom = ev2->atom; ++ ev->state = ev2->state; ++ return ENQUEUE_EVENT; ++ } ++ break; ++ + default: + printf("XInputWireToEvent: UNKNOWN WIRE EVENT! type=%d\n", type); + break; --- libxi-1.1.3.orig/debian/patches/100_add_xinput.h.patch +++ libxi-1.1.3/debian/patches/100_add_xinput.h.patch @@ -0,0 +1,1367 @@ +From: Peter Hutterer +Date: Fri, 25 Apr 2008 08:37:36 +0000 (+0930) +Subject: Add XInput.h file from inputproto package. +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libXi.git;a=commitdiff;h=94284e40f5fc9bf30cc2cc5915f6adb22de7bffe + +Add XInput.h file from inputproto package. + +This file only belongs to libXi, it shouldn't have been in the inputproto +package in the first place. For a revision history of this file refer to +git://anongit.freedesktop.org/git/xorg/proto/inputproto +--- + +Index: libxi-1.1.3/include/X11/extensions/XInput.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libxi-1.1.3/include/X11/extensions/XInput.h 2008-09-26 13:02:09.000000000 +0300 +@@ -0,0 +1,1331 @@ ++/************************************************************ ++ ++Copyright 1989, 1998 The Open Group ++ ++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. ++ ++The above copyright notice and this permission notice shall be included in ++all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++Except as contained in this notice, the name of The Open Group shall not be ++used in advertising or otherwise to promote the sale, use or other dealings ++in this Software without prior written authorization from The Open Group. ++ ++Copyright 1989 by Hewlett-Packard Company, Palo Alto, California. ++ ++ All Rights Reserved ++ ++Permission to use, copy, modify, and distribute this software and its ++documentation for any purpose and without fee is hereby granted, ++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 Hewlett-Packard not be ++used in advertising or publicity pertaining to distribution of the ++software without specific, written prior permission. ++ ++HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ++ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL ++HEWLETT-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. ++ ++********************************************************/ ++ ++/* Definitions used by the library and client */ ++ ++#ifndef _XINPUT_H_ ++#define _XINPUT_H_ ++ ++#include ++#include ++ ++#define _deviceKeyPress 0 ++#define _deviceKeyRelease 1 ++ ++#define _deviceButtonPress 0 ++#define _deviceButtonRelease 1 ++ ++#define _deviceMotionNotify 0 ++ ++#define _deviceFocusIn 0 ++#define _deviceFocusOut 1 ++ ++#define _proximityIn 0 ++#define _proximityOut 1 ++ ++#define _deviceStateNotify 0 ++#define _deviceMappingNotify 1 ++#define _changeDeviceNotify 2 ++/* Space of 3 between is necessary! Reserved for DeviceKeyStateNotify, ++ DeviceButtonStateNotify, DevicePresenceNotify (essentially unused). This ++ code has to be in sync with FixExtensionEvents() in xserver/Xi/extinit.c */ ++#define _propertyNotify 6 ++ ++#define FindTypeAndClass(d,type,_class,classid,offset) \ ++ { int _i; XInputClassInfo *_ip; \ ++ type = 0; _class = 0; \ ++ for (_i=0, _ip= ((XDevice *) d)->classes; \ ++ _i< ((XDevice *) d)->num_classes; \ ++ _i++, _ip++) \ ++ if (_ip->input_class == classid) \ ++ {type = _ip->event_type_base + offset; \ ++ _class = ((XDevice *) d)->device_id << 8 | type;}} ++ ++#define DeviceKeyPress(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, KeyClass, _deviceKeyPress) ++ ++#define DeviceKeyRelease(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, KeyClass, _deviceKeyRelease) ++ ++#define DeviceButtonPress(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, ButtonClass, _deviceButtonPress) ++ ++#define DeviceButtonRelease(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, ButtonClass, _deviceButtonRelease) ++ ++#define DeviceMotionNotify(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, ValuatorClass, _deviceMotionNotify) ++ ++#define DeviceFocusIn(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, FocusClass, _deviceFocusIn) ++ ++#define DeviceFocusOut(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, FocusClass, _deviceFocusOut) ++ ++#define ProximityIn(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, ProximityClass, _proximityIn) ++ ++#define ProximityOut(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, ProximityClass, _proximityOut) ++ ++#define DeviceStateNotify(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, OtherClass, _deviceStateNotify) ++ ++#define DeviceMappingNotify(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, OtherClass, _deviceMappingNotify) ++ ++#define ChangeDeviceNotify(d,type,_class) \ ++ FindTypeAndClass(d, type, _class, OtherClass, _changeDeviceNotify) ++ ++#define DevicePropertyNotify(d, type, _class) \ ++ FindTypeAndClass(d, type, _class, OtherClass, _propertyNotify) ++ ++#define DevicePointerMotionHint(d,type,_class) \ ++ { _class = ((XDevice *) d)->device_id << 8 | _devicePointerMotionHint;} ++ ++#define DeviceButton1Motion(d,type,_class) \ ++ { _class = ((XDevice *) d)->device_id << 8 | _deviceButton1Motion;} ++ ++#define DeviceButton2Motion(d,type,_class) \ ++ { _class = ((XDevice *) d)->device_id << 8 | _deviceButton2Motion;} ++ ++#define DeviceButton3Motion(d,type,_class) \ ++ { _class = ((XDevice *) d)->device_id << 8 | _deviceButton3Motion;} ++ ++#define DeviceButton4Motion(d,type, _class) \ ++ { _class = ((XDevice *) d)->device_id << 8 | _deviceButton4Motion;} ++ ++#define DeviceButton5Motion(d,type,_class) \ ++ { _class = ((XDevice *) d)->device_id << 8 | _deviceButton5Motion;} ++ ++#define DeviceButtonMotion(d,type, _class) \ ++ { _class = ((XDevice *) d)->device_id << 8 | _deviceButtonMotion;} ++ ++#define DeviceOwnerGrabButton(d,type,_class) \ ++ { _class = ((XDevice *) d)->device_id << 8 | _deviceOwnerGrabButton;} ++ ++#define DeviceButtonPressGrab(d,type,_class) \ ++ { _class = ((XDevice *) d)->device_id << 8 | _deviceButtonGrab;} ++ ++#define NoExtensionEvent(d,type,_class) \ ++ { _class = ((XDevice *) d)->device_id << 8 | _noExtensionEvent;} ++ ++ ++/* We need the declaration for DevicePresence. */ ++#if defined(__cplusplus) || defined(c_plusplus) ++extern "C" { ++#endif ++ extern int _XiGetDevicePresenceNotifyEvent(Display *); ++#if defined(__cplusplus) || defined(c_plusplus) ++} ++#endif ++ ++#define DevicePresence(dpy, type, _class) \ ++ { \ ++ type = _XiGetDevicePresenceNotifyEvent(dpy); \ ++ _class = (0x10000 | _devicePresence); \ ++ } ++ ++/* Errors */ ++#define BadDevice(dpy,error) _xibaddevice(dpy, &error) ++ ++#define BadClass(dpy,error) _xibadclass(dpy, &error) ++ ++#define BadEvent(dpy,error) _xibadevent(dpy, &error) ++ ++#define BadMode(dpy,error) _xibadmode(dpy, &error) ++ ++#define DeviceBusy(dpy,error) _xidevicebusy(dpy, &error) ++ ++typedef struct _XAnyClassinfo *XAnyClassPtr; ++ ++/*************************************************************** ++ * ++ * DeviceKey events. These events are sent by input devices that ++ * support input class Keys. ++ * The location of the X pointer is reported in the coordinate ++ * fields of the x,y and x_root,y_root fields. ++ * ++ */ ++ ++typedef struct ++ { ++ int type; /* of event */ ++ unsigned long serial; /* # of last request processed */ ++ Bool send_event; /* true if from SendEvent request */ ++ Display *display; /* Display the event was read from */ ++ Window window; /* "event" window reported relative to */ ++ XID deviceid; ++ Window root; /* root window event occured on */ ++ Window subwindow; /* child window */ ++ Time time; /* milliseconds */ ++ int x, y; /* x, y coordinates in event window */ ++ int x_root; /* coordinates relative to root */ ++ int y_root; /* coordinates relative to root */ ++ unsigned int state; /* key or button mask */ ++ unsigned int keycode; /* detail */ ++ Bool same_screen; /* same screen flag */ ++ unsigned int device_state; /* device key or button mask */ ++ unsigned char axes_count; ++ unsigned char first_axis; ++ int axis_data[6]; ++ } XDeviceKeyEvent; ++ ++typedef XDeviceKeyEvent XDeviceKeyPressedEvent; ++typedef XDeviceKeyEvent XDeviceKeyReleasedEvent; ++ ++/******************************************************************* ++ * ++ * DeviceButton events. These events are sent by extension devices ++ * that support input class Buttons. ++ * ++ */ ++ ++typedef struct { ++ int type; /* of event */ ++ unsigned long serial; /* # of last request processed by server */ ++ Bool send_event; /* true if from a SendEvent request */ ++ Display *display; /* Display the event was read from */ ++ Window window; /* "event" window reported relative to */ ++ XID deviceid; ++ Window root; /* root window that the event occured on */ ++ Window subwindow; /* child window */ ++ Time time; /* milliseconds */ ++ int x, y; /* x, y coordinates in event window */ ++ int x_root; /* coordinates relative to root */ ++ int y_root; /* coordinates relative to root */ ++ unsigned int state; /* key or button mask */ ++ unsigned int button; /* detail */ ++ Bool same_screen; /* same screen flag */ ++ unsigned int device_state; /* device key or button mask */ ++ unsigned char axes_count; ++ unsigned char first_axis; ++ int axis_data[6]; ++ } XDeviceButtonEvent; ++ ++typedef XDeviceButtonEvent XDeviceButtonPressedEvent; ++typedef XDeviceButtonEvent XDeviceButtonReleasedEvent; ++ ++/******************************************************************* ++ * ++ * DeviceMotionNotify event. These events are sent by extension devices ++ * that support input class Valuators. ++ * ++ */ ++ ++typedef struct ++ { ++ int type; /* of event */ ++ unsigned long serial; /* # of last request processed by server */ ++ Bool send_event; /* true if from a SendEvent request */ ++ Display *display; /* Display the event was read from */ ++ Window window; /* "event" window reported relative to */ ++ XID deviceid; ++ Window root; /* root window that the event occured on */ ++ Window subwindow; /* child window */ ++ Time time; /* milliseconds */ ++ int x, y; /* x, y coordinates in event window */ ++ int x_root; /* coordinates relative to root */ ++ int y_root; /* coordinates relative to root */ ++ unsigned int state; /* key or button mask */ ++ char is_hint; /* detail */ ++ Bool same_screen; /* same screen flag */ ++ unsigned int device_state; /* device key or button mask */ ++ unsigned char axes_count; ++ unsigned char first_axis; ++ int axis_data[6]; ++ } XDeviceMotionEvent; ++ ++/******************************************************************* ++ * ++ * DeviceFocusChange events. These events are sent when the focus ++ * of an extension device that can be focused is changed. ++ * ++ */ ++ ++typedef struct ++ { ++ int type; /* of event */ ++ unsigned long serial; /* # of last request processed by server */ ++ Bool send_event; /* true if from a SendEvent request */ ++ Display *display; /* Display the event was read from */ ++ Window window; /* "event" window reported relative to */ ++ XID deviceid; ++ int mode; /* NotifyNormal, NotifyGrab, NotifyUngrab */ ++ int detail; ++ /* ++ * NotifyAncestor, NotifyVirtual, NotifyInferior, ++ * NotifyNonLinear,NotifyNonLinearVirtual, NotifyPointer, ++ * NotifyPointerRoot, NotifyDetailNone ++ */ ++ Time time; ++ } XDeviceFocusChangeEvent; ++ ++typedef XDeviceFocusChangeEvent XDeviceFocusInEvent; ++typedef XDeviceFocusChangeEvent XDeviceFocusOutEvent; ++ ++/******************************************************************* ++ * ++ * ProximityNotify events. These events are sent by those absolute ++ * positioning devices that are capable of generating proximity information. ++ * ++ */ ++ ++typedef struct ++ { ++ int type; /* ProximityIn or ProximityOut */ ++ unsigned long serial; /* # of last request processed by server */ ++ Bool send_event; /* true if this came from a SendEvent request */ ++ Display *display; /* Display the event was read from */ ++ Window window; ++ XID deviceid; ++ Window root; ++ Window subwindow; ++ Time time; ++ int x, y; ++ int x_root, y_root; ++ unsigned int state; ++ Bool same_screen; ++ unsigned int device_state; /* device key or button mask */ ++ unsigned char axes_count; ++ unsigned char first_axis; ++ int axis_data[6]; ++ } XProximityNotifyEvent; ++typedef XProximityNotifyEvent XProximityInEvent; ++typedef XProximityNotifyEvent XProximityOutEvent; ++ ++/******************************************************************* ++ * ++ * DeviceStateNotify events are generated on EnterWindow and FocusIn ++ * for those clients who have selected DeviceState. ++ * ++ */ ++ ++typedef struct ++ { ++#if defined(__cplusplus) || defined(c_plusplus) ++ unsigned char c_class; ++#else ++ unsigned char class; ++#endif ++ unsigned char length; ++ } XInputClass; ++ ++typedef struct { ++ int type; ++ unsigned long serial; /* # of last request processed by server */ ++ Bool send_event; /* true if this came from a SendEvent request */ ++ Display *display; /* Display the event was read from */ ++ Window window; ++ XID deviceid; ++ Time time; ++ int num_classes; ++ char data[64]; ++} XDeviceStateNotifyEvent; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ unsigned char c_class; ++#else ++ unsigned char class; ++#endif ++ unsigned char length; ++ unsigned char num_valuators; ++ unsigned char mode; ++ int valuators[6]; ++} XValuatorStatus; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ unsigned char c_class; ++#else ++ unsigned char class; ++#endif ++ unsigned char length; ++ short num_keys; ++ char keys[32]; ++} XKeyStatus; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ unsigned char c_class; ++#else ++ unsigned char class; ++#endif ++ unsigned char length; ++ short num_buttons; ++ char buttons[32]; ++} XButtonStatus; ++ ++/******************************************************************* ++ * ++ * DeviceMappingNotify event. This event is sent when the key mapping, ++ * modifier mapping, or button mapping of an extension device is changed. ++ * ++ */ ++ ++typedef struct { ++ int type; ++ unsigned long serial; /* # of last request processed by server */ ++ Bool send_event; /* true if this came from a SendEvent request */ ++ Display *display; /* Display the event was read from */ ++ Window window; /* unused */ ++ XID deviceid; ++ Time time; ++ int request; /* one of MappingModifier, MappingKeyboard, ++ MappingPointer */ ++ int first_keycode;/* first keycode */ ++ int count; /* defines range of change w. first_keycode*/ ++} XDeviceMappingEvent; ++ ++/******************************************************************* ++ * ++ * ChangeDeviceNotify event. This event is sent when an ++ * XChangeKeyboard or XChangePointer request is made. ++ * ++ */ ++ ++typedef struct { ++ int type; ++ unsigned long serial; /* # of last request processed by server */ ++ Bool send_event; /* true if this came from a SendEvent request */ ++ Display *display; /* Display the event was read from */ ++ Window window; /* unused */ ++ XID deviceid; ++ Time time; ++ int request; /* NewPointer or NewKeyboard */ ++} XChangeDeviceNotifyEvent; ++ ++/******************************************************************* ++ * ++ * DevicePresenceNotify event. This event is sent when the list of ++ * input devices changes, in which case devchange will be false, and ++ * no information about the change will be contained in the event; ++ * the client should use XListInputDevices() to learn what has changed. ++ * ++ * If devchange is true, an attribute that the server believes is ++ * important has changed on a device, and the client should use ++ * XGetDeviceControl to examine the device. If control is non-zero, ++ * then that control has changed meaningfully. ++ */ ++ ++typedef struct { ++ int type; ++ unsigned long serial; /* # of last request processed by server */ ++ Bool send_event; /* true if this came from a SendEvent request */ ++ Display *display; /* Display the event was read from */ ++ Window window; /* unused */ ++ Time time; ++ Bool devchange; ++ XID deviceid; ++ XID control; ++} XDevicePresenceNotifyEvent; ++ ++/* ++ * Notifies the client that a property on a device has changed value. The ++ * client is expected to query the server for updated value of the property. ++ */ ++typedef struct { ++ int type; ++ unsigned long serial; /* # of last request processed by server */ ++ Bool send_event; /* true if this came from a SendEvent request */ ++ Display *display; /* Display the event was read from */ ++ Window window; /* unused */ ++ Time time; ++ XID deviceid; /* id of the device that changed */ ++ Atom atom; /* the property that changed */ ++ int state; /* PropertyNewValue or PropertyDeleted */ ++} XDevicePropertyNotifyEvent; ++ ++ ++ ++/******************************************************************* ++ * ++ * Control structures for input devices that support input class ++ * Feedback. These are used by the XGetFeedbackControl and ++ * XChangeFeedbackControl functions. ++ * ++ */ ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++} XFeedbackState; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int click; ++ int percent; ++ int pitch; ++ int duration; ++ int led_mask; ++ int global_auto_repeat; ++ char auto_repeats[32]; ++} XKbdFeedbackState; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int accelNum; ++ int accelDenom; ++ int threshold; ++} XPtrFeedbackState; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int resolution; ++ int minVal; ++ int maxVal; ++} XIntegerFeedbackState; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int max_symbols; ++ int num_syms_supported; ++ KeySym *syms_supported; ++} XStringFeedbackState; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int percent; ++ int pitch; ++ int duration; ++} XBellFeedbackState; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int led_values; ++ int led_mask; ++} XLedFeedbackState; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++} XFeedbackControl; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int accelNum; ++ int accelDenom; ++ int threshold; ++} XPtrFeedbackControl; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int click; ++ int percent; ++ int pitch; ++ int duration; ++ int led_mask; ++ int led_value; ++ int key; ++ int auto_repeat_mode; ++} XKbdFeedbackControl; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int num_keysyms; ++ KeySym *syms_to_display; ++} XStringFeedbackControl; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int int_to_display; ++} XIntegerFeedbackControl; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int percent; ++ int pitch; ++ int duration; ++} XBellFeedbackControl; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ XID id; ++ int led_mask; ++ int led_values; ++} XLedFeedbackControl; ++ ++/******************************************************************* ++ * ++ * Device control structures. ++ * ++ */ ++ ++typedef struct { ++ XID control; ++ int length; ++} XDeviceControl; ++ ++typedef struct { ++ XID control; ++ int length; ++ int first_valuator; ++ int num_valuators; ++ int *resolutions; ++} XDeviceResolutionControl; ++ ++typedef struct { ++ XID control; ++ int length; ++ int num_valuators; ++ int *resolutions; ++ int *min_resolutions; ++ int *max_resolutions; ++} XDeviceResolutionState; ++ ++typedef struct { ++ XID control; ++ int length; ++ int min_x; ++ int max_x; ++ int min_y; ++ int max_y; ++ int flip_x; ++ int flip_y; ++ int rotation; ++ int button_threshold; ++} XDeviceAbsCalibControl, XDeviceAbsCalibState; ++ ++typedef struct { ++ XID control; ++ int length; ++ int offset_x; ++ int offset_y; ++ int width; ++ int height; ++ int screen; ++ XID following; ++} XDeviceAbsAreaControl, XDeviceAbsAreaState; ++ ++typedef struct { ++ XID control; ++ int length; ++ int status; ++} XDeviceCoreControl; ++ ++typedef struct { ++ XID control; ++ int length; ++ int status; ++ int iscore; ++} XDeviceCoreState; ++ ++typedef struct { ++ XID control; ++ int length; ++ int enable; ++} XDeviceEnableControl, XDeviceEnableState; ++ ++/******************************************************************* ++ * ++ * An array of XDeviceList structures is returned by the ++ * XListInputDevices function. Each entry contains information ++ * about one input device. Among that information is an array of ++ * pointers to structures that describe the characteristics of ++ * the input device. ++ * ++ */ ++ ++typedef struct _XAnyClassinfo { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ } XAnyClassInfo; ++ ++typedef struct _XDeviceInfo *XDeviceInfoPtr; ++ ++typedef struct _XDeviceInfo ++ { ++ XID id; ++ Atom type; ++ char *name; ++ int num_classes; ++ int use; ++ XAnyClassPtr inputclassinfo; ++ } XDeviceInfo; ++ ++typedef struct _XKeyInfo *XKeyInfoPtr; ++ ++typedef struct _XKeyInfo ++ { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ unsigned short min_keycode; ++ unsigned short max_keycode; ++ unsigned short num_keys; ++ } XKeyInfo; ++ ++typedef struct _XButtonInfo *XButtonInfoPtr; ++ ++typedef struct _XButtonInfo { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ short num_buttons; ++ } XButtonInfo; ++ ++typedef struct _XAxisInfo *XAxisInfoPtr; ++ ++typedef struct _XAxisInfo { ++ int resolution; ++ int min_value; ++ int max_value; ++ } XAxisInfo; ++ ++typedef struct _XValuatorInfo *XValuatorInfoPtr; ++ ++typedef struct _XValuatorInfo ++ { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ unsigned char num_axes; ++ unsigned char mode; ++ unsigned long motion_buffer; ++ XAxisInfoPtr axes; ++ } XValuatorInfo; ++ ++/** ++ * Fake class, added to each device when parsing XListInputDevices internally. ++ * Indicates the master device this device is attached to. If the device is a ++ * master device, the value of attached is to be ignored. ++ */ ++typedef struct _XAttachInfo ++ { ++#if defined(__cplusplus) || defined(c_plusplus) ++ XID c_class; ++#else ++ XID class; ++#endif ++ int length; ++ unsigned char attached; ++ } XAttachInfo; ++ ++typedef struct _XAttachInfo *XAttachInfoPtr; ++ ++/******************************************************************* ++ * ++ * An XDevice structure is returned by the XOpenDevice function. ++ * It contains an array of pointers to XInputClassInfo structures. ++ * Each contains information about a class of input supported by the ++ * device, including a pointer to an array of data for each type of event ++ * the device reports. ++ * ++ */ ++ ++ ++typedef struct { ++ unsigned char input_class; ++ unsigned char event_type_base; ++} XInputClassInfo; ++ ++typedef struct { ++ XID device_id; ++ int num_classes; ++ XInputClassInfo *classes; ++} XDevice; ++ ++ ++/******************************************************************* ++ * ++ * The following structure is used to return information for the ++ * XGetSelectedExtensionEvents function. ++ * ++ */ ++ ++typedef struct { ++ XEventClass event_type; ++ XID device; ++} XEventList; ++ ++/******************************************************************* ++ * ++ * The following structure is used to return motion history data from ++ * an input device that supports the input class Valuators. ++ * This information is returned by the XGetDeviceMotionEvents function. ++ * ++ */ ++ ++typedef struct { ++ Time time; ++ int *data; ++} XDeviceTimeCoord; ++ ++ ++/******************************************************************* ++ * ++ * Device state structure. ++ * This is returned by the XQueryDeviceState request. ++ * ++ */ ++ ++typedef struct { ++ XID device_id; ++ int num_classes; ++ XInputClass *data; ++} XDeviceState; ++ ++/******************************************************************* ++ * ++ * Note that the mode field is a bitfield that reports the Proximity ++ * status of the device as well as the mode. The mode field should ++ * be OR'd with the mask DeviceMode and compared with the values ++ * Absolute and Relative to determine the mode, and should be OR'd ++ * with the mask ProximityState and compared with the values InProximity ++ * and OutOfProximity to determine the proximity state. ++ * ++ */ ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ unsigned char c_class; ++#else ++ unsigned char class; ++#endif ++ unsigned char length; ++ unsigned char num_valuators; ++ unsigned char mode; ++ int *valuators; ++} XValuatorState; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ unsigned char c_class; ++#else ++ unsigned char class; ++#endif ++ unsigned char length; ++ short num_keys; ++ char keys[32]; ++} XKeyState; ++ ++typedef struct { ++#if defined(__cplusplus) || defined(c_plusplus) ++ unsigned char c_class; ++#else ++ unsigned char class; ++#endif ++ unsigned char length; ++ short num_buttons; ++ char buttons[32]; ++} XButtonState; ++ ++ ++/******************************************************************* ++ * ++ */ ++typedef struct { ++ int type; ++ char* name; ++ Bool sendCore; ++ Bool enable; ++} XCreateMasterInfo; ++ ++typedef struct { ++ int type; ++ XDevice* device; ++ int returnMode; /* AttachToMaster, Floating */ ++ XDevice* returnPointer; ++ XDevice* returnKeyboard; ++} XRemoveMasterInfo; ++ ++typedef struct { ++ int type; ++ XDevice* device; ++ int changeMode; /* AttachToMaster, Floating */ ++ XDevice* newMaster; ++} XChangeAttachmentInfo; ++ ++typedef union { ++ int type; /* must be first element */ ++ XCreateMasterInfo create; ++ XRemoveMasterInfo remove; ++ XChangeAttachmentInfo change; ++} XAnyHierarchyChangeInfo; ++ ++ ++/******************************************************************* ++ * ++ * Function definitions. ++ * ++ */ ++ ++_XFUNCPROTOBEGIN ++ ++extern int XChangeKeyboardDevice( ++ Display* /* display */, ++ XDevice* /* device */ ++); ++ ++extern int XChangePointerDevice( ++ Display* /* display */, ++ XDevice* /* device */, ++ int /* xaxis */, ++ int /* yaxis */ ++); ++ ++extern int XGrabDevice( ++ Display* /* display */, ++ XDevice* /* device */, ++ Window /* grab_window */, ++ Bool /* ownerEvents */, ++ int /* event count */, ++ XEventClass* /* event_list */, ++ int /* this_device_mode */, ++ int /* other_devices_mode */, ++ Time /* time */ ++); ++ ++extern int XUngrabDevice( ++ Display* /* display */, ++ XDevice* /* device */, ++ Time /* time */ ++); ++ ++extern int XGrabDeviceKey( ++ Display* /* display */, ++ XDevice* /* device */, ++ unsigned int /* key */, ++ unsigned int /* modifiers */, ++ XDevice* /* modifier_device */, ++ Window /* grab_window */, ++ Bool /* owner_events */, ++ unsigned int /* event_count */, ++ XEventClass* /* event_list */, ++ int /* this_device_mode */, ++ int /* other_devices_mode */ ++); ++ ++extern int XUngrabDeviceKey( ++ Display* /* display */, ++ XDevice* /* device */, ++ unsigned int /* key */, ++ unsigned int /* modifiers */, ++ XDevice* /* modifier_dev */, ++ Window /* grab_window */ ++); ++ ++extern int XGrabDeviceButton( ++ Display* /* display */, ++ XDevice* /* device */, ++ unsigned int /* button */, ++ unsigned int /* modifiers */, ++ XDevice* /* modifier_device */, ++ Window /* grab_window */, ++ Bool /* owner_events */, ++ unsigned int /* event_count */, ++ XEventClass* /* event_list */, ++ int /* this_device_mode */, ++ int /* other_devices_mode */ ++); ++ ++extern int XUngrabDeviceButton( ++ Display* /* display */, ++ XDevice* /* device */, ++ unsigned int /* button */, ++ unsigned int /* modifiers */, ++ XDevice* /* modifier_dev */, ++ Window /* grab_window */ ++); ++ ++extern int XAllowDeviceEvents( ++ Display* /* display */, ++ XDevice* /* device */, ++ int /* event_mode */, ++ Time /* time */ ++); ++ ++extern int XGetDeviceFocus( ++ Display* /* display */, ++ XDevice* /* device */, ++ Window* /* focus */, ++ int* /* revert_to */, ++ Time* /* time */ ++); ++ ++extern int XSetDeviceFocus( ++ Display* /* display */, ++ XDevice* /* device */, ++ Window /* focus */, ++ int /* revert_to */, ++ Time /* time */ ++); ++ ++extern XFeedbackState *XGetFeedbackControl( ++ Display* /* display */, ++ XDevice* /* device */, ++ int* /* num_feedbacks */ ++); ++ ++extern void XFreeFeedbackList( ++ XFeedbackState* /* list */ ++); ++ ++extern int XChangeFeedbackControl( ++ Display* /* display */, ++ XDevice* /* device */, ++ unsigned long /* mask */, ++ XFeedbackControl* /* f */ ++); ++ ++extern int XDeviceBell( ++ Display* /* display */, ++ XDevice* /* device */, ++ XID /* feedbackclass */, ++ XID /* feedbackid */, ++ int /* percent */ ++); ++ ++extern KeySym *XGetDeviceKeyMapping( ++ Display* /* display */, ++ XDevice* /* device */, ++#if NeedWidePrototypes ++ unsigned int /* first */, ++#else ++ KeyCode /* first */, ++#endif ++ int /* keycount */, ++ int* /* syms_per_code */ ++); ++ ++extern int XChangeDeviceKeyMapping( ++ Display* /* display */, ++ XDevice* /* device */, ++ int /* first */, ++ int /* syms_per_code */, ++ KeySym* /* keysyms */, ++ int /* count */ ++); ++ ++extern XModifierKeymap *XGetDeviceModifierMapping( ++ Display* /* display */, ++ XDevice* /* device */ ++); ++ ++extern int XSetDeviceModifierMapping( ++ Display* /* display */, ++ XDevice* /* device */, ++ XModifierKeymap* /* modmap */ ++); ++ ++extern int XSetDeviceButtonMapping( ++ Display* /* display */, ++ XDevice* /* device */, ++ unsigned char* /* map[] */, ++ int /* nmap */ ++); ++ ++extern int XGetDeviceButtonMapping( ++ Display* /* display */, ++ XDevice* /* device */, ++ unsigned char* /* map[] */, ++ unsigned int /* nmap */ ++); ++ ++extern XDeviceState *XQueryDeviceState( ++ Display* /* display */, ++ XDevice* /* device */ ++); ++ ++extern void XFreeDeviceState( ++ XDeviceState* /* list */ ++); ++ ++/* Replaced by XQueryInputVersion */ ++extern _X_DEPRECATED XExtensionVersion *XGetExtensionVersion( ++ Display* /* display */, ++ _Xconst char* /* name */ ++); ++ ++extern XExtensionVersion *XQueryInputVersion( ++ Display* /* display */, ++ int /* major */, ++ int /* minor */ ++); ++ ++extern XDeviceInfo *XListInputDevices( ++ Display* /* display */, ++ int* /* ndevices */ ++); ++ ++extern void XFreeDeviceList( ++ XDeviceInfo* /* list */ ++); ++ ++extern XDevice *XOpenDevice( ++ Display* /* display */, ++ XID /* id */ ++); ++ ++extern int XCloseDevice( ++ Display* /* display */, ++ XDevice* /* device */ ++); ++ ++extern int XSetDeviceMode( ++ Display* /* display */, ++ XDevice* /* device */, ++ int /* mode */ ++); ++ ++extern int XSetDeviceValuators( ++ Display* /* display */, ++ XDevice* /* device */, ++ int* /* valuators */, ++ int /* first_valuator */, ++ int /* num_valuators */ ++); ++ ++extern XDeviceControl *XGetDeviceControl( ++ Display* /* display */, ++ XDevice* /* device */, ++ int /* control */ ++); ++ ++extern int XChangeDeviceControl( ++ Display* /* display */, ++ XDevice* /* device */, ++ int /* control */, ++ XDeviceControl* /* d */ ++); ++ ++extern int XSelectExtensionEvent( ++ Display* /* display */, ++ Window /* w */, ++ XEventClass* /* event_list */, ++ int /* count */ ++); ++ ++extern int XGetSelectedExtensionEvents( ++ Display* /* display */, ++ Window /* w */, ++ int* /* this_client_count */, ++ XEventClass** /* this_client_list */, ++ int* /* all_clients_count */, ++ XEventClass** /* all_clients_list */ ++); ++ ++extern int XChangeDeviceDontPropagateList( ++ Display* /* display */, ++ Window /* window */, ++ int /* count */, ++ XEventClass* /* events */, ++ int /* mode */ ++); ++ ++extern XEventClass *XGetDeviceDontPropagateList( ++ Display* /* display */, ++ Window /* window */, ++ int* /* count */ ++); ++ ++extern Status XSendExtensionEvent( ++ Display* /* display */, ++ XDevice* /* device */, ++ Window /* dest */, ++ Bool /* prop */, ++ int /* count */, ++ XEventClass* /* list */, ++ XEvent* /* event */ ++); ++ ++extern XDeviceTimeCoord *XGetDeviceMotionEvents( ++ Display* /* display */, ++ XDevice* /* device */, ++ Time /* start */, ++ Time /* stop */, ++ int* /* nEvents */, ++ int* /* mode */, ++ int* /* axis_count */ ++); ++ ++extern void XFreeDeviceMotionEvents( ++ XDeviceTimeCoord* /* events */ ++); ++ ++extern void XFreeDeviceControl( ++ XDeviceControl* /* control */ ++); ++ ++ ++extern Atom* XListDeviceProperties( ++ Display* /* dpy */, ++ XDevice* /* dev */, ++ int* /* nprops_return */ ++); ++ ++extern void XChangeDeviceProperty( ++ Display* /* dpy */, ++ XDevice* /* dev */, ++ Atom /* property */, ++ Atom /* type */, ++ int /* format */, ++ int /* mode */, ++ _Xconst unsigned char * /*data */, ++ int /* nelements */ ++); ++ ++extern void ++XDeleteDeviceProperty( ++ Display* /* dpy */, ++ XDevice* /* dev */, ++ Atom /* property */ ++); ++ ++extern Status ++XGetDeviceProperty( ++ Display* /* dpy*/, ++ XDevice* /* dev*/, ++ Atom /* property*/, ++ long /* offset*/, ++ long /* length*/, ++ Bool /* delete*/, ++ Atom /* req_type*/, ++ Atom* /* actual_type*/, ++ int* /* actual_format*/, ++ unsigned long* /* nitems*/, ++ unsigned long* /* bytes_after*/, ++ unsigned char** /* prop*/ ++); ++ ++_XFUNCPROTOEND ++ ++#endif /* _XINPUT_H_ */ +Index: libxi-1.1.3/src/Makefile.am +=================================================================== +--- libxi-1.1.3.orig/src/Makefile.am 2008-08-20 10:29:51.000000000 +0300 ++++ libxi-1.1.3/src/Makefile.am 2008-09-26 13:00:15.000000000 +0300 +@@ -46,11 +46,11 @@ + + AM_CFLAGS = $(XI_CFLAGS) $(MALLOC_ZERO_CFLAGS) + +-#INCLUDES = -I$(top_srcdir)/include/X11/extensions ++INCLUDES = -I$(top_srcdir)/include/X11/extensions + + libXi_la_LDFLAGS = -version-number 6:0:0 -no-undefined + +-#libXiincludedir = $(includedir)/X11/extensions +-#libXiinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xi.h ++libXiincludedir = $(includedir)/X11/extensions ++libXiinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XInput.h + + EXTRA_DIST = XFreeLst.c --- libxi-1.1.3.orig/debian/patches/series +++ libxi-1.1.3/debian/patches/series @@ -0,0 +1,3 @@ +100_add_xinput.h.patch +101_fix_up_am_cflags.patch +102_input_properties.patch --- libxi-1.1.3.orig/debian/patches/101_fix_up_am_cflags.patch +++ libxi-1.1.3/debian/patches/101_fix_up_am_cflags.patch @@ -0,0 +1,25 @@ +From: Peter Hutterer +Date: Wed, 30 Apr 2008 01:05:12 +0000 (+0930) +Subject: Fix up AM_CFLAGS, pulled in the system-includes before the local ones. +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libXi.git;a=commitdiff;h=26dde5aaf4bbc89140cc4e3d13fe18036041022d + +Fix up AM_CFLAGS, pulled in the system-includes before the local ones. +--- + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -58,9 +58,12 @@ libXi_la_SOURCES = \ + + libXi_la_LIBADD = $(XI_LIBS) + +-AM_CFLAGS = $(XI_CFLAGS) $(MALLOC_ZERO_CFLAGS) ++AM_CFLAGS = -I$(top_srcdir)/include \ ++ -I$(top_srcdir)/include/X11 \ ++ -I$(top_srcdir)/include/X11/extensions \ ++ $(XI_CFLAGS) \ ++ $(MALLOC_ZERO_CFLAGS) + +-INCLUDES = -I$(top_srcdir)/include/X11/extensions + + libXi_la_LDFLAGS = -version-number 6:0:0 -no-undefined + --- libxi-1.1.3.orig/debian/compat +++ libxi-1.1.3/debian/compat @@ -0,0 +1 @@ +5 --- libxi-1.1.3.orig/debian/copyright +++ libxi-1.1.3/debian/copyright @@ -0,0 +1,44 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/lib/ + +Copyright 1989, 1998 The Open Group + +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. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +Copyright 1989 by Hewlett-Packard Company, Palo Alto, California. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +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 Hewlett-Packard not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL HEWLETT-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. --- libxi-1.1.3.orig/debian/changelog +++ libxi-1.1.3/debian/changelog @@ -0,0 +1,192 @@ +libxi (2:1.1.3-2build1) intrepid; urgency=low + + * Rebuild due to x11proto-input fix in 283921 + + -- Bryce Harrington Sat, 18 Oct 2008 01:56:11 -0700 + +libxi (2:1.1.3-1ubuntu5) intrepid; urgency=low + + * Rebuild against new x11proto-input. + + -- William Grant Wed, 15 Oct 2008 07:53:31 +1100 + +libxi (2:1.1.3-1ubuntu4) intrepid; urgency=low + + * Add Breaks for current gnome-control-center, gnome-settings-daemon + and xinput because of the changed properties API. + + -- Timo Aaltonen Thu, 09 Oct 2008 14:36:44 +0300 + +libxi (2:1.1.3-1ubuntu3) intrepid; urgency=low + + * 102_input_properties.patch: Update to reflect the + changes to the API. Configure/Query property functionality and + requests have been culled. (LP: #274728) + * debian/control: Bump the build-dep on x11proto-input-dev. + * debian/rules : Bump shlibs for libxi6. + + -- Timo Aaltonen Fri, 26 Sep 2008 18:20:32 +0300 + +libxi (2:1.1.3-1ubuntu2) intrepid; urgency=low + + * debian/rules: Bump shlibs for libxi6 + * debian/control: + - Build-depend on the new inputproto (FTBFS). + - No need to Conflict the old inputproto. + - libxi-dev depends on the new inputproto. + + -- Timo Aaltonen Thu, 21 Aug 2008 11:59:51 +0300 + +libxi (2:1.1.3-1ubuntu1) intrepid; urgency=low + + * 100_add_xinput.h.patch, + 101_fix_up_am_cflags.patch, + 102_input_properties.patch: + - Add support for input-device properties. + * debian/control: + - Change the maintainer address + - Conflict/Replace x11proto-input-dev (<= 1.4.3-2). + * debian/libxi-dev.install: + - Install XInput.h + * debian/rules: + - Run autoreconf, and allow patching. + + -- Timo Aaltonen Wed, 20 Aug 2008 10:16:02 +0300 + +libxi (2:1.1.3-1) unstable; urgency=low + + * Add upstream URL to debian/copyright. + * New upstream release. + + -- Julien Cristau Thu, 06 Sep 2007 01:45:30 +0200 + +libxi (2:1.1.2-1) unstable; urgency=low + + * New upstream release + + fixes locking bugs (closes: #429147). + * Add myself to Uploaders and remove Branden and Fabio with their + permission. + * Use ${binary:Version} instead of ${Source-Version}. + * Add a XS-Vcs-Browser header. + + -- Julien Cristau Wed, 01 Aug 2007 05:07:05 +0200 + +libxi (2:1.1.1-1) unstable; urgency=low + + * New upstream release. + + -- Julien Cristau Fri, 06 Jul 2007 03:52:46 +0200 + +libxi (2:1.1.0-2) experimental; urgency=low + + * Pull fixes from upstream git. + + remove patch 00_upstream_002_XiCheckExtInit_unlockdisplay.diff applied + upstream. + * Bump epoch to 2 so ubuntu can sync this package. + + -- Julien Cristau Mon, 5 Mar 2007 17:24:20 +0100 + +libxi (1:1.1.0-1) experimental; urgency=low + + * Adjust Section values to what the override says. + * Update location of upstream repository from CVS to git in the long + descriptions. + * New upstream release. + + Drop patches applied upstream + + Bump build-dependency on x11proto-input-dev to >= 1.4. + * Install the upstream changelog. + * Add XS-Vcs-Git header in debian/control. + + -- Julien Cristau Fri, 9 Feb 2007 12:34:51 +0100 + +libxi (1:1.0.1-4) unstable; urgency=low + + * libXi: Various Display locking correctness issues (Closes: #400442) + * Add Josh and myself to Uploaders. + + -- Jamey Sharp Mon, 27 Nov 2006 15:07:34 -0800 + +libxi (1:1.0.1-3) unstable; urgency=low + + * Bring X11R7.1 into unstable. Still closes #377204. + * dbg package has priority extra. + + -- Drew Parsons Sat, 26 Aug 2006 20:46:35 +1000 + +libxi (1:1.0.1-2) experimental; urgency=low + + * Patch 10_manpage_section.diff sets the man page section according + to the definition given by xutils macros. Set Build-Depends: + xutils-dev to prove the point. Install man pages using + dh_installman. Closes: #377204. + + -- Drew Parsons Fri, 11 Aug 2006 15:03:27 +1000 + +libxi (1:1.0.1-1) experimental; urgency=low + + * New upstream version (X11R7.1). + - applies patch 01_manpage_location.diff. + * libxi provides no header files, so don't try to install usr/include/X11/* + * Exclude .la from dh_install. + + -- Drew Parsons Thu, 10 Aug 2006 03:00:53 +1000 + +libxi (1:1.0.0-6) UNRELEASED; urgency=low + + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + * Drop duplicate x11-common dep in -dev package. + * 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. + + -- Andres Salomon Mon, 17 Jul 2006 01:21:03 -0400 + +libxi (1:1.0.0-5) unstable; urgency=low + + * Reorder makeshlib command in rules file so that ldconfig is run + properly. Thanks Drew Parsons and Steve Langasek. + * Add quilt to build-depends + + -- David Nusinow Wed, 19 Apr 2006 00:36:48 -0400 + +libxi (1:1.0.0-4) unstable; urgency=low + + * Remove references to xss in -dev and -dbg package descriptions. Thanks + Josh Triplett. (closes: #362059) + + -- David Nusinow Tue, 11 Apr 2006 20:26:26 -0400 + +libxi (1:1.0.0-3) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Thu, 23 Mar 2006 22:44:42 -0500 + +libxi (1:1.0.0-2) experimental; urgency=low + + * Backport manpage location fix + + -- David Nusinow Thu, 9 Mar 2006 23:22:36 -0500 + +libxi (1:1.0.0-1) experimental; urgency=low + + * First modular upload to Debian + * Install manpages in libxi-dev. Thanks Julien Cristau. + + -- David Nusinow Thu, 29 Dec 2005 20:53:15 -0500 + +libxi (1:1.3.0-2) breezy; urgency=low + + * Bump libx11-dev and libxext-dev Build-Deps to avoid _XOPEN_SOURCE. + + -- Daniel Stone Sat, 23 Jul 2005 00:28:53 +1000 + +libxi (1:1.3.0-1) breezy; urgency=low + + * First libxi release. + + -- Daniel Stone Mon, 16 May 2005 22:10:17 +1000 --- libxi-1.1.3.orig/debian/libxi-dev.install +++ libxi-1.1.3/debian/libxi-dev.install @@ -0,0 +1,4 @@ +usr/lib/libXi.a +usr/lib/libXi.so +usr/lib/pkgconfig/xi.pc +usr/include/X11/extensions/* --- libxi-1.1.3.orig/debian/libxi-dev.manpages +++ libxi-1.1.3/debian/libxi-dev.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man3/* --- libxi-1.1.3.orig/debian/watch +++ libxi-1.1.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/releases/individual/lib/ libXi-(.*)\.tar\.gz --- libxi-1.1.3.orig/debian/libxi6.install +++ libxi-1.1.3/debian/libxi6.install @@ -0,0 +1 @@ +usr/lib/libXi.so.6* --- libxi-1.1.3.orig/debian/rules +++ libxi-1.1.3/debian/rules @@ -0,0 +1,103 @@ +#!/usr/bin/make -f +# debian/rules for the Debian libxi 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 = libxi6 + +include debian/xsfbs/xsfbs.mk + +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +configure: $(STAMP_DIR)/patch + dh_testdir + autoreconf -vfi + +obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure + dh_testdir + mkdir -p obj-$(DEB_BUILD_GNU_TYPE) + cd obj-$(DEB_BUILD_GNU_TYPE) && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags) \ + CFLAGS="$(CFLAGS)" + + +build: build-stamp +build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status + dh_testdir + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + >$@ + +clean: xsfclean + dh_testdir + dh_testroot + 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 obj-* + rm -f $$(find -name Makefile.in) + rm -f compile config.guess config.sub configure depcomp install-sh + rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap + rm -f include/do-not-use-config.h.in + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + + dh_installdocs + dh_install --sourcedir=debian/tmp --list-missing --exclude=libXi.la --exclude=usr/share/man/man3 + dh_installman + dh_installchangelogs ChangeLog + dh_link + dh_strip --dbg-package=$(PACKAGE)-dbg + dh_compress + dh_fixperms + dh_makeshlibs -V'libxi6 (>= 2:1.1.3-1ubuntu3)' + 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: build clean binary-indep binary-arch binary install --- libxi-1.1.3.orig/mkinstalldirs +++ libxi-1.1.3/mkinstalldirs @@ -0,0 +1,161 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy + +scriptversion=2006-05-11.19 + +# Original author: Noah Friedman +# Created: 1993-05-16 +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' +IFS=" "" $nl" +errstatus=0 +dirmode= + +usage="\ +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac +done + +for file +do + if test -d "$file"; then + shift + else + break + fi +done + +case $# in + 0) exit 0 ;; +esac + +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. +case $dirmode in + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; +esac + +for file +do + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file + shift + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr= + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi + + pathcomp=$pathcomp/ + done +done + +exit $errstatus + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: