x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog | 8 ++++
debian/clean | 1
debian/compat | 2 -
debian/control | 4 +-
debian/rules | 95 ++++++++++++++++---------------------------------------
5 files changed, 41 insertions(+), 69 deletions(-)
New commits:
commit e0d6afa13e3982b1cf1b9b74d6f5c8e7a385307e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 19 09:38:56 2014 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 02e8d75..01aa19a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-x11-xserver-utils (7.7+2) UNRELEASED; urgency=medium
+x11-xserver-utils (7.7+2) unstable; urgency=medium
* Remove Cyril Brulebois from Uploaders.
* Bump to debhelper compat level 7 and use dh with the autoreconf addon.
Should make arm64 happy and closes: #735489. Thanks, Wookey!
- -- Julien Cristau <jcristau@debian.org> Sat, 18 Jan 2014 20:27:01 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 19 Jan 2014 09:38:17 +0100
x11-xserver-utils (7.7+1) unstable; urgency=low
commit 992803dd44b73a9a449555ffb3a120ef87a5ca8b
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 18 20:29:59 2014 +0100
Bump to debhelper compat level 7 and use dh with the autoreconf addon.
Should make arm64 happy and closes: #735489. Thanks, Wookey!
diff --git a/debian/changelog b/debian/changelog
index dee9c60..02e8d75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
x11-xserver-utils (7.7+2) UNRELEASED; urgency=medium
* Remove Cyril Brulebois from Uploaders.
+ * Bump to debhelper compat level 7 and use dh with the autoreconf addon.
+ Should make arm64 happy and closes: #735489. Thanks, Wookey!
-- Julien Cristau <jcristau@debian.org> Sat, 18 Jan 2014 20:27:01 +0100
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..57287f4
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/autoreconf
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 84c4c84..f3f722b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 7.0.50),
+ dh-autoreconf,
pkg-config,
x11proto-core-dev (>= 7.0.17),
libx11-dev (>= 2:1.0.0),
diff --git a/debian/rules b/debian/rules
index ae8c1bf..338b5d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ include debian/xsfbs/xsfbs.mk
# subdirectory explicitly so that the build system knows what to build
DEF_SUBDIRS=iceauth rgb sessreg xcmsdb xgamma xhost xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer xsetroot xstdcmap xvidtune
SUBDIRS=$(DEF_SUBDIRS)
+CONFIG_STAMPS = $(addprefix $(STAMP_DIR)/configure-, $(SUBDIRS))
BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
CFLAGS = `dpkg-buildflags --get CFLAGS`
@@ -23,85 +24,47 @@ CFLAGS += -Wall
LDFLAGS = `dpkg-buildflags --get LDFLAGS`
CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
+%:
+ dh $@ --with autoreconf,quilt --parallel
-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)
-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
+debian/autoreconf:
+ echo $(SUBDIRS) > $@
+override_dh_autoreconf: debian/autoreconf
+ dh_autoreconf
-build: build-stamp
-build-stamp: $(BUILD_STAMPS)
+override_dh_auto_configure: $(CONFIG_STAMPS)
+
+$(STAMP_DIR)/configure-%:
+ mkdir -p $(STAMP_DIR)
+ dh_auto_configure -D$* -B$*-build -- \
+ --disable-silent-rules \
+ CFLAGS="$(CFLAGS)" \
+ CPPFLAGS="$(CPPFLAGS)" \
+ LDFLAGS="$(LDFLAGS)"
>$@
-$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
- dh_testdir
- mkdir -p $*-build
- cd $*-build && \
- ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info $(confflags) \
- --disable-silent-rules \
- CFLAGS="$(CFLAGS)" \
- CPPFLAGS="$(CPPFLAGS)" \
- LDFLAGS="$(LDFLAGS)"
- cd $*-build && $(MAKE)
+override_dh_auto_build: $(BUILD_STAMPS)
+
+$(STAMP_DIR)/build-%:
+ mkdir -p $(STAMP_DIR)
+ dh_auto_build -D$* -B$*-build
>$@
-clean: xsfclean
- dh_testdir
- rm -f build-stamp
- 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
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_auto_clean: $(addprefix clean-, $(SUBDIRS))
+ rm -rf $(STAMP_DIR)
+
+clean-%:
+ dh_auto_clean -D$* -B$*-build
+override_dh_auto_install:
for FILE in $(SUBDIRS); do \
cd "$$FILE"-build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-
- dh_installdocs
- dh_install --sourcedir=debian/tmp -Xrgb.txt --fail-missing
- dh_installmenu
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_shlibdeps
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_install:
+ dh_install -Xrgb.txt --fail-missing
.PHONY: get-tarballs
get-tarballs: $(addprefix get-tarball-,$(SUBDIRS))
commit 940cabd789b9c0066fe3c70e1b2bb5615ba63f1c
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 18 20:27:19 2014 +0100
Remove Cyril Brulebois from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index adf0185..dee9c60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xserver-utils (7.7+2) UNRELEASED; urgency=medium
+
+ * Remove Cyril Brulebois from Uploaders.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 18 Jan 2014 20:27:01 +0100
+
x11-xserver-utils (7.7+1) unstable; urgency=low
[ Robert Hooker ]
diff --git a/debian/control b/debian/control
index 8be6f27..84c4c84 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: x11-xserver-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
Reply to: