ChangeLog | 26 ++++++++++++++++++++++++++ autogen.sh | 4 +++- configure.ac | 3 +-- debian/changelog | 11 +++++++++-- 4 files changed, 39 insertions(+), 5 deletions(-)
New commits: commit 80e1164d382631a44c3f094d25cd76a417e2e200 Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Mon Apr 22 10:43:00 2013 +0300 update the changelog diff --git a/debian/changelog b/debian/changelog index 34227f8..0a98698 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x11proto-input (2.3-0ubuntu1) UNRELEASED; urgency=low + + * Merge from unreleased debian git. + - new upstream release + + -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 22 Apr 2013 10:42:21 +0300 + x11proto-input (2.3-1) UNRELEASED; urgency=low * New upstream release. commit 273373fb07ef66d79dba1058a754e413f01c4a3b Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Mon Apr 22 10:41:34 2013 +0300 update the changelogs diff --git a/ChangeLog b/ChangeLog index c7b6ea1..09e222b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +commit f33a329026c9f2eaa5fa436543e4feb0e54b685d +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Mar 7 10:42:39 2013 +1000 + + inputproto 2.3 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit f8428123019e7357891bbfc0aef21dbb4d0db10f +Author: Colin Walters <walt...@verbum.org> +Date: Wed Jan 4 17:37:06 2012 -0500 + + autogen.sh: Implement GNOME Build API + + http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit 8cad031f9f583089dd33bae41dfa8a7e0d8a71f4 +Author: Adam Jackson <a...@redhat.com> +Date: Tue Jan 15 14:01:10 2013 -0500 + + configure: Remove AM_MAINTAINER_MODE + + Signed-off-by: Adam Jackson <a...@redhat.com> + commit 4832c94775ee4a02cfaf53ba427d7cf677f70932 Merge: 48e3209 e93e9d0 Author: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/debian/changelog b/debian/changelog index 47fa4c3..34227f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -x11proto-input (2.2.99.1-1) UNRELEASED; urgency=low +x11proto-input (2.3-1) UNRELEASED; urgency=low - * New upstream release candidate. + * New upstream release. -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 08 Jan 2013 15:01:59 +0100 commit f33a329026c9f2eaa5fa436543e4feb0e54b685d Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Thu Mar 7 10:42:39 2013 +1000 inputproto 2.3 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index 85dfaf1..e6f3db4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([InputProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([InputProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_WITH_ASCIIDOC commit f8428123019e7357891bbfc0aef21dbb4d0db10f Author: Colin Walters <walt...@verbum.org> Date: Wed Jan 4 17:37:06 2012 -0500 autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi commit 8cad031f9f583089dd33bae41dfa8a7e0d8a71f4 Author: Adam Jackson <a...@redhat.com> Date: Tue Jan 15 14:01:10 2013 -0500 configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/configure.ac b/configure.ac index 7c8e2eb..85dfaf1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ AC_PREREQ([2.60]) AC_INIT([InputProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros: XORG_WITH_ASCIIDOC m4_ifndef([XORG_MACROS_VERSION], -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1uubwh-0001gs...@vasks.debian.org