xorg-server: Changes to 'debian-unstable'
debian/changelog | 11 +++
debian/compat | 2
debian/control | 31 --------
debian/rules | 199 +++++++++++--------------------------------------------
4 files changed, 54 insertions(+), 189 deletions(-)
New commits:
commit 695262d9efd966cbaa0f6997e75bda7fd019ee0c
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Dec 19 22:23:04 2016 +0100
Drop pre-wheezy Breaks
diff --git a/debian/changelog b/debian/changelog
index 3c32e2b..33a96f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-server (2:1.19.0-4) UNRELEASED; urgency=medium
them for us.
* Bump debhelper compat to 10.
* rules: use install consistently.
+ * Drop pre-wheezy Breaks.
-- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 19 Dec 2016 19:58:57 +0100
diff --git a/debian/control b/debian/control
index 1e33397..8268068 100644
--- a/debian/control
+++ b/debian/control
@@ -121,33 +121,6 @@ Recommends:
libpam-systemd,
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
Breaks:
- xserver-xorg-video,
- xserver-xorg-video-1.0,
- xserver-xorg-video-1.9,
- xserver-xorg-video-2,
- xserver-xorg-video-4,
- xserver-xorg-video-5,
- xserver-xorg-video-6,
- xserver-xorg-input,
- xserver-xorg-input-2,
- xserver-xorg-input-2.1,
- xserver-xorg-input-4,
- xserver-xorg-input-7,
- xserver-xorg-input-wacom (<< 0.7.8),
- xserver-xorg-input-joystick (<= 1:1.5.0-3),
- xserver-xorg-input-synaptics (<= 1.2.2-1),
- xserver-xorg-input-tslib (<= 0.0.6-3),
- xserver-xorg-input-vmmouse (<= 1:12.6.5-4),
- xserver-xorg-input-wacom (<= 0.10.5+20100415-1),
- xserver-xorg-video-cyrix (<= 1:1.1.0-8),
- xserver-xorg-video-i810 (<< 2:2.4),
- xserver-xorg-video-imstt (<= 1:1.1.0-7),
- xserver-xorg-video-nsc (<= 1:2.8.3-4),
- xserver-xorg-video-sunbw2 (<= 1:1.1.0-5),
- xserver-xorg-video-v4l (<< 1:0.2.0),
- xserver-xorg-video-vga (<= 1:4.1.0-8),
- libgl1-mesa-dri (<< 7.10.2-4),
- libgl1-mesa-dri-experimental (<< 7.10.2-4),
xserver-xorg (<< 1:7.7+10~),
systemd (<< 226-4~),
Replaces:
commit 4d0042577400eaf4c6c0b1ba61dc29f73868799b
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Dec 19 22:19:19 2016 +0100
Fix typo
diff --git a/debian/rules b/debian/rules
index e368753..1a424db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -240,7 +240,7 @@ endif
endif
# Only read the first line, the rest of the file is used to determine
-# when the minimal version as to be bumped:
+# when the minimal version is to be bumped:
SERVERMINVER = debian/serverminver
serverminver = $(shell head -1 $(SERVERMINVER))
commit 072b76cac2762276a2f54c0d7a6e8ef933d1bbb3
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Dec 19 22:19:07 2016 +0100
Use install consistently
diff --git a/debian/changelog b/debian/changelog
index 8da08d0..3c32e2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg-server (2:1.19.0-4) UNRELEASED; urgency=medium
* Drop build-deps on automake and libtool, dh-autoreconf depends on
them for us.
* Bump debhelper compat to 10.
+ * rules: use install consistently.
-- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 19 Dec 2016 19:58:57 +0100
diff --git a/debian/rules b/debian/rules
index 96a2a11..e368753 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,6 @@ else
config_tests = --enable-unit-tests
endif
-INSTALL=/usr/bin/install
-
VENDOR = $(shell lsb_release -i -s)
SUPPORT = https://www.debian.org/support
@@ -269,7 +267,7 @@ override_dh_install:
-chown root:root $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap
-chmod ug+s $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap
- $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
+ install -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
# Extract only the major ABI version:
abi_videodrv=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/pkgconfig pkg-config --variable=abi_videodrv xorg-server|cut -d . -f 1`; \
echo videoabi=xorg-video-abi-$$abi_videodrv > debian/xserver-xorg-core.substvars && \
@@ -286,8 +284,8 @@ override_dh_install:
echo 'xserver_confflags = $(confflags) $(confflags_main)' \
> debian/xserver-xorg-dev/usr/share/xserver-xorg/configure_flags.mk
- $(INSTALL) -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
- $(INSTALL) -m 755 debian/xserver-xorg-core.bug.script debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
+ install -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
+ install -m 755 debian/xserver-xorg-core.bug.script debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
ifeq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/xserver-xorg-core/lib/udev/rules.d
install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core/lib/udev/rules.d
commit 8a395effc9b55b828349a86f189d453d0b0138f3
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Dec 19 21:38:09 2016 +0100
Bump debhelper compat to 10
diff --git a/debian/changelog b/debian/changelog
index 45c3f06..8da08d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.19.0-4) UNRELEASED; urgency=medium
* Switch to dh.
* Drop build-deps on automake and libtool, dh-autoreconf depends on
them for us.
+ * Bump debhelper compat to 10.
-- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 19 Dec 2016 19:58:57 +0100
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 052fcbc..1e33397 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
po-debconf,
dpkg-dev (>= 1.16.1),
quilt,
commit d481153786b2f9231c427ecdbd42b644c4ce76b2
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Dec 19 21:34:28 2016 +0100
Drop build-deps on automake and libtool
diff --git a/debian/changelog b/debian/changelog
index 58ca92f..45c3f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.19.0-4) UNRELEASED; urgency=medium
* Switch to dh.
+ * Drop build-deps on automake and libtool, dh-autoreconf depends on
+ them for us.
-- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 19 Dec 2016 19:58:57 +0100
diff --git a/debian/control b/debian/control
index c2ef59c..052fcbc 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,6 @@ Build-Depends:
pkg-config,
bison,
flex,
- automake,
- libtool,
xutils-dev (>= 1:7.6+4),
xfonts-utils (>= 1:7.5+1),
x11proto-bigreqs-dev (>= 1:1.1.0),
commit 29d0f5ae367f0efa80d48990843f2e30019cd233
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Dec 19 19:59:13 2016 +0100
Switch to dh
diff --git a/debian/changelog b/debian/changelog
index 1f53ab6..58ca92f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.19.0-4) UNRELEASED; urgency=medium
+
+ * Switch to dh.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 19 Dec 2016 19:58:57 +0100
+
xorg-server (2:1.19.0-3) unstable; urgency=medium
* Drop xserver-xorg-core-dbg in favor of xserver-xorg-core-dbgsym.
diff --git a/debian/rules b/debian/rules
index 9ceb483..96a2a11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,47 +1,4 @@
#!/usr/bin/make -f
-# debian/rules for the Debian xorg-server package.
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
-# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
-# Copyright © 2005 David Nusinow <dnusinow@debian.org>
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Set up the $(STAMP_DIR) directory, and use it for quilt' stamp:
-STAMP_DIR := stampdir
-QUILT_STAMPFN := $(STAMP_DIR)/patch
-$(STAMP_DIR)/stampdir:
- mkdir $(STAMP_DIR)
- >$@
-
-include /usr/share/quilt/quilt.make
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-# udeb is arch-dependent...
-ifneq (, $(filter %-udeb, $(shell dh_listpackages -s)))
- udeb = yes
-endif
-
-# ...but let's support disabling it to speed up debug builds:
-ifneq (,$(filter noudeb,$(DEB_BUILD_OPTIONS)))
- udeb =
- DH_INSTALL_OPTIONS = -Nxserver-xorg-core-udeb
-endif
-
ifeq ($(DEB_HOST_ARCH_OS), linux)
selinux = --enable-xselinux
@@ -212,85 +169,48 @@ confflags_udeb = \
$(config_backend_udeb) \
$(void)
-$(QUILT_STAMPFN): $(STAMP_DIR)/stampdir
-
-$(STAMP_DIR)/autoreconf: $(STAMP_DIR)/stampdir $(QUILT_STAMPFN)
- dh_testdir
- autoreconf -vfi
- >$@
+%:
+ dh $@ --with quilt,autoreconf
-$(STAMP_DIR)/build-source: $(STAMP_DIR)/autoreconf
+build-source-stamp:
mkdir -p build-source
tar \
--owner=0 --group=0 \
--transform 's,^,xorg-server/,' \
- --exclude=stampdir --exclude=debian \
- --exclude=build-* --exclude=autom4te.cache \
+ --exclude=debian \
+ --exclude=autom4te.cache \
-cf - * | xz > build-source/xorg-server.tar.xz
>$@
-$(STAMP_DIR)/configure-%: $(STAMP_DIR)/autoreconf
- dh_testdir
- mkdir -p build-$*
- cd build-$* && \
- ../configure \
- --prefix=/usr \
- --libdir=\$${exec_prefix}/lib \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=\$${libdir}/xorg \
- $(confflags) \
- $(confflags_$*) \
- $(vars)
- >$@
-
-$(STAMP_DIR)/build-%: $(STAMP_DIR)/configure-%
- dh_testdir
- cd build-$* && $(MAKE)
- >$@
-
-$(STAMP_DIR)/tests-%: $(STAMP_DIR)/build-%
- cd build-$* && $(MAKE) -j1 check VERBOSE=1
- >$@
+override_dh_auto_configure:
+ dh_auto_configure --builddirectory=debian/build/main -- \
+ --libdir=\$${prefix}/lib \
+ --libexecdir=\$${libdir}/xorg \
+ $(confflags) \
+ $(confflags_main) \
+ $(vars)
+ dh_auto_configure --builddirectory=debian/build/udeb -- \
+ --libdir=\$${prefix}/lib \
+ --libexecdir=\$${libdir}/xorg \
+ $(confflags) \
+ $(confflags_udeb) \
+ $(vars)
+
+override_dh_auto_build:
+ dh_auto_build --builddirectory=debian/build/main
+ dh_auto_build --builddirectory=debian/build/udeb
+
+override_dh_auto_test:
+ dh_auto_test -- -j1 VERBOSE=1
build: abibumpcheck
-build: $(STAMP_DIR)/build-main
-build: $(STAMP_DIR)/tests-main
-ifeq ($(udeb), yes)
-build: $(STAMP_DIR)/build-udeb
-build: $(STAMP_DIR)/tests-udeb
-endif
-build-arch: build
-build-indep: $(STAMP_DIR)/build-source build
-
-clean: unpatch
- dh_testdir
- rm -rf $(STAMP_DIR)
- rm -f config.cache config.log config.status
- rm -f */config.cache */config.log */config.status
- rm -f conftest* */conftest*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf build-*
- rm -f compile config.guess config.sub configure depcomp install-sh
- rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap
- rm -f include/do-not-use-config.h.in
- rm -f m4/lt*.m4 m4/libtool.m4
- find -name Makefile.in -delete
- rm -f test-driver
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- cd build-main && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/main install
-ifeq ($(udeb), yes)
- cd build-udeb && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/udeb install
-endif
+build-indep: build-source-stamp
+
+override_dh_auto_install:
+ dh_auto_install --builddirectory=debian/build/main \
+ --destdir=debian/tmp/main
+ dh_auto_install --builddirectory=debian/build/udeb \
+ --destdir=debian/tmp/udeb
# oh, yuck.
find debian/tmp/*/usr/lib/xorg -type f -name '*.la' | \
@@ -321,24 +241,6 @@ ifeq ($(udeb), yes)
endif
endif
-# stub to start building deb files, used by binary-indep and binary-arch
-binary-initial:
- dh_testdir
- dh_testroot
-
-# stub to build deb files, used by binary-indep and binary-arch
-binary-deb:
- dh_lintian
- dh_compress
- dh_fixperms
- -chown root:root $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap
- -chmod ug+s $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
# Only read the first line, the rest of the file is used to determine
# when the minimal version as to be bumped:
SERVERMINVER = debian/serverminver
@@ -362,13 +264,11 @@ abibumpcheck: debian/serverminver $(QUILT_STAMPFN)
rm -f $(SERVERMINVER).new; \
fi
-# Build architecture-dependent files here.
-binary-arch: build install
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-initial
+override_dh_install:
+ dh_install
+ -chown root:root $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap
+ -chmod ug+s $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap
- dh_installdocs -s
- dh_installchangelogs -s
- dh_install $(DH_INSTALL_OPTIONS) -s --list-missing
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
# Extract only the major ABI version:
abi_videodrv=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/pkgconfig pkg-config --variable=abi_videodrv xorg-server|cut -d . -f 1`; \
@@ -396,22 +296,7 @@ ifeq ($(udeb), yes)
install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb/lib/udev/rules.d
endif
endif
- dh_installdebconf -s
- dh_installman -s
- dh_link -s
+
+override_dh_strip:
dh_strip -pxserver-xorg-core --dbgsym-migration="xserver-xorg-core-dbg (<< 2:1.19.0-3~)"
dh_strip -s -Nxserver-xorg-core -Nxserver-xorg-core-dbg
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-deb
-
-
-# Build architecture-independent files here
-binary-indep: build-indep install
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
- dh_install -i
- dh_installdocs -i
- dh_installchangelogs -i ChangeLog
-
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-deb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Reply to: