xserver-xorg-video-rendition: Changes to 'upstream-unstable'

[Timo Aaltonen]

 COPYING |   27 -
 configure.ac|2 -
 src/rendition.c |   85 +---
 src/rendition.h |2 +
 4 files changed, 24 insertions(+), 92 deletions(-)

New commits:
commit 2d62a81b452641999207c0576a08d82aee41cf06
Author: Dave Airlie 
Date:   Mon Sep 7 14:42:11 2009 +1000

rendition 4.2.3

diff --git a/configure.ac b/configure.ac
index 84e5c7b..e209b16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-rendition],
-4.2.2,
+4.2.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-rendition)
 

commit 47b68f542c836a76f4adb0d7951b7f0b6aaeabd1
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:41 2009 +1000

rendition: change to using ABI version check

diff --git a/src/rendition.h b/src/rendition.h
index 84809fa..ba0a22e 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -37,7 +37,7 @@
 /* All drivers using the mi colormap manipulation need this */
 #include "micmap.h"
 
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 /* Needed by Resources Access Control (RAC) */
 #include "xf86RAC.h"
 

commit d9e34c59faf63162f18dc87f599e36de024f557c
Author: Dave Airlie 
Date:   Tue Jul 28 13:32:35 2009 +1000

rendition: update for resources/RAC API removal

diff --git a/src/rendition.c b/src/rendition.c
index db62f8e..7a9e18b 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -538,7 +538,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
 pRendition->PciInfo = xf86GetPciInfoForEntity(pRendition->pEnt->index);
 pRendition->pcitag= pciTag(pRendition->PciInfo->bus,
pRendition->PciInfo->device, pRendition->PciInfo->func);
-#endif
 
 /*
  * XXX This could be refined if some VGA memory resources are not
@@ -549,11 +548,12 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
 if (xf86RegisterResources(pRendition->pEnt->index, NULL, ResExclusive))
  return FALSE;
 
+
 /* Operations for which memory access is required. */
 pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR;
 /* Operations for which I/O access is required. (XXX Check this) */
 pScreenInfo->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | 
RAC_VIEWPORT;
-
+#endif
 /* determine depth, bpp, etc. */
 if (!xf86SetDepthBpp(pScreenInfo, 0, 0, 0, Support32bppFb))
 return FALSE;
diff --git a/src/rendition.h b/src/rendition.h
index 2b43cba..84809fa 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -37,11 +37,13 @@
 /* All drivers using the mi colormap manipulation need this */
 #include "micmap.h"
 
+#ifndef XSERVER_LIBPCIACCESS
 /* Needed by Resources Access Control (RAC) */
 #include "xf86RAC.h"
 
 /* Several predefined resource lists */
 #include "xf86Resources.h"
+#endif
 
 /* Needed by the Shadow Framebuffer */
 #include "shadowfb.h"

commit 2013e650484bd66c238a497f241c23d82361e49e
Author: Adam Jackson 
Date:   Thu Jul 2 11:28:29 2009 -0400

rendition 4.2.2

diff --git a/configure.ac b/configure.ac
index d69aef2..84e5c7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-rendition],
-4.2.1,
+4.2.2,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-rendition)
 

commit c22f51f750dc495b9c58f8390c6a0d9fff756829
Author: Adam Jackson 
Date:   Thu May 28 15:13:38 2009 -0400

Remove useless loader symbol lists.

diff --git a/src/rendition.c b/src/rendition.c
index 594c7b8..db62f8e 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -200,72 +200,6 @@ _X_EXPORT DriverRec RENDITION={
 #endif
 };
 
-static const char *vgahwSymbols[]={
-"vgaHWBlankScreen",
-"vgaHWDPMSSet",
-"vgaHWFreeHWRec",
-"vgaHWGetHWRec",
-"vgaHWGetIOBase",
-"vgaHWGetIndex",
-"vgaHWLock",
-"vgaHWMapMem",
-"vgaHWProtect",
-"vgaHWRestore",
-"vgaHWSave",
-"vgaHWSaveScreen",
-"vgaHWUnlock",
-"vgaHWHandleColormaps",
-NULL
-};
-
-static const char *ramdacSymbols[] = {
-"xf86CreateCursorInfoRec",
-"xf86DestroyCursorInfoRec",
-"xf86InitCursor",
-NULL
-};
-
-#if defined(XFree86LOADER) || USE_ACCEL
-static const char *xaaSymbols[] = {
-"XAACreateInfoRec",
-"XAADestroyInfoRec",
-"XAAInit",
-NULL
-};
-#endif
-
-static const char *ddcSymbols[] = {
-"xf86DoEDID_DDC1",
-"xf86PrintEDID",
-NULL
-};
-
-static const char *int10Symbols[] = {
-"xf86FreeInt10",
-"xf86InitInt10",
-NULL
-};
-
-static const char *fbSymbols[]={
-"fbScreenInit",
-"fbPictureInit",
-NULL
-};
-
-static const char *shadowfbSymbols[] = {
-"ShadowFBInit",
-NULL
-};
-
-static const char *vbeSymbols[] = {
-"VBEInit",
-"vbeDoEDID",
-"vbeFree",
-NULL
-};
-
-
-
 #ifdef XFree86LOADER
 
 /* Module loader interface */
@@ -297,9 +231,6 @@ renditionSetup(pointer Module, pointer Options, int 
*ErrorMaj

xserver-xorg-video-rendition: Changes to 'debian-unstable'

[Timo Aaltonen]

 COPYING   |   27 +++--
 ChangeLog |   36 +++
 configure.ac  |2 
 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 src/rendition.c   |   85 -
 src/rendition.h   |2 
 10 files changed, 144 insertions(+), 356 deletions(-)

New commits:
commit 7d4b054c4a823df78a66ae86c8585661c73138b1
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:03:10 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 9469add..95786bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-rendition (1:4.2.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 09:54:00 +0200
 
diff --git a/debian/control b/debian/control
index abce664..fa23be2 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  libtool,
  xutils-dev,
  dpkg-dev (>= 1.14.17)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-rendition
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-rendition.git
 

commit 020e55aa9d29dd0745136bc03b488405f795a5fb
Author: Timo Aaltonen 
Date:   Tue Dec 1 09:54:24 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index b88d8ab..2c112c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+commit 2d62a81b452641999207c0576a08d82aee41cf06
+Author: Dave Airlie 
+Date:   Mon Sep 7 14:42:11 2009 +1000
+
+rendition 4.2.3
+
+commit 47b68f542c836a76f4adb0d7951b7f0b6aaeabd1
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:41 2009 +1000
+
+rendition: change to using ABI version check
+
+commit d9e34c59faf63162f18dc87f599e36de024f557c
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:35 2009 +1000
+
+rendition: update for resources/RAC API removal
+
+commit 2013e650484bd66c238a497f241c23d82361e49e
+Author: Adam Jackson 
+Date:   Thu Jul 2 11:28:29 2009 -0400
+
+rendition 4.2.2
+
+commit c22f51f750dc495b9c58f8390c6a0d9fff756829
+Author: Adam Jackson 
+Date:   Thu May 28 15:13:38 2009 -0400
+
+Remove useless loader symbol lists.
+
+commit 560e4fd2d289615297b7529bcbd61799db5b277b
+Author: Alan Coopersmith 
+Date:   Mon May 11 22:24:37 2009 -0700
+
+Fill in COPYING file
+
 commit 7ad4b3479433de0cbfca7ba756b07df09678b22a
 Author: Adam Jackson 
 Date:   Tue Feb 24 10:17:19 2009 -0500
diff --git a/debian/changelog b/debian/changelog
index da02c20..9469add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-rendition (1:4.2.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 09:54:00 +0200
+
 xserver-xorg-video-rendition (1:4.2.1-1) unstable; urgency=low
 
   * Use xsfbs/repack.sh to prune upstream tarball.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; 

xserver-xorg-video-s3: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   43 +
 configure.ac  |2 
 debian/changelog  |9 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 src/s3_bios.c |   33 ---
 src/s3_driver.c   |   19 ++--
 src/s3_shadow.c   |1 
 9 files changed, 89 insertions(+), 274 deletions(-)

New commits:
commit 114761ef59c5eebe6a9707b88d7f6f83051cb44b
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:06:03 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 5c0d6a8..5735ee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-s3 (1:0.6.3-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:04:06 +0200
 
diff --git a/debian/control b/debian/control
index 66dc692..5b9b4ea 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-s3
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-s3.git
 

commit 72206bffbc3554c7fdb1c8e3907eb24f01c1980e
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:05:30 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 6bd18cd..72a1a89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+commit d096fd94d8064a08895d34f978830240bfdc9616
+Author: Dave Airlie 
+Date:   Thu Jul 30 12:04:29 2009 +1000
+
+s3: bump for release 0.6.3
+
+commit 3e974443b5b2906d1b82b7c27c83062715f925e9
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:41 2009 +1000
+
+s3: change to using ABI version check
+
+commit f047dffb193ffc52a358bfb0a3ae595acf4726b2
+Author: Dave Airlie 
+Date:   Tue Jul 28 10:49:36 2009 +1000
+
+s3: fixup resources under pci access
+
+commit b8d3e448a8debbc2c77dee8e590a564a010ede59
+Author: Dave Airlie 
+Date:   Tue Jul 28 10:48:48 2009 +1000
+
+s3: remove unneeded include
+
+commit c5c69f9de5d11fd2cadc4ccf00bcf2e8cf65f2eb
+Author: Dave Airlie 
+Date:   Tue Jul 28 10:03:14 2009 +1000
+
+s3: switch to using config pci entity instead of active
+
+commit c41a1188ce53b8975e6d5c34c54a77a3f3c291bc
+Author: Adam Hoka 
+Date:   Sun Jul 5 22:01:46 2009 +0200
+
+Handle libpciaccess errors more gently and report any problems
+encountered in Xorg.log (server crash versus log entry).
+
+This fixes PR 22510.  Report and fix by Adam Hoka ,
+many thanks.
+
+Reviewed-by: Matthieu Herrb 
+Signed-off-by: Marc Balmer 
+
 commit aa955eda7b6fddd12b163ee66367ecc998f82ae0
 Author: Adam Jackson 
 Date:   Thu Jul 2 11:33:54 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index ae131b2..5c0d6a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-s3 (1:0.6.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-s3 (1:0.6.3-1) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
 choose a driver during autoconfiguration.
 + Disable patch system and remove quilt from build-deps.
 
- -- Brice Goglin   Wed, 29 Jul 2009 01:53:17 +0200
+  [ Timo Aaltonen ]
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:04:06 +0200
 
 xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low
 

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82e

xserver-xorg-video-s3: Changes to 'upstream-unstable'

[Timo Aaltonen]

 configure.ac|2 +-
 src/s3_bios.c   |   33 ++---
 src/s3_driver.c |   19 ---
 src/s3_shadow.c |1 -
 4 files changed, 35 insertions(+), 20 deletions(-)

New commits:
commit d096fd94d8064a08895d34f978830240bfdc9616
Author: Dave Airlie 
Date:   Thu Jul 30 12:04:29 2009 +1000

s3: bump for release 0.6.3

diff --git a/configure.ac b/configure.ac
index c2cc3df..0eecc87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-s3],
-0.6.2,
+0.6.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-s3)
 

commit 3e974443b5b2906d1b82b7c27c83062715f925e9
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:41 2009 +1000

s3: change to using ABI version check

diff --git a/src/s3_driver.c b/src/s3_driver.c
index a1adb6b..29e343d 100644
--- a/src/s3_driver.c
+++ b/src/s3_driver.c
@@ -45,7 +45,7 @@
 #include "xf86PciInfo.h"
 #include "xf86fbman.h"
 #include "xf86cmap.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 #include "xf86RAC.h"
 #endif

commit f047dffb193ffc52a358bfb0a3ae595acf4726b2
Author: Dave Airlie 
Date:   Tue Jul 28 10:49:36 2009 +1000

s3: fixup resources under pci access

diff --git a/src/s3_driver.c b/src/s3_driver.c
index a751cee..a1adb6b 100644
--- a/src/s3_driver.c
+++ b/src/s3_driver.c
@@ -43,10 +43,12 @@
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
-#include "xf86Resources.h"
 #include "xf86fbman.h"
 #include "xf86cmap.h"
+#ifndef XSERVER_LIBPCIACCESS
+#include "xf86Resources.h"
 #include "xf86RAC.h"
+#endif
 #include "compiler.h"
 #include "xaa.h"
 #include "mipointer.h"
@@ -421,11 +423,13 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
 }
 
 pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
 if (pEnt->resources) {
 xfree(pEnt);
 S3FreeRec(pScrn);
 return FALSE;
 }
+#endif
 
if (xf86LoadSubModule(pScrn, "int10")) {
pS3->pInt10 = xf86InitInt10(pEnt->index);
@@ -446,10 +450,10 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
 
 pS3->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
-xf86RegisterResources(pEnt->index, NULL, ResNone);
+#ifndef XSERVER_LIBPCIACCESS
/* don't disable PIO funcs */
 xf86SetOperatingState(resVgaMemShared, pEnt->index, ResDisableOpr);
-
+#endif
 if (pEnt->device->chipset && *pEnt->device->chipset) {
 pScrn->chipset = pEnt->device->chipset;
 pS3->Chipset = xf86StringToToken(S3Chipsets, pScrn->chipset);
@@ -935,9 +939,11 @@ static Bool S3ScreenInit(int scrnIndex, ScreenPtr pScreen, 
int argc,
 
xf86DPMSInit(pScreen, S3DisplayPowerManagementSet, 0);
 
+#ifndef XSERVER_LIBPCIACCESS
/* XXX Check if I/O and Mem flags need to be the same. */
pScrn->racIoFlags = pScrn->racMemFlags = RAC_COLORMAP
| RAC_FB | RAC_VIEWPORT | RAC_CURSOR;
+#endif
 
if (pS3->SlowEDODRAM)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, 

commit b8d3e448a8debbc2c77dee8e590a564a010ede59
Author: Dave Airlie 
Date:   Tue Jul 28 10:48:48 2009 +1000

s3: remove unneeded include

diff --git a/src/s3_shadow.c b/src/s3_shadow.c
index 1273765..f4fbbb3 100644
--- a/src/s3_shadow.c
+++ b/src/s3_shadow.c
@@ -34,7 +34,6 @@ in this Software without prior written authorization from the 
XFree86 Project.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "shadowfb.h"

commit c5c69f9de5d11fd2cadc4ccf00bcf2e8cf65f2eb
Author: Dave Airlie 
Date:   Tue Jul 28 10:03:14 2009 +1000

s3: switch to using config pci entity instead of active

diff --git a/src/s3_driver.c b/src/s3_driver.c
index d5b01bf..a751cee 100644
--- a/src/s3_driver.c
+++ b/src/s3_driver.c
@@ -277,7 +277,9 @@ static Bool S3Probe(DriverPtr drv, int flags)
if (flags & PROBE_DETECT)
foundScreen = TRUE;
else for (i=0; idriverVersion = VERSION_MAJOR;
pScrn->driverName = DRIVER_NAME;
@@ -292,9 +294,6 @@ static Bool S3Probe(DriverPtr drv, int flags)
pScrn->FreeScreen = S3FreeScreen;
 
foundScreen = TRUE;
-
-xf86ConfigActivePciEntity(pScrn, usedChips[i], S3PciChipsets,
-  NULL, NULL, NULL, NULL, NULL);
 }
 
 xfree(usedChips);

commit c41a1188ce53b8975e6d5c34c54a77a3f3c291bc
Author: Adam Hoka 
Date:   Sun Jul 5 22:01:46 2009 +0200

Handle libpciaccess errors more gently and report any problems
encountered in Xorg.log (server crash versus log entry).

This fixes PR 22510.  Report and fix by Adam Hoka ,
many thanks.

Reviewed-by: Matthieu Herrb 
 

xserver-xorg-video-s3virge: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   47 +
 configure.ac  |6 +
 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 src/s3v_driver.c  |  134 ++-
 src/s3v_shadow.c  |1 
 9 files changed, 149 insertions(+), 387 deletions(-)

New commits:
commit 92d37dd2164d8c3b7ea558e8f989aabddfe2d023
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:09:14 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 477e152..43824ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-s3virge (1:1.10.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:07:10 +0200
 
diff --git a/debian/control b/debian/control
index dbcd6f6..389f49d 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-s3virge
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-s3virge.git
 

commit cbdbd71dc4f48e21391ce88577e65e515aeb838e
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:08:35 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index ce20b56..1b95335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+commit 8abfc25662caf07911fd6e31d40b7db8b7c0cac1
+Author: Dave Airlie 
+Date:   Thu Jul 30 12:04:28 2009 +1000
+
+s3virge: bump for release 1.10.4
+
+commit 7db324f9d862cb9e11db480a1e6143aa01a81e3e
+Author: Dave Airlie 
+Date:   Thu Jul 30 11:09:01 2009 +1000
+
+s3v: add include to ABI version
+
+commit 20d8f38d667b565c56d8e161548fe7a70b8892f7
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:41 2009 +1000
+
+s3virge: change to using ABI version check
+
+commit 664d41155a5f60fa8ccf9c00d819d71d7fe0a238
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:36 2009 +1000
+
+s3virge: update for resources/RAC API removal
+
+commit c688ce43f935af22c23d58c692ffa501b88d9070
+Author: Peter Hutterer 
+Date:   Thu Jul 16 11:54:36 2009 +1000
+
+Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). 
Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer 
+
+commit 15a028c2a3a57198f5b64a8ca56ba075cc834768
+Author: Adam Jackson 
+Date:   Thu Jul 2 11:36:57 2009 -0400
+
+s3virge 1.10.3
+
+commit 4f3456b10b67f40a793609c7d25ec355d95fa83e
+Author: Adam Jackson 
+Date:   Thu May 28 15:15:15 2009 -0400
+
+Remove useless loader symbol lists.
+
 commit 7f563782c34e247c70b2a0271ce3d8c221510f3c
 Author: Alan Coopersmith 
 Date:   Fri Jan 30 20:59:35 2009 -0800
diff --git a/debian/changelog b/debian/changelog
index 9402eec..477e152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-s3virge (1:1.10.4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:07:10 +0200
+
 xserver-xorg-video-s3virge (1:1.10.2-2) unstable; urgency=low
 
   * Upload to unstable.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-  

xserver-xorg-video-s3virge: Changes to 'upstream-unstable'

[Timo Aaltonen]

 configure.ac |6 ++
 src/s3v_driver.c |  134 +--
 src/s3v_shadow.c |1 
 3 files changed, 18 insertions(+), 123 deletions(-)

New commits:
commit 8abfc25662caf07911fd6e31d40b7db8b7c0cac1
Author: Dave Airlie 
Date:   Thu Jul 30 12:04:28 2009 +1000

s3virge: bump for release 1.10.4

diff --git a/configure.ac b/configure.ac
index 03fa1a2..317b5bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-s3virge],
-1.10.3,
+1.10.4,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-s3virge)
 

commit 7db324f9d862cb9e11db480a1e6143aa01a81e3e
Author: Dave Airlie 
Date:   Thu Jul 30 11:09:01 2009 +1000

s3v: add include to ABI version

diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 7fc66e0..0928a7f 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -30,6 +30,7 @@ in this Software without prior written authorization from the 
XFree86 Project.
 
 #include 
 
+#include "xf86.h"
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 /* Needed by Resources Access Control (RAC) */

commit 20d8f38d667b565c56d8e161548fe7a70b8892f7
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:41 2009 +1000

s3virge: change to using ABI version check

diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 849f9f2..7fc66e0 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -30,7 +30,7 @@ in this Software without prior written authorization from the 
XFree86 Project.
 
 #include 
 
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 /* Needed by Resources Access Control (RAC) */
 #include "xf86RAC.h"

commit 664d41155a5f60fa8ccf9c00d819d71d7fe0a238
Author: Dave Airlie 
Date:   Tue Jul 28 13:32:36 2009 +1000

s3virge: update for resources/RAC API removal

diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index df5ea9b..849f9f2 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -29,9 +29,12 @@ in this Software without prior written authorization from 
the XFree86 Project.
 #endif
 
 #include 
+
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
 /* Needed by Resources Access Control (RAC) */
 #include "xf86RAC.h"
+#endif
 
 #include "xf86DDC.h"
 #include "vbe.h"
@@ -791,11 +794,13 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
 
 pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
 
+#ifndef XSERVER_LIBPCIACCESS
 if (pEnt->resources) {
xfree(pEnt);
S3VFreeRec(pScrn);
return FALSE;
 }
+#endif
 
 #if USE_INT10
 if (xf86LoadSubModule(pScrn, "int10")) {
@@ -812,9 +817,11 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
 }
 
 ps3v->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
 xf86RegisterResources(pEnt->index,NULL,ResNone);
 xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
 xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
+#endif
 
 /*
  * Set the Chipset and ChipRev, allowing config file entries to
diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c
index f61773a..e2e1269 100644
--- a/src/s3v_shadow.c
+++ b/src/s3v_shadow.c
@@ -60,7 +60,6 @@ in this Software without prior written authorization from the 
XFree86 Project.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "shadowfb.h"

commit c688ce43f935af22c23d58c692ffa501b88d9070
Author: Peter Hutterer 
Date:   Thu Jul 16 11:54:36 2009 +1000

Update to xextproto 7.1 support.

DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index a312ae1..03fa1a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto 
$REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),
+  HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 61e2273..df5ea9b 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -58,8 +58,13 @@ in this Software without prior written authorization from 
the XFree86 Project.

 
 #include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include 
+#else
 #define DPMS_SERVER
 #include 
+#endif
+
 
 #ifndef USE_INT10
 #define USE_INT10 0

commit 15a028c2a3a57198f5b64a8ca56ba075cc834768
Author: Adam Jackson 
Date:   Thu Jul 2 11:36:57 2009 -0400

s3virge 1.10.3

diff --

xserver-xorg-video-savage: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   35 +++
 configure.ac  |6 +
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 src/savage_driver.c   |   16 +++
 src/savage_driver.h   |2 
 src/savage_hwmc.c |1 
 9 files changed, 67 insertions(+), 256 deletions(-)

New commits:
commit de9a3b3e267d045736fd941eed8831d8f4fbca84
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:13:01 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index bbd0ad1..8c8d8f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:12:09 +0200
 
diff --git a/debian/control b/debian/control
index 37edece..8d5e0ab 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git
 

commit c630a872cb929e498f5f831cff15f2b1c8a590c4
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:12:35 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 76d0280..3d9bfcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+commit 36ab23a95fd8d46a1206a941278df8845d5765ba
+Author: Dave Airlie 
+Date:   Thu Jul 30 12:04:29 2009 +1000
+
+savage: bump for release 2.3.1
+
+commit ad0b7ba4618c09c1a9d5a6da6b12f42980b7450c
+Author: Dave Airlie 
+Date:   Tue Jul 28 18:40:18 2009 +1000
+
+savage: move abi check down for RAC
+
+commit 21f6bf3e492d328b8c7003ffb0c9deec0113fb05
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:41 2009 +1000
+
+savage: change to using ABI version check
+
+commit 3c0b164ffe9e1f582cee43f89a94fc0a2899bed8
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:36 2009 +1000
+
+savage: update for resources/RAC API removal
+
+commit 96d19b654e934fc3f85f9b45f1dee224cb40b389
+Author: Peter Hutterer 
+Date:   Thu Jul 16 11:54:48 2009 +1000
+
+Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). 
Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer 
+
 commit 75ce40850ea2ce2ed7122cf62856dcf8022187d2
 Author: Adam Jackson 
 Date:   Thu Jul 2 11:39:22 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 173b4d7..bbd0ad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:12:09 +0200
+
 xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low
 
   * New upstream release.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/

xserver-xorg-video-savage: Changes to 'upstream-unstable'

[Timo Aaltonen]

 configure.ac|6 +-
 src/savage_driver.c |   16 ++--
 src/savage_driver.h |2 ++
 src/savage_hwmc.c   |1 -
 4 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 36ab23a95fd8d46a1206a941278df8845d5765ba
Author: Dave Airlie 
Date:   Thu Jul 30 12:04:29 2009 +1000

savage: bump for release 2.3.1

diff --git a/configure.ac b/configure.ac
index b0af452..b2f22f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-savage],
-2.3.0, 
+2.3.1, 
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-savage)
 

commit ad0b7ba4618c09c1a9d5a6da6b12f42980b7450c
Author: Dave Airlie 
Date:   Tue Jul 28 18:40:18 2009 +1000

savage: move abi check down for RAC

diff --git a/src/savage_driver.c b/src/savage_driver.c
index 1566b47..c909783 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -42,9 +42,6 @@
 #include 
 #include 
 
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
-#include "xf86RAC.h"
-#endif
 #include "shadowfb.h"
 
 #include "globals.h"
@@ -63,6 +60,10 @@
 #include "savage_bci.h"
 #include "savage_streams.h"
 
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+#include "xf86RAC.h"
+#endif
+
 #define TRANSPARENCY_KEY 0xff;
 
 #ifdef XF86DRI

commit 21f6bf3e492d328b8c7003ffb0c9deec0113fb05
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:41 2009 +1000

savage: change to using ABI version check

diff --git a/src/savage_driver.c b/src/savage_driver.c
index e49c8c2..1566b47 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -42,7 +42,7 @@
 #include 
 #include 
 
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86RAC.h"
 #endif
 #include "shadowfb.h"
diff --git a/src/savage_driver.h b/src/savage_driver.h
index 34dfced..9c0ba58 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -51,7 +51,7 @@
 #include "compiler.h"
 #include "vgaHW.h"
 #include "xf86.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 #endif
 #include "xf86Pci.h"

commit 3c0b164ffe9e1f582cee43f89a94fc0a2899bed8
Author: Dave Airlie 
Date:   Tue Jul 28 13:32:36 2009 +1000

savage: update for resources/RAC API removal

diff --git a/src/savage_driver.c b/src/savage_driver.c
index 3ce0d73..e49c8c2 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -42,7 +42,9 @@
 #include 
 #include 
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
+#endif
 #include "shadowfb.h"
 
 #include "globals.h"
@@ -680,7 +682,7 @@ static Bool SavagePciProbe(DriverPtr drv, int entity_num,
 }
 
 pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL,
-   RES_SHARED_VGA, NULL, NULL, NULL, NULL);
+   NULL, NULL, NULL, NULL, NULL);
 if (pScrn != NULL) {
EntityInfoPtr pEnt;
SavagePtr psav;
@@ -1393,20 +1395,24 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
 }
 
 pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
 if (pEnt->resources) {
xfree(pEnt);
SavageFreeRec(pScrn);
return FALSE;
 }
+#endif
 psav->EntityIndex = pEnt->index;
 
 if (xf86LoadSubModule(pScrn, "vbe")) {
psav->pVbe = VBEInit(NULL, pEnt->index);
 }
 
+#ifndef XSERVER_LIBPCIACCESS
 xf86RegisterResources(pEnt->index, NULL, ResNone);
 xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
 xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
+#endif
 
 from = X_DEFAULT;
 if (pEnt->device->chipset && *pEnt->device->chipset) {
diff --git a/src/savage_driver.h b/src/savage_driver.h
index c47b472..34dfced 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -51,7 +51,9 @@
 #include "compiler.h"
 #include "vgaHW.h"
 #include "xf86.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
 #include "xf86_OSproc.h"
diff --git a/src/savage_hwmc.c b/src/savage_hwmc.c
index 43c9dfd..abfe805 100644
--- a/src/savage_hwmc.c
+++ b/src/savage_hwmc.c
@@ -28,7 +28,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"

commit 96d19b654e934fc3f85f9b45f1dee224cb40b389
Author: Peter Hutterer 
Date:   Thu Jul 16 11:54:48 2009 +1000

Update to xextproto 7.1 support.

DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 33be4d8..b0af452 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.1.0 xproto fontsproto 
$REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto 

xserver-xorg-video-siliconmotion: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   35 +++
 configure.ac  |6 +
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 src/smi_501.c |5 +
 src/smi_driver.c  |   20 +++-
 8 files changed, 70 insertions(+), 259 deletions(-)

New commits:
commit eed36a78fad642f798c30f9095144ba586231719
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:15:39 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 55b9700..0e8d8c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-siliconmotion (1:1.7.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:14:42 +0200
 
diff --git a/debian/control b/debian/control
index c13eca3..e710954 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: 
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-siliconmotion
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-siliconmotion.git
 

commit 614f398e8dba9d00086a122838100ea5f7e20a3c
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:15:17 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index d6633da..4751671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+commit 52f40e7569bbcc9bce8f5d885b0de2868398e8df
+Author: Dave Airlie 
+Date:   Wed Aug 5 11:09:26 2009 +1000
+
+fix build after headers moved
+
+commit 9d9bfe0349693b283e5dc1ced6fa882f10619253
+Author: Dave Airlie 
+Date:   Wed Aug 5 11:08:15 2009 +1000
+
+update for 1.7.3
+
+commit 115b564f78b038baef2d14c037785850efb4e9ca
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:41 2009 +1000
+
+siliconmotion: change to using ABI version check
+
+commit 70f2463faa6d21517d97aa460871e1b5f3fa6505
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:36 2009 +1000
+
+siliconmotion: update for resources/RAC API removal
+
+commit 841df790b5b6700e9a1d6d41ee04b0b913329084
+Author: Peter Hutterer 
+Date:   Thu Jul 16 11:55:05 2009 +1000
+
+Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). 
Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer 
+
 commit d754e9a2954e56a26a94e58d87a450a825c250e6
 Author: Adam Jackson 
 Date:   Thu Jul 2 11:43:52 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 600fe5e..55b9700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-siliconmotion (1:1.7.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:14:42 +0200
+
 xserver-xorg-video-siliconmotion (1:1.7.2-1) unstable; urgency=low
 
   * New upstream release.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$

xserver-xorg-video-siliconmotion: Changes to 'upstream-unstable'

[Timo Aaltonen]

 configure.ac |6 +-
 src/smi_501.c|5 +
 src/smi_driver.c |   20 ++--
 3 files changed, 24 insertions(+), 7 deletions(-)

New commits:
commit 52f40e7569bbcc9bce8f5d885b0de2868398e8df
Author: Dave Airlie 
Date:   Wed Aug 5 11:09:26 2009 +1000

fix build after headers moved

diff --git a/src/smi_driver.c b/src/smi_driver.c
index 39448c4..391efbc 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -31,7 +31,7 @@ authorization from The XFree86 Project or Silicon Motion.
 #include "config.h"
 #endif
 
-
+#include "xf86.h"
 #include "xf86DDC.h"
 #include "xf86int10.h"
 #include "vbe.h"

commit 9d9bfe0349693b283e5dc1ced6fa882f10619253
Author: Dave Airlie 
Date:   Wed Aug 5 11:08:15 2009 +1000

update for 1.7.3

diff --git a/configure.ac b/configure.ac
index e38433e..e461861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-siliconmotion],
-1.7.2,
+1.7.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-siliconmotion)
 

commit 115b564f78b038baef2d14c037785850efb4e9ca
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:41 2009 +1000

siliconmotion: change to using ABI version check

diff --git a/src/smi_driver.c b/src/smi_driver.c
index 9c07f61..39448c4 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -36,7 +36,7 @@ authorization from The XFree86 Project or Silicon Motion.
 #include "xf86int10.h"
 #include "vbe.h"
 
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 #include "xf86RAC.h"
 #endif

commit 70f2463faa6d21517d97aa460871e1b5f3fa6505
Author: Dave Airlie 
Date:   Tue Jul 28 13:32:36 2009 +1000

siliconmotion: update for resources/RAC API removal

diff --git a/src/smi_driver.c b/src/smi_driver.c
index b9b7b18..9c07f61 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -31,12 +31,16 @@ authorization from The XFree86 Project or Silicon Motion.
 #include "config.h"
 #endif
 
-#include "xf86Resources.h"
-#include "xf86RAC.h"
+
 #include "xf86DDC.h"
 #include "xf86int10.h"
 #include "vbe.h"
 
+#ifndef XSERVER_LIBPCIACCESS
+#include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
+
 #include "smi.h"
 #include "smi_501.h"
 #include "smilynx.h"
@@ -416,7 +420,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
LEAVE(TRUE);
 }
 
-if (pEnt->location.type != BUS_PCI || pEnt->resources) {
+if (pEnt->location.type != BUS_PCI) {
xfree(pEnt);
SMI_FreeRec(pScrn);
LEAVE(FALSE);
@@ -626,10 +630,9 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
}
 }
 
+#ifndef XSERVER_LIBPCIACCESS
 xf86RegisterResources(pEnt->index, NULL, ResExclusive);
-/*  xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); */
-/*  xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); */
-
+#endif
 /*
  * Set the Chipset and ChipRev, allowing config file entries to
  * override.

commit 841df790b5b6700e9a1d6d41ee04b0b913329084
Author: Peter Hutterer 
Date:   Thu Jul 16 11:55:05 2009 +1000

Update to xextproto 7.1 support.

DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index ec0e99e..e38433e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto 
$REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),
+  HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/smi_501.c b/src/smi_501.c
index a392eb0..a605e0d 100644
--- a/src/smi_501.c
+++ b/src/smi_501.c
@@ -35,8 +35,13 @@ authorization from The XFree86 Project or Silicon Motion.
 #include "smi_501.h"
 #include "regsmi.h"
 
+#ifdef HAVE_XEXTPROTO_71
+#include 
+#else
 #define DPMS_SERVER
 #include 
+#endif
+
 
 /* Want to see register dumps for now */
 #undef VERBLEV
diff --git a/src/smi_driver.c b/src/smi_driver.c
index b47f774..b9b7b18 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -43,8 +43,13 @@ authorization from The XFree86 Project or Silicon Motion.
 #include "smi_crtc.h"
 
 #include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include 
+#else
 #define DPMS_SERVER
 #include 
+#endif
+
 
 /*
  * Internals


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-sis: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   91 ++
 configure.ac  |6 +
 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 man/sis.man   |2 
 src/sis.h |4 
 src/sis_driver.c  |  167 ++
 src/sis_video.c   |4 
 11 files changed, 200 insertions(+), 422 deletions(-)

New commits:
commit 81565b1c807536c03fc7d4c0f1c921697f3dc480
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:18:05 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 0af7fc3..ecb0137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-sis (1:0.10.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:17:02 +0200
 
diff --git a/debian/control b/debian/control
index ff10056..08b3f69 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sis
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sis.git
 

commit fdb23a552ac15961cb6ef86905de7608805268fe
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:17:26 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 6919600..e401c91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,94 @@
+commit 9e50319293b10508bba4e3acef4a2851e7ab1f7a
+Author: Dave Airlie 
+Date:   Thu Jul 30 12:04:29 2009 +1000
+
+sis: bump for release 0.10.2
+
+commit 8c3eca873717e877048c2bde345c02b1e9099e50
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:41 2009 +1000
+
+sis: change to using ABI version check
+
+commit 9e1ebb9530bbb71be7fcab9e6f8f9a475be72efe
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:37 2009 +1000
+
+sis: update for resources/RAC API removal
+
+commit 59ea80738d22c69a2850fd7ff89bd75330cc310b
+Author: Peter Hutterer 
+Date:   Thu Jul 16 11:55:25 2009 +1000
+
+Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). 
Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer 
+
+commit 74553b5ee476a0dd28e136f5a33a546ea0c3ef28
+Author: Adam Jackson 
+Date:   Thu May 28 15:19:25 2009 -0400
+
+Remove useless loader symbol lists.
+
+commit 933dd8f860883c613acb5bcdf6b66100dbdfa952
+Author: Alan Coopersmith 
+Date:   Fri May 1 16:57:22 2009 -0700
+
+Correct bounds check of blitClip array access
+
+Array is defined as blitClip[NUM_BLIT_PORTS], so invalid indexes
+are >= NUM_BLIT_PORTS, not just > NUM_BLIT_PORTS
+
+[This bug was found by the Parfait bug checking tool.
+ For more information see http://research.sun.com/projects/parfait ]
+
+Signed-off-by: Alan Coopersmith 
+
+commit 49c641b638ac36d2a559555c04a3bd2777c8d071
+Author: Alan Coopersmith 
+Date:   Fri May 1 16:52:10 2009 -0700
+
+Make sisRegs3D4 big enough to hold all values written to it
+
+Increase size from 0xff to 0x100 since SiS315Save (sis_dac.c line 752)
+writes values into sisRegs3D4[0x00..0xff] if ChipType >= XGI_20
+
+[This bug was found by the Parfait bug checking tool.
+ For more information see http://research.sun.com/projects/parfait ]
+
+Signed-off-by: Alan Coopersmith 
+
+commit 5583c2342d873c0998ae73828246356867285460
+Author: Chris Ball 
+Date:   Fri Feb 27 10:57:35 2009 -0500
+
+Revert "Build fixes for EXA3"
+
+This reverts commit 7adc184e5e0f3df00423ea99b325d24764c1c067.
+The EXA developers have backed out this ABI bump.
+
+Signed-off-by: Chris Ball 
+
+commit 7adc184e5e0f3df00423ea99b325d24764c1c067
+Author: Chris Ball 
+Date:   Tue Feb 24 12:32:01 2009 -0500
+
+Build fixes for EXA3
+
+* EXA in xserver head now requires -DEXA_DRIVER_KNOWN_MAJOR=3
+* EXA3 drops the UploadToScratch hook, so guard it for < 3 only.
+
+Signed-off-by: Chris Ball 
+
+commit e4f6a2fcd5712d0f994d3719b9c6c13f5b02bc7c
+Author: Alan Coopersmith 
+Date:   Fri Jan 9 16:34:01 2009 -0800
+
+Remove xorgconfig & xorgcfg from See Also list in man page
+
 commit 6ab99d8d66ccd77314760edcb6110db924be3dcf
 Author: Dave Airlie 
 Date:   Mon Dec 22 14:38:17 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index b7ca88f..0af7fc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sis (1:0.10.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:17:02 +0200
+
 xserver-xorg-video-sis (1:0.10.1-2) unstable; urgency=low
 
   * Drop build-dep on x11proto-xf86misc-dev, not needed anymore.

commit 2a1b4553fc2

xserver-xorg-video-sis: Changes to 'upstream-unstable'

[Timo Aaltonen]

 configure.ac |6 +
 man/sis.man  |2 
 src/sis.h|4 -
 src/sis_driver.c |  167 ---
 src/sis_video.c  |4 -
 5 files changed, 25 insertions(+), 158 deletions(-)

New commits:
commit 9e50319293b10508bba4e3acef4a2851e7ab1f7a
Author: Dave Airlie 
Date:   Thu Jul 30 12:04:29 2009 +1000

sis: bump for release 0.10.2

diff --git a/configure.ac b/configure.ac
index f19c1b7..079faa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-sis],
-0.10.1,
+0.10.2,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-sis)
 

commit 8c3eca873717e877048c2bde345c02b1e9099e50
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:41 2009 +1000

sis: change to using ABI version check

diff --git a/src/sis.h b/src/sis.h
index e859c78..400b83f 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -77,7 +77,7 @@
 #include "xf86Pci.h"
 #include "xf86Priv.h"
 #include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 #endif
 #include "xf86.h"
diff --git a/src/sis_driver.c b/src/sis_driver.c
index bb11cbb..994b02d 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -49,7 +49,7 @@
 
 #include "sis.h"
 
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86RAC.h"
 #endif
 #include "dixstruct.h"

commit 9e1ebb9530bbb71be7fcab9e6f8f9a475be72efe
Author: Dave Airlie 
Date:   Tue Jul 28 13:32:37 2009 +1000

sis: update for resources/RAC API removal

diff --git a/src/sis.h b/src/sis.h
index 773f709..e859c78 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -77,7 +77,9 @@
 #include "xf86Pci.h"
 #include "xf86Priv.h"
 #include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
 #include "xf86.h"
 #include "xf86PciInfo.h"
 #include "xf86Cursor.h"
diff --git a/src/sis_driver.c b/src/sis_driver.c
index a1ced97..bb11cbb 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -49,7 +49,9 @@
 
 #include "sis.h"
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
+#endif
 #include "dixstruct.h"
 #include "shadowfb.h"
 #include "fb.h"
@@ -3552,6 +3554,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 SiS_MapVGAMem(pScrn);
 #endif
 
+#ifndef XSERVER_LIBPCIACCESS
 /* Set operating state */
 
 /* 1. memory */
@@ -3581,6 +3584,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 /* Operations for which I/O access is required */
 pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
 
+#endif
+
 /* Load ramdac module */
 if(!xf86LoadSubModule(pScrn, "ramdac")) {
SISErrorLog(pScrn, "Could not load ramdac module\n");
@@ -4424,6 +4429,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX (size %ldK)\n",
   (ULong)pSiS->IOAddress, pSiS->mmioSize);
 
+#ifndef XSERVER_LIBPCIACCESS
 /* Register the PCI-assigned resources */
 if(xf86RegisterResources(pSiS->pEnt->index, NULL, ResExclusive)) {
SISErrorLog(pScrn, "PCI resource conflicts detected\n");
@@ -4435,6 +4441,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
SISFreeRec(pScrn);
return FALSE;
 }
+#endif
 
 from = X_PROBED;
 if(pSiS->pEnt->device->videoRam != 0) {

commit 59ea80738d22c69a2850fd7ff89bd75330cc310b
Author: Peter Hutterer 
Date:   Thu Jul 16 11:55:25 2009 +1000

Update to xextproto 7.1 support.

DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 089c5fa..f19c1b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto 
xf86dgaproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),
+  HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/sis_driver.c b/src/sis_driver.c
index ef7b522..a1ced97 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -78,8 +78,13 @@
 
 #include "globals.h"
 
+#ifdef HAVE_XEXTPROTO_71
+#include 
+#else
 #define DPMS_SERVER
 #include 
+#endif
+
 
 #ifdef XF86DRI
 #include "dri.h"

commit 74553b5ee476a0dd28e136f5a33a546ea0c3ef28
Author: Adam Jackson 
Date:   Thu May 28 15:19:25 2009 -0400

Remove useless loader symbol lists.

diff --git a/src/sis_driver.c b/src/sis_driver.c
index 5d0f51f..ef7b522 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -191,127 +191,6 @@ static PciChipsets XGIPciChipsets[] = {
 

xserver-xorg-video-sisusb: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   35 +++
 configure.ac  |6 +
 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 src/sisusb.h  |1 
 src/sisusb_driver.c   |   34 +-
 9 files changed, 129 insertions(+), 295 deletions(-)

New commits:
commit 2724de4adade8a74cdadabef50012af0a21df9d4
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:21:35 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index f76d4fd..d7ac57a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-sisusb (1:0.9.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:19:52 +0200
 
diff --git a/debian/control b/debian/control
index 9bec12f..1db5f59 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sisusb
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sisusb.git
 

commit 4edefb00c63a967b5311e97e2efbd302d0f8b0dc
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:21:19 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index ead8562..df042df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+commit a18b2e7643188c5b0a900680792d413ca0e9941e
+Author: Dave Airlie 
+Date:   Thu Jul 30 12:04:29 2009 +1000
+
+sisusb: bump for release 0.9.3
+
+commit cf32d0b9a37137b26f2c89578b53197ba27b22a9
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:37 2009 +1000
+
+sisusb: update for resources/RAC API removal
+
+commit 35789a14c0074bb5994deb890e0f3832f1d4a067
+Author: Peter Hutterer 
+Date:   Thu Jul 16 11:55:36 2009 +1000
+
+Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). 
Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer 
+
+commit 89ca2b91468b13db7dda7984675013a6180feb97
+Author: Adam Jackson 
+Date:   Thu Jul 2 11:46:26 2009 -0400
+
+sisusb 0.9.2
+
+commit d6b8211d924ac41d878be707b79e585334d77347
+Author: Adam Jackson 
+Date:   Thu May 28 15:20:00 2009 -0400
+
+Remove useless loader symbol lists.
+
 commit 153b489ad561134ebdef6c4025f3b7ae5d873065
 Author: Adam Jackson 
 Date:   Tue Feb 24 10:22:50 2009 -0500
diff --git a/debian/changelog b/debian/changelog
index 5915025..f76d4fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sisusb (1:0.9.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:19:52 +0200
+
 xserver-xorg-video-sisusb (1:0.9.1-1) unstable; urgency=low
 
   * New upstream release.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_

xserver-xorg-video-sisusb: Changes to 'upstream-unstable'

[Timo Aaltonen]

 configure.ac|6 +-
 src/sisusb.h|1 -
 src/sisusb_driver.c |   34 +-
 3 files changed, 10 insertions(+), 31 deletions(-)

New commits:
commit a18b2e7643188c5b0a900680792d413ca0e9941e
Author: Dave Airlie 
Date:   Thu Jul 30 12:04:29 2009 +1000

sisusb: bump for release 0.9.3

diff --git a/configure.ac b/configure.ac
index 63914e9..f2ae362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-sisusb],
-0.9.2,
+0.9.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-sisusb)
 

commit cf32d0b9a37137b26f2c89578b53197ba27b22a9
Author: Dave Airlie 
Date:   Tue Jul 28 13:32:37 2009 +1000

sisusb: update for resources/RAC API removal

diff --git a/src/sisusb.h b/src/sisusb.h
index b5bb3ad..b9992ac 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -83,7 +83,6 @@
 #include "compiler.h"
 #include "xf86Priv.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "xf86.h"
 #include "xf86Cursor.h"
 #include "xf86cmap.h"
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index b6cd7f8..86b69f6 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -35,7 +35,6 @@
 
 #include "sisusb.h"
 
-#include "xf86RAC.h"
 #include "dixstruct.h"
 #include "shadowfb.h"
 #include "fb.h"
@@ -848,11 +847,6 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->chipset, pSiSUSB->sisusbversion, pSiSUSB->sisusbrevision,
pSiSUSB->sisusbpatchlevel);
 
-/* Operations for which memory access is required */
-/* USB2VGA: We never need memory or i/o access */
-pScrn->racMemFlags = 0;
-pScrn->racIoFlags = 0;
-
 /* Load ramdac module */
 if(!xf86LoadSubModule(pScrn, "ramdac")) {
SISUSBErrorLog(pScrn, "Could not load ramdac module\n");

commit 35789a14c0074bb5994deb890e0f3832f1d4a067
Author: Peter Hutterer 
Date:   Thu Jul 16 11:55:36 2009 +1000

Update to xextproto 7.1 support.

DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index ec498a0..63914e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto 
$REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),
+  HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 4424bd5..b6cd7f8 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -51,8 +51,13 @@
 
 #include "globals.h"
 
+#ifdef HAVE_XEXTPROTO_71
+#include 
+#else
 #define DPMS_SERVER
 #include 
+#endif
+
 
 /*
  * This is intentionally screen-independent.  It indicates the binding

commit 89ca2b91468b13db7dda7984675013a6180feb97
Author: Adam Jackson 
Date:   Thu Jul 2 11:46:26 2009 -0400

sisusb 0.9.2

diff --git a/configure.ac b/configure.ac
index daf0295..ec498a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-sisusb],
-0.9.1,
+0.9.2,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-sisusb)
 

commit d6b8211d924ac41d878be707b79e585334d77347
Author: Adam Jackson 
Date:   Thu May 28 15:20:00 2009 -0400

Remove useless loader symbol lists.

diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 290764d..4424bd5 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -90,24 +90,6 @@ static SymTabRec SISUSBChipsets[] = {
 { -1,  NULL }
 };
 
-static const char *fbSymbols[] = {
-"fbPictureInit",
-"fbScreenInit",
-NULL
-};
-
-static const char *shadowSymbols[] = {
-"ShadowFBInit",
-NULL
-};
-
-static const char *ramdacSymbols[] = {
-"xf86CreateCursorInfoRec",
-"xf86DestroyCursorInfoRec",
-"xf86InitCursor",
-NULL
-};
-
 #ifdef XFree86LOADER
 
 static MODULESETUPPROTO(sisusbSetup);
@@ -143,7 +125,6 @@ sisusbSetup(pointer module, pointer opts, int *errmaj, int 
*errmin)
 if(!setupDone) {
setupDone = TRUE;
xf86AddDriver(&SISUSB, module, SISUSB_HaveDriverFuncs);
-   LoaderRefSymLists(fbSymbols, shadowSymbols, ramdacSymbols, NULL);
return (pointer)TRUE;
 }
 
@@ -874,8 +855,6 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
 }
 
-xf86LoaderReqSymLists(ramdacSymbols, NULL);
-
 /* Set pScrn->monitor */
 pScrn->monitor = pScrn->confScreen->monitor;
 
@@ -1444,7 +1423,6 @@ SISUSBPreInit(ScrnInfoPtr pS

xserver-xorg-video-sunffb: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   35 +++
 README|   20 
 configure.ac  |6 +
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 man/sunffb.man|2 
 src/ffb.h |5 -
 9 files changed, 76 insertions(+), 255 deletions(-)

New commits:
commit 8ba2020ed22ba5e7915f65ae0c0f46314572bb45
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:25:28 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 502fdf7..11b7f0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-sunffb (1:1.2.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:24:47 +0200
 
diff --git a/debian/control b/debian/control
index fb2fe5b..5f46500 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
  x11proto-gl-dev,
  quilt,
  dpkg-dev (>= 1.14.17)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sunffb
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sunffb.git
 

commit 96dfa23e565f89e89d2452b6f708ba4b959a8231
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:25:06 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index bf7aa27..992ad8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+commit 03b1a6d6d92e8f751c93cc7996e26d929d02f3b0
+Author: Dave Airlie 
+Date:   Mon Sep 7 15:10:03 2009 +1000
+
+sunffb 1.2.1
+
+commit ecf5ecebcfc3ec6490111876895ab3a67197e565
+Author: Peter Hutterer 
+Date:   Thu Jul 16 12:44:57 2009 +1000
+
+Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). 
Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer 
+
+commit 4f881efe2ec8ae4def01014f9acf7400e93a807f
+Author: Julien Cristau 
+Date:   Mon May 4 18:39:10 2009 +0200
+
+Remove DRI remnants from build system
+
+commit 330e87f2a5c26aedc9b8f204a7e713f0a3aa3773
+Author: Alan Coopersmith 
+Date:   Fri Jan 30 21:04:20 2009 -0800
+
+Add README with pointers to mailing list, bugzilla & git repos
+
+commit 55b1ad67715c9af1a652bc893b072ed0cf8d94c0
+Author: Alan Coopersmith 
+Date:   Fri Jan 9 16:35:58 2009 -0800
+
+Remove xorgconfig & xorgcfg from See Also list in man page
+
 commit 18c56ae8c3f5bbb133db426e9c253d47bb72a0d4
 Author: Adam Jackson 
 Date:   Wed Sep 3 15:35:42 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index ab5c50c..502fdf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sunffb (1:1.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:24:47 +0200
+
 xserver-xorg-video-sunffb (1:1.2.0-2) unstable; urgency=low
 
   * Add missing comma in Build-Depends (LP: #391562).  Thanks, Bryce

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e 

xserver-xorg-video-sunffb: Changes to 'upstream-unstable'

[Timo Aaltonen]

 README  |   20 
 configure.ac|   40 +---
 man/sunffb.man  |2 +-
 src/Makefile.am |2 +-
 src/ffb.h   |5 -
 5 files changed, 31 insertions(+), 38 deletions(-)

New commits:
commit 03b1a6d6d92e8f751c93cc7996e26d929d02f3b0
Author: Dave Airlie 
Date:   Mon Sep 7 15:10:03 2009 +1000

sunffb 1.2.1

diff --git a/configure.ac b/configure.ac
index 1b4ec7a..5437811 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-sunffb],
-1.2.0,
+1.2.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-sunffb)
 

commit ecf5ecebcfc3ec6490111876895ab3a67197e565
Author: Peter Hutterer 
Date:   Thu Jul 16 12:44:57 2009 +1000

Update to xextproto 7.1 support.

DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 10cd570..1b4ec7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto 
$REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),
+  HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/ffb.h b/src/ffb.h
index ea1b7fc..a2c3ada 100644
--- a/src/ffb.h
+++ b/src/ffb.h
@@ -39,11 +39,14 @@
 #include "ffb_regs.h"
 #include "xf86sbusBus.h"
 #include "ffb_dac.h"
+#ifdef HAVE_XEXTPROTO_71
+#include 
+#else
 #ifndef  DPMS_SERVER
 #define  DPMS_SERVER
 #endif   /* DPMS_SERVER */
 #include 
-
+#endif
 
 /* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
 /* Note: do not mmap FFB_DFB8R_VOFF and following mappings using one mmap 
together

commit 4f881efe2ec8ae4def01014f9acf7400e93a807f
Author: Julien Cristau 
Date:   Mon May 4 18:39:10 2009 +0200

Remove DRI remnants from build system

diff --git a/configure.ac b/configure.ac
index 5a10b35..10cd570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,11 +53,6 @@ AC_ARG_WITH(xorg-module-dir,
 [moduledir="$withval"],
 [moduledir="$libdir/xorg/modules"])
 
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
-  [Disable DRI support [[default=auto]]]),
-  [DRI="$enableval"],
-  [DRI=auto])
-
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
@@ -72,37 +67,8 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 # Checks for header files.
 AC_HEADER_STDC
 
-if test "$DRI" != no; then
-AC_CHECK_FILE([${sdkdir}/dri.h],
-  [have_dri_h="yes"], [have_dri_h="no"])
-AC_CHECK_FILE([${sdkdir}/sarea.h],
-  [have_sarea_h="yes"], [have_sarea_h="no"])
-AC_CHECK_FILE([${sdkdir}/dristruct.h],
-  [have_dristruct_h="yes"], [have_dristruct_h="no"])
-fi
-
-AC_MSG_CHECKING([whether to include DRI support])
-if test x$DRI = xauto; then
-if test "$have_dri_h" = yes -a \
-"$have_sarea_h" = yes -a \
-"$have_dristruct_h" = yes; then
-DRI="yes"
-else
-DRI="no"
-fi
-fi
-AC_MSG_RESULT([$DRI])
-
-AM_CONDITIONAL(DRI, test x$DRI = xyes)
-if test "$DRI" = yes; then
-PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
-AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
-AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-fi
-
 AM_CONDITIONAL(SPARC, test x$SPARC = xyes)
 
-AC_SUBST([DRI_CFLAGS])
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 3e10f3a..198aac1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@
 sunffb_drv_la_LTLIBRARIES = sunffb_drv.la
 sunffb_drv_la_LDFLAGS = -module -avoid-version
 sunffb_drv_ladir = @moduledir@/drivers

commit 330e87f2a5c26aedc9b8f204a7e713f0a3aa3773
Author: Alan Coopersmith 
Date:   Fri Jan 30 21:04:20 2009 -0800

Add README with pointers to mailing list, bugzilla & git repos

diff --git a/README b/README
new file mode 100644
index 000..ffc2150
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+ffb - SUNFFB video driver for the Xorg X server
+
+Ple

xserver-xorg-video-tdfx: Changes to 'upstream-unstable'

[Timo Aaltonen]

 README|   20 
 configure.ac  |2 
 man/tdfx.man  |2 
 src/tdfx_driver.c |  124 ++
 4 files changed, 28 insertions(+), 120 deletions(-)

New commits:
commit 96ad72682ca7925918e8cb7298a2241dc096bd6f
Author: Dave Airlie 
Date:   Thu Jul 30 12:04:30 2009 +1000

tdfx: bump for release 1.4.3

diff --git a/configure.ac b/configure.ac
index 6ceb94f..f2949ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-tdfx],
-1.4.2,
+1.4.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-tdfx)
 

commit 690aaaedb3cf6e8241cad802651a640277094f22
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:41 2009 +1000

tdfx: change to using ABI version check

diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index a3435f5..8935505 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -54,7 +54,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 #include "xf86RAC.h"
 #endif

commit 7149d16ed17c064cc91cb1473f10e8e80055347c
Author: Dave Airlie 
Date:   Tue Jul 28 13:32:38 2009 +1000

tdfx: update for resources/RAC API removal

diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 76ffa51..a3435f5 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -54,8 +54,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
 #include "xf86RAC.h"
+#endif
 #include "vbe.h"
 #include "xf86cmap.h"
 
@@ -855,10 +857,12 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
   pTDFX->Primary = xf86IsPrimaryPci(pTDFX->PciInfo);
 #endif
 
+#ifndef XSERVER_LIBPCIACCESS
   if (xf86RegisterResources(pTDFX->pEnt->index, NULL, ResExclusive)) {
   TDFXFreeRec(pScrn);
   return FALSE;
   }
+
   /* 
* We don't need VGA resources during OPERATING state. However I'm
* not sure if they are disabled.
@@ -876,7 +880,7 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
   pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
   } else
   pScrn->racMemFlags = 0;
-
+#endif
   /* Set pScrn->monitor */
   pScrn->monitor = pScrn->confScreen->monitor;
 

commit b656f6522f287efb8595509c678ce6ec60843944
Author: Adam Jackson 
Date:   Thu Jul 2 11:48:35 2009 -0400

tdfx 1.4.2

diff --git a/configure.ac b/configure.ac
index 6df2ebc..6ceb94f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-tdfx],
-1.4.1,
+1.4.2,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-tdfx)
 

commit 871db4476dedf77e440a4ef121643bb2eb897254
Author: Adam Jackson 
Date:   Thu May 28 15:21:22 2009 -0400

Remove useless loader symbol lists.

diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index ee4b919..76ffa51 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -239,95 +239,6 @@ static const OptionInfoRec TDFXOptions[] = {
   { -1, NULL, OPTV_NONE, {0}, FALSE}
 };
 
-static const char *vgahwSymbols[] = {
-"vgaHWEnable",
-"vgaHWFreeHWRec",
-"vgaHWGetHWRec",
-"vgaHWGetIOBase",
-"vgaHWGetIndex",
-"vgaHWInit",
-"vgaHWLock",
-"vgaHWMapMem",
-"vgaHWProtect",
-"vgaHWRestore",
-"vgaHWSave",
-"vgaHWSeqReset",
-"vgaHWUnlock",
-0
-};
-
-static const char *ramdacSymbols[] = {
-"xf86CreateCursorInfoRec",
-"xf86InitCursor",
-NULL
-};
-
-static const char *ddcSymbols[] = {
-"xf86PrintEDID",
-"xf86SetDDCproperties",
-"xf86DoEDID_DDC2",
-NULL
-};
-
-static const char *i2cSymbols[] = {
-"xf86CreateI2CBusRec",
-"xf86I2CBusInit",
-NULL
-};
-
-static const char *fbSymbols[] = {
-"fbPictureInit",
-"fbScreenInit",
-NULL
-};
-
-static const char *xaaSymbols[] = {
-"XAACreateInfoRec",
-"XAADestroyInfoRec",
-"XAAInit",
-"XAAReverseBitOrder",
-NULL
-};
-
-static const char *vbeSymbols[] = {
-"VBEInit",
-"vbeDoEDID",
-"vbeFree",
-NULL
-};
-
-static const char *int10Symbols[] = {
-"xf86FreeInt10",
-"xf86InitInt10",
-NULL
-};
-
-#ifdef XF86DRI
-static const char *drmSymbols[] = {
-"drmAddMap",
-"drmFreeVersion",
-"drmGetVersion",
-NULL
-};
-
-static const char *driSymbols[] = {
-"DRICloseScreen",
-"DRICreateInfoRec",
-"DRIDestroyInfoRec",
-"DRIFinishScreenInit",
-"DRIGetSAREAPrivate",
-"DRILock",
-"DRIMoveBuffersHelper",
-"DRIQueryVersion",
-"DRIScreenInit",
-"DRIUnlock",
-"GlxSetVisualConfigs",
-"DRICreatePCIBusID",
-NULL
-};
-
-#endif
-
 #ifdef XFree86LOADER
 
 static MODULESETUPPROTO(tdfxSetup);
@@ -360,22 +271,6 @@ tdfxSetup(pointer module, pointer opts, int *errmaj, int 
*errmin)
 

xserver-xorg-video-tdfx: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   42 
 README|   20 
 configure.ac  |2 
 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 man/tdfx.man  |2 
 src/tdfx_driver.c |  124 +
 10 files changed, 154 insertions(+), 384 deletions(-)

New commits:
commit 13adfd19323c2246b7f0009e4969017d38615556
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:46:05 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index fd4511a..fdfa523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-tdfx (1:1.4.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:41:30 +0200
 
diff --git a/debian/control b/debian/control
index 1e26e46..801b5d5 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
  x11proto-xf86dri-dev,
  quilt,
  dpkg-dev (>= 1.14.17)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tdfx
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tdfx.git
 

commit fa6492ee4070a9622bd7c0e190901d07a77f9c2d
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:43:19 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 1598174..832e811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+commit 96ad72682ca7925918e8cb7298a2241dc096bd6f
+Author: Dave Airlie 
+Date:   Thu Jul 30 12:04:30 2009 +1000
+
+tdfx: bump for release 1.4.3
+
+commit 690aaaedb3cf6e8241cad802651a640277094f22
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:41 2009 +1000
+
+tdfx: change to using ABI version check
+
+commit 7149d16ed17c064cc91cb1473f10e8e80055347c
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:38 2009 +1000
+
+tdfx: update for resources/RAC API removal
+
+commit b656f6522f287efb8595509c678ce6ec60843944
+Author: Adam Jackson 
+Date:   Thu Jul 2 11:48:35 2009 -0400
+
+tdfx 1.4.2
+
+commit 871db4476dedf77e440a4ef121643bb2eb897254
+Author: Adam Jackson 
+Date:   Thu May 28 15:21:22 2009 -0400
+
+Remove useless loader symbol lists.
+
+commit 5fd80e29b10b9e9b6c5ad4a2ecdf5d9b4013a9e4
+Author: Alan Coopersmith 
+Date:   Fri Jan 30 21:04:39 2009 -0800
+
+Add README with pointers to mailing list, bugzilla & git repos
+
+commit 86c9439917cab56c2b0eef6cd5fd6d8fad886c33
+Author: Alan Coopersmith 
+Date:   Fri Jan 9 16:36:56 2009 -0800
+
+Remove xorgconfig & xorgcfg from See Also list in man page
+
 commit e30873010523a8cde8d23ed473343b2c60794cb6
 Author: Dave Airlie 
 Date:   Mon Dec 22 15:20:26 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index c0ebf62..fd4511a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tdfx (1:1.4.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:41:30 +0200
+
 xserver-xorg-video-tdfx (1:1.4.1-1) unstable; urgency=low
 
   * New upstream release.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/

xserver-xorg-video-trident: Changes to 'upstream-unstable'

[Timo Aaltonen]

 README   |   20 
 configure.ac |6 ++
 man/trident.man  |2 
 src/trident_driver.c |  119 +++
 src/trident_shadow.c |1 
 src/trident_video.c  |1 
 6 files changed, 43 insertions(+), 106 deletions(-)

New commits:
commit 33fc86bade1c638300f1b17236cb0b0a492ac6d0
Author: Dave Airlie 
Date:   Wed Aug 5 10:26:35 2009 +1000

bump to 1.3.3 for release

diff --git a/configure.ac b/configure.ac
index 4557538..a53fd69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-trident],
-1.3.2,
+1.3.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-trident)
 

commit 3008fa244f8fdf8bf3306dd8c3b781221885ec1b
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:41 2009 +1000

trident: change to using ABI version check

diff --git a/src/trident_driver.c b/src/trident_driver.c
index e745069..addb1af 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -39,7 +39,7 @@
 #include "micmap.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 #include "xf86RAC.h"
 #endif

commit 314cb60172135abb5efe40fd0a0e6837f2662780
Author: Dave Airlie 
Date:   Tue Jul 28 13:32:39 2009 +1000

trident: update for resources/RAC API removal

diff --git a/src/trident_driver.c b/src/trident_driver.c
index 79afa2f..e745069 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -39,12 +39,15 @@
 #include "micmap.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86cmap.h"
 #include "vgaHW.h"
-#include "xf86RAC.h"
+
 #include "vbe.h"
 #include "dixstruct.h"
 #include "compiler.h"
@@ -1016,7 +1019,9 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
 /* This is the general case */
 for (i = 0; inumEntities; i++) {
pTrident->pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+#ifndef XSERVER_LIBPCIACCESS
if (pTrident->pEnt->resources) return FALSE;
+#endif
pTrident->Chipset = pTrident->pEnt->chipset;
pScrn->chipset = (char *)xf86TokenToString(TRIDENTChipsets,
   pTrident->pEnt->chipset);
@@ -1105,7 +1110,9 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
 vgaIOBase = hwp->IOBase;
 pTrident->PIOBase = hwp->PIOOffset;
 
+#ifndef XSERVER_LIBPCIACCESS
 xf86SetOperatingState(resVga, pTrident->pEnt->index, ResUnusedOpr);
+#endif
 
 /* The ramdac module should be loaded here when needed */
 if (!xf86LoadSubModule(pScrn, "ramdac"))
@@ -1447,13 +1454,14 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
   (unsigned long)pTrident->IOAddress);
 }
 
+#ifndef XSERVER_LIBPCIACCESS
 /* Register the PCI-assigned resources. */
 if (xf86RegisterResources(pTrident->pEnt->index, NULL, ResExclusive)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
   "xf86RegisterResources() found resource conflicts\n");
return FALSE;
 }
-
+#endif
 /* Initialize VBE if possible 
  * Don't move this past MMIO enable!!
  * PIO access will be blocked
@@ -2432,13 +2440,14 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
TRIDENTUnmapMem(pScrn);
 }
 
+#ifndef XSERVER_LIBPCIACCESS
 pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
 
 if (pTrident->IsCyber && pTrident->MMIOonly)
pScrn->racIoFlags = 0;
 else 
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-
+#endif
 pTrident->FbMapSize = pScrn->videoRam * 1024;
 
 return TRUE;
diff --git a/src/trident_shadow.c b/src/trident_shadow.c
index d2169c8..6a86f7c 100644
--- a/src/trident_shadow.c
+++ b/src/trident_shadow.c
@@ -10,7 +10,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "shadowfb.h"
diff --git a/src/trident_video.c b/src/trident_video.c
index 7b6fb10..0c5497b 100644
--- a/src/trident_video.c
+++ b/src/trident_video.c
@@ -28,7 +28,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"

commit 6ef2f6e2e7628311e25d2fe35452372cd03bfb57
Author: Peter Hutterer 
Date:   Thu Jul 16 11:57:17 2009 +1000

Update to xextproto 7.1 support.

DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index e6c55f7..4557538 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG,

xserver-xorg-video-trident: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   77 +++
 README|   20 
 configure.ac  |6 +
 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 man/trident.man   |2 
 src/trident_driver.c  |  119 +++-
 src/trident_shadow.c  |1 
 src/trident_video.c   |1 
 12 files changed, 204 insertions(+), 370 deletions(-)

New commits:
commit e390653f500e032c26f8c5882625a30f926b4d61
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:50:39 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index ace5855..35b2865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-trident (1:1.3.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:47:32 +0200
 
diff --git a/debian/control b/debian/control
index f052d09..4779c38 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
  x11proto-randr-dev,
  x11proto-render-dev,
  dpkg-dev (>= 1.14.17)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git
 

commit 09b8fd0fb569836f5a2c81b3ff20ab73695b6290
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:49:01 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index d08e88b..8d10f2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,80 @@
+commit 33fc86bade1c638300f1b17236cb0b0a492ac6d0
+Author: Dave Airlie 
+Date:   Wed Aug 5 10:26:35 2009 +1000
+
+bump to 1.3.3 for release
+
+commit 3008fa244f8fdf8bf3306dd8c3b781221885ec1b
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:41 2009 +1000
+
+trident: change to using ABI version check
+
+commit 314cb60172135abb5efe40fd0a0e6837f2662780
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:39 2009 +1000
+
+trident: update for resources/RAC API removal
+
+commit 6ef2f6e2e7628311e25d2fe35452372cd03bfb57
+Author: Peter Hutterer 
+Date:   Thu Jul 16 11:57:17 2009 +1000
+
+Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). 
Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer 
+
+commit 51d9968f5084f3c38c7459d2e0a1c28d355cbae2
+Author: Adam Jackson 
+Date:   Thu Jul 2 11:51:05 2009 -0400
+
+trident 1.3.2
+
+commit 5f638c14ebda6473dea664b3730844ae9792933e
+Author: Adam Jackson 
+Date:   Thu May 28 15:22:59 2009 -0400
+
+Remove useless loader symbol lists.
+
+commit d0e17d0a40c771ae484252ab6a1c093a60bddaa7
+Author: Chris Ball 
+Date:   Fri Feb 27 10:58:07 2009 -0500
+
+Revert "Build fix: set EXA_DRIVER_KNOWN_MAJOR=3"
+
+This reverts commit b951fe81bb976704be716251a4925086f2c70013.
+The EXA developers have backed out this ABI bump.
+
+Signed-off-by: Chris Ball 
+
+commit b951fe81bb976704be716251a4925086f2c70013
+Author: Chris Ball 
+Date:   Wed Feb 25 13:00:12 2009 -0500
+
+Build fix: set EXA_DRIVER_KNOWN_MAJOR=3
+
+EXA in server HEAD requires this now. Since this driver doesn't use
+{Prepare,Finish}Access or UploadToScratch, the change is safe.
+
+Remove unused {Prepare,Finish}Access empty functions.
+
+Signed-off-by: Chris Ball 
+
+commit 4152c64a22e81a8f2e2d91507493c422aac301a3
+Author: Alan Coopersmith 
+Date:   Fri Jan 30 21:04:56 2009 -0800
+
+Add README with pointers to mailing list, bugzilla & git repos
+
+commit 52286f1c9c543d6e8105192dc4914fa6f934bf60
+Author: Alan Coopersmith 
+Date:   Fri Jan 9 16:37:18 2009 -0800
+
+Remove xorgconfig & xorgcfg from See Also list in man page
+
 commit a4ae6379a5725e77837201bf1dc735124f7dc368
 Author: Dave Airlie 
 Date:   Mon Dec 22 13:59:29 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index 8cf6dbd..ace5855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-trident (1:1.3.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:47:32 +0200
+
 xserver-xorg-video-trident (1:1.3.1-1) unstable; urgency=low
 
   * New upstream release.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-

xserver-xorg-video-tseng: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   42 
 README|   20 
 configure.ac  |2 
 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 man/tseng.man |2 
 src/tseng_driver.c|   80 +---
 10 files changed, 156 insertions(+), 338 deletions(-)

New commits:
commit dfdbcc6f44dccb64dedf7894358656635236e9aa
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:54:59 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 89f86f1..839127c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-tseng (1:1.2.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:54:05 +0200
 
diff --git a/debian/control b/debian/control
index fcb2ef0..7d7dba0 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-xext-dev,
  dpkg-dev (>= 1.14.17)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tseng
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tseng.git
 

commit a66268f1002df4b864ddca783f48234cb733e4b8
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:54:34 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index af47d82..5da6e54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+commit 5734845c91179a1138d75aaad48102cb077a2b12
+Author: Dave Airlie 
+Date:   Mon Sep 7 14:52:01 2009 +1000
+
+bump version to 1.2.3
+
+commit d095c1d51b1a895471ce0b1970ae21ee6499ae51
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:41 2009 +1000
+
+tseng: change to using ABI version check
+
+commit 17ebee6804a99af32747b801c5b979ba5248a9d8
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:40 2009 +1000
+
+tseng: update for resources/RAC API removal
+
+commit 25548be8814796925625b11f390dca29b1e47358
+Author: Adam Jackson 
+Date:   Thu Jul 2 11:53:03 2009 -0400
+
+tseng 1.2.2
+
+commit 1ce0bf811255b1faa00aa279e8972a1a027849ab
+Author: Adam Jackson 
+Date:   Thu May 28 15:23:41 2009 -0400
+
+Remove useless loader symbol lists.
+
+commit 7addf8709202634ac45b4c51d910e2798054271c
+Author: Alan Coopersmith 
+Date:   Fri Jan 30 21:05:06 2009 -0800
+
+Add README with pointers to mailing list, bugzilla & git repos
+
+commit 9d4aea1211de81fb27069d087bd4393d27355239
+Author: Alan Coopersmith 
+Date:   Fri Jan 9 16:37:31 2009 -0800
+
+Remove xorgconfig & xorgcfg from See Also list in man page
+
 commit 7f7e48cf5cf7512b5c1f5f3bf31eeafb201a9ad8
 Author: Dave Airlie 
 Date:   Mon Dec 22 15:02:32 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index cda66b9..89f86f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tseng (1:1.2.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:54:05 +0200
+
 xserver-xorg-video-tseng (1:1.2.1-1) unstable; urgency=low
 
   * Run autoreconf on build.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean de

xserver-xorg-video-tseng: Changes to 'upstream-unstable'

[Timo Aaltonen]

 README |   20 +
 configure.ac   |2 -
 man/tseng.man  |2 -
 src/tseng_driver.c |   80 +
 4 files changed, 30 insertions(+), 74 deletions(-)

New commits:
commit 5734845c91179a1138d75aaad48102cb077a2b12
Author: Dave Airlie 
Date:   Mon Sep 7 14:52:01 2009 +1000

bump version to 1.2.3

diff --git a/configure.ac b/configure.ac
index 3707413..7a0da70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-tseng],
-1.2.2,
+1.2.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-tseng)
 

commit d095c1d51b1a895471ce0b1970ae21ee6499ae51
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:41 2009 +1000

tseng: change to using ABI version check

diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index 1b61da8..445c17e 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -42,7 +42,7 @@
 
 #include "fb.h"
 
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86RAC.h"
 #include "xf86Resources.h"
 #endif

commit 17ebee6804a99af32747b801c5b979ba5248a9d8
Author: Dave Airlie 
Date:   Tue Jul 28 13:32:40 2009 +1000

tseng: update for resources/RAC API removal

diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index efa19c8..1b61da8 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -42,8 +42,10 @@
 
 #include "fb.h"
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
 #include "xf86Resources.h"
+#endif
 #include "xf86int10.h"
 
 #include "xf86xv.h"
@@ -889,10 +891,12 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
 pTseng->FbAddress = PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM);
 
 
+#ifndef XSERVER_LIBPCIACCESS
 if (xf86RegisterResources(pTseng->pEnt->index,NULL,ResNone)) {
 xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot register FB memory.\n");
 return FALSE;
 }
+#endif
 
 /* The W32 linear map address space is always 4Mb (mainly because the
  * memory-mapped registers are located near the top of the 4MB area). 
@@ -1089,13 +1093,14 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
 else
VGAHWPTR(pScrn)->MapSize = 0x1;
 
+#ifndef XSERVER_LIBPCIACCESS
 /*
  * XXX At least part of this range does appear to be disabled,
  * but to play safe, it is marked as "unused" for now.
  * Changed this to "disable". Otherwise it might interfere with DGA.
  */
 xf86SetOperatingState(resVgaMem, pTseng->pEnt->index, ResDisableOpr);
-
+#endif
 /* hibit processing (TsengProcessOptions() must have been called first) */
 pTseng->save_divide = 0x40;   /* default */
 if (pTseng->ChipType == ET4000) {
@@ -1466,9 +1471,10 @@ TsengScreenInit(int scrnIndex, ScreenPtr pScreen, int 
argc, char **argv)
 if (pScrn->depth == 4 || pScrn->depth == 8) { /* fb and xf4bpp */
vgaHWHandleColormaps(pScreen);
 }
+#ifndef XSERVER_LIBPCIACCESS
 pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
 pScrn->racMemFlags = pScrn->racIoFlags;
-
+#endif
 /* Wrap the current CloseScreen and SaveScreen functions */
 pScreen->SaveScreen = TsengSaveScreen;
 

commit 25548be8814796925625b11f390dca29b1e47358
Author: Adam Jackson 
Date:   Thu Jul 2 11:53:03 2009 -0400

tseng 1.2.2

diff --git a/configure.ac b/configure.ac
index 2fd20f7..3707413 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-tseng],
-1.2.1,
+1.2.2,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-tseng)
 

commit 1ce0bf811255b1faa00aa279e8972a1a027849ab
Author: Adam Jackson 
Date:   Thu May 28 15:23:41 2009 -0400

Remove useless loader symbol lists.

diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index 46fc3ae..efa19c8 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -180,58 +180,6 @@ static const OptionInfoRec TsengOptions[] =
{0}, FALSE}
 };
 
-static const char *int10Symbols[] = {
-"xf86FreeInt10",
-"xf86InitInt10",
-NULL
-};
-
-static const char *vgaHWSymbols[] = {
-  "vgaHWFreeHWRec",
-  "vgaHWGetHWRec",
-  "vgaHWGetIOBase",
-  "vgaHWGetIndex",
-  "vgaHWHandleColormaps",
-  "vgaHWInit",
-  "vgaHWLock",
-  "vgaHWMapMem",
-  "vgaHWProtect",
-  "vgaHWRestore",
-  "vgaHWSave", 
-  "vgaHWSaveScreen",
-  "vgaHWUnlock",
-  "vgaHWUnmapMem",
-  NULL
-};
-
-#ifdef XFree86LOADER
-static const char* miscfbSymbols[] = {
-  "xf1bppScreenInit",
-  "xf4bppScreenInit",
-  NULL
-};
-#endif
-
-static const char* fbSymbols[] = {
-  "fbPictureInit",
-  "fbScreenInit",
-  NULL
-};
-
-static const char *ramdacSymbols[] = {
-"xf86CreateCursorInfoRec",
-"xf86DestroyCursorInfoRec",
-"xf86InitCursor",
-NULL
-};
-
-static const char *xaaSymbols[] = {
-"XAACreateInfoRec",
-"XAADestroyInfoRec",
-"XAAInit",
-NULL
-};
-
 #ifdef XFree86LOADER
 
 static M

xserver-xorg-video-v4l: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 5 files changed, 84 insertions(+), 264 deletions(-)

New commits:
commit b0b45ab9918df9ea9f97c6c53d81a82fceaa3e91
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:59:01 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 0c82795..3bfa4a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-v4l (1:0.2.0-4) UNRELEASED; urgency=low
 
   * Bump the epoch to ease autosyncing to ubuntu.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 10:57:13 +0200
 
diff --git a/debian/control b/debian/control
index d715c96..f7d34d5 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-video-dev,
  dpkg-dev (>= 1.14.17)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.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 4bb98d6588b893aed4a43eb7bf2b0cee6ca84fdc
Author: Timo Aaltonen 
Date:   Tue Dec 1 10:58:21 2009 +0200

Bump the epoch to ease autosyncing to ubuntu.

diff --git a/debian/changelog b/debian/changelog
index b17c77f..0c82795 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-v4l (1:0.2.0-4) UNRELEASED; urgency=low
+
+  * Bump the epoch to ease autosyncing to ubuntu.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 10:57:13 +0200
+
 xserver-xorg-video-v4l (0.2.0-3) unstable; urgency=low
 
   * Run autoreconf on build.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
-   -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
  <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
  fi; \

commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau 
Date:   Fri Sep 25 15:33:39 2009 +0200

xsfbs.sh: fix typo and remove svn keyword

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
 # This is the X Strike Force shell library for X Window System package
 # maintainer scripts.  It serves to define shell functions commonly used by
 # such packages, and performs some error checking necessary for proper 
operation
@@ -8,7 +6,7 @@
 # removal tasks.
 
 # If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
 # skip past this library by scanning forward in this file to the string
 # "GOBSTOPPER".
 

commit 5693792171d885769e58d053c08b11acd12a
Author

xserver-xorg-video-vmware: Changes to 'debian-unstable'

[Timo Aaltonen]

 .cvsignore|   19 
 ChangeLog |   32 ++
 configure.ac  |2 
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 man/.cvsignore|2 
 src/.cvsignore|6 -
 src/vmware.c  |8 +
 src/vmware.h  |4 
 11 files changed, 54 insertions(+), 282 deletions(-)

New commits:
commit f9a02c65f72560eecfa0b9d6a86a84bd075d4938
Author: Timo Aaltonen 
Date:   Tue Dec 1 11:02:01 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 4afc316..e60b7ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-vmware (1:10.16.8-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 11:00:01 +0200
 
diff --git a/debian/control b/debian/control
index 4ca0923..8e7269d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vmware
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vmware.git
 

commit 7a8acc6265ad5b54d7528a74a6ee82768366dce5
Author: Timo Aaltonen 
Date:   Tue Dec 1 11:00:46 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index b609632..2c0fc55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+commit 6c8fc7b280295b823675285ed78b0fb2365bcf07
+Author: Philip Langdale 
+Date:   Tue Sep 8 22:21:33 2009 -0700
+
+Bump fo 10.16.8 Release
+
+commit e3e3d8d2488bd289660943e9038bdbe29e11cf77
+Author: Gaetan Nadon 
+Date:   Mon Sep 7 11:12:13 2009 -0400
+
+xf86-video-vmware: Remove unused .cvsignore file #23776
+
+Signed-off-by: Peter Hutterer 
+
+commit cce33db3f95c6f3c8537c782063b6ca9ad68f332
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:42 2009 +1000
+
+vmware: change to using ABI version check
+
+commit 0fddce5511b761206bb5f59dcd17652f15bda5ef
+Author: Dave Airlie 
+Date:   Tue Jul 28 14:11:59 2009 +1000
+
+vmware: fix resource removal properly
+
+commit 4605e8d3a99ddcd75314051bd00b51d8ecee06a1
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:41 2009 +1000
+
+vmware: update for resources/RAC API removal
+
 commit 382c25f53870da0db0ee74f343c20c312e6b03af
 Author: Philip Langdale 
 Date:   Mon Jul 20 18:03:47 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index e3b5a1e..4afc316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:10.16.8-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 11:00:01 +0200
+
 xserver-xorg-video-vmware (1:10.16.7-1) unstable; urgency=low
 
   * New upstream release.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/

xserver-xorg-video-vmware: Changes to 'upstream-unstable'

[Timo Aaltonen]

 .cvsignore |   19 ---
 configure.ac   |2 +-
 man/.cvsignore |2 --
 src/.cvsignore |6 --
 src/vmware.c   |8 +++-
 src/vmware.h   |4 +++-
 6 files changed, 11 insertions(+), 30 deletions(-)

New commits:
commit 6c8fc7b280295b823675285ed78b0fb2365bcf07
Author: Philip Langdale 
Date:   Tue Sep 8 22:21:33 2009 -0700

Bump fo 10.16.8 Release

diff --git a/configure.ac b/configure.ac
index eb5142e..b4e6a17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-vmware],
-10.16.7,
+10.16.8,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-vmware)
 
diff --git a/src/vmware.c b/src/vmware.c
index 879c206..6004677 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -85,7 +85,7 @@ char rcsId_vmware[] =
 #define VMWARE_DRIVER_NAME "vmware"
 #define VMWARE_MAJOR_VERSION   10
 #define VMWARE_MINOR_VERSION   16
-#define VMWARE_PATCHLEVEL  7
+#define VMWARE_PATCHLEVEL  8
 #define VMWARE_DRIVER_VERSION \
(VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 + 
VMWARE_PATCHLEVEL)
 #define VMWARE_DRIVER_VERSION_STRING \

commit e3e3d8d2488bd289660943e9038bdbe29e11cf77
Author: Gaetan Nadon 
Date:   Mon Sep 7 11:12:13 2009 -0400

xf86-video-vmware: Remove unused .cvsignore file #23776

Signed-off-by: Peter Hutterer 

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo

commit cce33db3f95c6f3c8537c782063b6ca9ad68f332
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:42 2009 +1000

vmware: change to using ABI version check

diff --git a/src/vmware.c b/src/vmware.c
index 9ea9fff..879c206 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -18,7 +18,7 @@ char rcsId_vmware[] =
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 #endif
 

commit 0fddce5511b761206bb5f59dcd17652f15bda5ef
Author: Dave Airlie 
Date:   Tue Jul 28 14:11:59 2009 +1000

vmware: fix resource removal properly

diff --git a/src/vmware.c b/src/vmware.c
index b1a9070..9ea9fff 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -118,7 +118,7 @@ static resRange vmwareLegacyRes[] = {
 _VGA_EXCLUSIVE, _END
 };
 #else
-static int vmwareLegacyRes = 0;
+#define vmwareLegacyRes NULL
 #endif
 
 #if XSERVER_LIBPCIACCESS

commit 4605e8d3a99ddcd75314051bd00b51d8ecee06a1
Author: Dave Airlie 
Date:   Tue Jul 28 13:32:41 2009 +1000

vmware: update for resources/RAC API removal

diff --git a/src/vmware.c b/src/vmware.c
index 2d1eabd..b1a9070 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -18,7 +18,9 @@ char rcsId_vmware[] =
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
 
 #include "compiler.h"  /* inb/outb */
 
@@ -109,11 +111,15 @@ static SymTabRec VMWAREChipsets[] = {
 { -1,  NULL }
 };
 
+#ifndef XSERVER_LIBPCIACCESS
 static resRange vmwareLegacyRes[] = {
 { ResExcIoBlock, SVGA_LEGACY_BASE_PORT,
   SVGA_LEGACY_BASE_PORT + SVGA_NUM_PORTS*sizeof(uint32)},
 _VGA_EXCLUSIVE, _END
 };
+#else
+static int vmwareLegacyRes = 0;
+#endif
 
 #if XSERVER_LIBPCIACCESS
 
diff --git a/src/vmware.h b/src/vmware.h
index a3502dd..31560b5 100644
--- a/src/vmware.h
+++ b/src/vmware.h
@@ -19,12 +19,14 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
+
 
 #include 
 
 #ifdef XSERVER_LIBPCIACCESS
 #include 
+#else
+#include "xf86Resources.h"
 #endif
 
 #include "compiler.h"  /* inb/outb */


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-voodoo: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog |   29 ++
 configure.ac  |6 +
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 src/voodoo_dga.c  |7 +
 src/voodoo_driver.c   |7 +
 src/voodoo_hardware.c |7 +
 9 files changed, 62 insertions(+), 257 deletions(-)

New commits:
commit 0a1ae687ed0a4cf92618789dd7dc0b968d251531
Author: Timo Aaltonen 
Date:   Tue Dec 1 11:31:08 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index b6aea98..3aa867f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 11:03:03 +0200
 
diff --git a/debian/control b/debian/control
index ce45a76..e4b05ea 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  x11proto-randr-dev,
  x11proto-render-dev,
  dpkg-dev (>= 1.14.17)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-voodoo
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-voodoo.git
 

commit eda940c9953de472251c275c4390b65ce4df34c6
Author: Timo Aaltonen 
Date:   Tue Dec 1 11:03:27 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index c8348e2..5a36399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+commit 89250c594f29fbad78f2006c32573ac083cccd73
+Author: Dave Airlie 
+Date:   Thu Jul 30 12:04:30 2009 +1000
+
+voodoo: bump for release 1.2.3
+
+commit 405bab2048a4077b7fbe456f4f24e0d9b448829f
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:42 2009 +1000
+
+voodoo: change to using ABI version check
+
+commit 023f464e830185c12de90f38219b34498d3e55d0
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:45:59 2009 +1000
+
+voodoo: remove rac/resources includes
+
+commit 840b9fe089d79507b660bdda3f26afb72faaa6ff
+Author: Peter Hutterer 
+Date:   Thu Jul 16 11:59:34 2009 +1000
+
+Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). 
Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer 
+
 commit b88c1e442fa9367ebb0addf744b759cea91a4868
 Author: Adam Jackson 
 Date:   Thu Jul 2 11:55:03 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 7879fb5..b6aea98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 01 Dec 2009 11:03:03 +0200
+
 xserver-xorg-video-voodoo (1:1.2.2-1) unstable; urgency=low
 
   * New upstream release.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
-   -e 's/@DEFAULT_DCRESOLUTIONS@/$(

xserver-xorg-video-voodoo: Changes to 'upstream-unstable'

[Timo Aaltonen]

 configure.ac  |6 +-
 src/voodoo_dga.c  |7 +--
 src/voodoo_driver.c   |7 +++
 src/voodoo_hardware.c |7 +--
 4 files changed, 22 insertions(+), 5 deletions(-)

New commits:
commit 89250c594f29fbad78f2006c32573ac083cccd73
Author: Dave Airlie 
Date:   Thu Jul 30 12:04:30 2009 +1000

voodoo: bump for release 1.2.3

diff --git a/configure.ac b/configure.ac
index 2fc06b2..7cac538 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-voodoo],
-1.2.2,
+1.2.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-voodoo)
 

commit 405bab2048a4077b7fbe456f4f24e0d9b448829f
Author: Dave Airlie 
Date:   Tue Jul 28 15:22:42 2009 +1000

voodoo: change to using ABI version check

diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index 6f35fe1..7ea8e05 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -56,7 +56,7 @@
 #include "xf86cmap.h"
 #include "shadowfb.h"
 #include "vgaHW.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86RAC.h"
 #include "xf86Resources.h"
 #endif

commit 023f464e830185c12de90f38219b34498d3e55d0
Author: Dave Airlie 
Date:   Tue Jul 28 13:45:59 2009 +1000

voodoo: remove rac/resources includes

diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index 9ad1962..622c1f9 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -47,8 +47,6 @@
 #include "xf86cmap.h"
 #include "shadowfb.h"
 #include "vgaHW.h"
-#include "xf86RAC.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xaa.h"
 #include "dgaproc.h"
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index e38ea46..6f35fe1 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -56,8 +56,10 @@
 #include "xf86cmap.h"
 #include "shadowfb.h"
 #include "vgaHW.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
 #include "xf86Resources.h"
+#endif
 #include "compiler.h"
 #include "xaa.h"
 
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index 2493612..60f9dc9 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -48,8 +48,6 @@
 #include "xf86cmap.h"
 #include "shadowfb.h"
 #include "vgaHW.h"
-#include "xf86RAC.h"
-#include "xf86Resources.h"
 #include "xaa.h"
 #include "compiler.h"
 

commit 840b9fe089d79507b660bdda3f26afb72faaa6ff
Author: Peter Hutterer 
Date:   Thu Jul 16 11:59:34 2009 +1000

Update to xextproto 7.1 support.

DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 919e29f..2fc06b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto 
xf86dgaproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),
+  HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index 9d088a7..9ad1962 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -59,8 +59,13 @@
 #include 
 
 #include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include 
+#else
 #define DPMS_SERVER
 #include 
+#endif
+
 
 
  /***
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index f412215..e38ea46 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -67,8 +67,13 @@
 #include 
 
 #include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include 
+#else
 #define DPMS_SERVER
 #include 
+#endif
+
 
 static const OptionInfoRec * VoodooAvailableOptions(int chipid, int busid);
 static voidVoodooIdentify(int flags);
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index d988b33..2493612 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -58,8 +58,13 @@
 #include 
 
 #include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include 
+#else
 #define DPMS_SERVER
 #include 
+#endif
+
 #include "mipict.h"
 #include "dixstruct.h"
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xauth: Changes to 'debian-unstable'

[Timo Aaltonen]

 .gitignore   |4 
 ChangeLog|   75 
 Makefile.am  |6 
 Makefile.in  |  690 
 README   |   26 
 aclocal.m4   | 1684 -
 config.guess | 1526 
 config.h.in  |   82 
 config.sub   | 1658 -
 configure| 6659 ---
 configure.ac |   12 
 debian/README.source |   73 
 debian/changelog |   11 
 debian/control   |   12 
 debian/rules |   17 
 debian/xsfbs/repack.sh   |   32 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 
 debian/xsfbs/xsfbs.mk|   72 
 debian/xsfbs/xsfbs.sh|  526 ---
 depcomp  |  589 ---
 gethost.c|3 
 install-sh   |  519 ---
 missing  |  367 --
 process.c|3 
 xauth.man|   55 
 25 files changed, 424 insertions(+), 14427 deletions(-)

New commits:
commit 0cbaee21486ae5943e3ad60049a08bf40acb53b9
Author: Timo Aaltonen 
Date:   Tue Dec 1 11:47:51 2009 +0200

Drop pre-dependency on x11-common. This was needed for upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index dbedc32..9d61b70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xauth (1:1.0.4-1) UNRELEASED; urgency=low
   * Run autoreconf on build. Add build-deps on automake and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
+  * Drop pre-dependency on x11-common. This was needed for upgrades
+from sarge.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 11:36:13 +0200
 
diff --git a/debian/control b/debian/control
index 8bc241b..455d4ef 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xauth.git
 Package: xauth
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: x11-common (>= 1:7.0.0)
 Replaces: xbase-clients (<= 1:7.2.ds2-3)
 Description: X authentication utility
  xauth is a small utility to read and manipulate Xauthority files, which

commit 1689e59a6dbb9d1b6348b5c63f7cf7aa63d1950b
Author: Timo Aaltonen 
Date:   Tue Dec 1 11:43:08 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index ab642bb..dbedc32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xauth (1:1.0.4-1) UNRELEASED; urgency=low
   * New upstream release.
   * Run autoreconf on build. Add build-deps on automake and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 11:36:13 +0200
 
diff --git a/debian/control b/debian/control
index 4e55646..8bc241b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  libxmuu-dev (>= 1:1.0.1),
  automake,
  xutils-dev (>= 1:7.5~1)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xauth
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xauth.git
 

commit 7402eb701423c733027a5aafd246d7bf8e9c9f15
Author: Timo Aaltonen 
Date:   Tue Dec 1 11:42:34 2009 +0200

Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.

diff --git a/debian/changelog b/debian/changelog
index af5c733..ab642bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xauth (1:1.0.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Run autoreconf on build. Add build-deps on automake and xutils-dev.
+  * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
 
  -- Timo Aaltonen   Tue, 01 Dec 2009 11:36:13 +0200
 
diff --git a/debian/rules b/debian/rules
index 909bfcb..478370e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,14 @@
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+   NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+   MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

commit 80011378e9eb3429028975088e6f01b90f10298f
Author: Timo Aaltonen 
Date:   Tue Dec 1 11:41:27 2009 +0200

Run autoreconf on build. Add build-deps on automake and xutils-dev.

diff --git a/debian/changelog b/debian/changelog
index a068f2f..af5c733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xauth (1:1.0.4-1) UNRELEASED; urgency=low
 
   * New upstream releas

xauth: Changes to 'upstream-unstable'

[Timo Aaltonen]

 .gitignore   |4 
 Makefile.am  |6 +++---
 README   |   26 ++
 configure.ac |   12 ++--
 gethost.c|3 ++-
 process.c|3 ++-
 xauth.man|   55 +--
 7 files changed, 72 insertions(+), 37 deletions(-)

New commits:
commit d2d802ea9f882b7b7eac1251309d8141e55f213e
Author: Alan Coopersmith 
Date:   Mon Sep 21 20:25:09 2009 -0700

xauth 1.0.4

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 90d1d29..a2e824f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xauth,[1.0.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
+AC_INIT(xauth,[1.0.4], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit e4ab625fd4e31a6cc043dfabbb7d5a801e87d526
Author: Alan Coopersmith 
Date:   Mon Sep 21 20:22:28 2009 -0700

Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith 

diff --git a/Makefile.am b/Makefile.am
index 21f3fc5..9faf89b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = xauth
 
-AM_CFLAGS = $(XAUTH_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XAUTH_CFLAGS)
 xauth_LDADD = $(XAUTH_LIBS)
 
 xauth_SOURCES =\
@@ -43,7 +43,7 @@ CLEANFILES = $(appman_DATA)
 
 if LINT
 ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(xauth_CFLAGS)
+$(AM_CPPFLAGS) $(CPPFLAGS) $(XAUTH_CFLAGS)
 
 lint:
$(LINT) $(ALL_LINT_FLAGS) $(xauth_SOURCES) $(xauth_LDADD)
diff --git a/configure.ac b/configure.ac
index 42e3d83..90d1d29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,14 +27,14 @@ AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
-# Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or 
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 AC_TYPE_SIGNAL
 
@@ -42,7 +42,6 @@ AC_CHECK_HEADERS([net/errno.h])
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
-XAUTH_CFLAGS="$CWARNFLAGS $XAUTH_CFLAGS"
 AC_SUBST(XAUTH_CFLAGS)
 AC_SUBST(XAUTH_LIBS)
 
@@ -51,8 +50,5 @@ AC_SUBST(XAUTH_LIBS)
 XTRANS_CONNECTION_FLAGS
 
 XORG_WITH_LINT
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])

commit 2cbcbed9dedb696535fe54290189478c6c007270
Author: Alan Coopersmith 
Date:   Mon Sep 21 20:17:48 2009 -0700

Man page updates: add "SEE ALSO", update xdm references

Also trim trailing whitespaces and fix a spelling error

Signed-off-by: Alan Coopersmith 

diff --git a/xauth.man b/xauth.man
index 9e7bdc0..1e3521f 100644
--- a/xauth.man
+++ b/xauth.man
@@ -1,15 +1,14 @@
-.\" $Xorg: xauth.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
 .\" Copyright 1993, 1998  The Open Group
-.\" 
+.\"
 .\" Permission to use, copy, modify, distribute, and sell this software and its
 .\" documentation for any purpose is hereby granted without fee, provided that
 .\" the above copyright notice appear in all copies and that both that
 .\" copyright notice and this permission notice appear in supporting
 .\" documentation.
-.\" 
+.\"
 .\" The above copyright notice and this permission notice shall be included
 .\" in all copies or substantial portions of the Software.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 .\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 .\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -17,13 +16,12 @@
 .\" 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.
-.\" 
+.\"
 .\" Except as contained in this notice, the name of The Open Group shall
 .\" not be used in advertising or otherwise to promote the sale, use or
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xauth/xauth.man,v 1.8tsi Exp $
 .\"
 .TH XAUTH 1 __xorgversion__
 .SH NAME
@@ -33,17 +31,18 @@ xauth \- X authority file utility
 [ \fB\-f\fP \fIauthfile\fP ] [ \fB\-vqibn\fP ] [ \fIcommand arg ...\fP ]
 .SH DESCRIPTION
 .PP
-The \fIxauth\fP program is used to edit and display the authorization 
+The \fIxauth\fP program is used to edit and display the authorization
 information used in connecting to the X server.  This program i

Bug#559010: Mouse cursor dissapears after most recent upgrade

[Alexandre Buisse]

On Tue, Dec  1, 2009 at 13:41:01 +0100, Alexandre Buisse wrote:

> Package: xserver-xorg-video-intel
> Version: 2:2.9.1-1
> Severity: normal
> 
> 
> I am having a similar issue, except that it began yesterday, before I upgraded
> from 2.9.0-1 to 2.9.1-1. I also have no trouble on my laptop screen, but only
> on the external monitor. When I try a simple "xrandr --output VGA --auto",
> results vary between black screen, blue screen (!) and correct output but
> without mouse cursor. It happens whether I use my old xorg.conf or not.
> 
> Also noteworthy is that when I launch X (through "startx")
> with VGA already plugged in, the resolution shown is that of LVDS (i.e.
> 1024x768) so appears very ugly on the 1280x1024 VGA monitor, but the mouse
> cursor is present on both screens. It is only when I change the resolution to
> 1280x1024 that it disappears on VGA.

Just a precision since my previous email was somewhat unclear about
timing:
- I started having problems with the cursor yesterday, *before* updating
  xserver-xorg-video-intel to 2.9.1-1. However, except for that, xrandr
  was working fine on the VGA screen.
- I updated to 2.9.1-1 this morning, and since then have had problems
  with xrandr only working about one in three times to output to VGA.
  And whenever it does, it's without cursor. The only thing I can do
  when it shows a black or blue screen is to restart X and try again.

/Alexandre


signature.asc
Description: Digital signature

xserver-xorg-video-intel 2:2.9.1-1 MIGRATED to testing

[Debian testing watch]

FYI: The status of the xserver-xorg-video-intel source package
in Debian's testing distribution has changed.

  Previous version: 2:2.9.0-1
  Current version:  2:2.9.1-1

-- 
This email is automatically generated once a day.  As the installation of
new packages into testing happens multiple times a day you will receive
later changes on the next day.
See http://release.debian.org/testing-watch/ for more information.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Processed: Re: Bug#556541: xserver-xorg-video-intel: Blank screen with OGRE programs

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> tag 556541 confirmed fixed-upstream
Bug #556541 [xserver-xorg-video-intel] xserver-xorg-video-intel: Blank screen 
with OGRE programs
Added tag(s) confirmed and fixed-upstream.
> kthxbye
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#556541: xserver-xorg-video-intel: Blank screen with OGRE programs

[Julien Cristau]

tag 556541 confirmed fixed-upstream
kthxbye

On Mon, Nov 30, 2009 at 15:46:38 +0100, Julien Cristau wrote:

> On Mon, Nov 30, 2009 at 14:11:11 +, Sam Morris wrote:
> 
> > On Mon, 2009-11-30 at 14:32 +0100, Julien Cristau wrote:
> > > Any chance you could try with an updated mesa?  Say upstream 7.6 or 7.7
> > > branch?
> > > If that doesn't help we probably need to report this upstream
> > > (instructions at http://intellinuxgraphics.org/how_to_report_bug.html).
> > 
> > I'm already using 7.6. Are there packages of 7.7 anywhere, or is it
> > possible/easy to build mesa 7.7 and use it with LD_LIBRARY_PATH or some
> > similar method?
> > 
> The mesa_7_6_branch has had a lot of fixes since the 7.6 release so
> could be a fix there.  In any case, it should be possible to build from
> git and then set LIBGL_DRIVERS_PATH to point where the new
> i9[16]5_dri.so (I don't remember which you use) driver was built.
> 
In particular, [1] seems to point at this commit[2] which went in
between 7.6 and 7.6.1-rc1:

commit a82da7fa263c7fb6b902285994136890e6dc3278
Author: Eric Anholt 
Date:   Sun Oct 11 11:04:09 2009 -0700

i965: Fix the bounds emitted in the vertex buffer packets.

It's the address of the last valid byte, not the address of the first
invalid byte.

This should also fix problems with rendering with the new sanity checks in
the kernel.

[1] http://mid.gmane.org/87y6londpv@gaiman.anholt.net
[2] 
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a82da7fa263c7fb6b902285994136890e6dc3278

Cheers,
Julien



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Processed: reassign 556541 to libgl1-mesa-dri, user debian-x@lists.debian.org, usertagging 556541

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> reassign 556541 libgl1-mesa-dri 7.6-1
Bug #556541 [xserver-xorg-video-intel] xserver-xorg-video-intel: Blank screen 
with OGRE programs
Bug reassigned from package 'xserver-xorg-video-intel' to 'libgl1-mesa-dri'.
Bug No longer marked as found in versions xserver-xorg-video-intel/2:2.9.0-1.
Bug #556541 [libgl1-mesa-dri] xserver-xorg-video-intel: Blank screen with OGRE 
programs
Bug Marked as found in versions mesa/7.6-1.
> user debian-x@lists.debian.org
Setting user to debian-x@lists.debian.org (was jcris...@debian.org).
> usertags 556541 i965
Bug#556541: xserver-xorg-video-intel: Blank screen with OGRE programs
There were no usertags set.
Usertags are now: i965.
>
End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Processing of xfs_1.0.8-2.2+lenny1_i386.changes

[Archive Administrator]

xfs_1.0.8-2.2+lenny1_i386.changes uploaded successfully to localhost
along with the files:
  xfs_1.0.8-2.2+lenny1.dsc
  xfs_1.0.8.orig.tar.gz
  xfs_1.0.8-2.2+lenny1.diff.gz
  xfs_1.0.8-2.2+lenny1_i386.deb

Greetings,

Your Debian queue daemon (running on host ries.debian.org)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libxfont: Changes to 'debian-unstable'

[Julien Cristau]

 .gitignore   |4 
 ChangeLog|   51 +++
 Makefile.am  |   21 +
 configure.ac |   32 +-
 debian/changelog |9 
 debian/control   |9 
 debian/rules |   15 -
 debian/xsfbs/xsfbs.mk|   21 -
 debian/xsfbs/xsfbs.sh|  233 
 doc/fontlib.css  |   46 +++
 doc/fontlib.xml  |  660 +++
 doc/fontlib.xsl  |   38 ++
 src/Makefile.am  |2 
 src/fontfile/Makefile.am |7 
 src/fontfile/fontdir.c   |3 
 15 files changed, 874 insertions(+), 277 deletions(-)

New commits:
commit 396eef6f7d56abab35aef3fc7e90ba1262c523f2
Author: Julien Cristau 
Date:   Tue Dec 1 23:04:23 2009 +0100

Enable support for bzip2 compressed bitmap fonts.

Also add build-dep on zlib1g-dev instead of counting on it being pulled
in indirectly.

diff --git a/debian/changelog b/debian/changelog
index b52719a..d814b85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxfont (1:1.4.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump xutils-dev build-dep for new util-macros.
   * Build documentation, install it in libxfont-dev.
+  * Enable support for bzip2 compressed bitmap fonts.
 
  -- Julien Cristau   Tue, 01 Dec 2009 22:22:35 +0100
 
diff --git a/debian/control b/debian/control
index eb15690..e41dd7d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,8 @@ Build-Depends:
  xtrans-dev,
  x11proto-fonts-dev,
  libfreetype6-dev,
+ zlib1g-dev,
+ libbz2-dev,
  quilt,
  xutils-dev (>= 1:7.5~1),
  autoconf,
diff --git a/debian/rules b/debian/rules
index 4f7cbf1..22eabeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,7 @@ doc_files = \
obj-$(DEB_BUILD_GNU_TYPE)/doc/fontlib.html
 
 confflags += \
+   --with-bzip2 \
--enable-fc \
--enable-builtins \
--enable-pcfformat \

commit 1e9475500fe82470dbf704a414e3c2331f374a74
Author: Julien Cristau 
Date:   Tue Dec 1 22:38:33 2009 +0100

Build documentation, install it in libxfont-dev.

diff --git a/debian/changelog b/debian/changelog
index df3446a..b52719a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxfont (1:1.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump xutils-dev build-dep for new util-macros.
+  * Build documentation, install it in libxfont-dev.
 
  -- Julien Cristau   Tue, 01 Dec 2009 22:22:35 +0100
 
diff --git a/debian/control b/debian/control
index 4b7761e..eb15690 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,10 @@ Build-Depends:
  xutils-dev (>= 1:7.5~1),
  autoconf,
  automake,
- libtool
+ libtool,
+# devel-docs
+ xmlto,
+ lynx,
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxfont
 Vcs-Browser:  http://git.debian.org/?p=pkg-xorg/lib/libxfont.git
diff --git a/debian/rules b/debian/rules
index 370ae79..4f7cbf1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,17 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-confflags += --enable-fc --enable-builtins --enable-pcfformat 
--enable-bdfformat
+doc_files = \
+   doc/fontlib.css \
+   obj-$(DEB_BUILD_GNU_TYPE)/doc/fontlib.txt \
+   obj-$(DEB_BUILD_GNU_TYPE)/doc/fontlib.html
+
+confflags += \
+   --enable-fc \
+   --enable-builtins \
+   --enable-pcfformat \
+   --enable-bdfformat \
+   --enable-devel-docs
 
 configure: $(STAMP_DIR)/patch
autoreconf -vfi
@@ -81,6 +91,8 @@ binary-arch: build install
 
dh_installdocs
dh_install --sourcedir=debian/tmp --list-missing -XlibXfont.la
+   install -d debian/libxfont-dev/usr/share/doc/libxfont-dev
+   install -m 644 $(doc_files) 
debian/libxfont-dev/usr/share/doc/libxfont-dev
dh_installchangelogs ChangeLog
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg

commit 968cd60d93c8378e3f173678434ec59bc761d46b
Author: Julien Cristau 
Date:   Tue Dec 1 22:25:59 2009 +0100

Bump xutils-dev build-dep for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index 679cb51..df3446a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxfont (1:1.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump xutils-dev build-dep for new util-macros.
 
  -- Julien Cristau   Tue, 01 Dec 2009 22:22:35 +0100
 
diff --git a/debian/control b/debian/control
index fa0b083..4b7761e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  x11proto-fonts-dev,
  libfreetype6-dev,
  quilt,
- xutils-dev (>= 1:7.4+4),
+ xutils-dev (>= 1:7.5~1),
  autoconf,
  automake,
  libtool

commit 516f20195952722b326e5501b28e1f2a37ebeb0d
Author: Julien Cristau 
Date:   Tue Dec 1 22:23:04 2009 +0100

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 4a82977..a5c5eec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+commit 64f21944c5f374b0da6

libxfont: Changes to 'upstream-unstable'

[Julien Cristau]

 .gitignore   |4 
 Makefile.am  |   21 +
 configure.ac |   32 +-
 doc/fontlib.css  |   46 +++
 doc/fontlib.xml  |  660 +++
 doc/fontlib.xsl  |   38 ++
 src/Makefile.am  |2 
 src/fontfile/Makefile.am |7 
 src/fontfile/fontdir.c   |3 
 9 files changed, 790 insertions(+), 23 deletions(-)

New commits:
commit 64f21944c5f374b0da63657f01e289b34d00904c
Author: Alan Coopersmith 
Date:   Fri Oct 9 17:38:33 2009 -0700

libXfont 1.4.1

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index c98a5ef..399f7d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ([2.57])
 
 AC_INIT([libXfont],
-   1.4.0,
+   1.4.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
 dnl

commit 947d3162f5edaaa05bbbfcfe2303d0c8b796f9ca
Author: Alan Coopersmith 
Date:   Wed Oct 7 13:05:26 2009 -0700

Remove unused setting of ENCODINGSDIR

Seems to have been a leftover from before the encoding code was split
out into libfontenc by XFree86

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 5c0a4a5..c98a5ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,13 +67,6 @@ AC_CHECK_FUNCS([poll])
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], 
m4_defn([AC_HELP_STRING]))])
 
-DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
-AC_ARG_WITH(encodingsdir,
-   AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to font 
encodings]),
-   [ENCODINGSDIR="$withval"],
-   [ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"])
-AC_SUBST(ENCODINGSDIR)
-
 #
 # select libraries to include
 #
diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am
index 05aded2..aa64ca5 100644
--- a/src/fontfile/Makefile.am
+++ b/src/fontfile/Makefile.am
@@ -1,9 +1,4 @@
-fontencd...@encodingsdir@
-FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\"
-
-INCLUDES = \
-   -I${top_srcdir}/include \
-   $(FONTENCDEFS)  
+INCLUDES = -I${top_srcdir}/include
 
 AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
 

commit 18053ffbf92473ffce23a3c5182de92b608b9cdf
Author: Alan Coopersmith 
Date:   Wed Oct 7 10:44:27 2009 -0700

Convert documentation from troff to DocBook/XML

Signed-off-by: Alan Coopersmith 

diff --git a/.gitignore b/.gitignore
index 70042c5..e0351c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,7 @@ xfont.pc
 libXfont-*.tar.*
 ChangeLog
 tags
+doc/fontlib.txt
+doc/fontlib.html
+doc/fontlib.ps
+doc/fontlib.pdf
diff --git a/Makefile.am b/Makefile.am
index 1da055b..b90a7ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,3 +52,24 @@ ChangeLog:
 
 dist-hook: ChangeLog
 
+# Developer documentation - not installed on system
+EXTRA_DIST += doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
+
+if MAKE_DEVEL_DOCS
+if HAVE_XMLTO
+noinst_DATA = doc/fontlib.txt doc/fontlib.html $(srcdir)/doc/fontlib.css
+CLEANFILES = doc/fontlib.txt doc/fontlib.html doc/fontlib.pdf doc/fontlib.ps
+
+doc/fontlib.txt: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
+   $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc txt 
$(srcdir)/doc/fontlib.xml
+
+doc/fontlib.html: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
+   $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc xhtml-nochunks 
$(srcdir)/doc/fontlib.xml
+
+doc/fontlib.pdf: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
+   $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc pdf 
$(srcdir)/doc/fontlib.xml
+
+doc/fontlib.ps: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
+   $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc ps 
$(srcdir)/doc/fontlib.xml
+endif HAVE_XMLTO
+endif MAKE_DEVEL_DOCS
diff --git a/configure.ac b/configure.ac
index bd096f4..5c0a4a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,18 @@ PKG_PROG_PKG_CONFIG
 
 XORG_DEFAULT_OPTIONS
 
+# xmlto is used to convert doc/fontlib.xml from DocBook to PDF/HTML
+AC_ARG_VAR([XMLTO], [Path to xmlto command])
+AC_PATH_PROG([XMLTO], [xmlto])
+AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
+
+# Option to enable support for building developer internals docs
+AC_ARG_ENABLE(devel-docs,
+   AS_HELP_STRING([--enable-devel-docs],
+   [Build internals documentation for developers (default: enabled)]),
+   [DEVEL_DOCS=$enableval], [DEVEL_DOCS=yes])
+AM_CONDITIONAL([MAKE_DEVEL_DOCS], [test "x$DEVEL_DOCS" = "xyes"])
+
 # Look for headers
 AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
 AC_CHECK_FUNCS([poll])
diff --git a/doc/fontlib.css b/doc/fontlib.css
new file mode 100644
index 000..137200f
--- /dev/null
+++ b/doc/fontlib.css
@@ -0,0 +1,46 @@
+/* Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any p

Bug#558788: please upload this to sid

[gurkan]

is there a plan?



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#559089: Follow-up

[Jonathan Protzenko]

After some extensive testing, because it really rendered my system
unusable, I tried :

sudo hal-set-property --udi
/org/freedesktop/Hal/devices/platform_i8042_i8042_KBD_port_logicaldev_input
--key input.x11_driver --string ""

after some advice on #debian-x. This set the right property, but didn't
solve the problem, so I simply removed /dev/input/event0 after seeing
with evtest that the internal keyboard of the laptop was causing the
issue (I'm using a USB keyboard now).

In hope this is useful,

jonathan



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org