[Git][xorg-team/xserver/xorg-server][debian-unstable] 11 commits: Simplify obtaining SOURCE_VERSION

[Sven Joachim <gitlab@salsa.debian.org>]

Title: GitLab

Sven Joachim pushed to branch debian-unstable at X Strike Force / xserver / xorg-server

Commits:

• b6a5b354
  by Sven Joachim at 2019-09-29T16:11:08Z

  Simplify obtaining SOURCE_VERSION
  
  The -S option has been supported since dpkg-parsechangelog 1.17.0.
  

• 01f6e992
  by Sven Joachim at 2019-09-29T16:24:18Z

  Drop some obsolete configure options
  
  Seen in the build logs:
  
  configure: WARNING: unrecognized options: --disable-maintainer-mode,
  --disable-tslib, --disable-xfake, --disable-xfbdev
  
  These options were all removed in xserver 1.20.0.  See commits
  5c7ed785e3bd, 35fbcb3f9987 and feed7e3f982a, respectively.
  

• 7e184353
  by Sven Joachim at 2019-09-29T16:29:23Z

  Remove QUILT_STAMPFN remnant of pre-dh packaging
  

• acd09bf2
  by Sven Joachim at 2019-09-29T16:31:19Z

  Let find delete pesky *.la files itself
  

• dffe16d8
  by Sven Joachim at 2019-09-29T16:32:03Z

  Remove the executable bits from debian/rules.flags
  
  This file does not need to be executable, and when not building from
  git it won't be anyway due to source format 1.0.
  

• 4792191b
  by Sven Joachim at 2019-09-29T16:41:36Z

  Set Rules-Requires-Root to binary-targets
  
  Needed because the wrapper in xserver-xorg-legacy is setuid root.
  

• 2b6a61af
  by Sven Joachim at 2019-09-29T16:54:32Z

  Drop dependency on libegl1-mesa
  
  For about two years, libegl1-mesa has been a dummy package pulling in
  libegl1, so only depend on the latter.
  

• fbb4e9ad
  by Sven Joachim at 2019-09-29T16:57:01Z

  Remove trailing whitespace from debian/control
  

• b18592d5
  by Sven Joachim at 2019-09-29T17:00:48Z

  Replace XC-Package-Type with Package-Type
  
  See "lintian-info -t xc-package-type-in-debian-control".
  

• 4e2e4525
  by Sven Joachim at 2019-09-29T17:07:44Z

  Delete debian/xserver-xorg-core.lintian-overrides
  
  The overrides have been unused since commit 695262d9ef.
  

• f8239403
  by Sven Joachim at 2019-09-29T18:42:40Z

  Fix reproducibility problems in the xorg-server-source package
  
  The files in the xorg-server.tar.xz tarball had random order, and the
  timestamps of patched and newly created files depended on the time of
  the build.  Fix that with the --sort, --mtime and --clamp-mtime
  options of tar.
  
  Also ensure that the files in the tarball have sane permissions.
  There is still a problem if the builder uses a restrictive umask, as
  scripts may end up not world-executable, but for usual umask values
  like 022 or 002 as on the buildds the xorg-server.tar.xz should always
  come out identically.
  
  This also means that xorg-server should build fully reproducible now.
  

5 changed files:

• debian/changelog
• debian/control
• debian/rules
• debian/rules.flags
• − debian/xserver-xorg-core.lintian-overrides

Changes:

debian/changelog

---

...	...	@@ -3,6 +3,11 @@ xorg-server (2:1.20.4-2) UNRELEASED; urgency=medium
3	3	* Remove the explicit build and build-indep targets (Closes: #941128).
4	4	* Exclude the directory where xorg-server.tar.xz is built from it
5	5	(Closes: #930405).
	6	+ * Make the xorg-server-source binary package reproducible by specifying
	7	+ suitable options to tar when creating /tmp/xorg-server.tar.xz.
	8	+ * Set Rules-Requires-Root to binary-targets.
	9	+ * Drop dependency on dummy package libegl1-mesa (Closes: #930608).
	10	+ * Remove no longer used lintian overrides from version 2:1.11.2.901-1.
6	11
7	12	-- Sven Joachim <svenjoac@gmx.de> Sun, 29 Sep 2019 13:01:04 +0200
8	13
...	...	@@ -2028,7 +2033,7 @@ xorg-server (2:1.5.99.901-1) experimental; urgency=low
2028	2033	[ Timo Aaltonen ]
2029	2034	* debian/control:
2030	2035	- Add x11proto-dri2-dev to build-depends.
2031		- - Bump the x11proto-randr-dev build-dep version to 1.2.99.3.
	2036	+ - Bump the x11proto-randr-dev build-dep version to 1.2.99.3.
2032	2037	- Bump the libpixman-1-dev build-dep version to 0.13.2.
2033	2038	- Bump the xtrans-dev build-dep version to 1.2.2.
2034	2039	- Bump the x11proto-xext-dev build-dep version to 7.0.3.
...	...	@@ -2175,7 +2180,7 @@ xorg-server (2:1.4.99.905-1) experimental; urgency=low
2175	2180
2176	2181	[ Timo Aaltonen ]
2177	2182	* Re-enable dri & glx.
2178		- * Add a build-dep on mesa-common-dev (>= 7.1~rc1) and bump the desired
	2183	+ * Add a build-dep on mesa-common-dev (>= 7.1~rc1) and bump the desired
2179	2184	version of libgl1-mesa-dev respectively.
2180	2185	* Bump the libdrm-dev build-dep version to 2.3.1.
2181	2186
...	...	@@ -3257,7 +3262,7 @@ xorg-server (2:1.1.1-19) unstable; urgency=high
3257	3262	(/usr/X11R6/lib/X11/fonts/Type1 not "/usr/X11R6/lib/ X11/fonts/Type1")
3258	3263
3259	3264	[ David Nusinow ]
3260		- * Conflict with and replace xserver-common, because that package used to
	3265	+ * Conflict with and replace xserver-common, because that package used to
3261	3266	provide the SecurityPolicy file. This is an RC bugfix because it breaks
3262	3267	upgrades, so it gets a high urgency. Thanks Christian Tsotras and Lionel
3263	3268	Elie Mamane for reporting and it. Closes: #402658

debian/control

---

...	...	@@ -78,6 +78,7 @@ Build-Depends:
78	78	# systemd-daemon
79	79	libsystemd-dev [linux-any],
80	80	Standards-Version: 3.9.8
	81	+Rules-Requires-Root: binary-targets
81	82	Vcs-Git: https://salsa.debian.org/xorg-team/xserver/xorg-server.git
82	83	Vcs-Browser: https://salsa.debian.org/xorg-team/xserver/xorg-server
83	84	Homepage: https://www.x.org/
...	...	@@ -90,7 +91,7 @@ Depends:
90	91	udev (>= 149) [linux-any],
91	92	devd [kfreebsd-any],
92	93	# for glamor; not a shlibdep because we use epoxy
93		- libegl1-mesa [linux-any kfreebsd-any] | libegl1 [linux-any kfreebsd-any],
	94	+ libegl1 [linux-any kfreebsd-any],
94	95	${shlibs:Depends},
95	96	${misc:Depends},
96	97	Recommends:
...	...	@@ -124,7 +125,7 @@ Description: Xorg X server - core server
124	125	This package is built from the X.org xserver module.
125	126
126	127	Package: xserver-xorg-core-udeb
127		-XC-Package-Type: udeb
	128	+Package-Type: udeb
128	129	Section: debian-installer
129	130	# exclude sparc because of linker errors
130	131	Architecture: any

debian/rules

---

...	...	@@ -19,6 +19,10 @@ override_dh_autoreconf-indep:
19	19	--exclude=debian \
20	20	--exclude=autom4te.cache \
21	21	--exclude=build-source \
	22	+ --sort=name \
	23	+ --mtime=@$(SOURCE_DATE_EPOCH) \
	24	+ --clamp-mtime \
	25	+ --mode=u+rw,go+r,go-w,a-s \
22	26	-cf - * | xz > build-source/xorg-server.tar.xz
23	27
24	28	override_dh_auto_configure:
...	...	@@ -45,8 +49,7 @@ override_dh_auto_install:
45	49	--destdir=debian/tmp/udeb
46	50
47	51	# oh, yuck.
48		- find debian/tmp/*/usr/lib/xorg -type f -name '*.la' | \
49		- xargs rm -f
	52	+ find debian/tmp/*/usr/lib/xorg -type f -name '*.la' -delete
50	53
51	54	# remove modules not needed in d-i
52	55	rm -rf debian/tmp/udeb/usr/lib/xorg/modules/multimedia
...	...	@@ -79,7 +82,7 @@ SERVERMINVER = debian/serverminver
79	82	serverminver = $(shell head -1 $(SERVERMINVER))
80	83
81	84	.PHONY: abibumpcheck
82		-abibumpcheck: debian/serverminver $(QUILT_STAMPFN)
	85	+abibumpcheck: debian/serverminver
83	86	@echo Checking for the need of an ABI bump
84	87	# Build an updated version of the file:
85	88	head -1 $(SERVERMINVER) > $(SERVERMINVER).new

debian/rules.flags

---

...	...	@@ -4,7 +4,8 @@ VENDOR = $(shell lsb_release -i -s)
4	4	SUPPORT = https://www.debian.org/support
5	5
6	6	SOURCE_NAME := xorg-server
7		-SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: / {print $$2}')
	7	+SOURCE_VERSION := $(shell dpkg-parsechangelog -S Version)
	8	+SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -S Timestamp)
8	9
9	10	# disable-static is so we don't get libfoo.a for modules. now if only we could
10	11	# kill the .las.
...	...	@@ -25,7 +26,6 @@ confflags += \
25	26	--enable-mitshm \
26	27	--enable-xres \
27	28	--disable-xcsecurity \
28		- --disable-tslib \
29	29	--enable-dbe \
30	30	--disable-xf86bigfont \
31	31	--enable-dpms \
...	...	@@ -34,8 +34,6 @@ confflags += \
34	34	--disable-linux-apm \
35	35	--disable-xquartz \
36	36	--disable-xwin \
37		- --disable-xfake \
38		- --disable-xfbdev \
39	37	--disable-install-setuid
40	38
41	39	confflags_main = \

debian/xserver-xorg-core.lintian-overrides deleted

---

1		-# That's OK, they were virtual packages:
2		-breaks-without-version xserver-xorg-input-7
3		-breaks-without-version xserver-xorg-video-6

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.