xserver-xorg-video-via: Changes to 'debian-experimental'

2007-09-14 Thread Brice Goglin 
 debian/changelog |6 ++
 debian/copyright |3 +++
 2 files changed, 9 insertions(+)

New commits:
commit 87a6c430220372c4e018399dad1fd255008d9822
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sat Sep 15 02:28:20 2007 +0200

Add upstream URL to debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 9dda195..fd63bf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-via (1:0.2.2-5) UNRELEASED; urgency=low
+
+  * Add upstream URL to debian/copyright.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Sat, 15 Sep 2007 02:28:04 +0200
+
 xserver-xorg-video-via (1:0.2.2-4) experimental; urgency=low
 
   * Build against and build-dep on Xserver 1.4
diff --git a/debian/copyright b/debian/copyright
index 191fbd5..98fda90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
 Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
 Copyright (c) 2000 Intel Corporation. All rights reserved.
 Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-via: Changes to 'debian-experimental'

2007-09-09 Thread David Nusinow 
 debian/changelog|6 ++
 debian/control  |2 +-
 src/Makefile.am |6 --
 src/via_drmclient.h |1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit c8edc1578a48a61e19910d8f51503a22f5532395
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Sep 9 21:24:54 2007 -0400

* Build against and build-dep on Xserver 1.4

diff --git a/debian/changelog b/debian/changelog
index 32c6345..9dda195 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-via (1:0.2.2-4) experimental; urgency=low
+
+  * Build against and build-dep on Xserver 1.4
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun, 09 Sep 2007 21:15:57 -0400
+
 xserver-xorg-video-via (1:0.2.2-3) experimental; urgency=low
 
   * Build against xserver 2:1.3.99.0 and build-dep on that version
diff --git a/debian/control b/debian/control
index 7c08084..2f20b76 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 [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED]
-Build-Depends: debhelper (= 5.0.0), pkg-config, xserver-xorg-dev (= 
2:1.3.99.0), libxvmc-dev, x11proto-xf86dri-dev, x11proto-gl-dev, 
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, 
libdrm-dev ( 2.0) [!hurd-i386], libgl1-mesa-dev | libgl1-dev, quilt
+Build-Depends: debhelper (= 5.0.0), pkg-config, xserver-xorg-dev (= 2:1.4), 
libxvmc-dev, x11proto-xf86dri-dev, x11proto-gl-dev, x11proto-core-dev, 
x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev ( 
2.0) [!hurd-i386], libgl1-mesa-dev | libgl1-dev, quilt
 Standards-Version: 3.7.2.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-via
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-via.git

commit 9c1157215097f9239c60b2483956dd4cdfbdedc7
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Sep 9 21:21:03 2007 -0400

Also unapply patch 2 in the sources. grr

diff --git a/src/via_drmclient.h b/src/via_drmclient.h
index c34458c..2b7dbfb 100644
--- a/src/via_drmclient.h
+++ b/src/via_drmclient.h
@@ -26,7 +26,6 @@
 
 #include drm.h
 #include xf86drm.h
-#include stdint.h
 
 #if HAVE_INTTYPES_H
 #  include inttypes.h

commit 80f7cc00ca6ef2c76df30bae60f46811d97c2b65
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Sep 9 21:18:03 2007 -0400

Don't commit the patch as part of the source

diff --git a/src/Makefile.am b/src/Makefile.am
index a980b96..c403cd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,9 +79,3 @@ EXTRA_DIST = \
  via_xvmc.c \
  via_xvmc.h 
 endif
-
-pcidatadir = $(datadir)/xserver-xorg/pci
-pcidata_DATA = via.ids
-
-via.ids : via_id.h
-   awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/via_id.h | sed -e 
's/0x/1106/'  via.ids


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-via: Changes to 'debian-experimental'

2007-08-19 Thread David Nusinow 
 Makefile.in |  129 +-
 aclocal.m4  |  676 +++
 configure   | 1131 
 debian/changelog|8 
 debian/control  |2 
 debian/patches/01_gen_pci_ids.diff  |   14 
 debian/patches/series   |1 
 debian/xserver-xorg-video-via.install.alpha |1 
 debian/xserver-xorg-video-via.install.amd64 |1 
 debian/xserver-xorg-video-via.install.arm   |1 
 debian/xserver-xorg-video-via.install.hppa  |1 
 debian/xserver-xorg-video-via.install.hurd-i386 |1 
 debian/xserver-xorg-video-via.install.i386  |1 
 debian/xserver-xorg-video-via.install.ia64  |1 
 debian/xserver-xorg-video-via.install.kfreebsd-i386 |1 
 debian/xserver-xorg-video-via.install.m68k  |1 
 debian/xserver-xorg-video-via.install.mips  |1 
 debian/xserver-xorg-video-via.install.mipsel|1 
 debian/xserver-xorg-video-via.install.powerpc   |1 
 debian/xserver-xorg-video-via.install.sparc |1 
 man/Makefile.in |   96 -
 src/Makefile.in |  191 +--
 src/xvmc/Makefile.in|  128 +-
 23 files changed, 1488 insertions(+), 901 deletions(-)

New commits:
commit 2ba7a0001763fb087ef42b3f3f1d9674eb475f5f
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Aug 19 15:26:29 2007 -0400

Add 01_gen_pci_ids.diff.

This patch adds a list of pci id's that the driver supports so that the
server can automatically load it.

Autoreconf to deal with it

diff --git a/Makefile.in b/Makefile.in
index 77d48e5..8518a56 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 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  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 = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog compile 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@

xserver-xorg-video-via: Changes to 'debian-experimental'

2007-08-19 Thread David Nusinow 
 ChangeLog | 1327 --
 config.guess  |   32 -
 config.sub|   16 
 debian/changelog  |   16 
 debian/control|   12 
 debian/rules  |2 
 debian/xsfbs/xsfbs.mk |9 
 7 files changed, 1036 insertions(+), 378 deletions(-)

New commits:
commit e47a70a6ec0f3644b2674d4fb629ded2d3b6b2b9
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed May 2 16:09:13 2007 +0200

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 2e065b4..65af51d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-via (1:0.2.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-via (1:0.2.2-2) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * Replaces/Conflicts: xserver-xorg-driver-via.
@@ -12,7 +12,7 @@ xserver-xorg-video-via (1:0.2.2-2) UNRELEASED; urgency=low
 module in the long description.
   * Remove Fabio from uploaders with his permission. He's always welcome back.
 
- -- Brice Goglin [EMAIL PROTECTED]  Mon, 30 Apr 2007 12:41:51 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Wed, 02 May 2007 16:06:02 +0200
 
 xserver-xorg-video-via (1:0.2.2-1) experimental; urgency=low
 

commit e2af3e3ba41cde7cbdd8312dab5a525f41bd0dc9
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Mon Apr 30 12:59:55 2007 +0200

Update upstream ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 1c85261..ecce85e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,355 +1,972 @@
-2006-05-23  Thomas Hellstrom  thomas-at-tungstengraphics.com
-
-   * src/via_dri.c: (VIADRIFinishScreenInit):
-   Bugzilla #6668 https://bugs.freedesktop.org/show_bug.cgi?id=6668  
-   Fix critical unlibcwrap breakage. (Morgoth)
-   
-2006-04-07  Adam Jackson  [EMAIL PROTECTED]
-
-   * configure.ac:
-   * src/via_driver.h:
-   Bump to 0.2.1 for Xv changes.
-
-2006-04-07  Aaron Plattner  [EMAIL PROTECTED]
-
-   * src/via_video.c: (viaReputImage), (viaPutImage):
-   * src/via_xvmc.c: (viaXvMCInterceptPutImage):
-   Add a DrawablePtr argument to the XV functions to pave the way for
-   redirected video.
-
-2006-04-07  Adam Jackson  [EMAIL PROTECTED]
-
-   * configure.ac:
-   * src/via.h:
-   * src/via_accel.c:
-   * src/via_dri.c:
-   * src/via_driver.h:
-   * src/via_memcpy.c:
-   * src/via_memory.c:
-   * src/via_mode.c:
-   * src/via_shadow.c:
-   * src/via_swov.c:
-   * src/via_vbe.c:
-   * src/via_vgahw.c:
-   * src/via_video.c:
-   * src/via_xvmc.c:
-   Unlibcwrap.  Bump server version requirement.  Bump to 0.2.0.
-
-2006-03-19  Thomas Hellstrom  thomas-at-tungstengraphics.com
-
-   * src/via_accel.c: (viaAccelPlaneMaskHelper),
-   (viaSetupForSolidLine), (viaSubsequentSolidTwoPointLine),
-   (viaSetupForDashedLine), (viaPixelARGB),
-   (viaExaDownloadFromScreen), (viaExaTexUploadToScreen),
-   (viaExaUploadToScreen), (viaExaCheckComposite),
-   (viaExaPrepareComposite), (viaInitExa), (viaInitAccel),
-   (viaExitAccel), (viaFinishInitAccel):
-   * src/via_driver.h:
-   Fix for XAA solid lines broken by the EXA merge.
-   (Openchrome Chgset 170).
-   Indent.
-   
-2006-03-17  Thomas Hellstrom  thomas-at-tungstengraphics.com
-
-   * src/via_driver.c:
-   Bugzilla #6291 https://bugs.freedesktop.org/show_bug.cgi?id=6291
-   s/XF86_VERSION_CURRENT/XORG_VERSION_CURRENT/
-   (Reported by Eric Anholt)
-   
-2006-03-17  Thomas Hellstrom  thomas-at-tungstengraphics.com
-
-   * src/via_accel.c: (viaInitExa):
-   * src/via_driver.c: (VIAPreInit):
-   Fix via EXA after API update.
-
-2006-03-08  Thomas Hellstrom  thomas-at-tungstengraphics.com
-
-   * src/via_id.c:
-   Update PCI-ids from lists maintained at unichrome.sf.net by 
-   Luc Verhaegen and openchrome.org by Xavier Bachelot.
-   
-2006-03-08  Thomas Hellstrom  thomas-at-tungstengraphics.com
-
-   * src/via_swov.c: 
-   * src/via_swov.h:
-   * src/via_video.c: 
-   * src/via_video.h:
-   * src/via_xvmc.c: 
-   * src/via_xvmc.h:
-   * src/via_xvpriv.h:
-   Indent above files after syncing them with openChrome.
-   
-2006-03-08  Thomas Hellstrom  thomas-at-tungstengraphics.com
-
-   * man/via.man:
-   * src/via.h:
-   * src/via_accel.c: (viaExaDownloadFromScreen),
-   (viaExaUploadToScreen):
-   * src/via_driver.c: (VIAPreInit):
-   * src/via_driver.h:
-   * src/via_id.h:
-   * src/via_priv.h:
-   * src/via_swov.c: (viaWaitVideoCommandFire), (VIAVidHWDiffInit),
-   (viaOverlayGetV1V3Format), (viaOverlayGetSrcStartAddress),
-   (viaOverlayGetFetch), (viaCalculateVideoColor), (viaSetColorSpace),
-   (ViaInitVideoStatusFlag), (ViaSetVidCtl), (CreateSurface),
-   (ViaSwovSurfaceCreate), (ViaSwovSurfaceDestroy), (SetFIFO_V3),
-   (SetFIFO_V3_64or32or32), (SetFIFO_V3_64or32or16),

xserver-xorg-video-via: Changes to 'debian-experimental'

2007-08-19 Thread David Nusinow 
 debian/changelog|2 +-
 src/Makefile.am |6 ++
 src/via_drmclient.h |1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 6983271285ae57bdff7888559a9f5bb106f39ade
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Aug 19 15:36:07 2007 -0400

Bump to revision 3. Update before hacking damn it.

diff --git a/debian/changelog b/debian/changelog
index 6d5b90f..32c6345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-via (1:0.2.2-2) experimental; urgency=low
+xserver-xorg-video-via (1:0.2.2-3) experimental; urgency=low
 
   * Build against xserver 2:1.3.99.0 and build-dep on that version
   * Add 01_gen_pci_ids.diff. This patch adds a list of pci id's that the
diff --git a/src/Makefile.am b/src/Makefile.am
index c403cd4..a980b96 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,3 +79,9 @@ EXTRA_DIST = \
  via_xvmc.c \
  via_xvmc.h 
 endif
+
+pcidatadir = $(datadir)/xserver-xorg/pci
+pcidata_DATA = via.ids
+
+via.ids : via_id.h
+   awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/via_id.h | sed -e 
's/0x/1106/'  via.ids
diff --git a/src/via_drmclient.h b/src/via_drmclient.h
index 2b7dbfb..c34458c 100644
--- a/src/via_drmclient.h
+++ b/src/via_drmclient.h
@@ -26,6 +26,7 @@
 
 #include drm.h
 #include xf86drm.h
+#include stdint.h
 
 #if HAVE_INTTYPES_H
 #  include inttypes.h


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-via: Changes to 'debian-experimental'

2007-08-19 Thread David Nusinow 
 debian/control |1 -
 1 file changed, 1 deletion(-)

New commits:
commit dbd647ec2a9df8ac95f6ee390d1f7f7d602a2c0d
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Aug 19 15:37:49 2007 -0400

Fix merge goof

diff --git a/debian/control b/debian/control
index 56c83b6..7c08084 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED]
 Build-Depends: debhelper (= 5.0.0), pkg-config, xserver-xorg-dev (= 
2:1.3.99.0), libxvmc-dev, x11proto-xf86dri-dev, x11proto-gl-dev, 
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, 
libdrm-dev ( 2.0) [!hurd-i386], libgl1-mesa-dev | libgl1-dev, quilt
-Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED]
 Standards-Version: 3.7.2.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-via
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-via.git


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-via: Changes to 'debian-experimental'

2007-02-21 Thread David Nusinow 
 debian/control|2 +-
 debian/xsfbs/xsfbs.mk |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b509e814a21eb7402a640eed9f740727bf332c97
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Feb 21 22:09:04 2007 -0500

Generate Provides line automatically

diff --git a/debian/control b/debian/control
index 51b75cd..e7afd59 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2.2
 Package: xserver-xorg-video-via
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
-Provides: xserver-xorg-video-1.1
+Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- VIA display driver
  This driver for the X.Org X server (see xserver-xorg for a further 
description)

commit dacefd5a6bb9f786c78f35358273e3214c7492e9
Author: David Nusinow [EMAIL PROTECTED]
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 @@ # Generate the shlibs.local file.
 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


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-via: Changes to 'debian-experimental'

2007-02-20 Thread David Nusinow 
 debian/changelog  |4 ++--
 debian/control|2 +-
 debian/rules  |2 +-
 debian/xsfbs/xsfbs.mk |   15 +++
 4 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 4474b781e2a8a34b53f6da3b1a171777d87e08d1
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Feb 20 22:29:01 2007 -0500

Generate server dependencies automatically from the ABI

diff --git a/debian/changelog b/debian/changelog
index 07b3535..844a375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 xserver-xorg-video-via (1:0.2.2-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * Bump xserver ABI metadata to 1.1 for use with server 1.2
   * Pull fix from upstream for XvMC building
+  * Generate server dependencies automatically from the ABI
 
- -- David Nusinow [EMAIL PROTECTED]  Wed, 14 Feb 2007 22:53:20 -0500
+ -- David Nusinow [EMAIL PROTECTED]  Tue, 20 Feb 2007 22:27:26 -0500
 
 xserver-xorg-video-via (1:0.2.1-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a53414a..51b75cd 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2.2
 
 Package: xserver-xorg-video-via
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (= 2:1.2.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
 Provides: xserver-xorg-video-1.1
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- VIA display driver
diff --git a/debian/rules b/debian/rules
index f986e0f..ba04d0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,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 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau [EMAIL PROTECTED]
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 @@ # Generate the shlibs.local file.
 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:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-via: Changes to 'debian-experimental'

2007-02-11 Thread David Nusinow 
New branch 'debian-experimental' available with the following commits:
commit 43ac5a59178e11b87763f149238980ff0a2b9031
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sat Feb 10 21:25:17 2007 -0500

Prepare drivers for use with xserver 1.2, which has a new ABI (version 1.1)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]