xinit: Changes to 'debian-unstable'
debian/README.source | 2 +-
debian/changelog | 7 +++++++
debian/control | 2 +-
debian/rules | 1 -
debian/xsfbs/xsfbs.mk | 35 ++++++++++++++++++++++-------------
5 files changed, 31 insertions(+), 16 deletions(-)
New commits:
commit 2477599fe9ff57303394a2f5ce33769016f55d05
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Jun 5 19:08:26 2010 +0200
debian/changelog entry for xsfbs update
diff --git a/debian/changelog b/debian/changelog
index 0d23099..7e5afd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xinit (1.2.0-2) UNRELEASED; urgency=low
* Depend on coreutils (>= 7.4-1) for mktemp's --tmpdir option
(Closes: #559852).
* Remove unneeded dh_makeshlibs call from debian/rules.
+ * Update xsfbs to 81fc271788605b52e85c2d11635a0371fb44605e.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:13 +0000
commit d1f24b37ed7e6ec74642f61a00a9723874c8eb95
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Jun 5 18:57:19 2010 +0200
debian/rules: Remove unneeded dh_makeshlibs call
Lintian complained about the wrong order of debhelper commands, and
this is not a library package anyway.
diff --git a/debian/changelog b/debian/changelog
index a83aaf3..0d23099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xinit (1.2.0-2) UNRELEASED; urgency=low
[ Sven Joachim ]
* Depend on coreutils (>= 7.4-1) for mktemp's --tmpdir option
(Closes: #559852).
+ * Remove unneeded dh_makeshlibs call from debian/rules.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:13 +0000
diff --git a/debian/rules b/debian/rules
index 904ba24..7b55331 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,7 +86,6 @@ binary-arch: build install
dh_fixperms
dh_installdeb
dh_shlibdeps
- dh_makeshlibs
dh_gencontrol
dh_md5sums
dh_builddeb
commit b8ea13e2366f55b11b0af927f298d5c8158b9885
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Jun 5 18:33:09 2010 +0200
Depend on coreutils (>= 7.4-1)
Lenny's mktemp does not support the --tmpdir option, ensure that the
coreutils mktemp implementation is used.
diff --git a/debian/changelog b/debian/changelog
index 27feeb9..a83aaf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xinit (1.2.0-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ [ Sven Joachim ]
+ * Depend on coreutils (>= 7.4-1) for mktemp's --tmpdir option
+ (Closes: #559852).
+
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:13 +0000
xinit (1.2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 13604e3..8fbea74 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xinit.git
Package: xinit
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xauth
+Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils (>= 7.4-1), x11-common, xauth
Recommends: xserver-xorg | xserver, xterm | x-session-manager | x-window-manager | x-terminal-emulator
Replaces: xbase-clients (<= 1:7.2.ds2-3)
Description: X server initialisation tool
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun May 2 02:14:45 2010 +0200
Add xorg-driver-{video,input} to Provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 16 22:14:46 2010 +0200
Update serverabi rule for xserver 1.7.6.901
Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers. The ${xserver:Depends} variable is deprecated.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
+
+# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
.PHONY: serverabi
serverabi: install
-ifeq ($(SERVERMINVERS),)
- @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+ @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
@exit 1
else
- echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
+ # the following is there for compatibility...
echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
endif
# vim:set noet ai sts=8 sw=8 tw=0:
commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 13 14:06:33 2010 +0200
xsfbs.mk: don't use a directory as a make target
The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+ >$@
# Apply all patches to the upstream source.
.PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Apr 1 20:49:15 2010 +0200
Fix typo.
diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..b09a1ab 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch.
Otherwise, the upstream sources are manually installed in the Debian
git repository.
-The .orig.tar.gz upstream source file could be generated this
+The .orig.tar.gz upstream source file could be generated using this
"upstream-*" branch in the Debian git repository but it is actually
copied from upstream tarballs directly.
Reply to: