Rebased ref, commits from common ancestor:
commit 6545f9c7f679df9f407dfa220a083f92b02b2c00
Author: Julien Cristau jcris...@debian.org
Date: Sun Jun 6 18:40:59 2010 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 490a5b0..73bb360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ivtvdev (1.1.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-ivtvdev (1.1.1-2) unstable; urgency=low
[ Ian Campbell ]
* Add misc:Depends for xserver-xorg-video-ivtv-dbg.
@@ -7,7 +7,7 @@ xserver-xorg-video-ivtvdev (1.1.1-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Update xsfbs and use new ${xviddriver:Depends} substvar.
- -- Ian Campbell i...@hellion.org.uk Sat, 16 Jan 2010 20:04:28 +
+ -- Julien Cristau jcris...@debian.org Sun, 06 Jun 2010 18:40:53 +0200
xserver-xorg-video-ivtvdev (1.1.1-1) unstable; urgency=low
commit 62022ebb4cf55dfc9ab3c7a360f53d13cfa4136a
Author: Julien Cristau jcris...@debian.org
Date: Sat May 22 15:53:55 2010 +0200
Update xsfbs and use new ${xviddriver:Depends} substvar.
diff --git a/debian/changelog b/debian/changelog
index df42401..490a5b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-video-ivtvdev (1.1.1-2) UNRELEASED; urgency=low
+ [ Ian Campbell ]
* Add misc:Depends for xserver-xorg-video-ivtv-dbg.
* Bump Standards-Version to 3.8.3 (no changes).
+ [ Julien Cristau ]
+ * Update xsfbs and use new ${xviddriver:Depends} substvar.
+
-- Ian Campbell i...@hellion.org.uk Sat, 16 Jan 2010 20:04:28 +
xserver-xorg-video-ivtvdev (1.1.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ff07181..c6b0cd8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: contrib/x11
Priority: extra
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Uploaders: David Nusinow dnusi...@debian.org, Ian Campbell
i...@hellion.org.uk
-Build-Depends: debhelper (= 5), pkg-config, autotools-dev, xserver-xorg-dev
(= 2:1.4), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (= 5), pkg-config, autotools-dev, xserver-xorg-dev
(= 2:1.7.6.901), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ivtvdev
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ivtvdev.git
Package: xserver-xorg-video-ivtv
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips
mipsel netbsd-i386 powerpc
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
Provides: ${xviddriver:Provides}
Description: X.Org X server -- IVTV display driver
This package provides the driver for the overlay framebuffer provided
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
