[Git][xorg-team/app/x11-apps][debian-unstable] 3 commits: Fix Vcs-Git control field

[Julien Cristau]

Julien Cristau pushed to branch debian-unstable at X Strike Force / app / x11-apps


Commits:
94d97d7f by Julien Cristau at 2018-11-28T15:26:08Z
Fix Vcs-Git control field

- - - - -
e3069d63 by Andreas Henriksson at 2018-11-28T15:29:05Z
Pass MKTEMP=/bin/mktemp to configure

Fix reproducible build on merged-usr vs non-merged systems (x11perfcomp
embeds the path).

Closes: #914911

- - - - -
54836bac by Julien Cristau at 2018-11-28T15:30:44Z
Merge branch 'debian-unstable' into HEAD

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,13 @@
x11-apps (7.7+8) UNRELEASED; urgency=medium

+ [ Julien Cristau ]
* Bump x11proto-core-dev build-dep to 7.0.25 per xwud's configure.ac.

+ [ Andreas Henriksson ]
+ * Pass MKTEMP=/bin/mktemp to configure to fix reproducible build
+ on merged-usr vs non-merged systems (x11perfcomp embeds the path).
+ (Closes: #914911)
+
-- Julien Cristau <***@debian.org> Sun, 18 Mar 2018 17:10:35 +0100

x11-apps (7.7+7) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -52,7 +52,7 @@ Build-Depends:
# xwd: libx11-dev, x11proto-core-dev
# xwud: libx11-dev
Standards-Version: 3.9.8
-Vcs-Git: https://salsa.debian.org/xorg-team/app/x11-apps
+Vcs-Git: https://salsa.debian.org/xorg-team/app/x11-apps.git
Vcs-Browser: https://salsa.debian.org/xorg-team/app/x11-apps

Package: x11-apps


=====================================
debian/rules
=====================================
@@ -30,7 +30,8 @@ $(STAMP_DIR)/configure-%:
dh_auto_configure -D$* -B$*-build -- \
--libdir=\$${prefix}/lib \
--disable-silent-rules \
- MANCONF="/etc/manpath.config"
+ MANCONF="/etc/manpath.config" \
+ MKTEMP=/bin/mktemp
override_dh_auto_build: $(BUILD_STAMPS)



View it on GitLab: https://salsa.debian.org/xorg-team/app/x11-apps/compare/58e86641118cef4277409e25f15866c269c1b1ca...54836bac7c71787c9f3810a89f54b4757aa257dd