debian/changelog | 10 ++++++++++ debian/compat | 2 +- debian/control | 8 ++++---- debian/rules | 3 +++ specs/Makefile.am | 2 +- 5 files changed, 19 insertions(+), 6 deletions(-)
New commits: commit 1fd1bed6b96da2c3c809c3bcd222f1168c468da7 Author: Andreas Boll <[email protected]> Date: Fri Apr 1 11:57:17 2016 +0200 control: Bump Standards-Version to 3.9.7 (no changes). diff --git a/debian/changelog b/debian/changelog index 6515103..70345b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x11proto-input (2.3.1-2) UNRELEASED; urgency=medium upstream (Closes: #795981). Thanks, Eduard Sanou! * Bump debhelper compat level to 9. * Update Vcs fields to use https. + * control: Bump Standards-Version to 3.9.7 (no changes). -- Andreas Boll <[email protected]> Fri, 01 Apr 2016 11:42:48 +0200 diff --git a/debian/control b/debian/control index 06be342..9866fd6 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: quilt, xutils-dev (>= 1:7.5+4), asciidoc, -Standards-Version: 3.9.2 +Standards-Version: 3.9.7 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/proto/x11proto-input.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/proto/x11proto-input.git commit 98855ffd5ad2e0dd2ee43a7f2fca7500f1429bd4 Author: Andreas Boll <[email protected]> Date: Fri Apr 1 11:56:46 2016 +0200 Update Vcs fields to use https. diff --git a/debian/changelog b/debian/changelog index 54501ec..6515103 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x11proto-input (2.3.1-2) UNRELEASED; urgency=medium * Cherry-pick 1dbdc29 (specs: Set TZ=UTC before calling asciidoc) from upstream (Closes: #795981). Thanks, Eduard Sanou! * Bump debhelper compat level to 9. + * Update Vcs fields to use https. -- Andreas Boll <[email protected]> Fri, 01 Apr 2016 11:42:48 +0200 diff --git a/debian/control b/debian/control index 22b20cc..06be342 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ Build-Depends: xutils-dev (>= 1:7.5+4), asciidoc, Standards-Version: 3.9.2 -Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-input -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-input.git +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/proto/x11proto-input.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/proto/x11proto-input.git Package: x11proto-input-dev Architecture: all commit 95611b6d3f271b1577d7dccbf81aeba456b84a3c Author: Andreas Boll <[email protected]> Date: Fri Apr 1 11:55:34 2016 +0200 Bump debhelper compat level to 9. diff --git a/debian/changelog b/debian/changelog index ede74a8..54501ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x11proto-input (2.3.1-2) UNRELEASED; urgency=medium * Cherry-pick 1dbdc29 (specs: Set TZ=UTC before calling asciidoc) from upstream (Closes: #795981). Thanks, Eduard Sanou! + * Bump debhelper compat level to 9. -- Andreas Boll <[email protected]> Fri, 01 Apr 2016 11:42:48 +0200 diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index b2a8680..22b20cc 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <[email protected]> Uploaders: Drew Parsons <[email protected]>, Build-Depends: - debhelper (>= 8), + debhelper (>= 9), dh-autoreconf, quilt, xutils-dev (>= 1:7.5+4), diff --git a/debian/rules b/debian/rules index f97f5fd..155b4f1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,8 @@ #!/usr/bin/make -f +override_dh_auto_configure: + dh_auto_configure -- --libdir=\$${exec_prefix}/lib + # Install in debian/tmp to retain control through dh_install: override_dh_auto_install: dh_auto_install --destdir=debian/tmp commit 83e5d1517b18eaca043bf422a0c3ce7df81a147a Author: Andreas Boll <[email protected]> Date: Fri Apr 1 11:42:51 2016 +0200 Bump changelog. diff --git a/debian/changelog b/debian/changelog index b6627c1..ede74a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x11proto-input (2.3.1-2) UNRELEASED; urgency=medium + + * Cherry-pick 1dbdc29 (specs: Set TZ=UTC before calling asciidoc) from + upstream (Closes: #795981). Thanks, Eduard Sanou! + + -- Andreas Boll <[email protected]> Fri, 01 Apr 2016 11:42:48 +0200 + x11proto-input (2.3.1-1) unstable; urgency=medium * New upstream release. commit 67a49357db148221ca7811a9e13318893377d271 Author: Andreas Boll <[email protected]> Date: Fri Dec 11 10:49:33 2015 +0100 specs: Set TZ=UTC before calling asciidoc Set TZ=UTC before calling asciidoc to make the embedded dates invariant to timezones in order to make the package build reproducibly. Fixes bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981 v2: Set TZ=UTC after $(AM_V_GEN) (fixes non-verbose build) Suggested-by: Eduard Sanou <[email protected]> Signed-off-by: Andreas Boll <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> (cherry picked from commit 1dbdc297d915e4979a7823d6a569d9c7fed14617) diff --git a/specs/Makefile.am b/specs/Makefile.am index a83cf40..f2454bc 100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -6,7 +6,7 @@ doc_DATA = XI2proto.html XIproto.html dist_doc_DATA = XI2proto.txt XIproto.txt %.html: %.txt - $(AM_V_GEN)$(ASCIIDOC) -o $@ $< + $(AM_V_GEN)TZ=UTC $(ASCIIDOC) -o $@ $< CLEANFILES = $(doc_DATA)
