libxinerama: Changes to 'debian-experimental'
.gitignore | 9
ChangeLog | 326
INSTALL | 236
Makefile.am | 6
Makefile.in | 710 -
README | 25
aclocal.m4 | 7884 ------------
config.guess | 1500 --
config.h.in | 55
config.sub | 1616 --
configure |21073 ----------------------------------
configure.ac | 16
debian/README.source | 73
debian/changelog | 62
debian/compat | 2
debian/control | 48
debian/copyright | 2
debian/libxinerama-dev.install | 3
debian/rules | 25
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 172
debian/xsfbs/xsfbs.sh | 533
depcomp | 530
include/X11/extensions/Xinerama.h | 74
include/X11/extensions/panoramiXext.h | 85
install-sh | 323
ltmain.sh | 6871 -----------
man/Makefile.in | 440
man/Xinerama.man | 28
missing | 360
mkinstalldirs | 158
src/.gitignore | 6
src/Makefile.am | 10
src/Makefile.in | 490
src/Xinerama.c | 27
36 files changed, 948 insertions(+), 43012 deletions(-)
New commits:
commit 026dc0a16e2e731ab1040de4bdfb9f1ad8801396
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 2 15:06:21 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index c1921aa..888088e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxinerama (2:1.1-1) UNRELEASED; urgency=low
+libxinerama (2:1.1-1) experimental; urgency=low
[ Brice Goglin ]
* Add upstream URL to debian/copyright.
@@ -17,7 +17,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
* Drop pre-dependency on x11-common from libxinerama-dev. This was needed
for upgrades from sarge.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:38:59 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 02 Dec 2009 15:06:18 +0100
libxinerama (2:1.0.3-2) unstable; urgency=low
commit b5fa1d2830a47673dbbc290e81bee60a640290de
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 2 15:05:58 2009 +0100
Delete pointless INSTALL file
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index d3c5b40..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,237 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
- 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 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.
-
- Running `configure' might take a while. 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.
-
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
-
-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=c99 CFLAGS=-g 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 can use 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 `..'.
-
- With a non-GNU `make', it is safer 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).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
-
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/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.
-
diff --git a/debian/rules b/debian/rules
index bdbc6d8..0167a4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,7 @@ clean:
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
find -name Makefile.in -delete
+ rm -f INSTALL
dh_clean
commit 49ce203d2d4f1029f2bf9c9a6208408ead7dc4fd
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 25 19:02:26 2009 +0100
Add bug closer
diff --git a/debian/changelog b/debian/changelog
index 90ab1f4..c1921aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
in the long description.
[ Timo Aaltonen ]
- * New upstream release.
+ * New upstream release (closes: #555997).
* Run autoreconf on build. Add build-deps on automake, libtool
and xutils-dev.
* Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
commit cd9973c9870f546ff528e6532218e0f7713dc551
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Nov 24 13:08:51 2009 +0200
Bump {Build-,}Depends, add Replaces on x11proto-xinerama-dev.
diff --git a/debian/changelog b/debian/changelog
index 4c46aa7..90ab1f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
* Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
* Bump Standards-Version to 3.8.3.
* Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
- * Add Replaces: x11proto-xinerama-dev (<< 1.2).
+ * Bump {Build-,}Depends, add Replaces on x11proto-xinerama-dev.
* Move -dbg package to section debug.
* Drop pre-dependency on x11-common from libxinerama-dev. This was needed
for upgrades from sarge.
diff --git a/debian/control b/debian/control
index 79eebab..61e41a6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
libx11-dev (>= 1:0.99.2),
libxext-dev (>= 1:0.99.1),
- x11proto-xinerama-dev,
+ x11proto-xinerama-dev (>= 1.2),
pkg-config,
automake,
libtool,
@@ -63,7 +63,13 @@ Description: X11 Xinerama extension library (debug package)
Package: libxinerama-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= ${binary:Version}), libx11-dev, libxext-dev, x11proto-xinerama-dev
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libxinerama1 (= ${binary:Version}),
+ libx11-dev,
+ libxext-dev,
+ x11proto-xinerama-dev (>= 1.2)
Replaces: x11proto-xinerama-dev (<< 1.2)
Description: X11 Xinerama extension library (development headers)
libXinerama provides an X Window System client interface to the XINERAMA
commit 8bdffe29fa8da248d27cfda1a5bd65a45e1f8b42
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Nov 24 13:06:52 2009 +0200
Drop pre-dependency on x11-common from libxinerama-dev. This was needed for upgrades from sarge.
diff --git a/debian/changelog b/debian/changelog
index 8550673..4c46aa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
* Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
* Add Replaces: x11proto-xinerama-dev (<< 1.2).
* Move -dbg package to section debug.
+ * Drop pre-dependency on x11-common from libxinerama-dev. This was needed
+ for upgrades from sarge.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:38:59 +0200
diff --git a/debian/control b/debian/control
index 2de41a8..79eebab 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,6 @@ Package: libxinerama-dev
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= ${binary:Version}), libx11-dev, libxext-dev, x11proto-xinerama-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
Replaces: x11proto-xinerama-dev (<< 1.2)
Description: X11 Xinerama extension library (development headers)
libXinerama provides an X Window System client interface to the XINERAMA
commit d78986f008b86b4ca75a5012ba3c630e02c501d5
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Nov 24 13:05:33 2009 +0200
Move -dbg package to section debug.
diff --git a/debian/changelog b/debian/changelog
index c39ab51..8550673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.3.
* Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
* Add Replaces: x11proto-xinerama-dev (<< 1.2).
+ * Move -dbg package to section debug.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:38:59 +0200
diff --git a/debian/control b/debian/control
index 5ee446f..2de41a8 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: X11 Xinerama extension library
git://anongit.freedesktop.org/git/xorg/lib/libXinerama
Package: libxinerama1-dbg
-Section: libdevel
+Section: debug
Priority: extra
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= ${binary:Version})
commit fe966705eaaaa1de9875ec1d587afd0edc410b1d
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Nov 24 13:05:06 2009 +0200
Add libtool to bdeps.
diff --git a/debian/changelog b/debian/changelog
index 4dd02df..c39ab51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
- * Run autoreconf on build. Add build-deps on automake and xutils-dev.
+ * Run autoreconf on build. Add build-deps on automake, libtool
+ and xutils-dev.
* Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
* Bump Standards-Version to 3.8.3.
* Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
diff --git a/debian/control b/debian/control
index 8db2a2e..5ee446f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
x11proto-xinerama-dev,
pkg-config,
automake,
+ libtool,
xutils-dev (>= 1:7.5~1)
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxinerama
commit c4999aaeea904c31cf022750d4e6cdf4a88a17f9
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 23 14:50:51 2009 +0200
Add Replaces: x11proto-xinerama-dev (<< 1.2).
diff --git a/debian/changelog b/debian/changelog
index efb66ef..4dd02df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
* Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
* Bump Standards-Version to 3.8.3.
* Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
+ * Add Replaces: x11proto-xinerama-dev (<< 1.2).
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:38:59 +0200
diff --git a/debian/control b/debian/control
index cfbf28a..8db2a2e 100644
--- a/debian/control
+++ b/debian/control
@@ -64,6 +64,7 @@ Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= ${binary:Version}), libx11-dev, libxext-dev, x11proto-xinerama-dev
Pre-Depends: x11-common (>= 1:7.0.0)
+Replaces: x11proto-xinerama-dev (<< 1.2)
Description: X11 Xinerama extension library (development headers)
libXinerama provides an X Window System client interface to the XINERAMA
extension to the X protocol.
commit 0632202605f0669fecd3e2eab208dd35dea30e46
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 23 14:47:40 2009 +0200
Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
diff --git a/debian/changelog b/debian/changelog
index fe47179..efb66ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
* Run autoreconf on build. Add build-deps on automake and xutils-dev.
* Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
* Bump Standards-Version to 3.8.3.
+ * Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:38:59 +0200
diff --git a/debian/libxinerama-dev.install b/debian/libxinerama-dev.install
index 714a3df..c020c30 100644
--- a/debian/libxinerama-dev.install
+++ b/debian/libxinerama-dev.install
@@ -2,3 +2,4 @@ usr/lib/libXinerama.a
usr/lib/libXinerama.so
usr/lib/pkgconfig/xinerama.pc
usr/share/man/man3/*
+usr/include/X11/extensions/*
commit 420de4a4265bd4b3f25430ab9917d9676b94c994
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 23 14:45:44 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index d00c200..fe47179 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
* New upstream release.
* Run autoreconf on build. Add build-deps on automake and xutils-dev.
* Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:38:59 +0200
diff --git a/debian/control b/debian/control
index 6f37eca..cfbf28a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
pkg-config,
automake,
xutils-dev (>= 1:7.5~1)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxinerama
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxinerama.git
commit ac321c512a5c102a78aa5124bf4cfc483ae44211
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 23 14:45:18 2009 +0200
Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
diff --git a/debian/changelog b/debian/changelog
index f58733d..d00c200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
* Run autoreconf on build. Add build-deps on automake and xutils-dev.
+ * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:38:59 +0200
diff --git a/debian/rules b/debian/rules
index 21cfa9a..bdbc6d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,14 @@ PACKAGE = libxinerama1
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
commit ab73c4af6af6129d73c0efa5a4d3d676c4356739
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 23 14:44:39 2009 +0200
Run autoreconf on build. Add build-deps on automake and xutils-dev.
diff --git a/debian/changelog b/debian/changelog
index 2b88731..f58733d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
+ * Run autoreconf on build. Add build-deps on automake and xutils-dev.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:38:59 +0200
diff --git a/debian/control b/debian/control
index 207a374..6f37eca 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,14 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2), libxext-dev (>= 1:0.99.1), x11proto-xinerama-dev, pkg-config
+Build-Depends:
+ debhelper (>= 5.0.0),
+ libx11-dev (>= 1:0.99.2),
+ libxext-dev (>= 1:0.99.1),
+ x11proto-xinerama-dev,
+ pkg-config,
+ automake,
+ xutils-dev (>= 1:7.5~1)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxinerama
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxinerama.git
diff --git a/debian/rules b/debian/rules
index 957e65e..21cfa9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,15 +35,14 @@ endif
build: build-stamp
build-stamp:
dh_testdir
-
- test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ autoreconf -vfi
+ 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)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
-
- touch build-stamp
+ >$@
clean:
dh_testdir
@@ -55,6 +54,9 @@ clean:
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
+ rm -f aclocal.m4 config.guess config.h.in config.sub configure
+ rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
+ find -name Makefile.in -delete
dh_clean
commit a2d0e2e68b9265334931f493661d1986fefc14d5
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 23 14:41:32 2009 +0200
Delete generated files.
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 03ed79e..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,726 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright 2005 Red Hat, Inc.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of Red Hat not be used in
-# advertising or publicity pertaining to distribution of the software without
-# specific, written prior permission. Red Hat makes no
-# representations about the suitability of this software for any purpose. It
-# is provided "as is" without express or implied warranty.
-#
-# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-# EVENT SHALL RED HAT 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.
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/xinerama.pc.in $(top_srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
- install-sh ltmain.sh missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = xinerama.pc
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfig_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
-ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMTAR = @AMTAR@
-APP_MAN_DIR = @APP_MAN_DIR@
-APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
-DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
-DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FILE_MAN_DIR = @FILE_MAN_DIR@
-FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIB_MAN_DIR = @LIB_MAN_DIR@
-LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-LINT = @LINT@
-LINT_FLAGS = @LINT_FLAGS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
-MISC_MAN_DIR = @MISC_MAN_DIR@
-MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NMEDIT = @NMEDIT@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
-XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = src man
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xinerama.pc
-EXTRA_DIST = xinerama.pc.in autogen.sh ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-
-distclean-hdr:
- -rm -f config.h stamp-h1
Reply to: