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

2013-01-08 Thread Maarten Lankhorst 
 ChangeLog|   44 +++
 configure.ac |2 
 debian/changelog |4 
 src/alp_driver.c |5 
 src/cir_driver.c |   12 +-
 src/cir_shadow.c |  317 +++
 src/lg_driver.c  |5 
 7 files changed, 237 insertions(+), 152 deletions(-)

New commits:
commit 257211311d6f94ad50615a632ff99caccbc01bd7
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jan 8 11:15:51 2013 +0100

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index a5d1a48..d730d78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+commit e2bf5b255611de267bc1c56b2fccf51268d28f3d
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Tue Jan 8 11:04:38 2013 +0100
+
+cirrus: release 1.5.2
+
+commit bade70ce71ea26fae4f250f0bd1729dfb0d392df
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Tue Jan 8 11:00:33 2013 +0100
+
+cirrus: fix out of bounds access to shadowfb
+
+Perform the same bounds checking other drivers do. Thanks to Dave Gilbert 
for feedback on this patch.
+
+Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
+
+commit 5fcb3b018797457c3099a86c6c1257b6e4e89ceb
+Author: Adam Jackson a...@redhat.com
+Date:   Tue Sep 25 08:54:36 2012 -0400
+
+Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit aa9016576163b3065910437b6ea51a69f24a41ca
+Author: Dave Airlie airl...@gmail.com
+Date:   Tue Aug 21 21:01:43 2012 +1000
+
+cirrus: fix build against old server
+
+Reported-by: jobermayer on irc
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit bc04e9ed659be51a3c712f34a038bd60f639f9c5
+Author: Dave Airlie airl...@redhat.com
+Date:   Mon Aug 20 13:49:19 2012 +1000
+
+cirrus: fix falling back after kernel check
+
+if we find a kernel driver the code leave the pci slot claimed which
+stops us falling back. unclaim the pci slot.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
 commit 129076c2a9c20ab515736bb7141b4f334699e21b
 Author: Dave Airlie airl...@redhat.com
 Date:   Tue Jul 17 16:05:09 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index b47b682..dee9d6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xserver-xorg-video-cirrus (1:1.5.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
 
-  * New upstream release 1.5.1
+  * New upstream release.
   * Require xserver 1.13rc1
   * Refresh 10-qemu.diff
 

commit e2bf5b255611de267bc1c56b2fccf51268d28f3d
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jan 8 11:04:38 2013 +0100

cirrus: release 1.5.2

diff --git a/configure.ac b/configure.ac
index dddf9ef..0e00305 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-cirrus],
-[1.5.1],
+[1.5.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-cirrus])
 AC_CONFIG_SRCDIR([Makefile.am])

commit bade70ce71ea26fae4f250f0bd1729dfb0d392df
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jan 8 11:00:33 2013 +0100

cirrus: fix out of bounds access to shadowfb

Perform the same bounds checking other drivers do. Thanks to Dave Gilbert 
for feedback on this patch.

Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com

diff --git a/src/cir_shadow.c b/src/cir_shadow.c
index a9b425b..6bde0fd 100644
--- a/src/cir_shadow.c
+++ b/src/cir_shadow.c
@@ -15,30 +15,41 @@
 #include cir.h
 #include alp.h
 
+#define MIN(a, b) (((a)  (b)) ? (a) : (b))
+#define MAX(a, b) (((a)  (b)) ? (a) : (b))
+
 _X_EXPORT void
 cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
 {
 CirPtr pCir = CIRPTR(pScrn);
-int width, height, Bpp, FBPitch;
+int width, height, Bpp, FBPitch, x1, x2, y1, y2;
 unsigned char *src, *dst;

 Bpp = pScrn-bitsPerPixel  3;
 FBPitch = BitmapBytePad(pScrn-displayWidth * pScrn-bitsPerPixel);
 
 while(num--) {
-   width = (pbox-x2 - pbox-x1) * Bpp;
-   height = pbox-y2 - pbox-y1;
-   src = pCir-ShadowPtr + (pbox-y1 * pCir-ShadowPitch) + 
-   (pbox-x1 * Bpp);
-   dst = pCir-FbBase + (pbox-y1 * FBPitch) + (pbox-x1 * Bpp);
-
-   while(height--) {
-   memcpy(dst, src, width);
-   dst += FBPitch;
-   src += pCir-ShadowPitch;
-   }
-   
-   pbox++;
+x1 = MAX(pbox-x1, 0);
+y1 = MAX(pbox-y1, 0);
+x2 = MIN(pbox-x2, pScrn-virtualX);
+y2 = MIN(pbox-y2, pScrn-virtualY);
+
+width = (x2 - x1) * Bpp;
+height = y2 - y1;
+
+if (width = 0 || height = 0)
+continue;
+
+src = pCir-ShadowPtr + (y1 * pCir-ShadowPitch) + (x1 * Bpp);
+dst = pCir-FbBase + (y1 * FBPitch) + (x1 * Bpp);
+
+while(height--) {
+memcpy(dst, src, width);
+

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

2012-07-25 Thread Maarten Lankhorst 
 configure.ac |2 +-
 debian/changelog |4 ++--
 debian/control   |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8fc560784e21fdb773c3e21d7b732dff76f29256
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 25 09:07:48 2012 +0200

New upstream release 1.5.1

diff --git a/debian/changelog b/debian/changelog
index 363ed16..b47b682 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xserver-xorg-video-cirrus (1:1.5.99~somegit) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.5.1-1) UNRELEASED; urgency=low
 
-  * New upstream release 1.5.0
+  * New upstream release 1.5.1
   * Require xserver 1.13rc1
   * Refresh 10-qemu.diff
 
diff --git a/debian/control b/debian/control
index cf053c5..7470065 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-xext-dev,
  xutils-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
 

commit 129076c2a9c20ab515736bb7141b4f334699e21b
Author: Dave Airlie airl...@redhat.com
Date:   Tue Jul 17 16:05:09 2012 +1000

xf86-video-cirrus: bump to version 1.5.1

Signed-off-by: Dave Airlie airl...@redhat.com

diff --git a/configure.ac b/configure.ac
index 1157ab1..dddf9ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-cirrus],
-[1.5.0],
+[1.5.1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-cirrus])
 AC_CONFIG_SRCDIR([Makefile.am])


-- 
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/e1stvhm-0006dn...@vasks.debian.org

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

2012-07-25 Thread Maarten Lankhorst 
 ChangeLog |8 
 1 file changed, 8 insertions(+)

New commits:
commit 793c8649e5ce47298e3c488a85674328aac865db
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 25 09:09:43 2012 +0200

Bump changelog

diff --git a/ChangeLog b/ChangeLog
index d10418a..a5d1a48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+commit 129076c2a9c20ab515736bb7141b4f334699e21b
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 17 16:05:09 2012 +1000
+
+xf86-video-cirrus: bump to version 1.5.1
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
 commit e443ede15981549ff5f6b01f42c3cb8dc909d778
 Author: Dave Airlie airl...@gmail.com
 Date:   Fri Jul 13 14:47:40 2012 +1000


-- 
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/e1stvjc-00078h...@vasks.debian.org

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

2012-07-16 Thread Maarten Lankhorst 
 .gitignore|   70 +++
 ChangeLog |  373 +
 Makefile.am   |   11 
 configure.ac  |   68 +--
 debian/README.source  |   24 -
 debian/changelog  |   47 ++
 debian/compat |2 
 debian/control|   23 -
 debian/patches/10-qemu.diff   |   30 +
 debian/patches/series |1 
 debian/rules  |  104 -
 debian/watch  |1 
 debian/xserver-xorg-video-cirrus.install  |1 
 debian/xserver-xorg-video-cirrus.manpages |1 
 debian/xsfbs/repack.sh|   32 -
 debian/xsfbs/xsfbs.mk |  285 -
 debian/xsfbs/xsfbs.sh |  622 --
 man/.gitignore|2 
 man/Makefile.am   |   63 +--
 man/cirrus.man|1 
 src/.gitignore|6 
 src/CirrusClk.c   |3 
 src/Makefile.am   |3 
 src/alp.h |4 
 src/alp_driver.c  |  222 --
 src/alp_hwcurs.c  |7 
 src/alp_i2c.c |3 
 src/alp_xaa.c |8 
 src/alp_xaam.c|   10 
 src/cir.h |   13 
 src/cir_dga.c |   25 -
 src/cir_driver.c  |   24 -
 src/cir_pcirename.h   |   51 ++
 src/cir_shadow.c  |9 
 src/compat-api.h  |   99 
 src/lg.h  |4 
 src/lg_driver.c   |  100 ++--
 src/lg_hwcurs.c   |6 
 src/lg_i2c.c  |3 
 src/lg_xaa.c  |8 
 src/lg_xaa.h  |1 
 41 files changed, 1049 insertions(+), 1321 deletions(-)

New commits:
commit a3c79a44c306eb55c77fe227c04f2f133fd73215
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Jul 16 15:38:46 2012 +0200

Refresh 10-qemu.diff

diff --git a/debian/changelog b/debian/changelog
index e08d0f2..363ed16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-cirrus (1:1.5.99~somegit) UNRELEASED; 
urgency=low
 
   * New upstream release 1.5.0
   * Require xserver 1.13rc1
+  * Refresh 10-qemu.diff
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Mon, 16 Jul 2012 
15:30:58 +0200
 
diff --git a/debian/patches/10-qemu.diff b/debian/patches/10-qemu.diff
index 4a5532d..7089205 100644
--- a/debian/patches/10-qemu.diff
+++ b/debian/patches/10-qemu.diff
@@ -5,10 +5,11 @@ Stolen from Fedora.
 Pointed out by Guido Günther a...@sigxcpu.org in #586693.
 --- a/src/alp_driver.c
 +++ b/src/alp_driver.c
-@@ -734,6 +734,20 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -775,7 +775,21 @@
   else
xf86SetDDCproperties(pScrn,xf86PrintEDID(
-   xf86DoEDID_DDC2(pScrn-scrnIndex,pCir-I2CPtr1)));
+xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn),pCir-I2CPtr1)));
+- 
 +#ifdef XSERVER_LIBPCIACCESS
 + if (!pScrn-monitor-DDC 
 +   ((pCir-PciInfo-subvendor_id  0x) == 0x1af4)) {
@@ -23,6 +24,7 @@ Pointed out by Guido Günther a...@sigxcpu.org in #586693.
 +  pScrn-monitor-maxPixClock = 65000;
 + }
 +#endif
-  
++
   /* Probe the possible LCD display */
   AlpProbeLCD(pScrn);
+ 

commit c855e6d70261c02a32388b54c90f8b1ee42716f1
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Jul 16 15:32:29 2012 +0200

Bump changelog

diff --git a/ChangeLog b/ChangeLog
index 9881813..d10418a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+commit e443ede15981549ff5f6b01f42c3cb8dc909d778
+Author: Dave Airlie airl...@gmail.com
+Date:   Fri Jul 13 14:47:40 2012 +1000
+
+cirrus: handle server with no XAA
+
+this fixes cirrus to work with a server with no XAA module.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit 46a9e962c6f33509e89d664115a9a2db51c9b67d
+Author: Dave Airlie airl...@redhat.com
+Date:   Mon Jul 2 11:57:59 2012 +0100
+
+cirrus: bump to 1.5.0 for release.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit 7ae890b29b12609d410f5558640bb0407b0fdd2d
+Author: Johannes Obermayr johannesoberm...@gmx.de
+Date:   Sat Jun 9 11:29:02 2012 +0100
+
+use int scrnIndex instead of int i in macro SCREEN_INIT_ARGS_DECL.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit bab8041291ff81c81a98aca385cce561ecddc9d1
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jun 5 19:35:39 2012 +0100
+
+cirrus: drop

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

2010-10-16 Thread Cyril Brulebois 
 debian/README.source  |2 +-
 debian/changelog  |   22 ++
 debian/control|   10 --
 debian/rules  |   10 +-
 debian/xsfbs/xsfbs.mk |   35 ++-
 5 files changed, 54 insertions(+), 25 deletions(-)

New commits:
commit 15b3cfb31d0f640c93a82de13a17ae764b11d64f
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 16 17:38:39 2010 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index e7849c2..761725d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.2-3) experimental; urgency=low
 
   * Build against Xserver 1.9.1 rc1.
 
- -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 17:37:57 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 17:38:38 +0200
 
 xserver-xorg-video-cirrus (1:1.3.2-2) unstable; urgency=low
 

commit 400c1f32dc36ea1083330053454b3892b96902f0
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 16 17:38:09 2010 +0200

Build against Xserver 1.9.1 rc1.

diff --git a/debian/changelog b/debian/changelog
index 2e70cbb..e7849c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
+
+  * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 17:37:57 +0200
+
 xserver-xorg-video-cirrus (1:1.3.2-2) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 9fdbbbe..2db65e8 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),
  pkg-config,
- xserver-xorg-dev (= 2:1.7.6.901),
+ xserver-xorg-dev (= 2:1.9.0.901),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,

commit aed510069ee4970b23c58d9e5ee5ba58892f41a8
Author: Mikhail Gusarov dotted...@debian.org
Date:   Fri May 7 18:58:57 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 3fb6a11..9fdbbbe 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,5 @@ Description: X.Org X server -- Cirrus 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-cirrus driver module.

commit 0d6d8b4bef9ab63bf2f8f8970d3376ec2967f575
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 23:03:36 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 2584458..2e70cbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.2-2) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -12,7 +12,7 @@ xserver-xorg-video-cirrus (1:1.3.2-2) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
 
- -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:17:16 +0100
+ -- Cyril Brulebois k...@debian.org  Mon, 03 May 2010 23:03:28 +0200
 
 xserver-xorg-video-cirrus (1:1.3.2-1) experimental; urgency=low
 

commit 9838bc1ed3c6daf3f5d858584cfcb0b614c0367d
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 23:03:18 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 eb6cff5..2584458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-cirrus (1:1.3.2-2) 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).
 
  -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:17:16 +0100
 
diff --git a/debian/control b/debian/control
index 41c5ef1..3fb6a11 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,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-cirrus
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
 

commit eb30651dd118b5a4b979b3ba88743f2b4b33b778
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 23:02:58 2010 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 0a4be3b..eb6cff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-cirrus (1:1.3.2-2) UNRELEASED; urgency=low
   * Update to new xsfbs, replace deprecated ${xserver:Depends}

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

2009-12-05 Thread Cyril Brulebois 
 COPYING  |   68 +-
 ChangeLog|  114 +++
 Makefile.am  |   12 +
 README   |   24 ++
 configure.ac |   10 
 debian/README.source |   73 +++
 debian/changelog |   42 
 debian/control   |5 
 debian/copyright |   45 
 debian/patches/01_gen_pci_ids.diff   |   27 --
 debian/patches/series|1 
 debian/rules |4 
 debian/xserver-xorg-video-cirrus.install |1 
 debian/xsfbs/repack.sh   |   32 +++
 debian/xsfbs/xsfbs.mk|   21 --
 debian/xsfbs/xsfbs.sh|  311 ---
 man/.cvsignore   |2 
 man/.gitignore   |2 
 man/cirrus.man   |5 
 src/.cvsignore   |6 
 src/.gitignore   |6 
 src/CirrusClk.c  |2 
 src/Makefile.am  |2 
 src/alp_driver.c |  100 -
 src/cir_dga.c|2 
 src/cir_driver.c |   44 
 src/cir_shadow.c |   13 -
 src/lg_driver.c  |   96 -
 28 files changed, 455 insertions(+), 615 deletions(-)

New commits:
commit bda47a7168b79b7485c48468f24b2b36ab1bf21f
Author: Cyril Brulebois k...@debian.org
Date:   Sun Dec 6 03:24:09 2009 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 68c3c2e..0880270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-cirrus (1:1.3.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.2-1) experimental; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 10:53:56 +0200
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois k...@debian.org  Sun, 06 Dec 2009 03:24:06 +0100
 
 xserver-xorg-video-cirrus (1:1.3.1-1) unstable; urgency=low
 

commit 71bb99b800aaa1aeb9aba4dcd92e93e281539070
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 13:22:22 2009 +0200

Fix the version.

diff --git a/debian/changelog b/debian/changelog
index b56de1a..68c3c2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.8.3.

commit 4d6f60994929bea1040234af454375afcd6018b2
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 10:56:32 2009 +0200

Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index 9625c75..b56de1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 10:53:56 +0200
 
diff --git a/debian/control b/debian/control
index ecd403c..48239c4 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),
  pkg-config,
- xserver-xorg-dev (= 2:1.5.99.901),
+ xserver-xorg-dev (= 2:1.7),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,

commit f3fb2d13f218a45219edc9bb89a3c396e7ec9029
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 10:55:10 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 5260617..9625c75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 10:53:56 +0200
 
diff --git a/debian/control b/debian/control
index 2462f4c..ecd403c 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-cirrus
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
 

commit e8afb9021e1b866c0615a14a19b0e904faa51208
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 10:54:13 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 912b6ba..59ef5d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+commit

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

2009-01-25 Thread Julien Cristau 
 Makefile.in  |  674 -
 aclocal.m4   | 8256 ---
 config.guess | 1526 ---
 config.h.in  |   72 
 config.sub   | 1658 ---
 configure|23296 ---
 debian/changelog |   18 
 debian/control   |   18 
 debian/rules |   23 
 depcomp  |  589 -
 install-sh   |  519 -
 ltmain.sh| 6964 
 man/Makefile.in  |  426 -
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  671 -
 src/alp_driver.c |4 
 17 files changed, 51 insertions(+), 45191 deletions(-)

New commits:
commit adadc6970fbf0a6afd671c31a0b31417108dfa1a
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 25 21:39:33 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 88b63d0..f4ce803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.2.1-3) experimental; urgency=low
 
   * Merge changes from 1:1.2.1-1.lenny1.
   * Run autoreconf on build.  Build-depend on automake, libtool and
@@ -7,7 +7,7 @@ xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
   * Build against xserver 1.6 rc1.
   * Add myself to Uploaders.
 
- -- Julien Cristau jcris...@debian.org  Sun, 25 Jan 2009 21:17:45 +0100
+ -- Julien Cristau jcris...@debian.org  Sun, 25 Jan 2009 21:39:31 +0100
 
 xserver-xorg-video-cirrus (1:1.2.1-2) experimental; urgency=low
 

commit e51c61965859ff06bbc67f9d7decc6a4ad30caa0
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 25 21:39:27 2009 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index f6c1514..88b63d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
 xutils-dev.
   * Handle parallel builds.
   * Build against xserver 1.6 rc1.
+  * Add myself to Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Sun, 25 Jan 2009 21:17:45 +0100
 
diff --git a/debian/control b/debian/control
index 4480513..130c387 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-cirrus
 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, Julien Cristau jcris...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,

commit 2d3e738e3274eafcf9992e3703e5e8f9a0143595
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 25 21:35:41 2009 +0100

Build against xserver 1.6 rc1.

diff --git a/debian/changelog b/debian/changelog
index 2aa4838..f6c1514 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
   * Run autoreconf on build.  Build-depend on automake, libtool and
 xutils-dev.
   * Handle parallel builds.
+  * Build against xserver 1.6 rc1.
 
  -- Julien Cristau jcris...@debian.org  Sun, 25 Jan 2009 21:17:45 +0100
 
diff --git a/debian/control b/debian/control
index 6a073aa..4480513 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5),
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.5),
+ xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,

commit 07b9d60b677f80ccd2654ee498ee34eed7bfbe88
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 25 21:33:46 2009 +0100

Delete generated files

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 3cc47f1..000
--- a/Makefile.in
+++ /dev/null
@@ -1,674 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-...@set_make@
-
-#  Copyright 2005 Adam Jackson.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the Software),
-#  to deal in the Software without restriction, including without limitation
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, and/or sell copies of the Software, and to permit persons to whom
-#  the Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice

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

2008-09-04 Thread Julien Cristau 
 ChangeLog  |   15 +
 aclocal.m4 |2 
 configure  |   20 -
 configure.ac   |2 
 debian/changelog   |   22 +-
 debian/control |2 
 debian/patches/01_gen_pci_ids.diff |   12 -
 debian/rules   |2 
 debian/xsfbs/xsfbs-autoreconf.mk   |  150 --
 debian/xsfbs/xsfbs.mk  |   51 +---
 debian/xsfbs/xsfbs.sh  |  387 +++--
 ltmain.sh  |2 
 src/alp_driver.c   |   10 
 13 files changed, 286 insertions(+), 391 deletions(-)

New commits:
commit 73204f6d24ac286592a59f20c22b62a174eeb5c2
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Sep 4 14:49:29 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ac9079d..534fae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-cirrus (1:1.2.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.2.1-2) experimental; urgency=low
 
   * Build against xserver 1.5.
 
- -- Julien Cristau [EMAIL PROTECTED]  Wed, 19 Mar 2008 20:55:15 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Thu, 04 Sep 2008 14:49:26 +0200
 
 xserver-xorg-video-cirrus (1:1.2.1-1) unstable; urgency=low
 

commit b5f4f9f7ff79e933236a9241ba91315d1e59827b
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Sep 4 14:46:14 2008 +0200

Build against xserver 1.5.

diff --git a/debian/changelog b/debian/changelog
index 04b55b8..ac9079d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xserver-xorg-video-cirrus (1:1.2.1-2) UNRELEASED; urgency=low
 
-  * Build against xserver 1.5 rc1.
+  * Build against xserver 1.5.
 
  -- Julien Cristau [EMAIL PROTECTED]  Wed, 19 Mar 2008 20:55:15 +0100
 
diff --git a/debian/control b/debian/control
index 45cf38f..8de852f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4.99.901), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, dpkg-dev (= 
1.14.17)
+Build-Depends: debhelper (= 5), pkg-config, quilt, xserver-xorg-dev (= 
2:1.5), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, dpkg-dev (= 
1.14.17)
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git

commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jul 17 15:44:45 2008 +0200

xsfbs.mk: make 'log' a separate target

'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
 .PHONY: prepare
 stampdir_targets+=prepare
 prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
-   mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
$@
 
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+   mkdir -p $(STAMP_DIR)/log
+
 # Apply all patches to the upstream source.
 .PHONY: patch
 stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
 
 # Revert all patches to the upstream source.
 .PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n Unapplying patches...; \
if $(QUILT) applied /dev/null 2/dev/null; then \

commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Jul 16 18:42:14 2008 +0200

xsfbs.mk: update the list of releases, and drop some unused code

we haven't had a separate source tree since modularization.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 
's/^.://')
 BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo [EMAIL PROTECTED](cat 
/etc/mailname 2/dev/null))}})
 
 # Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings woody or sarge in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the

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

2008-03-19 Thread Julien Cristau 
 .cvsignore |   19 
 .gitignore |   20 
 ChangeLog  |   56 +
 Makefile.in|   31 
 aclocal.m4 |  265 +--
 config.guess   |   60 +
 config.h.in|6 
 config.sub |   66 +
 configure  | 1256 +++--
 configure.ac   |   16 
 debian/changelog   |   16 
 debian/control |8 
 debian/patches/01_gen_pci_ids.diff |   14 
 debian/xsfbs/xsfbs.mk  |   76 --
 depcomp|   93 ++
 install-sh |  514 ++-
 ltmain.sh  |  277 +---
 man/Makefile.am|1 
 man/Makefile.in|9 
 missing|   61 +
 mkinstalldirs  |5 
 src/Makefile.am|3 
 src/Makefile.in|   50 -
 src/alp_driver.c   |   40 -
 src/cir.h  |6 
 src/cir_driver.c   |   57 +
 src/cir_pcirename.h|  122 +++
 src/lg_driver.c|   16 
 28 files changed, 2373 insertions(+), 790 deletions(-)

New commits:
commit 52746e5c1544af8f8afcd87421a5a1c38d939713
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Mar 19 20:58:32 2008 +0100

debian/control updates

* Build against xserver 1.5 rc1.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.

diff --git a/debian/changelog b/debian/changelog
index 074996f..86f6864 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xserver-xorg-video-cirrus (1:1.2.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Refresh patch 01_gen_pci_ids.diff.
+  * Build against xserver 1.5 rc1.
+  * Bump Standards-Version to 3.7.3.
+  * Drop the XS- prefix from Vcs-* control fields.
 
  -- Julien Cristau [EMAIL PROTECTED]  Wed, 19 Mar 2008 20:55:15 +0100
 
diff --git a/debian/control b/debian/control
index 89f50cf..a26593b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
-XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
+Build-Depends: debhelper (= 5), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4.99.901), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, libpciaccess-dev
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
+Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
 
 Package: xserver-xorg-video-cirrus
 Architecture: any

commit dc89639869a5d3563c80acc7fda4bcb812dbb146
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Mar 19 20:56:54 2008 +0100

Update changelogs and refresh patch.

diff --git a/ChangeLog b/ChangeLog
index c281afc..6cd89d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+commit e9d517d8bd7398aa9ca33ceb64db46d659f70707
+Author: Adam Jackson [EMAIL PROTECTED]
+Date:   Wed Mar 19 13:45:30 2008 -0400
+
+chips 1.2.0
+
+commit 0bb813fa212b0c349b92c3ae2f9165738003533d
+Author: Dave Airlie [EMAIL PROTECTED]
+Date:   Thu Mar 13 12:44:21 2008 +1000
+
+cirrus: set default depth to 24bpp
+
+this fixes autoconfiguation and it shouldn't override anything else.
+
+commit 2cece73303455fb9a28e723d6b8c1e3eb867b8ed
+Author: Matthieu Herrb [EMAIL PROTECTED]
+Date:   Sat Mar 8 23:27:13 2008 +0100
+
+Makefile.am: nuke RCS Id
+
+commit 78ce737e57867472c8166135a4dccd06eb1b2023
+Author: Dave Airlie [EMAIL PROTECTED]
+Date:   Mon Jan 21 18:16:33 2008 +1000
+
+fixup iomapsize so we only map the 4k not 16k which is an error
+
+commit 25abf8e9b55efe51b9ef0fcde3b98c38bf3a7ba6
+Author: Dave Airlie [EMAIL PROTECTED]
+Date:   Tue Jan 8 15:49:24 2008 +1000
+
+make dist check pass
+
+commit 8a33d2b5a820789309688855c81a4b11f8283500
+Author: Dave Airlie [EMAIL PROTECTED]
+Date:   Tue Jan 8 15:48:00 2008 +1000
+
+test for 1/4 bpp in case server is configured with them off
+
+commit 46e982ec0208bf7a32d47cd7cf7b1895e7bbfe1d
+Author: Dave Airlie [EMAIL PROTECTED]
+Date:   Tue Jan 8 15:06:33 2008 +1000
+
+cirrus initial pci access support
+
+commit 6d114041dc22763aa89ef6a4f4af3246de3e3b1b
+Author: Brice Goglin [EMAIL PROTECTED]
+Date:   Tue

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

2007-09-13 Thread Brice Goglin 
 ChangeLog |  281 +-
 debian/changelog  |   35 --
 debian/control|   13 +-
 debian/copyright  |3 
 debian/rules  |2 
 debian/xsfbs/xsfbs.mk |   36 +++---
 debian/xsfbs/xsfbs.sh |7 -
 man/cirrus.man|6 -
 8 files changed, 297 insertions(+), 86 deletions(-)

New commits:
commit 8a74643b63087b7ac29e5ac1ed083f4e4accf3eb
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Thu Sep 13 22:11:21 2007 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index c22b438..fa44465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.1.0-6) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.1.0-6) experimental; urgency=low
 
   [ Julien Cristau ]
   * Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -17,11 +17,12 @@ xserver-xorg-video-cirrus (1:1.1.0-6) UNRELEASED; 
urgency=low
   * Add XS-Vcs-*.
   * Add a link to www.X.org and a reference to the xf86-video-cirrus
 module in the long description.
-  * Remove Fabio from uploaders with his permission. He's always welcome back.
+  * Add myself to uploaders, and remove Branden and Fabio with their
+permission.
   * Build against xserver 1.4.
   * Add upstream URL to debian/copyright.
 
- -- Brice Goglin [EMAIL PROTECTED]  Sun, 29 Apr 2007 10:53:55 +0200
+ -- Brice Goglin [EMAIL PROTECTED]  Thu, 13 Sep 2007 22:09:13 +0200
 
 xserver-xorg-video-cirrus (1:1.1.0-5) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 007e095..c238bb5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-cirrus
 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), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, 
x11proto-render-dev, x11proto-xext-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus

commit feff017b4ae383bbb12ee02c37f1f39a3ff6a3ff
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Thu Sep 13 22:08:51 2007 +0200

Build against xserver 1.4

diff --git a/debian/changelog b/debian/changelog
index b342bd0..c22b438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ xserver-xorg-video-cirrus (1:1.1.0-6) UNRELEASED; urgency=low
   * Add a link to www.X.org and a reference to the xf86-video-cirrus
 module in the long description.
   * Remove Fabio from uploaders with his permission. He's always welcome back.
+  * Build against xserver 1.4.
+  * Add upstream URL to debian/copyright.
 
  -- Brice Goglin [EMAIL PROTECTED]  Sun, 29 Apr 2007 10:53:55 +0200
 
diff --git a/debian/control b/debian/control
index e4e7557..007e095 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED]
-Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, 
x11proto-render-dev, x11proto-xext-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
diff --git a/debian/copyright b/debian/copyright
index 64e5acd..bb283cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
 Copyright 2000 by Egbert Eich
 
 Permission to use, copy, modify, distribute, and sell this software and its

commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Wed Aug 29 09:36:00 2007 +0200

Do not call laptop-detect, let the only user call it directly

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
 
 ARCHITECTURE=$(dpkg --print-installation-architecture)
 
-LAPTOP=
-if [ -n $(which laptop-detect) ]; then
-if laptop-detect /dev/null; then
-   LAPTOP=true
-fi
-fi
-
 if [ $1 = reconfigure ] || [ -n $DEBCONF_RECONFIGURE ]; then
   RECONFIGURE=true
 else

commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Thu Jul 12 16:06:22 2007 +0200

Fix

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

2007-09-13 Thread David Nusinow 
 Makefile.in  |  125 +--
 aclocal.m4   |  676 --
 configure| 1119 +++
 debian/changelog |8 
 debian/control   |2 
 debian/patches/01_gen_pci_ids.diff   |   27 
 debian/patches/series|1 
 debian/rules |4 
 debian/xserver-xorg-video-cirrus.install |1 
 man/Makefile.in  |   92 +-
 src/Makefile.in  |  164 ++--
 11 files changed, 1408 insertions(+), 811 deletions(-)

New commits:
commit b82deb6569cdba76e4c43c5b96d1348c796243b8
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Sep 14 00:27:59 2007 -0400

* Add 01_gen_pci_ids.diff
  This patch provides a set of PCI ID's supported by this driver so that it
  can be autoloaded by the X server

diff --git a/Makefile.in b/Makefile.in
index 0db2dbe..9d96bfb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
 #  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
@@ -73,10 +69,13 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
-   install-exec-recursive install-info-recursive \
-   install-recursive installcheck-recursive installdirs-recursive \
-   pdf-recursive ps-recursive uninstall-info-recursive \
-   uninstall-recursive
+   install-dvi-recursive install-exec-recursive \
+   install-html-recursive install-info-recursive \
+   install-pdf-recursive install-ps-recursive install-recursive \
+   installcheck-recursive installdirs-recursive pdf-recursive \
+   ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -94,8 +93,6 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -130,6 +127,7 @@ FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -143,11 +141,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -158,19 +155,20 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

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

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

New commits:
commit 8394e3d252aa5f9556f8f1d472c9f280bcd0abfe
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Feb 21 22:07:57 2007 -0500

Generate Provides line automatically

diff --git a/debian/control b/debian/control
index 75952e8..17b22de 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2
 Package: xserver-xorg-video-cirrus
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
-Provides: xserver-xorg-video-1.1
+Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- Cirrus display driver
  This package provides the driver for the Cirrus Logic family of video

commit dacefd5a6bb9f786c78f35358273e3214c7492e9
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Feb 21 21:37:52 2007 -0500

Update serverabi generation to also account for driver Provides

* Have the drivers use the file serverminver instead of serverabiver in 
order
  to generate the versioned dependency on the server. This is clearer
  naming.
* Use serverabiver to actually store the server's video ABI version. This
  is used to generate the Provides: line for drivers so the server can
  depend on them properly. This goes in to the substvar
  xviddriver:Provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index dbb2872..ae767b1 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,8 +354,10 @@ # Generate the shlibs.local file.
 debian/shlibs.local:
cat debian/*.shlibs $@
 
+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2/dev/null)
 SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (= $(SERVERABI))
+SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS))
+DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)
 endif
@@ -367,6 +369,7 @@ ifeq ($(SERVERABI),)
@exit 1
 else
echo xserver:Depends=$(SERVER_DEPENDS)  debian/$(PACKAGE).substvars
+   echo xviddriver:Provides=$(DRIVER_PROVIDES)  
debian/$(PACKAGE).substvars
 endif
 
 include debian/xsfbs/xsfbs-autoreconf.mk


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

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

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

New commits:
commit 721d59fe840509a06a571a2364656462490a70ca
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Feb 20 22:28:20 2007 -0500

Generate server dependencies automatically from the ABI

diff --git a/debian/changelog b/debian/changelog
index 29a53f6..05dc576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 xserver-xorg-video-cirrus (1:1.1.0-5) UNRELEASED; urgency=low
 
-  * Bump xserver ABI metadata to 1.1 for use with server 1.2
   * Minor updates from upstream
+  * Generate server dependencies automatically from the ABI
 
- -- David Nusinow [EMAIL PROTECTED]  Sun, 11 Feb 2007 21:46:54 -0500
+ -- David Nusinow [EMAIL PROTECTED]  Tue, 20 Feb 2007 22:19:57 -0500
 
 xserver-xorg-video-cirrus (1:1.1.0-4) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
index 3b5e3db..75952e8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
 
 Package: xserver-xorg-video-cirrus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (= 2:1.2.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
 Provides: xserver-xorg-video-1.1
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- Cirrus display driver
diff --git a/debian/rules b/debian/rules
index de06583..dc5e837 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build install serverabi
dh_testdir
dh_testroot
 

commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Feb 17 16:01:41 2007 +0100

Add new serverabi rule to generate drivers dependency on the server.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 7b8206e..dbb2872 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,6 +354,21 @@ # Generate the shlibs.local file.
 debian/shlibs.local:
cat debian/*.shlibs $@
 
+SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2/dev/null)
+SERVER_DEPENDS = xserver-xorg-core (= $(SERVERABI))
+ifeq ($(PACKAGE),)
+PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)
+endif
+
+.PHONY: serverabi
+serverabi:
+ifeq ($(SERVERABI),)
+   @echo error: xserver-xorg-dev needs to be installed
+   @exit 1
+else
+   echo xserver:Depends=$(SERVER_DEPENDS)  debian/$(PACKAGE).substvars
+endif
+
 include debian/xsfbs/xsfbs-autoreconf.mk
 
 # vim:set noet ai sts=8 sw=8 tw=0:


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

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

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

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


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

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

2007-02-11 Thread David Nusinow 
 debian/changelog |3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ff559cfaf9f12410d1bbaf064cf7166b841038f2
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Feb 11 21:47:01 2007 -0500

Note merge from upstream in changelog

diff --git a/debian/changelog b/debian/changelog
index ef6b3b4..29a53f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-video-cirrus (1:1.1.0-5) UNRELEASED; urgency=low
 
   * Bump xserver ABI metadata to 1.1 for use with server 1.2
+  * Minor updates from upstream
 
- -- David Nusinow [EMAIL PROTECTED]  Sat, 10 Feb 2007 21:23:37 -0500
+ -- David Nusinow [EMAIL PROTECTED]  Sun, 11 Feb 2007 21:46:54 -0500
 
 xserver-xorg-video-cirrus (1:1.1.0-4) UNRELEASED; urgency=low
 


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