xorg-server: Changes to 'debian-experimental'
debian/changelog | 9 ++++-----
debian/control | 1 -
debian/rules | 5 +++--
3 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 1db4f64f98f5586635ced39eb81f8a016129874b
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Oct 21 23:46:39 2013 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index fae465b..6f8be69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.14.99.3-1) UNRELEASED; urgency=low
+xorg-server (2:1.14.99.3-1) experimental; urgency=low
* New upstream snapshot.
* Drop patches applied upstream:
@@ -18,7 +18,7 @@ xorg-server (2:1.14.99.3-1) UNRELEASED; urgency=low
* Run abibumpcheck on build instead of clean so it's done on a patched tree.
* Remove Drew and Cyril from Uploaders.
- -- Julien Cristau <jcristau@debian.org> Mon, 21 Oct 2013 20:25:02 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 21 Oct 2013 23:46:34 +0200
xorg-server (2:1.14.3-4) unstable; urgency=high
commit 45e4378c5c107026d0dd793f8d4f81a873bdfb37
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Oct 21 23:46:24 2013 +0200
Remove Drew and Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index c9b91dc..fae465b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xorg-server (2:1.14.99.3-1) UNRELEASED; urgency=low
* Reduce noise from dh_install --list-missing by deleting some files from the
udeb build after make install.
* Run abibumpcheck on build instead of clean so it's done on a patched tree.
+ * Remove Drew and Cyril from Uploaders.
-- Julien Cristau <jcristau@debian.org> Mon, 21 Oct 2013 20:25:02 +0200
diff --git a/debian/control b/debian/control
index 4ae4c81..e661228 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xorg-server
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
# all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg
# server, and common dependencies for the DIX.
# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.
commit 6c609aa062afaf42af5981d2fbe1f395cc4510e6
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Oct 21 23:30:18 2013 +0200
Run abibumpcheck on build instead of clean so it's done on a patched tree.
diff --git a/debian/changelog b/debian/changelog
index bdbf088..c9b91dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,9 +15,7 @@ xorg-server (2:1.14.99.3-1) UNRELEASED; urgency=low
* Stop building Xfbdev.
* Reduce noise from dh_install --list-missing by deleting some files from the
udeb build after make install.
- * Delete old patch 13_debian_add_xkbpath_env_variable.diff. It's not been
- applied since 1.6, and nobody seems to have noticed, so clearly it's not
- needed.
+ * Run abibumpcheck on build instead of clean so it's done on a patched tree.
-- Julien Cristau <jcristau@debian.org> Mon, 21 Oct 2013 20:25:02 +0200
diff --git a/debian/rules b/debian/rules
index f4e2ccc..22cdd77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -207,6 +207,7 @@ $(STAMP_DIR)/tests-%: $(STAMP_DIR)/build-%
cd build-$* && $(MAKE) check
>$@
+build: abibumpcheck
build: $(STAMP_DIR)/build-main
build: $(STAMP_DIR)/tests-main
ifeq ($(udeb), yes)
@@ -216,7 +217,7 @@ endif
build-arch: build
build-indep: build
-clean: unpatch abibumpcheck
+clean: unpatch
dh_testdir
rm -rf $(STAMP_DIR)
rm -f config.cache config.log config.status
@@ -294,7 +295,7 @@ SERVERMINVER = debian/serverminver
serverminver = $(shell head -1 $(SERVERMINVER))
.PHONY: abibumpcheck
-abibumpcheck: debian/serverminver
+abibumpcheck: debian/serverminver $(QUILT_STAMPFN)
@echo Checking for the need of an ABI bump
# Build an updated version of the file:
head -1 $(SERVERMINVER) > $(SERVERMINVER).new
Reply to: