libxdamage: Changes to 'debian-unstable'
.gitignore | 20
AUTHORS | 2
COPYING | 3
ChangeLog | 193
INSTALL | 238
Makefile.am | 2
Makefile.in | 19
NEWS | 2
README | 11
aclocal.m4 | 96
config.guess | 667 +
config.h.in | 9
config.sub | 230
configure | 7962 +++++++++++-----------
configure.ac | 4
debian/changelog | 30
debian/control | 8
debian/copyright | 1
debian/libxdamage1.shlibs | 1
debian/patches/00_upstream_000_unlockdisplay.diff | 25
debian/patches/series | 1
debian/rules | 2
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 380 +
debian/xsfbs/xsfbs.sh | 907 ++
include/X11/extensions/Xdamage.h | 7
ltmain.sh | 12
mkinstalldirs | 89
src/.gitignore | 6
src/Makefile.am | 2
src/Makefile.in | 17
src/Xdamage.c | 24
src/xdamageint.h | 2
33 files changed, 6840 insertions(+), 4282 deletions(-)
New commits:
commit cb87c1c5e4aeeb6b25121c0649f96e9782944261
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 20 22:38:46 2007 +0200
Fix the shlibs file: it's libXdamage, not libxdamage...
diff --git a/debian/changelog b/debian/changelog
index 1ac3223..34365e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ libxdamage (1:1.1.1-3) unstable; urgency=low
* Add XS-Vcs-Browser.
* Remove Fabio from Uploaders, with his permission.
* Upload to unstable.
+ * Fix the shlibs file: it's libXdamage, not libxdamage...
- -- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2007 22:34:37 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2007 22:37:32 +0200
libxdamage (1:1.1.1-2) experimental; urgency=low
diff --git a/debian/libxdamage1.shlibs b/debian/libxdamage1.shlibs
index 151d9dd..011fe1c 100644
--- a/debian/libxdamage1.shlibs
+++ b/debian/libxdamage1.shlibs
@@ -1 +1 @@
-libxdamage 1 libxdamage1 (>= 1:1.1)
+libXdamage 1 libxdamage1 (>= 1:1.1)
commit a93b5ad0d05a5ad100033a5e9bfa116e2597c040
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 20 22:34:53 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index a0eefec..1ac3223 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libxdamage (1:1.1.1-3) UNRELEASED; urgency=low
+libxdamage (1:1.1.1-3) unstable; urgency=low
* Add XS-Vcs-Browser.
* Remove Fabio from Uploaders, with his permission.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2007 22:29:32 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2007 22:34:37 +0200
libxdamage (1:1.1.1-2) experimental; urgency=low
commit 5327961e7f7c317595a8addf54703b09b6a59ae5
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 20 22:30:06 2007 +0200
Add XS-Vcs-Browser and remove Fabio from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 793bf95..a0eefec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxdamage (1:1.1.1-3) UNRELEASED; urgency=low
+
+ * Add XS-Vcs-Browser.
+ * Remove Fabio from Uploaders, with his permission.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2007 22:29:32 +0200
+
libxdamage (1:1.1.1-2) experimental; urgency=low
* Bump shlibs to libxdamage >= 1:1.1.
diff --git a/debian/control b/debian/control
index 946d0b4..c944c17 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,11 @@ Source: libxdamage
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>, Drew Parsons <dparsons@debian.org>, Jamey Sharp <sharpone@debian.org>, Josh Triplett <josh@freedesktop.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>, Jamey Sharp <sharpone@debian.org>, Josh Triplett <josh@freedesktop.org>
Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxfixes-dev (>= 1:3.0.0-4), x11proto-damage-dev (>= 1.1), pkg-config, quilt
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxdamage
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxdamage.git
Package: libxdamage1
Section: libs
commit 6c9f18152f24cd687b345d034661dcf846c35ceb
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 21 12:54:54 2007 +0100
Bump shlibs to libxdamage1 >= 1:1.1.
libXdamage 1.1 adds a new XDamageAdd() function.
diff --git a/debian/changelog b/debian/changelog
index 16cdb60..793bf95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxdamage (1:1.1.1-2) experimental; urgency=low
+
+ * Bump shlibs to libxdamage >= 1:1.1.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 21 Mar 2007 12:50:56 +0100
+
libxdamage (1:1.1.1-1) experimental; urgency=low
[ Julien Cristau ]
diff --git a/debian/libxdamage1.shlibs b/debian/libxdamage1.shlibs
new file mode 100644
index 0000000..151d9dd
--- /dev/null
+++ b/debian/libxdamage1.shlibs
@@ -0,0 +1 @@
+libxdamage 1 libxdamage1 (>= 1:1.1)
commit 53a5ed45358995666a1310999b036732d9d389df
Author: Drew Parsons <dparsons@debian.org>
Date: Wed Mar 21 21:12:32 2007 +1100
Upload new version to experimental.
diff --git a/debian/changelog b/debian/changelog
index ec72067..16cdb60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxdamage (1:1.1.1-1) UNRELEASED; urgency=low
+libxdamage (1:1.1.1-1) experimental; urgency=low
[ Julien Cristau ]
* Adjust Section values to what the override says.
@@ -13,7 +13,7 @@ libxdamage (1:1.1.1-1) UNRELEASED; urgency=low
[ Drew Parsons ]
* New upstream release 1.1.1.
- -- Drew Parsons <dparsons@debian.org> Wed, 21 Mar 2007 20:42:54 +1100
+ -- Drew Parsons <dparsons@debian.org> Wed, 21 Mar 2007 21:11:50 +1100
libxdamage (1:1.0.3-3) unstable; urgency=low
commit b30ade769883ce3216f2d2c9b553376121d105ac
Author: Drew Parsons <dparsons@debian.org>
Date: Wed Mar 21 21:01:08 2007 +1100
autoreconf and upload new upstream version to experimental.
diff --git a/INSTALL b/INSTALL
index 1c5b4b5..23e5f25 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,236 @@
-libXdamage is built with the traditional configure script:
+Installation Instructions
+*************************
- $ ./configure --prefix=/usr/X11R6
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
-This should generate valid Makefiles, then:
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
- $ make
- $ make install
diff --git a/aclocal.m4 b/aclocal.m4
index 5e7d056..9b14ffc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6567,7 +6567,8 @@ dnl
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -6580,6 +6581,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
diff --git a/config.h.in b/config.h.in
index d3a954b..ec19ca3 100644
--- a/config.h.in
+++ b/config.h.in
@@ -48,6 +48,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff --git a/config.sub b/config.sub
index 387c18d..fab0aa3 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -367,7 +368,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1366,6 +1371,9 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
diff --git a/configure b/configure
index aa717a3..3590e5e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libXdamage 1.1.
+# Generated by GNU Autoconf 2.61 for libXdamage 1.1.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libXdamage'
PACKAGE_TARNAME='libXdamage'
-PACKAGE_VERSION='1.1'
-PACKAGE_STRING='libXdamage 1.1'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='libXdamage 1.1.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1406,7 +1406,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libXdamage 1.1 to adapt to many kinds of systems.
+\`configure' configures libXdamage 1.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1480,7 +1480,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXdamage 1.1:";;
+ short | recursive ) echo "Configuration of libXdamage 1.1.1:";;
esac
cat <<\_ACEOF
@@ -1595,7 +1595,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libXdamage configure 1.1
+libXdamage configure 1.1.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1609,7 +1609,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libXdamage $as_me 1.1, which was
+It was created by libXdamage $as_me 1.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2279,7 +2279,7 @@ fi
# Define the identity of the package.
PACKAGE='libXdamage'
- VERSION='1.1'
+ VERSION='1.1.1'
cat >>confdefs.h <<_ACEOF
@@ -20883,6 +20883,29 @@ fi
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
fi
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
ac_config_files="$ac_config_files Makefile src/Makefile xdamage.pc"
@@ -21310,7 +21333,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libXdamage $as_me 1.1, which was
+This file was extended by libXdamage $as_me 1.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21363,7 +21386,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXdamage config.status 1.1
+libXdamage config.status 1.1.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 46d9a25..ec72067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libxdamage (1:1.1-1) UNRELEASED; urgency=low
+libxdamage (1:1.1.1-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Adjust Section values to what the override says.
* Update location of upstream repository from CVS to git in the long
descriptions.
@@ -9,7 +10,10 @@ libxdamage (1:1.1-1) UNRELEASED; urgency=low
* Install upstream changelog.
* Add XS-Vcs-Git header in debian/control.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Wed, 31 Jan 2007 07:56:07 +0100
+ [ Drew Parsons ]
+ * New upstream release 1.1.1.
+
+ -- Drew Parsons <dparsons@debian.org> Wed, 21 Mar 2007 20:42:54 +1100
libxdamage (1:1.0.3-3) unstable; urgency=low
diff --git a/src/Makefile.in b/src/Makefile.in
index 97c2363..68ccc49 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -201,7 +201,7 @@ libXdamage_la_SOURCES = \
libXdamage_la_LIBADD = $(XDAMAGE_LIBS) $(X_LIBS)
AM_CFLAGS = $(XDAMAGE_CFLAGS) $(X_CFLAGS)
INCLUDES = -I$(top_srcdir)/include/X11/extensions
-libXdamage_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+libXdamage_la_LDFLAGS = -version-number 1:1:0 -no-undefined
libXdamageincludedir = $(includedir)/X11/extensions
libXdamageinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xdamage.h
all: all-am
commit b96e17d8a4fe8e19515c0f183e5e299939c6eca0
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Mar 5 16:51:06 2007 -0500
Fix DSO version number to match protocol number.
Also increment package version number to 1.1.1 for eventual release.
diff --git a/configure.ac b/configure.ac
index 55a2847..040eda2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ dnl try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXdamage, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXdamage)
+AC_INIT(libXdamage, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXdamage)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/src/Makefile.am b/src/Makefile.am
index 3bb170f..0aa9f4f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ AM_CFLAGS = $(XDAMAGE_CFLAGS) $(X_CFLAGS)
INCLUDES = -I$(top_srcdir)/include/X11/extensions
-libXdamage_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+libXdamage_la_LDFLAGS = -version-number 1:1:0 -no-undefined
libXdamageincludedir = $(includedir)/X11/extensions
libXdamageinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xdamage.h
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ 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-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Mar 1 22:06:04 2007 -0500
Fix one missed bit from the serverabiver -> serverminver rename
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index cfc5496..0343aec 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -366,7 +366,7 @@ endif
.PHONY: serverabi
serverabi:
-ifeq ($(SERVERABI),)
+ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
else
commit 1344bb9deda5ba54215d0ec5b164706999236b0b
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 23:08:17 2007 -0500
Fix typo that prevented the input abi versioning from working.
Good catch Julien
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e8cf41..cfc5496 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -356,7 +356,7 @@ debian/shlibs.local:
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/driverabiver 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-video-$(INPUTABI)
commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Feb 27 21:50:20 2007 -0500
Add support for X server input ABI versioning
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d54ffd3..5e8cf41 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -355,9 +355,11 @@ debian/shlibs.local:
cat debian/*.shlibs >$@
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
-SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
+VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
+INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
-DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
+INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
@@ -369,7 +371,8 @@ ifeq ($(SERVERABI),)
@exit 1
else
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
- echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> 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
commit 00fc799ec3107c0c29286b75e780bef82c1fa137
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 21 22:47:30 2007 -0500
Fix name of serverminver
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index ae767b1..d54ffd3 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,7 +354,7 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
debian/shlibs.local:
cat debian/*.shlibs >$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null)
+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
commit dacefd5a6bb9f786c78f35358273e3214c7492e9
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 21 21:37:52 2007 -0500
Update serverabi generation to also account for driver Provides
* Have the drivers use the file serverminver instead of serverabiver in order
to generate the versioned dependency on the server. This is clearer
naming.
* Use serverabiver to actually store the server's video ABI version. This
is used to generate the Provides: line for drivers so the server can
depend on them properly. This goes in to the substvar
xviddriver:Provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index dbb2872..ae767b1 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,8 +354,10 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
debian/shlibs.local:
cat debian/*.shlibs >$@
+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null)
SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI))
+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
+DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
@@ -367,6 +369,7 @@ ifeq ($(SERVERABI),)
@exit 1
else
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
endif
include debian/xsfbs/xsfbs-autoreconf.mk
commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 17 16:01:41 2007 +0100
Add new "serverabi" rule to generate drivers dependency on the server.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 7b8206e..dbb2872 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,6 +354,21 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
debian/shlibs.local:
cat debian/*.shlibs >$@
+SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI))
+ifeq ($(PACKAGE),)
+PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
+endif
+
+.PHONY: serverabi
+serverabi:
+ifeq ($(SERVERABI),)
+ @echo error: xserver-xorg-dev needs to be installed
+ @exit 1
+else
+ echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+endif
+
include debian/xsfbs/xsfbs-autoreconf.mk
# vim:set noet ai sts=8 sw=8 tw=0:
commit 502f9412dcaa6abd23b94372d86824c895cea3b8
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Feb 4 20:43:28 2007 -0500
Move the files so they'll be put in debian/xsfbs automatically when pulled
in to our git repos
diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
new file mode 100644
index 0000000..dce8fc8
--- /dev/null
+++ b/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 <http://www.gnu.org/copyleft/gpl.txt>.
+
+# 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 $@
Reply to: