xserver-xorg-video-v4l: Changes to 'debian-experimental'
.cvsignore | 19
.gitignore | 20
ChangeLog | 271 ++++-
Makefile.in | 152 +--
aclocal.m4 | 911 ++++++++++++-------
config.guess | 60 -
config.sub | 66 +
configure | 1837 ++++++++++++++++++++++++++-------------
configure.ac | 2
debian/changelog | 52 -
debian/control | 17
debian/copyright | 3
debian/rules | 4
debian/xsfbs/xsfbs-autoreconf.mk | 150 ---
debian/xsfbs/xsfbs.mk | 153 ---
debian/xsfbs/xsfbs.sh | 394 ++++----
depcomp | 93 +
install-sh | 514 +++++++---
ltmain.sh | 277 +++--
man/.cvsignore | 2
man/.gitignore | 2
man/Makefile.am | 1
man/Makefile.in | 95 +-
man/v4l.man | 2
missing | 61 -
mkinstalldirs | 5
src/.cvsignore | 6
src/.gitignore | 6
src/Makefile.in | 140 +-
src/v4l.c | 8
src/videodev.h | 1
31 files changed, 3392 insertions(+), 1932 deletions(-)
New commits:
commit 8648f27ca3c16a5aff9427cd55cb570855050bfd
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Sep 10 14:10:09 2008 +0100
Build against xserver 1.5.
diff --git a/debian/changelog b/debian/changelog
index 86539d4..752bbfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-v4l (0.2.0-2) experimental; urgency=low
+
+ * Build against xserver 1.5.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 10 Sep 2008 14:10:03 +0100
+
xserver-xorg-video-v4l (0.2.0-1) unstable; urgency=low
[ Brice Goglin ]
diff --git a/debian/control b/debian/control
index 4f4df7c..6b6aec1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev, dpkg-dev (>= 1.14.17)
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.5), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev, dpkg-dev (>= 1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-v4l
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-v4l.git
commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 17 15:44:45 2008 +0200
xsfbs.mk: make 'log' a separate target
'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
- mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
>$@
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+ mkdir -p $(STAMP_DIR)/log
+
# Apply all patches to the upstream source.
.PHONY: patch
stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:42:14 2008 +0200
xsfbs.mk: update the list of releases, and drop some unused code
we haven't had a separate source tree since modularization.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://')
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}})
# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
# version number. Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
# Set up parameters for the Debian build environment.
@@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir
-# $(SOURCE_DIR) houses one or more source trees.
-SOURCE_DIR:=build-tree
-
-# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
-# is more than one, others are found using this name plus a suffix to indicate
-# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
-# "setup" target is responsible for creating such trees.
-#SOURCE_TREE:=$(SOURCE_DIR)/xc
-#FIXME We need to define this in our debian/rules file
-
# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
# their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp
commit 6c29758eb1a2798f6b77516b7a75dc399769d217
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: more parallel make fixing
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index fa2431e..2350f80 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,8 +119,8 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
mkdir -p $(STAMP_DIR)/log
>$@
commit 78b3958b14a5298165d8500d711342be1b7b6463
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: fix the prepare target for parallel make
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b871b3b..fa2431e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,11 +119,9 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/log ]; then \
- mkdir $(STAMP_DIR)/log; \
- fi; \
+ mkdir -p $(STAMP_DIR)/log
>$@
# Apply all patches to the upstream source.
commit 9d426b1f8a91d944e4169236b03d8d33afa612f2
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 9 20:30:44 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 4248123..86539d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-v4l (0.2.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-v4l (0.2.0-1) unstable; urgency=low
[ Brice Goglin ]
* Add upstream URL to debian/copyright.
@@ -14,7 +14,7 @@ xserver-xorg-video-v4l (0.2.0-1) UNRELEASED; urgency=low
dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
dpkg-dev >= 1.14.17.
- -- Julien Cristau <jcristau@debian.org> Mon, 09 Jun 2008 20:19:29 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 09 Jun 2008 20:30:35 +0200
xserver-xorg-video-v4l (0.1.1-6) unstable; urgency=low
commit 20932b77869e3df76cef02b87f0fbfac8acdcfb1
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 9 20:30:25 2008 +0200
Run dpkg-shlibdeps with --warnings=6.
Drivers reference symbols from /usr/bin/Xorg and other modules,
and that's not a bug, so we want dpkg-shlibdeps to shut up about
symbols it can't find. Build-depend on dpkg-dev >= 1.14.17.
diff --git a/debian/changelog b/debian/changelog
index 3447511..4248123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ xserver-xorg-video-v4l (0.2.0-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
* Use 'Video For Linux' instead of 'video 4 linux' in the long description.
+ * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
+ /usr/bin/Xorg and other modules, and that's not a bug, so we want
+ dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
+ dpkg-dev >= 1.14.17.
-- Julien Cristau <jcristau@debian.org> Mon, 09 Jun 2008 20:19:29 +0200
diff --git a/debian/control b/debian/control
index 17387c3..4f4df7c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev, dpkg-dev (>= 1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-v4l
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-v4l.git
diff --git a/debian/rules b/debian/rules
index a12ce10..2249a73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps
+ dh_shlibdeps -- --warnings=6
dh_gencontrol
dh_md5sums
dh_builddeb
commit 8f056815c6efba443dc6f93bd32917dfd2e240c5
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 9 20:28:56 2008 +0200
Use 'Video For Linux' instead of 'video 4 linux' in the long description.
diff --git a/debian/changelog b/debian/changelog
index efd7add..3447511 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-v4l (0.2.0-1) UNRELEASED; urgency=low
* Remove Branden from Uploaders with his permission, and add myself.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
+ * Use 'Video For Linux' instead of 'video 4 linux' in the long description.
-- Julien Cristau <jcristau@debian.org> Mon, 09 Jun 2008 20:19:29 +0200
diff --git a/debian/control b/debian/control
index ee1f19e..17387c3 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-v4l
Conflicts: xserver-xorg-driver-v4l
Description: X.Org X server -- Video 4 Linux display driver
This driver for the X.Org X server (see xserver-xorg for a further description)
- uses the video 4 linux interface. It does not provide a graphics chip
+ uses the Video For Linux interface. It does not provide a graphics chip
driver, but instead registers a number of generic Xv adaptors which can be
used with any graphics chipset driver.
.
commit 5d6f16c6ac09a4ec82d68a409c5363b927a848dd
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 9 20:21:36 2008 +0200
debian/control updates
* Remove Branden from Uploaders with his permission, and add myself.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 84f01f6..efd7add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ xserver-xorg-video-v4l (0.2.0-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* New upstream release.
+ * Remove Branden from Uploaders with his permission, and add myself.
+ * Bump Standards-Version to 3.7.3.
+ * Drop the XS- prefix from Vcs-* control fields.
-- Julien Cristau <jcristau@debian.org> Mon, 09 Jun 2008 20:19:29 +0200
diff --git a/debian/control b/debian/control
index 0324640..ee1f19e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: xserver-xorg-video-v4l
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev
-Standards-Version: 3.6.1
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-v4l
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-v4l.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-v4l
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-v4l.git
Package: xserver-xorg-video-v4l
Architecture: any
commit fbc1b65289cbc9251d8df1cc5fd569fe8fe8eefb
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 9 20:20:10 2008 +0200
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index 02fc6fa..6d84c68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,57 +1,256 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 509d2914791f19aed96707cd4d7c64c2c52a2e33
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 16:43:42 2008 -0400
- * configure.ac:
- * src/v4l.c:
- Bump to 0.1.1 for Xv changes.
+ v4l 0.2.0
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit b0dad860b9bbe5db7ae7cf5ef1a8eacb3cb5db05
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 16:42:18 2008 -0400
- * src/v4l.c: (V4lPutVideo), (V4lPutStill):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ Fix ioctl() outparameter on LP64 systems.
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit edfeb249a80e52fb67c075e1f5e07d420cccb2b5
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 16:14:52 2008 -0400
- * configure.ac:
- * src/v4l.c:
- Unlibcwrap. Bump server version requirement. Bump to 0.1.0.
+ Death to RCS tags.
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit eb742cfb9e0db0962e9e0380b57418cff2059110
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Mar 9 00:03:41 2008 +0100
- * configure.ac:
- Update package version for X11R7 release.
+ Makefile.am: nuke RCS Id
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a2cddcf03437f485fa91ee081bf1e0c2dccf86fe
+Author: Fabrice Lorrain <Fabrice.Lorrain@free.fr>
+Date: Sat Feb 16 18:07:48 2008 +0100
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Fix typo in the manpage.
+
+ (Debian bug #466098)
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6260e7a8166cefb57c85d3e6aa3ac9f421e2a8b9
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:48 2007 -0400
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Add *~ to .gitignore to skip patch/emacs droppings
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 68ef5a3537dbb78644969e08eab09cfb29c32239
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:26:00 2007 -0400
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Rename .cvsignore to .gitignore
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 0fb67e3f76398b85f19c634b095cbc1522c76ef5
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:52:08 2006 +0000
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Bump to 0.1.1 for Xv changes.
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit 3288506bb324c1de36985170d9862c5c7d143b61
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:17:04 2006 +0000
- * configure.ac:
- Only build dlloader modules by default.
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 0ae947b760b829010392a41c0d0497466d775474
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 21:45:55 2006 +0000
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Unlibcwrap. Bump server version requirement. Bump to 0.1.0.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f00943051a80d286e8a55f28bf60baebab2a4e92
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:04 2005 +0000
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ Update package version for X11R7 release.
+
+commit 58443583fbef699ebc4dda243bf86241913edbe8
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:56 2005 +0000
+
+ Stub COPYING files
+
+commit 0f0ae40ac9a9815d50c1ae3eee4b524557b9fb68
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Dec 19 09:07:50 2005 +0000
+
+ Typo fixes, mailing list & url updates, and other changes to prepare for
+ X11R6.9 & 7.0 releases.
+
+commit c3917f36a9ac2b2cd77b8aff2b74a5245f687ef3
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:21 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 6a46c3a4dba3f2470290191c760c1e657214e1f7
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:40 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 7b16fc59d14b2ca0db3a270f44d455f2911d2924
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:36 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit db38e33e96bb3a9a6e4ab6456f41796ee164584d
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:11 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit e09d3fa5a2954bb5d651eddc79b24998a64a3c46
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:30:06 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit b960665c1a03112251537bbf324cac85dcd105f7
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:14 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 9e9e26cbfcd483b0f4f59fa3f58cb2176f86e45b
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:21 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit f95d090f2618019cbddc4eba95304aa7fd06482f
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:22 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit f1b782df5d01a4f17e33fb5506dff5523b65c9e2
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:56 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit bec1ce8deaad0f3f8a25e669e1cb5118f7ba81ce
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:06 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit d66e3714e897eca8c21a588b73c630e6505efa1d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:55 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit ff178dcf9abded36bfaa6b9b62eae792095b7c67
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:37 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit c61d66bc02c1ac7bc15d90ceb15aa4ed1841f881
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:08 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 083adf60322bf9de0a6838846f5688928b2cb017
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Sep 21 00:30:22 2005 +0000
+
+ Bug #4328: Add build skeleton for the poor forgotten v4l driver.
+
+commit 1f05cde42c682f3b366543958f78e119f755415f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:30:06 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 1fa8d2f701bd9173c36610ecf09bce25c1b32a82
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:59 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 7123df70e01cbcca9a49a0b54b7f421f4a91760a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:32 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit b299863dd21226e2ea47f7983f31e1920ac70cd9
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:24:09 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 1f8ceb0991d6154eb5993cf2eb8b2d9a68a8eaf9
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:52:24 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit fb4a148b6ea5f839f418a8dc7ab0f44bd90678d1
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:41 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit abaaf69833e147c48bbcc355597f4ac2f86f2774
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:28 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit bd8c0455c20035003f93d4cfe17036de0236f646
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:55 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 9c34b95344359a22f1c730165be3af80a804df7e
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 871d6d6aeffa34b9a6fe8072f8dba94da9d733a8
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:08:41 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit e8bf6a26c81b32da1b9a02dc8a5dc9998b5ce708
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Dec 19 20:55:19 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit 0fc7fdb71a319c3af5cf33cc46f0ebc0c2648e67
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:43 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 1c98a4f36feff5bde09283b4d4cc7420ce92d4e6
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 5c72acfc65bcea784244f6c8412b6c6c22bcd05d
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index d991d70..84f01f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-xserver-xorg-video-v4l (0.1.1-7) UNRELEASED; urgency=low
+xserver-xorg-video-v4l (0.2.0-1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Add upstream URL to debian/copyright.
- -- Brice Goglin <bgoglin@debian.org> Wed, 19 Sep 2007 00:10:14 +0200
+ [ Julien Cristau ]
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 09 Jun 2008 20:19:29 +0200
xserver-xorg-video-v4l (0.1.1-6) unstable; urgency=low
commit d646493b0b8a436fec504cd0168009cb29ed1777
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 9 20:19:09 2008 +0200
autoreconf
diff --git a/Makefile.in b/Makefile.in
index f4223d4..45584ed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
@@ -73,10 +69,13 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -94,8 +93,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -119,6 +116,7 @@ DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -130,6 +128,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -143,11 +142,11 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -158,19 +157,20 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -182,6 +182,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -210,8 +211,11 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = README
@@ -256,7 +260,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -278,7 +282,6 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -311,8 +314,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -356,8 +358,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -382,8 +384,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -393,13 +395,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -414,23 +415,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -444,7 +444,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -452,6 +452,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -459,7 +461,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -468,6 +470,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -495,6 +501,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -534,7 +542,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -604,12 +612,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-recursive
Reply to: