debian/changelog

@@ -3,6 +3,11 @@ xorg-server (2:1.20.4-2) UNRELEASED; urgency=medium
   * Remove the explicit build and build-indep targets (Closes: #941128).
   * Exclude the directory where xorg-server.tar.xz is built from it
     (Closes: #930405).
+  * Make the xorg-server-source binary package reproducible by specifying
+    suitable options to tar when creating /tmp/xorg-server.tar.xz.
+  * Set Rules-Requires-Root to binary-targets.
+  * Drop dependency on dummy package libegl1-mesa (Closes: #930608).
+  * Remove no longer used lintian overrides from version 2:1.11.2.901-1.
 
  -- Sven Joachim <svenjoac@gmx.de>  Sun, 29 Sep 2019 13:01:04 +0200
 

debian/control

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

debian/rules

@@ -19,6 +19,10 @@ override_dh_autoreconf-indep:
 	--exclude=debian \
 	--exclude=autom4te.cache \
 	--exclude=build-source \
+	--sort=name \
+	--mtime=@$(SOURCE_DATE_EPOCH) \
+	--clamp-mtime \
+	--mode=u+rw,go+r,go-w,a-s \
         -cf - * | xz > build-source/xorg-server.tar.xz
 
 override_dh_auto_configure:
@@ -45,8 +49,7 @@ override_dh_auto_install:
 		--destdir=debian/tmp/udeb
 
 	# oh, yuck.
-	find debian/tmp/*/usr/lib/xorg -type f -name '*.la' | \
-	  xargs rm -f
+	find debian/tmp/*/usr/lib/xorg -type f -name '*.la' -delete
 
 	# remove modules not needed in d-i
 	rm -rf debian/tmp/udeb/usr/lib/xorg/modules/multimedia
@@ -79,7 +82,7 @@ SERVERMINVER = debian/serverminver
 serverminver = $(shell head -1 $(SERVERMINVER))
 
 .PHONY: abibumpcheck
-abibumpcheck: debian/serverminver $(QUILT_STAMPFN)
+abibumpcheck: debian/serverminver
 	@echo Checking for the need of an ABI bump
 	# Build an updated version of the file:
 	head -1 $(SERVERMINVER) > $(SERVERMINVER).new

debian/rules.flags

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

debian/xserver-xorg-core.lintian-overrides

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