ChangeLog | 32 ++++++++++++++++++++++++++++++++ configure.ac | 22 +++++++--------------- debian/changelog | 6 ++++++ src/Makefile.am | 1 + 4 files changed, 46 insertions(+), 15 deletions(-)
New commits: commit a235e21c8225124165cb148959160d1abf24ea87 Author: Cyril Brulebois <[email protected]> Date: Sat Dec 31 02:53:10 2011 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 9a9ace9..cc22386 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-input-void (1:1.4.0-1) UNRELEASED; urgency=low +xserver-xorg-input-void (1:1.4.0-1) unstable; urgency=low * New upstream release. - -- Cyril Brulebois <[email protected]> Sat, 31 Dec 2011 02:51:51 +0100 + -- Cyril Brulebois <[email protected]> Sat, 31 Dec 2011 02:53:07 +0100 xserver-xorg-input-void (1:1.3.1-3) unstable; urgency=low commit c57cda90eb871bc73cc9d3912ba8e22532dfed42 Author: Cyril Brulebois <[email protected]> Date: Sat Dec 31 02:52:04 2011 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index df06ab2..0079438 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +commit e2eabdd0bd6bc33d65ba61aeb30f2c59ec90f516 +Author: Alan Coopersmith <[email protected]> +Date: Wed May 4 20:31:02 2011 -0700 + + xf86-input-void 1.4.0 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 28cb0b4aa530b966eb48a9fd22617e65390a9792 +Author: Alan Coopersmith <[email protected]> +Date: Mon May 2 19:25:41 2011 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS variables + AC_HEADERS_STDC result was never used + No headers exist in $(top_srcdir)/src, so no point including -I in CFLAGS + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 47812d4f46ec0211e97b891ce42cb47428c1caac +Author: Alan Coopersmith <[email protected]> +Date: Mon May 2 19:21:27 2011 -0700 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + + Signed-off-by: Alan Coopersmith <[email protected]> + commit cb8d19b8ac433d5292502e032f6210ee5151d6e2 Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 12:48:22 2010 +1000 diff --git a/debian/changelog b/debian/changelog index 43a09b6..9a9ace9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-void (1:1.4.0-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Cyril Brulebois <[email protected]> Sat, 31 Dec 2011 02:51:51 +0100 + xserver-xorg-input-void (1:1.3.1-3) unstable; urgency=low * Merge upstream up to cb8d19b8ac: commit e2eabdd0bd6bc33d65ba61aeb30f2c59ec90f516 Author: Alan Coopersmith <[email protected]> Date: Wed May 4 20:31:02 2011 -0700 xf86-input-void 1.4.0 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index e7c91bc..a0792a3 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to produce a configure script # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-void], - [1.3.1], + [1.4.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-void) AC_CONFIG_SRCDIR([Makefile.am]) commit 28cb0b4aa530b966eb48a9fd22617e65390a9792 Author: Alan Coopersmith <[email protected]> Date: Mon May 2 19:25:41 2011 -0700 config: Remove unnecessary calls from configure.ac AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS variables AC_HEADERS_STDC result was never used No headers exist in $(top_srcdir)/src, so no point including -I in CFLAGS Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 75392e4..e7c91bc 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,6 @@ XORG_DEFAULT_OPTIONS # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL -AC_PROG_CC AH_TOP([#include "xorg-server.h"]) @@ -61,11 +60,4 @@ AC_SUBST(inputdir) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.1] xproto) -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -AC_SUBST([CFLAGS]) - -# Checks for header files. -AC_HEADER_STDC - - AC_OUTPUT([Makefile src/Makefile man/Makefile]) diff --git a/src/Makefile.am b/src/Makefile.am index 2221bbc..f16093f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. +AM_CFLAGS = $(XORG_CFLAGS) @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @DRIVER_NAME@_drv_ladir = @inputdir@ commit 47812d4f46ec0211e97b891ce42cb47428c1caac Author: Alan Coopersmith <[email protected]> Date: Mon May 2 19:21:27 2011 -0700 config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 4271b5a..75392e4 100644 --- a/configure.ac +++ b/configure.ac @@ -18,18 +18,20 @@ # 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. # -# Process this file with autoconf to produce a configure script +dnl Process this file with autoconf to produce a configure script -AC_PREREQ(2.60) +# Initialize Autoconf +AC_PREREQ([2.60]) AC_INIT([xf86-input-void], [1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-void) - AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AC_CONFIG_HEADERS([config.h]) +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE DRIVER_NAME=void @@ -41,8 +43,6 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER([config.h]) - # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
