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

2012-05-01 Thread Cyril Brulebois 
 ChangeLog   |  287 
 configure.ac|   53 -
 debian/changelog|7 +
 man/Makefile.am |   34 --
 man/sis.man |   20 ---
 src/initextx.c  |   18 +--
 src/osdef.h |   24 ++--
 src/sis.h   |   29 +++--
 src/sis6326_video.c |6 -
 src/sis_dga.c   |6 -
 src/sis_dri.c   |   24 ++--
 src/sis_driver.c|  269 
 src/sis_memcpy.c|   10 -
 src/sis_opt.c   |   16 +-
 src/sis_utility.c   |   48 
 src/sis_vga.c   |   11 +
 src/sis_video.c |8 -
 src/sispcirename.h  |   29 +
 src/vgatypes.h  |   12 --
 19 files changed, 616 insertions(+), 295 deletions(-)

New commits:
commit 06c16a118166f221f25af2e523368480711192ab
Author: Cyril Brulebois k...@debian.org
Date:   Tue May 1 19:17:31 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index e415c74..bc95aa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-sis (1:0.10.4-1) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.10.4-1) unstable; urgency=low
 
   * New upstream release:
 - Fix FTBFS with X server 1.12.
 
- -- Cyril Brulebois k...@debian.org  Tue, 01 May 2012 19:17:02 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 01 May 2012 19:17:28 +0200
 
 xserver-xorg-video-sis (1:0.10.3-3) unstable; urgency=low
 

commit 1c4f3505b7d75c409b00300b1f9ed73bb54ff22e
Author: Cyril Brulebois k...@debian.org
Date:   Tue May 1 19:17:24 2012 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index ecb8dfc..a9eb815 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,290 @@
+commit e067fc080c653a5d47cd319ca1a7afeebe6c7c4e
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Mar 23 19:52:38 2012 -0700
+
+xf86-video-sis 0.10.4
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit f5dafa24d825a7d279c8177422c66b997b82d240
+Author: Johannes Obermayr johannesoberm...@gmx.de
+Date:   Mon Feb 6 23:15:31 2012 +0100
+
+Fix build with XInput version 12.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit bdaf1ba97cf8b0abb5aeee97a822ee466bf8f5f5
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jan 17 15:21:26 2012 +1000
+
+Undo typos from last commit
+
+Reported-by: Tormod Volden debian.tor...@gmail.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 9c1f8f775ca692858fd88e325ef815cc49e55805
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Jan 4 13:58:01 2012 +1000
+
+Untangle XF86DRI from the driver-specific DRI define
+
+XF86DRI is defined by xorg-server.h, so --disable-dri in the sis driver
+itself does exactly nothing other than not fill in the CFLAGS and thus stop
+the driver from compiling.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit 16724f3ecd322c64d9ee164fb122d4285d9cef08
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Oct 31 15:03:21 2011 +1000
+
+Use miPointerSetPosition, not miPointerAbsoluteCursor
+
+miPointerAbsoluteCursor was removed in '09.
+
+Technically this shouldn't just work on the VCP since any master pointer 
may
+end up in the dead area. However, I suspect the Venn diagramm of MPX users
+and sis merged framebuffer users shows little overlap.
+
+miPointerSetPosition's prototype changed a few times, these are a bunch of
+untested ifdefs that should be correct according to the git history.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit 3e0d8e11927b8c68f6531eef39eb5bca557e887b
+Author: Adam Jackson a...@redhat.com
+Date:   Mon Dec 19 17:28:33 2011 -0500
+
+Fall back to shadowfb if XAA is unavailable
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 2b459f385dc2f1b5e769e2ce84b6f4ec099c0a23
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Mon Oct 31 11:57:49 2011 -0700
+
+Build fix for older servers (error: conflicting types for 'pciTag')
+
+/usr/include/xorg/xf86Pci.h:254:25: note: previous declaration of 'pciTag' 
was here
+
+Reported-by: Johannes Obermayr johannesoberm...@gmx.de
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 0ab07a477a4916923a13c073c3fd6e575e79f725
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sun Oct 30 11:09:30 2011 -0700
+
+Use pci_device_map_legacy rather than xf86MapDomainMemory on newer servers
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 77046f9be08295dbca69b51987df3308a284d87e
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sat Oct 29 17:44:55 2011 -0700
+
+Convert use of LookupWindow to dixLookupWindow
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com

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

2011-02-05 Thread Cyril Brulebois 
 debian/README.source   |   24 -
 debian/changelog   |   21 +
 debian/compat  |2 
 debian/control |   22 -
 debian/rules   |  108 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 8 files changed, 44 insertions(+), 1072 deletions(-)

New commits:
commit e90f52fcf5a5b6b40ecc5051f2124fa64f7ff4c3
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 14:55:47 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6356070..e5eac8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-sis (1:0.10.3-3) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.10.3-3) unstable; urgency=low
 
   * Switch to dh:
 - Use debhelper 8.
@@ -11,7 +11,7 @@ xserver-xorg-video-sis (1:0.10.3-3) UNRELEASED; urgency=low
   * Wrap Depends/Provides.
   * Bump Standards-Version to 3.9.1 (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Fri, 04 Feb 2011 05:45:05 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 14:55:47 +0100
 
 xserver-xorg-video-sis (1:0.10.3-2) experimental; urgency=low
 

commit f91a33556f23c4350254502bbb8fcf6fe36fdb0f
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 05:47:14 2011 +0100

Bump Standards-Version to 3.9.1 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index 5802078..6356070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-sis (1:0.10.3-3) UNRELEASED; urgency=low
   * Update Uploaders list. Thanks, David  Brice!
   * Remove long obsolete Replaces/Conflicts.
   * Wrap Depends/Provides.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Fri, 04 Feb 2011 05:45:05 +0100
 
diff --git a/debian/control b/debian/control
index 7cd28a0..59cdd82 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
  x11proto-xf86dri-dev,
  quilt,
  xutils-dev (= 1:7.5+1),
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 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 888a877345ade54a2dc0dd2d79f032793a48c3c2
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 05:47:00 2011 +0100

Wrap Depends/Provides.

diff --git a/debian/changelog b/debian/changelog
index 016877f..5802078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-sis (1:0.10.3-3) UNRELEASED; urgency=low
   * Remove xsfbs accordingly.
   * Update Uploaders list. Thanks, David  Brice!
   * Remove long obsolete Replaces/Conflicts.
+  * Wrap Depends/Provides.
 
  -- Cyril Brulebois k...@debian.org  Fri, 04 Feb 2011 05:45:05 +0100
 
diff --git a/debian/control b/debian/control
index 9bdeab4..7cd28a0 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,12 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sis.git
 
 Package: xserver-xorg-video-sis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
-Provides: ${xviddriver:Provides}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
 Description: X.Org X server -- SiS display driver
  This package provides the driver for all SiS and XGI Volari cards.
  .

commit 9cffd46963b5a0a1c2dd422ccef4fe4650cd7a03
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 05:46:42 2011 +0100

Remove long obsolete Replaces/Conflicts.

diff --git a/debian/changelog b/debian/changelog
index a15d2ca..016877f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-sis (1:0.10.3-3) UNRELEASED; urgency=low
   debhelper sequence.
   * Remove xsfbs accordingly.
   * Update Uploaders list. Thanks, David  Brice!
+  * Remove long obsolete Replaces/Conflicts.
 
  -- Cyril Brulebois k...@debian.org  Fri, 04 Feb 2011 05:45:05 +0100
 
diff --git a/debian/control b/debian/control
index a2af7fb..9bdeab4 100644
--- a/debian/control
+++ b/debian/control
@@ -30,8 +30,6 @@ Package: xserver-xorg-video-sis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
 Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-sis
-Conflicts: xserver-xorg-driver-sis
 Description: X.Org X server -- SiS display driver
  This package provides the driver for all SiS and XGI Volari cards.
  .

commit a9d90c75cb2899016aa2a1271f5a7d8f49e806d4
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 05:46:26 2011 +0100

Update Uploaders list. Thanks, David  Brice!

diff --git a/debian/changelog b/debian/changelog
index 4ba6d0e..a15d2ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-sis (1:0.10.3-3) UNRELEASED; urgency=low
 - Bump

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

2010-07-24 Thread Julien Cristau 
 COPYING  |  143 +++--
 ChangeLog|  177 +
 Makefile.am  |   15 ++-
 README   |  110 -
 README.sgml  |  235 ---
 configure.ac |   17 ++-
 debian/changelog |   12 ++
 debian/control   |4 
 debian/copyright |  132 ++
 man/Makefile.am  |   41 -
 man/sis.man  |8 -
 src/sis_driver.c |   12 +-
 src/sis_opt.c|2 
 src/sis_vga.c|8 +
 14 files changed, 548 insertions(+), 368 deletions(-)

New commits:
commit 8d8104be35e60e31d992c92caabc2a2444ef4362
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 24 13:12:53 2010 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 466d8e1..4dc68ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-sis (1:0.10.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.10.3-1) unstable; urgency=low
 
   * New upstream release.
 + SISVGABlankScreen: only update the hardware if we're changing the state
@@ -8,7 +8,7 @@ xserver-xorg-video-sis (1:0.10.3-1) UNRELEASED; urgency=low
   * Bump xutils-dev build-dep for util-macros 1.4.
   * Update debian/copyright from upstream COPYING.
 
- -- Julien Cristau jcris...@debian.org  Sat, 24 Jul 2010 12:32:00 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 24 Jul 2010 13:12:50 +0200
 
 xserver-xorg-video-sis (1:0.10.2-3) unstable; urgency=low
 

commit 835e6ca109cd5ab2f2acfb8a24548e5458426bf7
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 24 13:09:01 2010 +0200

Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index 0e3f61e..466d8e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-sis (1:0.10.3-1) UNRELEASED; urgency=low
 + Fix broken URLs in various places (closes: #517075)
   * Bump Standards-Version to 3.9.0.
   * Bump xutils-dev build-dep for util-macros 1.4.
+  * Update debian/copyright from upstream COPYING.
 
  -- Julien Cristau jcris...@debian.org  Sat, 24 Jul 2010 12:32:00 +0200
 
diff --git a/debian/copyright b/debian/copyright
index bdb96ed..b72246f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,30 @@
 This package was downloaded from
 http://xorg.freedesktop.org/releases/individual/driver/
 
+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1) Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2) Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3) The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England.
 Parts Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria.
 
@@ -24,27 +48,95 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, 
NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
+Copyright (C) 2003 Eric Anholt
 
+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 appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose.  It is provided
+as is without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF

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

2010-05-07 Thread Mikhail Gusarov 
 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit c1ed7f9b050cce9538266b1488e30f46353fb3e9
Author: Mikhail Gusarov dotted...@debian.org
Date:   Fri May 7 18:58:58 2010 +0700

Remove duplicate xorg.fd.o URL and confusing mailing list URL from 
debian/control

diff --git a/debian/control b/debian/control
index 71f50a4..212b86e 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,5 @@ Description: X.Org X server -- SiS display driver
  .
  More information about X.Org can be found at:
  URL:http://www.X.org
- URL:http://xorg.freedesktop.org
- URL:http://lists.freedesktop.org/mailman/listinfo/xorg
  .
  This package is built from the X.org xf86-video-sis driver module.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1oamq8-00027k...@alioth.debian.org

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

2010-05-03 Thread Cyril Brulebois 
 debian/README.source  |2 +-
 debian/changelog  |   10 ++
 debian/control|8 
 debian/xsfbs/xsfbs.mk |   35 ++-
 4 files changed, 37 insertions(+), 18 deletions(-)

New commits:
commit 27702d048c30f7276083b555b98196c1314ca0aa
Author: Cyril Brulebois k...@debian.org
Date:   Tue May 4 00:29:11 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index dac1d16..2233692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-sis (1:0.10.2-3) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.10.2-3) unstable; urgency=low
 
   * Update to new xsfbs, replace deprecated ${xserver:Depends} with
 ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
@@ -6,7 +6,7 @@ xserver-xorg-video-sis (1:0.10.2-3) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Tue, 04 May 2010 00:28:07 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 04 May 2010 00:29:06 +0200
 
 xserver-xorg-video-sis (1:0.10.2-2) unstable; urgency=high
 

commit 9a945bba572914ef36d9a8c7932abadd6882e53e
Author: Cyril Brulebois k...@debian.org
Date:   Tue May 4 00:28:42 2010 +0200

Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index 79aad9f..dac1d16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-sis (1:0.10.2-3) UNRELEASED; urgency=low
 ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
 accordingly.
   * Add myself to Uploaders.
+  * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Tue, 04 May 2010 00:28:07 +0200
 
diff --git a/debian/control b/debian/control
index 9fcb68d..71f50a4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 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 644928441b801f1ee453215cd20a2951f93e138f
Author: Cyril Brulebois k...@debian.org
Date:   Tue May 4 00:28:24 2010 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index b449276..79aad9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-sis (1:0.10.2-3) UNRELEASED; urgency=low
   * Update to new xsfbs, replace deprecated ${xserver:Depends} with
 ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
 accordingly.
+  * Add myself to Uploaders.
 
  -- Cyril Brulebois k...@debian.org  Tue, 04 May 2010 00:28:07 +0200
 
diff --git a/debian/control b/debian/control
index 6bbafbb..9fcb68d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-sis
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org, Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,

commit 2dbaf88f714d23c1ee6c395db674806f2d2e442d
Author: Cyril Brulebois k...@debian.org
Date:   Tue May 4 00:28:07 2010 +0200

Update to new xsfbs, replace deprecated ${xserver:Depends} with 
${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly.

diff --git a/debian/changelog b/debian/changelog
index d8f0cf0..b449276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-sis (1:0.10.2-3) UNRELEASED; urgency=low
+
+  * Update to new xsfbs, replace deprecated ${xserver:Depends} with
+${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
+accordingly.
+
+ -- Cyril Brulebois k...@debian.org  Tue, 04 May 2010 00:28:07 +0200
+
 xserver-xorg-video-sis (1:0.10.2-2) unstable; urgency=high
 
   * High urgency upload for RC bug fix.
diff --git a/debian/control b/debian/control
index fd59323..6bbafbb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
- xserver-xorg-dev (= 2:1.7),
+ xserver-xorg-dev (= 2:1.7.6.901),
  x11proto-video-dev,
  x11proto-xext-dev,
  x11proto-gl-dev,
@@ -30,7 +30,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sis.git
 
 Package: xserver-xorg-video-sis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
 Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-sis
 Conflicts: xserver-xorg-driver-sis

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

2010-03-22 Thread Tormod Volden 
 debian/changelog |7 +++
 src/sis_driver.c |2 ++
 2 files changed, 9 insertions(+)

New commits:
commit 94a59e5aee8259baca57479561185e2970115b2d
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Mar 22 23:10:46 2010 +0100

Update changelog with previous cherry-pick

diff --git a/debian/changelog b/debian/changelog
index f12672b..63b3dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-sis (1:0.10.2-3) unstable; urgency=low
+
+  * Cherry-pick 8370499d4035ec7a5c8e1f1b04d5a6c404883442
+Fix BIOS read on 650 and 760. (#19070) Closes: #546714.
+
+ -- Tormod Volden debian.tor...@gmail.com  Mon, 22 Mar 2010 22:30:07 +0100
+
 xserver-xorg-video-sis (1:0.10.2-2) UNRELEASED; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no

commit 0b6e1ce4d753617ba2e1e579f9c731a2df6ca2fe
Author: Matteo Delfino kendats...@gmail.com
Date:   Wed Oct 21 10:26:45 2009 -0400

Fix BIOS read on 650 and 760. (#19070)

Signed-off-by: Matteo Delfino kendats...@gmail.com
Signed-off-by: Adam Jackson a...@redhat.com
(cherry picked from commit 8370499d4035ec7a5c8e1f1b04d5a6c404883442)

diff --git a/src/sis_driver.c b/src/sis_driver.c
index 994b02d..b19e7a9 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -4099,6 +4099,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 case SIS_315H:
 case SIS_330:
 case SIS_340:
+case SIS_650:
+case SIS_760:
 case XGI_40: readpci = TRUE;
  break;
 case XGI_20: readpci = TRUE;


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ntpzg-0006g3...@alioth.debian.org

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

2010-03-22 Thread Tormod Volden 
 debian/changelog |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit d2b4d40af21a851dca12e4bf9c3cbd4ec0fb8043
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Mar 22 23:28:31 2010 +0100

Fix version in changelog and merge entries.

diff --git a/debian/changelog b/debian/changelog
index 63b3dcd..a0472a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,15 @@
-xserver-xorg-video-sis (1:0.10.2-3) unstable; urgency=low
-
-  * Cherry-pick 8370499d4035ec7a5c8e1f1b04d5a6c404883442
-Fix BIOS read on 650 and 760. (#19070) Closes: #546714.
-
- -- Tormod Volden debian.tor...@gmail.com  Mon, 22 Mar 2010 22:30:07 +0100
-
-xserver-xorg-video-sis (1:0.10.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.10.2-2) unstable; urgency=low
 
+  [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
 
- -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 01:56:20 +0100
+  [ Tormod Volden ]
+  * Cherry-pick 8370499d4035ec7a5c8e1f1b04d5a6c404883442
+Fix BIOS read on 650 and 760. (#19070) Closes: #546714.
+
+ -- Tormod Volden debian.tor...@gmail.com  Mon, 22 Mar 2010 23:27:06 +0100
 
 xserver-xorg-video-sis (1:0.10.2-1) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ntq7n-kd...@alioth.debian.org

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

2010-03-22 Thread Tormod Volden 
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 961762c59f168621c2c0ab36ba514b730f520018
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Mar 22 23:31:26 2010 +0100

Add bug closer for launchpad too.

diff --git a/debian/changelog b/debian/changelog
index a0472a2..a6d7c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ xserver-xorg-video-sis (1:0.10.2-2) unstable; urgency=low
 
   [ Tormod Volden ]
   * Cherry-pick 8370499d4035ec7a5c8e1f1b04d5a6c404883442
-Fix BIOS read on 650 and 760. (#19070) Closes: #546714.
+Fix BIOS read on 650 and 760. (#19070) Closes: #546714. LP: #287475
 
  -- Tormod Volden debian.tor...@gmail.com  Mon, 22 Mar 2010 23:27:06 +0100
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ntqac-hs...@alioth.debian.org

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

2010-03-22 Thread Julien Cristau 
 debian/changelog |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 71647b8b472afbe6a486facc3dadf131dcacfafe
Author: Julien Cristau jcris...@debian.org
Date:   Mon Mar 22 23:56:56 2010 +0100

Bump urgency.

diff --git a/debian/changelog b/debian/changelog
index a6d7c4c..d8f0cf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-xserver-xorg-video-sis (1:0.10.2-2) unstable; urgency=low
+xserver-xorg-video-sis (1:0.10.2-2) unstable; urgency=high
+
+  * High urgency upload for RC bug fix.
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ntqao-0004fs...@alioth.debian.org

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

2010-01-22 Thread Julien Cristau 
 debian/changelog |   17 -
 debian/control   |2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 7189d3088fd6c489b3b55ffbc69a7054acd467d2
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 23 01:46:28 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index e48cbf8..c9e1c5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-sis (1:0.10.2-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:11 +0200
 
diff --git a/debian/control b/debian/control
index 25150c6..fd59323 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-sis
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org, Julien Cristau jcris...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,

commit 858b31789c8e37f093a7bcc758491f97f26b798c
Author: Cyril Brulebois k...@debian.org
Date:   Sun Dec 6 01:38:25 2009 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index a8bea2b..89e1934 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-xserver-xorg-video-sis (1:0.10.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.10.2-1) experimental; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
   * Remove 03_gen_pci_ids.diff. The X server now uses an internal table to
 choose a driver during autoconfiguration.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:11 +0200
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois k...@debian.org  Sun, 06 Dec 2009 01:38:21 +0100
 
 xserver-xorg-video-sis (1:0.10.1-2) unstable; urgency=low
 


-- 
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'

2010-01-16 Thread Julien Cristau 
 debian/changelog |5 +
 debian/rules |   14 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 10d32142ffbc773b54806fb50ae6a781370d80e8
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:48:39 2010 +

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index a8bea2b..e48cbf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 xserver-xorg-video-sis (1:0.10.2-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
   * Remove 03_gen_pci_ids.diff. The X server now uses an internal table to
 choose a driver during autoconfiguration.
 
+  [ Julien Cristau ]
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:11 +0200
 
 xserver-xorg-video-sis (1:0.10.1-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 3c752c2..78ba5c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,17 +40,17 @@ confflags += --disable-static
 configure: $(STAMP_DIR)/patch
autoreconf -vfi
 
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
-   mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
-   cd obj-$(DEB_BUILD_GNU_TYPE)  \
+build/config.status: configure
+   mkdir -p build
+   cd build  \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS=$(CFLAGS) 
 
 build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd build  $(MAKE)
$@
 
 clean: xsfclean
@@ -62,7 +62,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf obj-*
+   rm -rf build
rm -f $$(find -name Makefile.in)
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
@@ -75,7 +75,7 @@ install: build
dh_clean -k
dh_installdirs
 
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
+   cd build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install serverabi


-- 
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'

2009-12-05 Thread Timo Aaltonen 
 debian/changelog   |2 ++
 debian/patches/03_gen_pci_ids.diff |   30 --
 debian/patches/series  |1 -
 3 files changed, 2 insertions(+), 31 deletions(-)

New commits:
commit 86ff2847ac02dfa5042c4a9fd6a4041c8de6aa03
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 10:04:43 2009 +0200

Remove 03_gen_pci_ids.diff. The X server now uses an internal table to 
choose a driver during autoconfiguration.

diff --git a/debian/changelog b/debian/changelog
index 61b0b7d..a8bea2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xserver-xorg-video-sis (1:0.10.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
+  * Remove 03_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:11 +0200
 
diff --git a/debian/patches/03_gen_pci_ids.diff 
b/debian/patches/03_gen_pci_ids.diff
deleted file mode 100644
index 4a80cc8..000
--- a/debian/patches/03_gen_pci_ids.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: xserver-xorg-video-sis/src/sis.ids
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ xserver-xorg-video-sis/src/sis.ids 2007-08-22 21:35:38.0 -0400
-@@ -0,0 +1,14 @@
-+10390200
-+10396306
-+10396326
-+10390300
-+10396300
-+10395300
-+10395315 
-+10390310
-+10390325
-+10396325 
-+10390330
-+10390340
-+01039315
-+10396330
-Index: xserver-xorg-video-sis/src/Makefile.am
-===
 xserver-xorg-video-sis.orig/src/Makefile.am2007-08-22 
21:35:49.0 -0400
-+++ xserver-xorg-video-sis/src/Makefile.am 2007-08-22 21:36:07.0 
-0400
-@@ -76,3 +76,6 @@
-  sis_dri.c \
-  sis_dri.h 
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = sis.ids
diff --git a/debian/patches/series b/debian/patches/series
index ca04166..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-03_gen_pci_ids.diff


-- 
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'

2009-12-05 Thread Timo Aaltonen 
 debian/xserver-xorg-video-sis.install |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f6d2df8b9024b254b97dd26a22bb40626ea17a7a
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 14:43:36 2009 +0200

Don't try to install the pci-ids.

diff --git a/debian/xserver-xorg-video-sis.install 
b/debian/xserver-xorg-video-sis.install
index 8a9f4ba..614cfb4 100644
--- a/debian/xserver-xorg-video-sis.install
+++ b/debian/xserver-xorg-video-sis.install
@@ -1,3 +1,2 @@
 usr/lib/xorg/modules/drivers/*.so
 usr/share/man/man4/*
-usr/share/xserver-xorg/pci/*


-- 
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'

2009-12-04 Thread Timo Aaltonen 
 debian/changelog |3 ++-
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 313f72cf287f1f6afe677716a792f9d507960344
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 02:09:30 2009 +0200

Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index ecb0137..61b0b7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-sis (1:0.10.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 01 Dec 2009 10:17:02 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:11 +0200
 
 xserver-xorg-video-sis (1:0.10.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 08b3f69..25150c6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
- xserver-xorg-dev (= 2:1.5.99.901),
+ xserver-xorg-dev (= 2:1.7),
  x11proto-video-dev,
  x11proto-xext-dev,
  x11proto-gl-dev,


-- 
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'

2009-12-01 Thread 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 tjaal...@cc.hut.fi
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 tjaal...@ubuntu.com  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 tjaal...@cc.hut.fi
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 airl...@redhat.com
+Date:   Thu Jul 30 12:04:29 2009 +1000
+
+sis: bump for release 0.10.2
+
+commit 8c3eca873717e877048c2bde345c02b1e9099e50
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 15:22:41 2009 +1000
+
+sis: change to using ABI version check
+
+commit 9e1ebb9530bbb71be7fcab9e6f8f9a475be72efe
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 13:32:37 2009 +1000
+
+sis: update for resources/RAC API removal
+
+commit 59ea80738d22c69a2850fd7ff89bd75330cc310b
+Author: Peter Hutterer peter.hutte...@who-t.net
+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 peter.hutte...@who-t.net
+
+commit 74553b5ee476a0dd28e136f5a33a546ea0c3ef28
+Author: Adam Jackson a...@redhat.com
+Date:   Thu May 28 15:19:25 2009 -0400
+
+Remove useless loader symbol lists.
+
+commit 933dd8f860883c613acb5bcdf6b66100dbdfa952
+Author: Alan Coopersmith alan.coopersm...@sun.com
+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 alan.coopersm...@sun.com
+
+commit 49c641b638ac36d2a559555c04a3bd2777c8d071
+Author: Alan Coopersmith alan.coopersm...@sun.com
+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 alan.coopersm...@sun.com
+
+commit 5583c2342d873c0998ae73828246356867285460
+Author: Chris Ball c...@laptop.org
+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 c...@laptop.org
+
+commit 7adc184e5e0f3df00423ea99b325d24764c1c067
+Author: Chris Ball c...@laptop.org
+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 c...@laptop.org
+
+commit e4f6a2fcd5712d0f994d3719b9c6c13f5b02bc7c
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Jan 9 16:34:01 2009 -0800
+
+Remove xorgconfig  xorgcfg from See Also list in man page
+
 commit 6ab99d8d66ccd77314760edcb6110db924be3dcf
 Author: Dave Airlie airl...@redhat.com
 Date:   Mon Dec 22 14:38:17 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index

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

2009-04-09 Thread Julien Cristau 
 ChangeLog  |   22 
 Makefile.in|  687 -
 aclocal.m4 | 8256 -
 config.guess   | 1526 ---
 config.h.in|   75 
 config.sub | 1658 ---
 configure  |23695 -
 configure.ac   |3 
 debian/changelog   |   23 
 debian/control |   22 
 debian/rules   |   25 
 debian/xsfbs/repack.sh |   32 
 debian/xsfbs/xsfbs.mk  |   29 
 debian/xsfbs/xsfbs.sh  |   66 
 depcomp|  589 -
 install-sh |  519 -
 ltmain.sh  | 6964 --
 man/Makefile.in|  449 
 missing|  367 
 mkinstalldirs  |  161 
 src/Makefile.in|  593 -
 src/sis_driver.c   |   20 
 src/sis_driver.h   |4 
 src/sis_utility.c  |   18 
 24 files changed, 135 insertions(+), 45668 deletions(-)

New commits:
commit 6995aa9b14194df073dc002c6e0e358c1c0421af
Author: Julien Cristau jcris...@debian.org
Date:   Thu Apr 9 11:46:30 2009 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index fba1f95..b7ca88f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-sis (1:0.10.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.10.1-2) unstable; urgency=low
 
   * Drop build-dep on x11proto-xf86misc-dev, not needed anymore.
+  * Upload to unstable.
 
- -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 11:45:56 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 11:46:28 +0100
 
 xserver-xorg-video-sis (1:0.10.1-1) experimental; urgency=low
 

commit bc9ae784040799518343e9de35b03acf9094a728
Author: Julien Cristau jcris...@debian.org
Date:   Thu Apr 9 11:46:14 2009 +0100

Drop build-dep on x11proto-xf86misc-dev, not needed anymore.

diff --git a/debian/changelog b/debian/changelog
index d59e23f..fba1f95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sis (1:0.10.1-2) UNRELEASED; urgency=low
+
+  * Drop build-dep on x11proto-xf86misc-dev, not needed anymore.
+
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 11:45:56 +0100
+
 xserver-xorg-video-sis (1:0.10.1-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index c3b6b5f..ff10056 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends:
  x11proto-gl-dev,
  x11proto-xinerama-dev,
  x11proto-xf86dga-dev,
- x11proto-xf86misc-dev,
  libgl1-mesa-dev | libgl-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,

commit fa6396d6bf68b9a0154089146287245f9ad60a1e
Author: Julien Cristau jcris...@debian.org
Date:   Wed Feb 25 21:31:03 2009 +0100

xsfbs: repack.sh needs to be executable

diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
old mode 100644
new mode 100755

commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau jcris...@debian.org
Date:   Tue Feb 17 17:20:42 2009 +0100

xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so

libx11's postinst was the only post-sarge user, and it's gone now.

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
   fi
 }
 
-register_x_lib_dir_with_ld_so () {
-  # syntax: register_x_lib_dir_with_ld_so
-  #
-  # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
-  # libraries.
-  #
-  # Call this function from the postinst script of a package that places a
-  # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
-  local dir ldsoconf
-
-  dir=/usr/X11R6/lib
-  ldsoconf=/etc/ld.so.conf
-
-  # is the line not already present?
-  if ! fgrep -qsx $dir $ldsoconf; then
-observe adding $dir directory to $ldsoconf
-echo $dir  $ldsoconf
-  fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
-  # syntax: deregister_x_lib_dir_with_ld_so
-  #
-  # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
-  # libraries, if and only if no shared libaries remain there.
-  #
-  # Call this function from the postrm script of a package that places a shared
-  # library in /usr/X11R6/lib, in the event $1 is remove, and before
-  # invoking ldconfig.
-
-  local dir ldsoconf fgrep_status cmp_status
-
-  dir=/usr/X11R6/lib
-  ldsoconf=/etc/ld.so.conf
-
-  # is the line present?
-  if fgrep -qsx $dir $ldsoconf; then
-# are there any shared objects in the directory?
-if [ $(echo $dir/lib*.so.*.*) = $dir/lib*.so.*.* ]; then
-  # glob expansion produced nothing, so no shared libraries are present
-  observe removing $dir directory from $ldsoconf
-  # rewrite the file (very carefully)
-  set +e
-  fgrep -svx $dir $ldsoconf  $ldsoconf.dpkg-tmp
-  fgrep_status=$?
-  set -e
-  case $fgrep_status in
-0|1) ;; # we don't actually care if any lines matched or not
-*) die error reading \$ldsoconf\;

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

2008-06-06 Thread Julien Cristau 
 ChangeLog |  114 +++
 Makefile.in   |   31 -
 aclocal.m4|  265 +
 config.guess  |   60 +-
 config.sub|   66 +-
 configure |  985 +++---
 configure.ac  |   15 
 debian/changelog  |   14 
 debian/control|   10 
 debian/patches/01_missing_assert.diff |   12 
 debian/patches/02_missing_unistd.diff |   27 
 debian/patches/series |2 
 debian/rules  |2 
 debian/xsfbs/xsfbs-autoreconf.mk  |  150 -
 debian/xsfbs/xsfbs.mk |  121 
 debian/xsfbs/xsfbs.sh |  394 +++--
 depcomp   |   93 ++-
 install-sh|  514 -
 ltmain.sh |  277 ++---
 man/Makefile.am   |1 
 man/Makefile.in   |9 
 missing   |   61 +-
 mkinstalldirs |5 
 src/300vtbl.h |2 
 src/310vtbl.h |2 
 src/Makefile.am   |1 
 src/Makefile.in   |   55 +
 src/init.c|   16 
 src/init.h|2 
 src/init301.c |8 
 src/init301.h |2 
 src/initdef.h |2 
 src/initextx.c|2 
 src/initextx.h|2 
 src/oem300.h  |2 
 src/oem310.h  |2 
 src/osdef.h   |2 
 src/sis.h |   31 -
 src/sis300_accel.c|2 
 src/sis300_accel.h|2 
 src/sis310_accel.c|2 
 src/sis310_accel.h|2 
 src/sis6326_video.c   |2 
 src/sis_accel.c   |2 
 src/sis_accel.h   |2 
 src/sis_common.h  |2 
 src/sis_cursor.c  |2 
 src/sis_cursor.h  |2 
 src/sis_dac.c |   16 
 src/sis_dac.h |2 
 src/sis_dga.c |2 
 src/sis_dri.c |6 
 src/sis_dri.h |2 
 src/sis_driver.c  |  212 ++-
 src/sis_driver.h  |2 
 src/sis_opt.c |2 
 src/sis_regs.h|2 
 src/sis_setup.c   |  189 +-
 src/sis_shadow.c  |2 
 src/sis_utility.c |2 
 src/sis_vb.c  |2 
 src/sis_vga.c |7 
 src/sis_video.c   |2 
 src/sis_video.h   |2 
 src/sis_videostr.h|2 
 src/sispcirename.h|  122 
 src/vgatypes.h|2 
 src/vstruct.h |2 
 68 files changed, 2644 insertions(+), 1315 deletions(-)

New commits:
commit 178299b010d2bc543777527034969034c1315dee
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Jun 6 12:33:26 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 1d7d44e..2742c75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-sis (1:0.10.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.10.0-1) unstable; urgency=low
 
   * New upstream release.
   * Remove patches 01_missing_assert.diff and 02_missing_unistd.diff.
@@ -10,7 +10,7 @@ xserver-xorg-video-sis (1:0.10.0-1) UNRELEASED; urgency=low
 dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
 dpkg-dev = 1.14.17.
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 21 Mar 2008 12:42:37 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 06 Jun 2008 12:33:23 +0200
 
 xserver-xorg-video-sis (1:0.9.3-6) unstable; urgency=low
 

commit de8fc193487273a3d4093e6761e2e7ba75e8bb29
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Jun 6 12:30:17 2008 +0200

Run dpkg-shlibdeps with --warnings=6.

Drivers reference symbols from /usr/bin/Xorg and other modules,
and that's not a bug, so we want dpkg-shlibdeps to shut up about
symbols it can't find.  Build-depend on dpkg-dev = 1.14.17.

diff --git a/debian/changelog b/debian/changelog
index 0f2f705..1d7d44e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ xserver-xorg-video-sis (1:0.10.0-1) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Bump Standards-Version to 3.7.3.
   * Drop the XS- prefix from Vcs-* control fields.

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

2007-11-11 Thread Brice Goglin 
 .cvsignore   |   19 ---
 ChangeLog|   43 +++
 debian/changelog |7 +--
 debian/control   |2 +-
 man/.cvsignore   |2 --
 src/.cvsignore   |6 --
 src/sis.h|8 
 src/sis_dri.h|3 ---
 src/sis_video.h  |2 +-
 9 files changed, 54 insertions(+), 38 deletions(-)

New commits:
commit e53e3c39f526c243a7504944d2c99ca5f08df12c
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sun Nov 11 12:07:43 2007 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 5b4c0d6..9de6bdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xserver-xorg-video-sis (1:0.9.3-6) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.9.3-6) unstable; urgency=low
 
   * Pull upstream commits up to 748df8070893675ad3839fff295bec913be876f2
 + Fix xserver version detection, closes: #449280.
   * Add upstream URL to debian/copyright.
+  * Add myself to Uploaders, and remove Branden with his permission.
 
- -- Brice Goglin [EMAIL PROTECTED]  Sun, 11 Nov 2007 12:01:08 +0100
+ -- Brice Goglin [EMAIL PROTECTED]  Sun, 11 Nov 2007 12:07:21 +0100
 
 xserver-xorg-video-sis (1:0.9.3-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 526c3b0..58fe032 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-sis
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED]
+Uploaders: David Nusinow [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED]
 Build-Depends: debhelper (= 5.0.0), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, x11proto-xinerama-dev, 
x11proto-xf86dga-dev, x11proto-xf86misc-dev, libgl1-mesa-dev | libgl-dev, 
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, 
libdrm-dev ( 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
 Standards-Version: 3.7.2.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sis

commit a512770ff15154d9661d587da493455d40941679
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sun Nov 11 12:04:02 2007 +0100

Pull upstream commits up to 748df8070893675ad3839fff295bec913be876f2

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 2df4a8d..000
--- a/.gitignore
+++ /dev/null
@@ -1,20 +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/ChangeLog b/ChangeLog
index 9acc886..b83b444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+commit 748df8070893675ad3839fff295bec913be876f2
+Author: James Cloos [EMAIL PROTECTED]
+Date:   Mon Sep 3 05:52:43 2007 -0400
+
+Add *~ to .gitignore to skip patch/emacs droppings
+
+commit f269b388cb8853b4eabfe8c42e03baf4caa32ad8
+Author: James Cloos [EMAIL PROTECTED]
+Date:   Thu Aug 23 19:25:55 2007 -0400
+
+Rename .cvsignore to .gitignore
+
+commit ba3c4d45d6e8f04536e6512103db820f0d21b77a
+Author: Julien Cristau [EMAIL PROTECTED]
+Date:   Thu Aug 9 03:36:07 2007 +0200
+
+Get rid of the XFree86Server macro.
+
+It's not exported by xserver these days, so don't test it.
+
+commit 391dad44fa305be4cded31cf2f9a4fba7420af99
+Author: Julien Cristau [EMAIL PROTECTED]
+Date:   Thu Aug 9 03:35:12 2007 +0200
+
+Fix xserver version detection.
+
+Newer xserver releases report a version of 1.x, which is smaller
+than 6.8.99.900.
+
+commit 89d2f2118a2409d1bf0239448a4e3d2f6e7a1919
+Author: Brice Goglin [EMAIL PROTECTED]
+Date:   Tue Aug 7 12:57:23 2007 +0200
+
+Define SIS_*_VERSION using PACKAGE_VERSION*
+
+commit 346693719a49cf50ff62cb25b09d433d2d8db9ea
+Author: Alex Deucher [EMAIL PROTECTED]
+Date:   Tue Feb 27 20:35:35 2007 -0500
+
+bump Xv image height up from 1080 to 1088 for 315 chips
+
+fixes bug 10075
+
 commit be1d494e0921d234918c899c6fe833c5d74b16fd
 Author: Eamon Walsh [EMAIL PROTECTED]
 Date:   Mon Dec 18 14:09:45 2006 -0500
diff --git a/debian/changelog b/debian/changelog
index 79dd8c3..5b4c0d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 xserver-xorg-video-sis (1:0.9.3-6) UNRELEASED; urgency=low
 
+  * Pull upstream commits up to 748df8070893675ad3839fff295bec913be876f2
++ Fix xserver version detection, closes: #449280.
   * Add upstream URL to debian/copyright.
 
- -- Brice Goglin [EMAIL PROTECTED]  Sat, 15 Sep 2007 02:17:40 +0200
+ -- Brice Goglin [EMAIL PROTECTED]  Sun, 11 Nov 2007 12:01:08 +0100
 
 xserver-xorg-video-sis (1:0.9.3-5) unstable; urgency=low
 
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore

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

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

New commits:
commit a9914a17ace1781c87e80430adca31fafef0051d
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sat Sep 15 02:18:58 2007 +0200

Add upstream URL to debian/copyright

diff --git a/debian/changelog b/debian/changelog
index e329766..4a18cc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sis (1:0.9.3-5) UNRELEASED; urgency=low
+
+  * Add upstream URL to debian/copyright.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Sat, 15 Sep 2007 02:17:40 +0200
+
 xserver-xorg-video-sis (1:0.9.3-4) experimental; urgency=low
 
   * Build against and build-dep on xserver 1.4
diff --git a/debian/copyright b/debian/copyright
index c85add9..bdb96ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
 Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England.
 Parts Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria.
 


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

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

2007-09-16 Thread David Nusinow 
 Makefile.in   |  131 ++-
 aclocal.m4|  676 +---
 configure | 1135 +-
 debian/changelog  |   22 
 debian/control|4 
 debian/patches/03_gen_pci_ids.diff|   30 
 debian/patches/series |1 
 debian/xserver-xorg-video-sis.install |1 
 man/Makefile.in   |   98 +-
 src/Makefile.in   |  155 ++--
 10 files changed, 1419 insertions(+), 834 deletions(-)

New commits:
commit 00b3f93359c006ed4268b841464536ef73ebc215
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Sep 16 16:18:39 2007 -0400

* Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e329766..510adab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sis (1:0.9.3-5) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun, 16 Sep 2007 15:43:48 -0400
+
 xserver-xorg-video-sis (1:0.9.3-4) experimental; urgency=low
 
   * Build against and build-dep on xserver 1.4

commit aadfaa6ee3f7080171d03d5fb9e9bb639d8dcdf2
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Sep 9 23:26:38 2007 -0400

* Build against and build-dep on xserver 1.4
* Bump standards version to 3.7.2.2. No changes needed.

diff --git a/debian/changelog b/debian/changelog
index 6b18339..e329766 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-sis (1:0.9.3-4) experimental; urgency=low
+
+  * Build against and build-dep on xserver 1.4
+  * Bump standards version to 3.7.2.2. No changes needed.
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun, 09 Sep 2007 23:23:57 -0400
+
 xserver-xorg-video-sis (1:0.9.3-3) experimental; urgency=low
 
   * Build against xserver 1.3.99.0 and build-dep on it as well
diff --git a/debian/control b/debian/control
index c5b30c5..526c3b0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED]
-Build-Depends: debhelper (= 5.0.0), pkg-config, xserver-xorg-dev (= 
2:1.3.99.0), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, 
x11proto-xinerama-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev, 
libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, libdrm-dev ( 2.0) [!hurd-i386], 
x11proto-xf86dri-dev, quilt
-Standards-Version: 3.7.2
+Build-Depends: debhelper (= 5.0.0), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, x11proto-xinerama-dev, 
x11proto-xf86dga-dev, x11proto-xf86misc-dev, libgl1-mesa-dev | libgl-dev, 
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, 
libdrm-dev ( 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
+Standards-Version: 3.7.2.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sis
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sis.git
 

commit 9ae4d39f05409e2f22772c5b21e1c700f25141ee
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Aug 22 21:40:09 2007 -0400

Add 03_gen_pci_ids.diff.

This patch provides a listing of the PCI id's that are supported by this
driver so that the server can automatically load it when necessary.

Autoreconf also.

diff --git a/Makefile.in b/Makefile.in
index 8fb41d3..566ee4a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
 #  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+subdir = .
 DIST_COMMON = README $(am__configure_deps)

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

2007-05-02 Thread Julien Cristau 
 debian/changelog |5 +++--
 debian/control   |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 1a2b2e8391fba600439ad0b73c3da4e118d014da
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed May 2 15:21:34 2007 +0200

Bump Standards-Version to 3.7.2.

diff --git a/debian/changelog b/debian/changelog
index 7940bb1..b5c0b05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-sis (1:0.9.3-2) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.9.3-2) unstable; urgency=low
 
   [ Julien Cristau ]
   * Add link to xserver-xorg-core bug script, so that bugreports contain
 the user's config and log files.
+  * Bump Standards-Version to 3.7.2.
 
   [ Timo Aaltonen ]
   * Replaces/Conflicts: xserver-xorg-driver-sis.
@@ -18,7 +19,7 @@ xserver-xorg-video-sis (1:0.9.3-2) UNRELEASED; urgency=low
 module in the long description.
   * Remove Fabio from uploaders with his permission. He's always welcome back.
 
- -- Brice Goglin [EMAIL PROTECTED]  Fri, 27 Apr 2007 20:05:36 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Wed, 02 May 2007 15:21:11 +0200
 
 xserver-xorg-video-sis (1:0.9.3-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 46385ac..967bddd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED]
 Build-Depends: debhelper (= 5.0.0), pkg-config, xserver-xorg-dev (= 
2:1.2.99.902), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, 
x11proto-xinerama-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev, 
libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, libdrm-dev ( 2.0) [!hurd-i386], 
x11proto-xf86dri-dev, quilt
-Standards-Version: 3.6.1
+Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sis
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sis.git
 


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

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

2007-04-27 Thread Brice Goglin 
 .cvsignore|   19 
 ChangeLog | 1281 ++-
 aclocal.m4|  147 +++-
 autogen.sh|   12 
 config.guess  |  667 +++-
 config.h.in   |9 
 config.sub|  230 +--
 configure | 1619 +-
 configure.ac  |2 
 debian/changelog  |   24 
 debian/control|   14 
 debian/rules  |4 
 debian/xsfbs/xsfbs.mk |   28 
 ltmain.sh |   12 
 man/.cvsignore|2 
 man/Makefile.am   |2 
 man/Makefile.in   |2 
 man/sis.man   |2 
 mkinstalldirs |   89 ++
 src/.cvsignore|6 
 src/300vtbl.h |2 
 src/310vtbl.h |2 
 src/init.c|2 
 src/init.h|2 
 src/init301.c |2 
 src/init301.h |2 
 src/initdef.h |2 
 src/initextx.c|2 
 src/initextx.h|2 
 src/oem300.h  |2 
 src/oem310.h  |2 
 src/osdef.h   |2 
 src/sis300_accel.c|4 
 src/sis300_accel.h|2 
 src/sis310_accel.c|4 
 src/sis310_accel.h|2 
 src/sis6326_video.c   |2 
 src/sis_accel.c   |4 
 src/sis_accel.h   |2 
 src/sis_common.h  |2 
 src/sis_cursor.c  |2 
 src/sis_cursor.h  |2 
 src/sis_dac.c |2 
 src/sis_dac.h |2 
 src/sis_dga.c |2 
 src/sis_dri.c |2 
 src/sis_dri.h |2 
 src/sis_driver.c  |2 
 src/sis_driver.h  |2 
 src/sis_memcpy.c  |1 
 src/sis_opt.c |2 
 src/sis_regs.h|2 
 src/sis_setup.c   |2 
 src/sis_shadow.c  |2 
 src/sis_utility.c |2 
 src/sis_vb.c  |2 
 src/sis_vga.c |2 
 src/sis_video.c   |2 
 src/sis_video.h   |2 
 src/sis_videostr.h|2 
 src/vgatypes.h|2 
 src/vstruct.h |2 
 62 files changed, 2564 insertions(+), 1696 deletions(-)

New commits:
commit 0505248a57292ea14b12b229b337c4ab78cb3dac
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Fri Apr 27 20:22:42 2007 +0200

Update upstream ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 67b5b35..9acc886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,87 +1,1260 @@
-2006-06-06  Donnie Berkholz  [EMAIL PROTECTED]
+commit be1d494e0921d234918c899c6fe833c5d74b16fd
+Author: Eamon Walsh [EMAIL PROTECTED]
+Date:   Mon Dec 18 14:09:45 2006 -0500
 
-   * src/sis_dri.c:
-   Add missing #include assert.h.
+Revert Convert callers of LookupWindow() to dixLookupWindow().
+
+This reverts commit e3070bc4832d4f1e00f16591cba35776d9a87f2d.
 
-2006-04-30  Alex Deucher  [EMAIL PROTECTED]
+commit e3070bc4832d4f1e00f16591cba35776d9a87f2d
+Author: Eamon Walsh [EMAIL PROTECTED]
+Date:   Fri Dec 15 17:46:03 2006 -0500
 
-   * src/sis300_accel.c: (SiS300AccelInit):
-   * src/sis310_accel.c:
-   * src/sis_accel.c: (SiSAccelInit):
-   - fix minor typo
+Convert callers of LookupWindow() to dixLookupWindow().
 
-2006-04-07  Adam Jackson  [EMAIL PROTECTED]
+commit 07ca144f29e7038a0bd83c31783b134e57471b8b
+Author: Daniel Stone [EMAIL PROTECTED]
+Date:   Thu Nov 30 19:58:16 2006 +0200
 
-   * configure.ac:
-   * src/sis.h:
-   Bump to 0.9.1 for Xv changes.
+bump to 0.9.3
 
-2006-04-07  Aaron Plattner  [EMAIL PROTECTED]
+commit 27299b5af820e91c14529f5c3486d1018e99b6c4
+Author: Daniel Stone [EMAIL PROTECTED]
+Date:   Thu Nov 30 16:10:57 2006 +0200
 
-   * src/sis6326_video.c:
-   * src/sis_video.c: (SISPutImage):
-   * src/sis_video.h:
-   Add a DrawablePtr argument to the XV functions to pave the way for
-   redirected video.
+include stdlib.h for strtod
+Calling strtod() without including stdlib.h leads to unspecified results.
+
https://launchpad.net/distros/ubuntu/+source/xserver-xorg-video-sis/+bug/56649
 
-2006-04-07  Adam Jackson  [EMAIL PROTECTED]
+commit 115106f042ff5cdad1675c030f0731f0d4559434
+Author: Adam Jackson [EMAIL PROTECTED]
+Date:   Fri Oct 13 18:43:53 2006 -0400
 
-   * configure.ac:
-   * src/sis.h:
-   Unlibcwrap.  Bump server version requirement.  Bump to 0.9.0.
+Bump to 0.9.2
 
-2006-04-06  Eric Anholt  [EMAIL PROTECTED]
+commit 7a38608cd4cae811d12b7424f19af6d732a52f03
+Author: Donnie Berkholz [EMAIL PROTECTED]
+Date:   Tue Jun 6 16:09:54 2006 +
 
-   * src/sis_driver.c:
-   Don't forget to zero the xf86ModReqInfo before using it.
-   Noticed by Alex Deucher.
+Add missing #include assert.h.
 
-2005-12-20  Kevin E. Martin  kem-at-freedesktop-dot-org
+commit f16c4ee67f57bea639fb3dfab0cf09c4cd981183
+Author: Alex Deucher [EMAIL PROTECTED]
+Date:   Sun Apr 30 18:17:18 2006 +
 
-   * configure.ac:
-   Update package version for X11R7 release.
+- fix minor typo
 
-2005-12-14  Kevin E. Martin

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

2007-04-24 Thread Timo Aaltonen 
 debian/changelog |6 +-
 debian/control   |3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 7308a50833b55ae257af99ec44f596f2d9abf220
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue Apr 24 14:28:53 2007 +0300

Replaces/Conflicts: xserver-xorg-driver-sis.

diff --git a/debian/changelog b/debian/changelog
index c5f83e8..f457940 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-sis (1:0.9.1-5) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Add link to xserver-xorg-core bug script, so that bugreports contain
 the user's config and log files.
   * Bump dependency on xserver-xorg-core to = 2:1.1.1-11, as previous
 versions don't have the bug script.
 
- -- Julien Cristau [EMAIL PROTECTED]  Tue,  7 Nov 2006 07:30:43 +0100
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-sis.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 24 Apr 2007 14:28:29 +0300
 
 xserver-xorg-video-sis (1:0.9.1-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c5b6130..07f9b45 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-sis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (= 2:1.1.1-11)
 Provides: xserver-xorg-video-1.0
-Replaces: xserver-xorg ( 6.8.2-35)
+Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-sis
+Conflicts: xserver-xorg-driver-sis
 Description: X.Org X server -- SiS display driver
  This package provides the driver for all SiS and XGI Volari cards.
  .


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

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

2007-02-01 Thread David Nusinow 
New branch 'debian-unstable' available with the following commits:
commit 8730f2bf53b72fd72c9e127439550c8b16116604
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Nov 7 06:46:29 2006 +

For each driver, add a symlink to xserver-xorg-core's bug script, so that 
each
new bugreport contains the user's config and log files.  Bump dependencies 
on
xserver-xorg-core to = 2:1.1.1-11, to make sure that the bug script is
present.

commit 6342f524df3d64449677ec4ce5a0fbf45a4eef84
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Oct 13 20:51:30 2006 +

we also need fcntl.h

commit 53ad9bfd799ee658a1d7c09c7f1bf9398340ce50
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Oct 13 20:42:19 2006 +

* Add 02_missing_unistd.diff to include unistd.h because sis_regs.h uses
  various functions defined in there, and yet it doesn't include it. Thanks
  Martin Michlmayr. Closes: #392595

commit 597aa5351650f38432def0666fcacd9958aee0bb
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Oct 13 20:22:45 2006 +

* Add 01_missing_assert.diff to include assert.h because the driver now uses
  the assert macro. Thanks Nate Eldredge. Closes: #392546

commit 292826f129ddd9e7780b75262bba75a28f478606
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Tue Sep 26 10:26:34 2006 +

Add some more watch files.

commit 05b5ad57047f4f523f2686b1dff162c6030753d7
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Sep 19 00:38:27 2006 +

Prepare changelog for upload to unstable

commit 6f2c382543a64a76745b883a851597a9ccba3af9
Author: Steve Langasek [EMAIL PROTECTED]
Date:   Mon Sep 18 12:06:29 2006 +

merge sis 7.1 video driver to trunk for upload to unstable

commit eb655157f3066378c4a64ac947556bd36f6709fc
Author: Steve Langasek [EMAIL PROTECTED]
Date:   Mon Sep 18 06:33:05 2006 +

more fixes for unversioned directory names

commit 811a9f9656f23fecda74a680f77322c6521507c2
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Apr 5 00:10:22 2006 +

Prepare changelogs for upload to unstable

commit e54d0de78017a4df07b170ca2d9dd112096e347d
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Feb 13 03:46:16 2006 +

Fix Branden's email address

commit 1f19dc05687730a3143a255115dfa135d9b0a775
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Feb 12 16:24:02 2006 +

Move all install files for renaming scheme and delete v4l driver which 
doesn't currently have packaging

commit 596951632826fe1c346e5a082ee599a8e2e81bf9
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Feb 10 03:40:14 2006 +

Change driver package names to new scheme

commit b0dccc707da97dfc515850aeee298304557c5c29
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Jan 30 02:48:04 2006 +

Fix package names for sis and sunbw2 drivers in changelog

commit e8ba7d489abfddd161f9636c583570608194103d
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Jan 30 02:24:55 2006 +

Move .install files to new naming scheme for drivers

commit 0f01946313aea26fabd02c867a45a4da46613f6b
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Jan 29 21:21:32 2006 +

Pull in and use xsfbs

commit a2c276197d174e8c28248fe4cf1303bceac5655c
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Jan 29 20:36:06 2006 +

* Rename driver packages to be more consistent and intuitive
  + Video drivers are now named xorg-video-driver-foo and input drivers are
now named xorg-input-driver-foo
  + Video drivers provide xorg-video-driver and input drivers provide
xorg-input-driver
  + xorg-server-core depends on xorg-video-drivers-all | xorg-video-driver
and also xorg-input-drivers-all | xorg-input-drivers

commit 028b3a2ed9f689daa65671ac0e698c8923ccf2fa
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 20 04:31:26 2006 +

Fix maintainer and uploader fields. God, I love sed.

commit 583f53f8987c95b383a2329f36c11fc4f094af3e
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 13 05:48:42 2006 +

Add packaging for various drivers

commit 3f91613f6f9b8ae2282a88464df9210ba711ecd4
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 13 04:05:21 2006 +

Update drivers in modular branch. We'll re-pull the ubuntu packaging 
properly

commit d5aac5b511cb74f23744ef3a97d697ff2f23bad5
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Dec 30 18:14:25 2005 +

Vendor drop of the rest of 7.0


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