xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'
debian/changelog | 13 ++++++++++++-
debian/control | 10 ++++++----
debian/patches/remove-xf86_ansic.h | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
debian/xsfbs/xsfbs.mk | 28 ++++++++++++++++++++++++----
6 files changed, 68 insertions(+), 10 deletions(-)
New commits:
commit bc5e8861cca5fb3876a9cc5f6fb4439f9bdfc866
Author: Ian Campbell <ijc@hellion.org.uk>
Date: Wed May 2 07:11:33 2007 +0100
Remove inclusion of xf86ansic.h from drivers targetting Xorg 7.0.
diff --git a/debian/changelog b/debian/changelog
index 4b148e1..f690fb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-ivtvdev (0.10.6+svn3805-1) UNRELEASED; urgency=low
* Imported upstream subversion revision 3805.
* Patch 00_xorg_7_1 is no longer required.
+ * The xf86_ansic.h header is no longer required.
-- Ian Campbell <ijc@hellion.org.uk> Wed, 28 Mar 2007 22:05:43 +0100
diff --git a/debian/patches/remove-xf86_ansic.h b/debian/patches/remove-xf86_ansic.h
new file mode 100644
index 0000000..76d5767
--- /dev/null
+++ b/debian/patches/remove-xf86_ansic.h
@@ -0,0 +1,24 @@
+Index: xserver-xorg-video-ivtvdev.git/src/ivtvdev.c
+===================================================================
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtvdev.c 2007-05-02 06:29:59.000000000 +0100
++++ xserver-xorg-video-ivtvdev.git/src/ivtvdev.c 2007-05-02 06:43:40.000000000 +0100
+@@ -13,7 +13,6 @@
+ /* all driver need this */
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86_ansic.h"
+
+ #include "mipointer.h"
+ #include "mibstore.h"
+Index: xserver-xorg-video-ivtvdev.git/src/ivtvhw.c
+===================================================================
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtvhw.c 2007-05-02 06:29:59.000000000 +0100
++++ xserver-xorg-video-ivtvdev.git/src/ivtvhw.c 2007-05-02 06:47:45.000000000 +0100
+@@ -5,7 +5,6 @@
+ /* all driver need this */
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86_ansic.h"
+
+ /* pci stuff */
+ #include "xf86PciInfo.h"
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..2256471 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove-xf86_ansic.h
commit a7e9ebfa148f6f0722ce405887f733864963dc0d
Author: Ian Campbell <ijc@hellion.org.uk>
Date: Wed May 2 05:52:12 2007 +0100
Call serverabi from binary-arch so auto provides and depends work.
diff --git a/debian/rules b/debian/rules
index a1b28c4..d96501a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build install serverabi
dh_testdir
dh_testroot
commit 5c96e853347a5f3130c9ba5e0d4ebeebe9e0a2a3
Author: Ian Campbell <ijc@hellion.org.uk>
Date: Wed May 2 05:44:03 2007 +0100
Miscellaneous fixes to debian/control suggested by Brice Goglin
diff --git a/debian/changelog b/debian/changelog
index 460abeb..1b087ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ xserver-xorg-video-ivtvdev (0.10.6-2) UNRELEASED; urgency=low
[ Ian Campbell ]
* Include linux/types.h in ivtvhw.h. (Closes: #406032)
+ * Updates suggested by Brice Goglin:
+ - Pull latest xsfbs
+ - Use ${xviddriver:Provides} and ${xserver:Depends}
+ - Update build depends
+ - Added XS-Vcs-*
+ * Bumped standards version
-- Ian Campbell <ijc@hellion.org.uk> Tue, 20 Feb 2007 22:09:22 +0000
diff --git a/debian/control b/debian/control
index 7a10bf5..ba659c9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,15 @@ Section: contrib/x11
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Ian Campbell <ijc@hellion.org.uk>
-Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.1.1-1), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, ivtv-utils
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, ivtv-utils
+Standards-Version: 3.7.2.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ivtvdev
+XS-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-xorg-core (>= 2:1.1.1-11)
-Provides: xserver-xorg-video-1.0
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Provides: ${xviddriver:Provides}
Description: X.Org X server -- IVTV display driver
This package provides the driver for the overlay framebuffer provided
by the iTVC15 family of MPEG codecs. The iTVC15 family includes the
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ 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-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Mar 1 22:06:04 2007 -0500
Fix one missed bit from the serverabiver -> serverminver rename
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index cfc5496..0343aec 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -366,7 +366,7 @@ endif
.PHONY: serverabi
serverabi:
-ifeq ($(SERVERABI),)
+ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
else
commit 1344bb9deda5ba54215d0ec5b164706999236b0b
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 23:08:17 2007 -0500
Fix typo that prevented the input abi versioning from working.
Good catch Julien
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e8cf41..cfc5496 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -356,7 +356,7 @@ debian/shlibs.local:
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
-INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 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-video-$(INPUTABI)
commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Feb 27 21:50:20 2007 -0500
Add support for X server input ABI versioning
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d54ffd3..5e8cf41 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -355,9 +355,11 @@ debian/shlibs.local:
cat debian/*.shlibs >$@
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
-SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
+VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
+INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
-DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
+INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
@@ -369,7 +371,8 @@ ifeq ($(SERVERABI),)
@exit 1
else
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
- echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
endif
include debian/xsfbs/xsfbs-autoreconf.mk
commit 00fc799ec3107c0c29286b75e780bef82c1fa137
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 21 22:47:30 2007 -0500
Fix name of serverminver
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index ae767b1..d54ffd3 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,7 +354,7 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
debian/shlibs.local:
cat debian/*.shlibs >$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null)
+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
commit dacefd5a6bb9f786c78f35358273e3214c7492e9
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 21 21:37:52 2007 -0500
Update serverabi generation to also account for driver Provides
* Have the drivers use the file serverminver instead of serverabiver in order
to generate the versioned dependency on the server. This is clearer
naming.
* Use serverabiver to actually store the server's video ABI version. This
is used to generate the Provides: line for drivers so the server can
depend on them properly. This goes in to the substvar
xviddriver:Provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index dbb2872..ae767b1 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,8 +354,10 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
debian/shlibs.local:
cat debian/*.shlibs >$@
+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null)
SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI))
+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
+DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
@@ -367,6 +369,7 @@ ifeq ($(SERVERABI),)
@exit 1
else
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
endif
include debian/xsfbs/xsfbs-autoreconf.mk
commit b12324ef355c75d38e3e022f9cb2719db9349160
Author: Ian Campbell <ijc@hellion.org.uk>
Date: Tue Feb 20 22:48:59 2007 +0000
Fix #406032 by including linux/types.h for linux/ivtv.h
diff --git a/debian/changelog b/debian/changelog
index 3f36452..460abeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xserver-xorg-video-ivtvdev (0.10.6-2) UNRELEASED; urgency=low
+ [ David Nusinow ]
* Bump server version requirement to use newer server so that reportbug
stuff is guaranteed to be installed
- -- David Nusinow <dnusinow@debian.org> Sat, 18 Nov 2006 20:41:59 -0500
+ [ Ian Campbell ]
+ * Include linux/types.h in ivtvhw.h. (Closes: #406032)
+
+ -- Ian Campbell <ijc@hellion.org.uk> Tue, 20 Feb 2007 22:09:22 +0000
xserver-xorg-video-ivtvdev (0.10.6-1) unstable; urgency=low
diff --git a/debian/patches/01_include_linux_types_h b/debian/patches/01_include_linux_types_h
new file mode 100644
index 0000000..b896551
--- /dev/null
+++ b/debian/patches/01_include_linux_types_h
@@ -0,0 +1,12 @@
+Index: xserver-xorg-video-ivtvdev.git/src/ivtvhw.h
+===================================================================
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtvhw.h 2007-02-20 22:07:45.000000000 +0000
++++ xserver-xorg-video-ivtvdev.git/src/ivtvhw.h 2007-02-20 22:08:05.000000000 +0000
+@@ -7,6 +7,7 @@
+ #include <asm/ioctl.h>
+ #undef __STRICT_ANSI__
+ #include <inttypes.h>
++#include <linux/types.h>
+ #include <linux/ivtv.h>
+
+ #define FBDEVHW_PACKED_PIXELS 0 /* Packed Pixels */
diff --git a/debian/patches/series b/debian/patches/series
index ae0a0a9..a078662 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
00_xorg_7_1
+01_include_linux_types_h
commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 17 16:01:41 2007 +0100
Add new "serverabi" rule to generate drivers dependency on the server.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 7b8206e..dbb2872 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,6 +354,21 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
debian/shlibs.local:
cat debian/*.shlibs >$@
+SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI))
+ifeq ($(PACKAGE),)
+PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
+endif
+
+.PHONY: serverabi
+serverabi:
+ifeq ($(SERVERABI),)
+ @echo error: xserver-xorg-dev needs to be installed
+ @exit 1
+else
+ echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+endif
+
include debian/xsfbs/xsfbs-autoreconf.mk
# vim:set noet ai sts=8 sw=8 tw=0:
Reply to: