debian/README.source | 2 +-
debian/changelog | 20 +++++++++++++++-----
debian/control | 10 +++++-----
debian/xsfbs/xsfbs.mk | 35 ++++++++++++++++++++++-------------
4 files changed, 43 insertions(+), 24 deletions(-)
New commits:
commit ed214b50803be79065bd069e331707a69842e8ee
Author: Julien Cristau <jcris...@debian.org>
Date: Sun May 23 23:38:10 2010 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index ff80b4d..db2af2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-void (1:1.3.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-void (1:1.3.0-2) unstable; urgency=medium
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Update xsfbs, use new ${xinpdriver:Depends} substvar.
* Drop XS- prefix from Vcs-* control fields.
- -- Julien Cristau <jcris...@debian.org> Sun, 23 May 2010 23:35:29 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 23 May 2010 23:38:01 +0200
xserver-xorg-input-void (1:1.3.0-1) experimental; urgency=low
commit 62e05ed813173ea551850634cbb7b2e9ef60b83e
Author: Julien Cristau <jcris...@debian.org>
Date: Sun May 23 23:37:45 2010 +0200
Drop XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 62a62b3..ff80b4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-void (1:1.3.0-2) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Update xsfbs, use new ${xinpdriver:Depends} substvar.
+ * Drop XS- prefix from Vcs-* control fields.
-- Julien Cristau <jcris...@debian.org> Sun, 23 May 2010 23:35:29 +0200
diff --git a/debian/control b/debian/control
index 3976c51..4885223 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends:
libtool,
xutils-dev (>= 1:7.5~1)
Standards-Version: 3.8.3
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-void
-XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-void.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-void
+Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-void.git
Package: xserver-xorg-input-void
Architecture: any
commit 0a8ce95799ac446d1d6b91b785bb0b9b10d3efd8
Author: Julien Cristau <jcris...@debian.org>
Date: Sun May 23 23:36:59 2010 +0200
Update xsfbs, use new ${xinpdriver:Depends} substvar.
diff --git a/debian/changelog b/debian/changelog
index 19e89b4..62a62b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-void (1:1.3.0-2) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
+ * Update xsfbs, use new ${xinpdriver:Depends} substvar.
-- Julien Cristau <jcris...@debian.org> Sun, 23 May 2010 23:35:29 +0200
diff --git a/debian/control b/debian/control
index 6da4913..3976c51 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org
Build-Depends:
debhelper (>= 5),
pkg-config,
- xserver-xorg-dev (>= 2:1.7),
+ xserver-xorg-dev (>= 2:1.7.6.901),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-input-dev,
@@ -19,7 +19,7 @@ XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-void
Package: xserver-xorg-input-void
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends}
Provides: ${xinpdriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35)
Description: X.Org X server -- void input driver
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois <k...@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 <jcris...@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 <jcris...@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 <k...@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.
commit 2e8f6998f7ea2f0c0329094c4f316afe1c48e150
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Dec 5 23:09:53 2009 +0100
Update Build-Depends: bump debhelper from >= 4.0.0 to >= 5.
diff --git a/debian/changelog b/debian/changelog
index 33f7be2..8eb9cc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xserver-xorg-input-void (1:1.3.0-1) experimental; urgency=low
[ Cyril Brulebois ]
* Upload to experimental.
+ * Bump versioned Build-Depends on debhelper from >= 4.0.0 to >= 5 to
+ match the compat level.
-- Cyril Brulebois <k...@debian.org> Sat, 05 Dec 2009 23:06:37 +0100
diff --git a/debian/control b/debian/control
index 947ff4f..f550fa7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org>
Build-Depends:
- debhelper (>= 4.0.0),
+ debhelper (>= 5),
pkg-config,
xserver-xorg-dev (>= 2:1.7),
x11proto-core-dev,
commit 7b95c32f8792afab5f876adacb51a8a86a956695
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Dec 5 23:06:48 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 4b1fecf..33f7be2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-xserver-xorg-input-void (1:1.3.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-void (1:1.3.0-1) experimental; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
* Bump dephelper compat level to 5.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:05 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <k...@debian.org> Sat, 05 Dec 2009 23:06:37 +0100
xserver-xorg-input-void (1:1.2.0-2) unstable; urgency=low
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ogitc-0005qj...@alioth.debian.org
