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

[Timo Aaltonen]

 debian/changelog |6 ++
 debian/control   |2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 2c50cde98510b1c29f854f5519950e9234fb8b76
Author: Timo Aaltonen 
Date:   Thu Feb 4 13:03:47 2016 +0200

control: Drop recommends on -modesetting, part of the server now.

diff --git a/debian/changelog b/debian/changelog
index a8b0e6a..71f7df6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.5.3-2) UNRELEASED; urgency=medium
+
+  * control: Drop recommends on -modesetting, part of the server now.
+
+ -- Timo Aaltonen   Thu, 04 Feb 2016 13:03:00 +0200
+
 xserver-xorg-video-cirrus (1:1.5.3-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 4039730..b4a43e1 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${xviddriver:Depends},
-Recommends:
- xserver-xorg-video-modesetting,
 Provides:
  ${xviddriver:Provides}
 Description: X.Org X server -- Cirrus display driver

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

[Julien Cristau]

 ChangeLog   |   45 +++
 autogen.sh  |4 +
 configure.ac|3 -
 debian/changelog|8 +++
 debian/compat   |2 
 debian/control  |2 
 debian/rules|4 +
 debian/upstream/signing-key.asc |   94 
 debian/watch|1 
 src/Makefile.am |   10 +++-
 src/alp_driver.c|2 
 src/cir.h   |2 
 src/lg_driver.c |2 
 13 files changed, 171 insertions(+), 8 deletions(-)

New commits:
commit 8639f7afc5ef41cabdc3003049d7770d04336c99
Author: Julien Cristau jcris...@debian.org
Date:   Thu May 7 18:01:46 2015 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 343afca..a8b0e6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-cirrus (1:1.5.3-1) UNRELEASED; urgency=medium
+xserver-xorg-video-cirrus (1:1.5.3-1) unstable; urgency=medium
 
   * New upstream release.
   * Bump debhelper compat level to 9.
   * Let uscan verify tarball signatures.
 
- -- Julien Cristau jcris...@debian.org  Thu, 07 May 2015 17:57:48 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 07 May 2015 18:01:43 +0200
 
 xserver-xorg-video-cirrus (1:1.5.2-2) unstable; urgency=medium
 

commit 744ceb8c4a64bf6416d5e3921e806caa050e283e
Author: Julien Cristau jcris...@debian.org
Date:   Thu May 7 18:00:07 2015 +0200

Let uscan verify tarball signatures.

diff --git a/debian/changelog b/debian/changelog
index bc7418d..343afca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-cirrus (1:1.5.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Bump debhelper compat level to 9.
+  * Let uscan verify tarball signatures.
 
  -- Julien Cristau jcris...@debian.org  Thu, 07 May 2015 17:57:48 +0200
 
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 000..3cf2356
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,94 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBEoIZDEBEAD5MrFJC9Hi4mXZ97HlFotHIrkMURIFkvl17XEuJ8Jh3hlzJD/q
+K1ByzQGHozzVcfbg4lP4lzqfdps6WCbusqtVYcTF61jjFhYo398lBgpKHUBbsEPC
+SfYp5WkoICa824zcmWO9qYizGqkpd1C6gdQtK6ZaGjLx3xt08M9oVZqj+E2SsPHz
+WaYLugCwCKhlbVTaP28OGy7tBRY6hcLtiZc2CNpr0YjZ53B7Ubs0BVYQutYxho7l
+u0ChE9zNesy4KaIOumXZjTUrMCLpxF/01M1tfzXArMMLAqx3F1M6QIuy18F1zJ2W
+LlkRwJi47NTiJ6jwLUYKBTN9T3nmy0oNAvv5v4B8nWgZAOjjDC2pFoVJa1O3K8Ab
+vSRA3L/N+80MxM9VK5bw451pDqNhxn5q0yeS+RBagmOb2PZSMIuw9adooMurAfDJ
+hsxqp3KaCTdYX5p+mCczNkoKMRUQiVUi250426o69IAmtpVi1q+MV0qWLl2tSvx4
+I4iph9XAhho7ycb4jziWf46ZljnhoGn54EU5GEqH0huakYcXK7XoNxU0XzS/eQuD
+qVy2NH2C945h3LAtMo4zr49VZXjNnFn++zZqCUHASDX6Y3h8uMpzIY6Eslu2S85W
+gpb+V4M5RvKPeuEJTuzxJOOW/B3nyoWFQfN6SXWGVW618dLEmFmQnyLBwwARAQAB
+tCxKdWxpZW4gQ3Jpc3RhdSA8anVsaWVuLmNyaXN0YXVAZW5zLWx5b24ub3JnPokC
+PAQTAQgAJgIbAwIeAQIXgAYLCQgHAwIGFQoJCAsCBRYCAwEABQJK4Fj7AhkBAAoJ
+EDEBgAUJBeQMu/wP/jmGDVXrXZXtNJ7Ov94iDBwcEBlLoNHUyH4FWQG05eW3CqT0
+w9ZOvZEQ/kKlSjpdZzPiYMjgunl7D78aoL4Il2qKyirlT+trt+v79rl5VkD2xJx/
+gi7iN34VJQ50iGBxyxPicUjkXUO17kpJ2/uw/7/pNG0buBDbLGPwYPQFyV3UVOv7
+R8chvmAqtujck1961gRffKPihiv6sj4zjGs8ukmLCO3EgLzpz3shBfJyq6GNMNmy
+aVX7hAcwhErKCrPeGVlzFpCLbtqIxpq6uPfxrDI20LhQkQ9NPD/4t1qkvenRCY77
+wqoiUBSYlpsKND2I2mywOE2FVMj34aBKvn96YsZWlj3Rkc++JvzdZQy09WQIUXt5
+fqEoQI6J+3l4gaQaFHCt0EWZhSCN/uNDP4sEXmX+MQP6sybU7UU18cEDFy/Op0z0
+2+2Csf3ewVPPcP8Dw6JZJjbiFH6+rQmHgBdz2kValcWwoEgD2oESyibGxI08XrJL
+nonfZSDdhrfJ31q7F+qUnX+ukxVGo8Z+VdlZCyqacNrFbKPWSeM82vXucvgxeWIK
+kjMiJsLVtitK117u3p5FkStKkzwqjmg6DM7NTyNExA/AyPmeFeGZU1iWwcIsT/UI
+Sn7A8IWQk7lPJ5aJs7c+FCTl169FOkyhK4Xu8dWcXdyXg8ReeWt5qsynnukRtCRK
+dWxpZW4gQ3Jpc3RhdSA8amNyaXN0YXVAZGViaWFuLm9yZz6JAjYEEwEIACAFAkos
+Iv4CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAxAYAFCQXkDIxHEACa0xs8
+cH59Q8MpHuWu+c2CVksTDw0O4t88inhtc9Ut66eN8uSEf/DZM/VgCyj5kYbGHIdA
+cSAQHOWXa9GLeI/ZJ+LuQ53I4xw5xT5fAf8vIPbYJ+4fsHouTVY4pp59HQPs87d3
+VdGcOcPsTw3p5mypZfNX8tq6DD9i3pZpK7t2wzvSgQkJs0f4IliUsurxG2aiDNwS
+Og1pUBQWdcuriLZRV7aBWJaLO7lCWEpxMiTFRODsMzjI28kRxU7MLlSwL0PlhhJc
+XMTxQJVRJnLMW92btoRL5LBn8FHCFCj3yFj1GX1yZVgmzCUOrHu4xpRBR/cRtxgQ
+Znh/aG9EttjQsB5byvSuzC2vZ9O+/l6mLi9zmhtIxxRGRn+ATYpXr/kddff9k8AH
+WPE3N/jrXnIEC9+2HKolyRdK6mxfwOrq5Je3C+C+0vFtbZFxpP76LI7O9p+t4T77
+KuufxDNMix9LvPxQpAuUJkbWwiIO8T4ygYMzlIDZswi5Tyl7BMQ4IheJtKEyzuFp
+DN6FvLpwh5gj6RM+i/IvCIExStcW+ySUZcuMItIELTsQlSycatO0OQi+3rXbBTsC
+QidP/uL6cmxxTvBAs/XPK7XYdhl7P/9LvBSSNb1ZhHN2D3qfDXTwYWt8sZe3G7cj
+2IrPvxBROvaoJCF1OriG4cXUTbsCWwe28rAbUbkCDQRKCGXUEAgAvfSSNQmYedmB
+2KL6LqTHmt98Vs2fC6cJQ+uZtRf9lfQWYm5ssSTHN53czQNqMTlEL1vRILJb+uDk
+B1nAFT5zy6JX/JmD6QXpUonx+YzTvL9ZI0qIF91hb4qPcNt4Nh+6bRfA7KLT7lWE
+Rudr2MzkD3lb0Nubkq4+QmYhog8UhvUxfWUA/ubwktakKiYgveVKRb/ONTOIpZa+
+TAeZOsfMeDggTFMqOaFTxISV63O8p8mi8a7O/qM+rsPqlTjEVf/0Y3tILhEIoEfC

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

[Julien Cristau]

 debian/changelog |7 +++
 debian/control   |3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit c2b3486837fa203ec92dda88cddcd29bb3022741
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 11 01:14:59 2014 +0200

Recommend xserver-xorg-video-modesetting, for kms on qemu.

diff --git a/debian/changelog b/debian/changelog
index 390c837..e0f76f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-cirrus (1:1.5.2-2) UNRELEASED; urgency=medium
 
   * Remove Cyril Brulebois from Uploaders.
+  * Recommend xserver-xorg-video-modesetting, for kms on qemu.
 
  -- Julien Cristau jcris...@debian.org  Sun, 11 May 2014 01:13:54 +0200
 
diff --git a/debian/control b/debian/control
index dd9a046..a732a03 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,8 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${xviddriver:Depends},
+Recommends:
+ xserver-xorg-video-modesetting,
 Provides:
  ${xviddriver:Provides}
 Description: X.Org X server -- Cirrus display driver

commit 90ea573c52e30538e49bbfd037186015b526b6d2
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 11 01:14:06 2014 +0200

Remove Cyril Brulebois from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 94a30db..390c837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.5.2-2) UNRELEASED; urgency=medium
+
+  * Remove Cyril Brulebois from Uploaders.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 11 May 2014 01:13:54 +0200
+
 xserver-xorg-video-cirrus (1:1.5.2-1) unstable; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/control b/debian/control
index d840f48..dd9a046 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-video-cirrus
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 8),
  dh-autoreconf,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wjgu0-000341...@moszumanska.debian.org

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

[Julien Cristau]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6f621833abdc3c3acb4b92838f5ec03c90386100
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 11 01:22:56 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e0f76f6..859f2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-cirrus (1:1.5.2-2) UNRELEASED; urgency=medium
+xserver-xorg-video-cirrus (1:1.5.2-2) unstable; urgency=medium
 
   * Remove Cyril Brulebois from Uploaders.
   * Recommend xserver-xorg-video-modesetting, for kms on qemu.
 
- -- Julien Cristau jcris...@debian.org  Sun, 11 May 2014 01:13:54 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 11 May 2014 01:22:34 +0200
 
 xserver-xorg-video-cirrus (1:1.5.2-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wjggv-00060t...@moszumanska.debian.org

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

[Julien Cristau]

 debian/changelog |8 +---
 debian/control   |2 +-
 debian/rules |3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 2490152421c8ad723949492c859aca58a517b697
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 17 08:41:11 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8648f49..94a30db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.5.2-1) unstable; urgency=low
 
   [ Maarten Lankhorst ]
   * New upstream release.
@@ -11,7 +11,7 @@ xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Disable silent build rules.
 
- -- Maarten Lankhorst maarten.lankho...@canonical.com  Mon, 16 Jul 2012 
15:30:58 +0200
+ -- Julien Cristau jcris...@debian.org  Tue, 17 Sep 2013 08:34:42 +0200
 
 xserver-xorg-video-cirrus (1:1.4.0-2) unstable; urgency=low
 

commit c7d2726e93313e10e7ef0ca6a38920bc0eaf69f7
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 17 08:33:54 2013 +0200

Build against xserver 1.12

diff --git a/debian/changelog b/debian/changelog
index 29e2b88..8648f49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * New upstream release.
-  * Require xserver 1.13rc1
   * Refresh 10-qemu.diff
 
   [ Michele Cane ]
diff --git a/debian/control b/debian/control
index e86ad63..d840f48 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  dh-autoreconf,
  quilt,
  pkg-config,
- xserver-xorg-dev (= 2:1.12.99.901),
+ xserver-xorg-dev (= 2:1.12),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,

commit 47f8449f7ed69199d7651bbdb0ef7868f723b076
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 17 08:31:13 2013 +0200

Disable silent build rules.

diff --git a/debian/changelog b/debian/changelog
index 5a843fd..29e2b88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.4, no changes needed.
   * Refresh patches.
 
+  [ Julien Cristau ]
+  * Disable silent build rules.
+
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Mon, 16 Jul 2012 
15:30:58 +0200
 
 xserver-xorg-video-cirrus (1:1.4.0-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 3d192dc..496a59a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+override_dh_auto_configure:
+   dh_auto_configure -- --disable-silent-rules
+
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:
dh_auto_install --destdir=debian/tmp


-- 
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/e1vloyr-00070l...@vasks.debian.org

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

[Michele Cane]

 ChangeLog   |  106 ++
 configure.ac|   20 ++
 debian/changelog|   12 +
 debian/control  |4 
 debian/patches/10-qemu.diff |8 -
 src/CirrusClk.c |1 
 src/Makefile.am |3 
 src/alp.h   |2 
 src/alp_driver.c|   88 +--
 src/alp_hwcurs.c|5 
 src/alp_i2c.c   |1 
 src/alp_xaa.c   |6 
 src/alp_xaam.c  |9 -
 src/cir.h   |9 -
 src/cir_dga.c   |   20 +-
 src/cir_driver.c|   19 +-
 src/cir_pcirename.h |   24 +++
 src/cir_shadow.c|  324 
 src/compat-api.h|   99 +
 src/lg.h|2 
 src/lg_driver.c |   84 +--
 src/lg_hwcurs.c |5 
 src/lg_i2c.c|1 
 src/lg_xaa.c|7 
 24 files changed, 582 insertions(+), 277 deletions(-)

New commits:
commit 6cd7cef87189c744bdea4e972fb76eb89a0f9772
Author: Michele Cane michele.c...@gmail.com
Date:   Sun Sep 8 21:28:29 2013 +0200

Bump Standards-Version to 3.9.4, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index 38e9429..270bbea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
 
+  [ Maarten Lankhorst ]
   * New upstream release.
   * Require xserver 1.13rc1
   * Refresh 10-qemu.diff
 
+  [ Michele Cane ]
+  * Bump Standards-Version to 3.9.4, no changes needed.
+
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Mon, 16 Jul 2012 
15:30:58 +0200
 
 xserver-xorg-video-cirrus (1:1.4.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7470065..e86ad63 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.3
+Standards-Version: 3.9.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 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 

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

[Michele Cane]

 debian/changelog|1 +
 debian/patches/10-qemu.diff |8 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 4d141f88dd3c58620c37f05ac89771609640b4c2
Author: Michele Cane michele.c...@gmail.com
Date:   Sun Sep 8 21:31:27 2013 +0200

Refresh patches

diff --git a/debian/changelog b/debian/changelog
index 270bbea..5a843fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
 
   [ Michele Cane ]
   * Bump Standards-Version to 3.9.4, no changes needed.
+  * Refresh patches.
 
  -- 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 7089205..23ba00a 100644
--- a/debian/patches/10-qemu.diff
+++ b/debian/patches/10-qemu.diff
@@ -3,9 +3,11 @@ Default to 1024x768 for Qemu.
 Stolen from Fedora.
 
 Pointed out by Guido Günther a...@sigxcpu.org in #586693.
 a/src/alp_driver.c
-+++ b/src/alp_driver.c
-@@ -775,7 +775,21 @@
+Index: xserver-xorg-video-cirrus.git/src/alp_driver.c
+===
+--- xserver-xorg-video-cirrus.git.orig/src/alp_driver.c2013-09-08 
21:30:19.0 +0200
 xserver-xorg-video-cirrus.git/src/alp_driver.c 2013-09-08 
21:30:19.0 +0200
+@@ -772,7 +772,21 @@
   else
xf86SetDDCproperties(pScrn,xf86PrintEDID(
 xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn),pCir-I2CPtr1)));


-- 
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/e1vikht-0001yw...@vasks.debian.org

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

[Julien Cristau]

 debian/changelog |7 +++
 src/cir_driver.c |   11 +++
 2 files changed, 18 insertions(+)

New commits:
commit 6d558a146edbf3ef5b489a2729eb90491c1800b2
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jul 16 22:42:02 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e4030f1..d6bb0e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-cirrus (1:1.4.0-2) unstable; urgency=low
+
+  * cirrus: don't bind if there is a PCI kernel driver loaded, for
+compatibility with the cirrus KMS driver in Linux 3.5.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 16 Jul 2012 22:41:46 +0200
+
 xserver-xorg-video-cirrus (1:1.4.0-1) unstable; urgency=low
 
   * New upstream release:

commit 2e35bc316d7b74feca177c87a49a8050a2a0ff00
Author: Dave Airlie airl...@redhat.com
Date:   Thu May 17 10:23:34 2012 +0100

cirrus: don't bind if there is a PCI kernel driver loaded.

this should ensure we end up using -modesetting under kms.

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

diff --git a/src/cir_driver.c b/src/cir_driver.c
index 7e470bb..c6967da 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -256,6 +256,17 @@ CIRProbe(DriverPtr drv, int flags)
   they should be handled in this driver (as opposed to their
   own driver). */
pPci = xf86GetPciInfoForEntity(usedChips[i]);
+
+#ifdef XSERVER_LIBPCIACCESS
+if (pci_device_has_kernel_driver(pPci)) {
+xf86DrvMsg(0, X_ERROR,
+   cirrus: The PCI device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d has 
a kernel module claiming it.\n,
+   pPci-device_id, pPci-bus, pPci-domain, pPci-dev, 
pPci-func);
+xf86DrvMsg(0, X_ERROR,
+   cirrus: This driver cannot operate until it has been 
unloaded.\n);
+return FALSE;
+}
+#endif
pScrn = NULL;
if (pPci  (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5462 ||
 PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464 ||


-- 
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/e1sqsdk-00060j...@vasks.debian.org

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

[Cyril Brulebois]

 .gitignore |   70 +-
 ChangeLog  |  319 +
 Makefile.am|   11 -
 configure.ac   |   50 ++--
 debian/changelog   |9 
 debian/patches/20-faumachine-maxpitch.diff |   38 ---
 debian/patches/series  |1 
 man/.gitignore |2 
 man/Makefile.am|   63 ++---
 man/cirrus.man |1 
 src/.gitignore |6 
 src/CirrusClk.c|2 
 src/alp.h  |2 
 src/alp_driver.c   |  147 -
 src/alp_hwcurs.c   |2 
 src/alp_i2c.c  |2 
 src/alp_xaa.c  |2 
 src/alp_xaam.c |1 
 src/cir.h  |4 
 src/cir_dga.c  |5 
 src/cir_driver.c   |   14 -
 src/cir_pcirename.h|   27 ++
 src/cir_shadow.c   |2 
 src/lg.h   |2 
 src/lg_driver.c|   21 +
 src/lg_hwcurs.c|1 
 src/lg_i2c.c   |2 
 src/lg_xaa.c   |1 
 src/lg_xaa.h   |1 
 29 files changed, 631 insertions(+), 177 deletions(-)

New commits:
commit fd612778231309136b8c444e5312a50bc7978b56
Author: Cyril Brulebois k...@debian.org
Date:   Mon Apr 2 02:12:54 2012 +

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 0cba45c..e4030f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-cirrus (1:1.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.4.0-1) unstable; urgency=low
 
   * New upstream release:
 - Add support for Xserver 1.12.
   * Drop patch (merged upstream):
 - 20-faumachine-maxpitch.diff
 
- -- Cyril Brulebois k...@debian.org  Mon, 02 Apr 2012 02:02:33 +
+ -- Cyril Brulebois k...@debian.org  Mon, 02 Apr 2012 02:12:51 +
 
 xserver-xorg-video-cirrus (1:1.3.2-4) unstable; urgency=low
 

commit 0f44f3fa7d2e0987dc7bebea2ab75eb1e88b75dc
Author: Cyril Brulebois k...@debian.org
Date:   Mon Apr 2 02:12:46 2012 +

Drop patch (merged upstream): 20-faumachine-maxpitch.diff

diff --git a/debian/changelog b/debian/changelog
index a054329..0cba45c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xserver-xorg-video-cirrus (1:1.4.0-1) UNRELEASED; urgency=low
 
   * New upstream release:
 - Add support for Xserver 1.12.
+  * Drop patch (merged upstream):
+- 20-faumachine-maxpitch.diff
 
  -- Cyril Brulebois k...@debian.org  Mon, 02 Apr 2012 02:02:33 +
 
diff --git a/debian/patches/20-faumachine-maxpitch.diff 
b/debian/patches/20-faumachine-maxpitch.diff
deleted file mode 100644
index dd0ea32..000
--- a/debian/patches/20-faumachine-maxpitch.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Fix max pitch issues in FAUmachine.
-
-Patch by Stefan Potyra sistp...@ubuntu.com, stolen from bugzilla:
-https://bugs.freedesktop.org/show_bug.cgi?id=23775
-
 a/src/alp_driver.c
-+++ b/src/alp_driver.c
-@@ -407,6 +407,8 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
- {
-   int *linePitches = NULL;
-   int i, n = 0;
-+  int max_pitch = 2048;
-+
-   CirPtr pCir = CIRPTR(pScrn);
- 
-   /* XXX ajv - 512, 576, and 1536 may not be supported
-@@ -423,8 +425,20 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
-   1280, 1536, 1600, 1920, 
2048, 0 };
- #endif
- 
-+  switch (pCir-Chipset) {
-+  case PCI_CHIP_GD5446:
-+  max_pitch = 0x1ff  3;
-+  break;
-+
-+  default:
-+  /* FIXME max_pitch for other chipsets? */
-+  max_pitch = (pScrn-bitsPerPixel / 8) * 2048;
-+  break;
-+  }
-+
-   for (i = 0; accelWidths[i] != 0; i++) {
--  if (accelWidths[i] % pCir-Rounding == 0) {
-+  if ((accelWidths[i] % pCir-Rounding == 0)
-+((accelWidths[i] * pScrn-bitsPerPixel / 8) = max_pitch)) {
-   n++;
-   linePitches = xnfrealloc(linePitches, n * sizeof(int));
-   linePitches[n - 1] = accelWidths[i];
diff --git a/debian/patches/series b/debian/patches/series
index e99ced6..354eb33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 10-qemu.diff
-20-faumachine-maxpitch.diff

commit 1be781965b002ffc78096d26a7e3d7e7cf981aab
Author: Cyril Brulebois k...@debian.org
Date:   Mon Apr 2 02:02:45 2012 +

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 59ef5d4..9881813 100644
--- 

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

[Cyril Brulebois]

 debian/README.source  |   24 -
 debian/changelog  |   22 -
 debian/compat |2 
 debian/control|   22 -
 debian/rules  |  104 -
 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 --
 10 files changed, 43 insertions(+), 1072 deletions(-)

New commits:
commit 05aa5267e19c64e0f45587d4bf5072b0e14074c4
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 14:43:10 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index df94f52..8312281 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.2-4) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.2-4) unstable; urgency=low
 
   * Switch to dh:
 - Use debhelper 8.
@@ -12,7 +12,7 @@ xserver-xorg-video-cirrus (1:1.3.2-4) UNRELEASED; urgency=low
   * Wrap Depends/Provides.
   * Bump Standards-Version to 3.9.1 (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 11:35:04 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 14:43:10 +0100
 
 xserver-xorg-video-cirrus (1:1.3.2-3) experimental; urgency=low
 

commit 45adcd06232baa3bcebfda8b2145e401fa6ea39e
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 11:42:54 2011 +0100

Fix sequence ordering.

Since both the autoreconf and quilt sequences insert a command before
dh_auto_configure, it is important that we use the quilt one in the first
place, so that autoreconf is run on a patched tree. Ditto for dh_clean.

diff --git a/debian/rules b/debian/rules
index 63d3106..3d192dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,4 +14,4 @@ override_dh_shlibdeps:
dh_shlibdeps -- --warnings=6
 
 %:
-   dh $@ --with autoreconf,quilt,xsf --builddirectory=build/
+   dh $@ --with quilt,autoreconf,xsf --builddirectory=build/

commit 9ea4f49fc48e8dedb239a7151eca927c757a92bb
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 11:41:29 2011 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 24ff9a0..7d442e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-cirrus (1:1.3.2-4) 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  Thu, 03 Feb 2011 11:35:04 +0100
 
diff --git a/debian/control b/debian/control
index 7e72a8a..7e74d8e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-xext-dev,
  xutils-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 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 528c3c67d3cdd0745c1c137d57092c0fa58a1be9
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 11:41:14 2011 +0100

Wrap Depends/Provides.

diff --git a/debian/changelog b/debian/changelog
index 8ec0028..24ff9a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-cirrus (1:1.3.2-4) 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  Thu, 03 Feb 2011 11:35:04 +0100
 
diff --git a/debian/control b/debian/control
index ad5905b..7e72a8a 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,12 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.
 
 Package: xserver-xorg-video-cirrus
 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 -- Cirrus display driver
  This package provides the driver for the Cirrus Logic family of video
  cards.

commit cf2bc170a6f6a3e6209d89475fc4e6be354f7933
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 11:40:34 2011 +0100

Remove long obsolete Replaces/Conflicts.

diff --git a/debian/changelog b/debian/changelog
index 6ceb004..8ec0028 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-cirrus (1:1.3.2-4) UNRELEASED; urgency=low
 - Specify usr/share/man in .install, remove .manpages accordingly.
   * Remove xsfbs accordingly.
   * Update Uploaders list. Thanks, David  Brice!
+  

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

[Cyril Brulebois]

 debian/changelog |6 ++
 debian/rules |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 03f5b9e99665a7176ea773131522f4141290d961
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jan 14 04:23:00 2011 +0100

Fix unpatching by adding xsfclean dependency to clean target.

diff --git a/debian/changelog b/debian/changelog
index 60990e5..f53e1ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.3.2-2+squeeze2) UNRELEASED; urgency=low
+
+  * Fix unpatching by adding xsfclean dependency to clean target.
+
+ -- Cyril Brulebois k...@debian.org  Fri, 14 Jan 2011 04:22:11 +0100
+
 xserver-xorg-video-cirrus (1:1.3.2-2+squeeze1) unstable; urgency=low
 
   * Add 10-qemu.diff, stolen from Fedora, making the driver default to
diff --git a/debian/rules b/debian/rules
index e3127e1..eeba5a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ build-stamp: configure
cd build  $(MAKE)
$@
 
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp


-- 
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/e1pdaew-00032j...@alioth.debian.org

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

[Cyril Brulebois]

 debian/changelog   |   14 ++
 debian/control |1 
 debian/patches/10-qemu.diff|   28 +
 debian/patches/20-faumachine-maxpitch.diff |   38 +
 debian/patches/series  |2 +
 debian/rules   |2 -
 6 files changed, 84 insertions(+), 1 deletion(-)

New commits:
commit 1077f170043bc92d868141490a5f539b18ac67b8
Author: Cyril Brulebois k...@debian.org
Date:   Wed Jan 12 03:52:18 2011 +0100

Upload to unstable, fixing version.

There's already 1:1.3.2-3 in experimental.

diff --git a/debian/changelog b/debian/changelog
index b1ca8d0..60990e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.2-2+squeeze1) unstable; urgency=low
 
   * Add 10-qemu.diff, stolen from Fedora, making the driver default to
 1024x768 instead of 800x600 for the device simulated by QEMU. Thanks
@@ -10,7 +10,7 @@ xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
   * Add 20-faumachine-maxpitch.diff, stolen from Ubuntu, fixing pitch
 issues with GD5446, which is the device simulated by FAUmachine.
 
- -- Cyril Brulebois k...@debian.org  Wed, 12 Jan 2011 03:15:54 +0100
+ -- Cyril Brulebois k...@debian.org  Wed, 12 Jan 2011 03:51:33 +0100
 
 xserver-xorg-video-cirrus (1:1.3.2-2) unstable; urgency=low
 

commit b98e49e8112bdff64d1308851d587f2b757dbc65
Author: Cyril Brulebois k...@debian.org
Date:   Wed Jan 12 03:44:57 2011 +0100

Clarify that the default resolution change targets QEMU's device.

diff --git a/debian/changelog b/debian/changelog
index 89912fa..b1ca8d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
 
   * Add 10-qemu.diff, stolen from Fedora, making the driver default to
-1024x768 instead of 800x600. Thanks to Guido Günther for the pointer
-to that pretty ugly hack (Closes: #586693).
+1024x768 instead of 800x600 for the device simulated by QEMU. Thanks
+to Guido Günther for the pointer to that pretty ugly yet useful hack
+(Closes: #586693).
   * Add a dependency from configure to $(STAMP_DIR)/patch to get patches
 applied.
   * Add quilt build-dep accordingly.

commit c42559c446d1ac9a0e16ce52579ac5b07c893d54
Author: Cyril Brulebois k...@debian.org
Date:   Wed Jan 12 03:40:41 2011 +0100

Add 20-faumachine-maxpitch.diff, stolen from Ubuntu.

This fixes pitch issues with GD5446, which is the device simulated by
FAUmachine.

diff --git a/debian/changelog b/debian/changelog
index 26f9d47..89912fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
   * Add a dependency from configure to $(STAMP_DIR)/patch to get patches
 applied.
   * Add quilt build-dep accordingly.
+  * Add 20-faumachine-maxpitch.diff, stolen from Ubuntu, fixing pitch
+issues with GD5446, which is the device simulated by FAUmachine.
 
  -- Cyril Brulebois k...@debian.org  Wed, 12 Jan 2011 03:15:54 +0100
 
diff --git a/debian/patches/20-faumachine-maxpitch.diff 
b/debian/patches/20-faumachine-maxpitch.diff
new file mode 100644
index 000..dd0ea32
--- /dev/null
+++ b/debian/patches/20-faumachine-maxpitch.diff
@@ -0,0 +1,38 @@
+Fix max pitch issues in FAUmachine.
+
+Patch by Stefan Potyra sistp...@ubuntu.com, stolen from bugzilla:
+https://bugs.freedesktop.org/show_bug.cgi?id=23775
+
+--- a/src/alp_driver.c
 b/src/alp_driver.c
+@@ -407,6 +407,8 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
+ {
+   int *linePitches = NULL;
+   int i, n = 0;
++  int max_pitch = 2048;
++
+   CirPtr pCir = CIRPTR(pScrn);
+ 
+   /* XXX ajv - 512, 576, and 1536 may not be supported
+@@ -423,8 +425,20 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
+   1280, 1536, 1600, 1920, 
2048, 0 };
+ #endif
+ 
++  switch (pCir-Chipset) {
++  case PCI_CHIP_GD5446:
++  max_pitch = 0x1ff  3;
++  break;
++
++  default:
++  /* FIXME max_pitch for other chipsets? */
++  max_pitch = (pScrn-bitsPerPixel / 8) * 2048;
++  break;
++  }
++
+   for (i = 0; accelWidths[i] != 0; i++) {
+-  if (accelWidths[i] % pCir-Rounding == 0) {
++  if ((accelWidths[i] % pCir-Rounding == 0)
++((accelWidths[i] * pScrn-bitsPerPixel / 8) = max_pitch)) {
+   n++;
+   linePitches = xnfrealloc(linePitches, n * sizeof(int));
+   linePitches[n - 1] = accelWidths[i];
diff --git a/debian/patches/series b/debian/patches/series
index 354eb33..e99ced6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 10-qemu.diff
+20-faumachine-maxpitch.diff

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

[Mikhail Gusarov]

 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
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.


-- 
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/e1oamnu-0007ts...@alioth.debian.org

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

[Cyril Brulebois]

 debian/README.source  |2 +-
 debian/changelog  |   12 ++--
 debian/control|8 
 debian/xsfbs/xsfbs.mk |   35 ++-
 4 files changed, 37 insertions(+), 20 deletions(-)

New commits:
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} with
 ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
 accordingly.
+  * Add myself to Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:17:16 +0100
 
diff --git a/debian/control b/debian/control
index 6b2b4cb..41c5ef1 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, Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,

commit 2097cf77ef4c0255f1eb23b695670995049b4549
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 23:02:47 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 e26eca9..0a4be3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 xserver-xorg-video-cirrus (1:1.3.2-2) 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
 
+  [ Cyril Brulebois ]
+  * Update to new xsfbs, replace deprecated ${xserver:Depends} with
+${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
+accordingly.
+
  -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:17:16 +0100
 
 xserver-xorg-video-cirrus (1:1.3.2-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index f801c1f..6b2b4cb 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),
+ xserver-xorg-dev (= 2:1.7.6.901),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,
@@ -23,7 +23,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.
 
 Package: xserver-xorg-video-cirrus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, 

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

[Julien Cristau]

 debian/changelog |   17 -
 debian/control   |2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 99a308010a1bea351b31820411de3fd4fbf0ad2d
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 23 01:46:33 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 8ff0cda..45f4e25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-cirrus (1:1.3.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 10:53:56 +0200
 
diff --git a/debian/control b/debian/control
index 48239c4..f801c1f 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, Julien Cristau jcris...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,

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
 


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

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

[Julien Cristau]

 debian/changelog |5 +
 debian/rules |   10 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit e8611f8a1048cdcfc1737594e18e81b69c4bc74f
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:48:47 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 68c3c2e..8ff0cda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xserver-xorg-video-cirrus (1:1.3.2-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
+  [ 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 10:53:56 +0200
 
 xserver-xorg-video-cirrus (1:1.3.1-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 8476ace..7f11fd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,12 +40,12 @@ build: build-stamp
 build-stamp: configure
dh_testdir
 
-   mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
-   cd obj-$(DEB_BUILD_GNU_TYPE)  \
+   mkdir -p build
+   cd build  \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS=$(CFLAGS) 
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd build  $(MAKE)
$@
 
 clean:
@@ -57,7 +57,7 @@ clean:
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 aclocal.m4 config.guess config.sub config.h.in configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f $$(find -name Makefile.in)
@@ -70,7 +70,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-cirrus: Changes to 'debian-unstable'

[Timo Aaltonen]

 ChangeLog|   18 ++
 configure.ac |2 +-
 debian/changelog |8 
 debian/control   |4 ++--
 src/alp_driver.c |6 +-
 src/cir_driver.c |3 ++-
 src/cir_shadow.c |1 -
 src/lg_driver.c  |5 -
 8 files changed, 40 insertions(+), 7 deletions(-)

New commits:
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 5cbe6d11d11070da698a6a3ddd5d95d1cff34da1
+Author: Dave Airlie airl...@redhat.com
+Date:   Thu Jul 30 12:04:26 2009 +1000
+
+cirrus: bump for release 1.3.2
+
+commit 4ecaa548a996475fbb4c6403698b2ecaf35e9d6b
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 15:22:40 2009 +1000
+
+cirrus: change to using ABI version check
+
+commit 2765aba56fe66038ab7de554474b8d30995f3ef0
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 13:32:29 2009 +1000
+
+cirrus: update for resources/RAC API removal
+
 commit ecdf94e86d44bdbeff1bb944fb372da92d2fa907
 Author: Adam Jackson a...@redhat.com
 Date:   Thu Jul 2 10:28:20 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 35cf87c..5260617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 10:53:56 +0200
+
 xserver-xorg-video-cirrus (1:1.3.1-1) unstable; urgency=low
 
   [ Julien Cristau ]

commit 5cbe6d11d11070da698a6a3ddd5d95d1cff34da1
Author: Dave Airlie airl...@redhat.com
Date:   Thu Jul 30 12:04:26 2009 +1000

cirrus: bump for release 1.3.2

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

commit 4ecaa548a996475fbb4c6403698b2ecaf35e9d6b
Author: Dave Airlie airl...@redhat.com
Date:   Tue Jul 28 15:22:40 2009 +1000

cirrus: change to using ABI version check

diff --git a/src/alp_driver.c b/src/alp_driver.c
index c5c531d..fe81757 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -36,7 +36,7 @@
 /* This driver needs to be modified to not use vgaHW for multihead operation */
 #include vgaHW.h
 
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION)  6
 #include xf86RAC.h
 #include xf86Resources.h
 #endif
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 758e2fb..5466c48 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -21,7 +21,7 @@
 #include xf86.h
 #include xf86_OSproc.h
 
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION)  6
 #include xf86Resources.h
 #endif
 /* All drivers need this */
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 9d0850b..cfc3e65 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -39,7 +39,7 @@
 /* This driver needs to be 

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

[Timo Aaltonen]

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
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.


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

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

[Brice Goglin]

 ChangeLog|   20 +++
 configure.ac |2 -
 debian/changelog |9 -
 debian/control   |2 -
 src/alp_driver.c |   94 ---
 src/cir_driver.c |   33 ---
 src/lg_driver.c  |   89 +---
 7 files changed, 32 insertions(+), 217 deletions(-)

New commits:
commit 54fb225b3486121ae0dba31712f870ec79003cbe
Author: Brice Goglin bgog...@debian.org
Date:   Sun Jul 19 23:53:14 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 7925bfa..35cf87c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.1-1) unstable; urgency=low
 
   [ Julien Cristau ]
   * Update debian/copyright from upstream's COPYING.
@@ -7,7 +7,7 @@ xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump Standards-Version to 3.8.2.
 
- -- Brice Goglin bgog...@debian.org  Sun, 19 Jul 2009 23:51:59 +0200
+ -- Brice Goglin bgog...@debian.org  Sun, 19 Jul 2009 23:52:36 +0200
 
 xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
 

commit 6dab6fe4068b43e145fcc60c09429aa8ed36
Author: Brice Goglin bgog...@debian.org
Date:   Sun Jul 19 23:52:29 2009 +0200

Bump Standards-Version

diff --git a/debian/changelog b/debian/changelog
index 19a373f..7925bfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
 
   [ Brice Goglin ]
   * New upstream release.
+  * Bump Standards-Version to 3.8.2.
 
- -- Brice Goglin bgog...@debian.org  Sun, 19 Jul 2009 23:50:20 +0200
+ -- Brice Goglin bgog...@debian.org  Sun, 19 Jul 2009 23:51:59 +0200
 
 xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3c19df8..2462f4c 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 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 e029de457044f2d469fd6be70886805b76341460
Author: Brice Goglin bgog...@debian.org
Date:   Sun Jul 19 23:50:42 2009 +0200

New upstream release

diff --git a/ChangeLog b/ChangeLog
index 2ccae80..912b6ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+commit ecdf94e86d44bdbeff1bb944fb372da92d2fa907
+Author: Adam Jackson a...@redhat.com
+Date:   Thu Jul 2 10:28:20 2009 -0400
+
+cirrus 1.3.1
+
+commit 2939b59585d96bb9b6f852ddb1eaa5ffd4df1cfb
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Jun 10 14:16:32 2009 +1000
+
+cirrus: add inputstr.h explicitly
+
+using inputInfo requires inputstr.h this got included by accident before
+
+commit f07b4a3c5dd3e6834367e223aa454054c34a2ac8
+Author: Adam Jackson a...@redhat.com
+Date:   Thu May 28 14:53:06 2009 -0400
+
+Remove useless loader symbol lists.
+
 commit 15b1632d4136d4d20e006626836fb1f73c5a61f7
 Author: Alan Coopersmith alan.coopersm...@sun.com
 Date:   Thu May 7 06:56:57 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index acc0116..19a373f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-xserver-xorg-video-cirrus (1:1.3.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Update debian/copyright from upstream's COPYING.
 
- -- Julien Cristau jcris...@debian.org  Mon, 08 Jun 2009 18:21:18 +0200
+  [ Brice Goglin ]
+  * New upstream release.
+
+ -- Brice Goglin bgog...@debian.org  Sun, 19 Jul 2009 23:50:20 +0200
 
 xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
 

commit ecdf94e86d44bdbeff1bb944fb372da92d2fa907
Author: Adam Jackson a...@redhat.com
Date:   Thu Jul 2 10:28:20 2009 -0400

cirrus 1.3.1

diff --git a/configure.ac b/configure.ac
index bc503cb..14b3a6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-cirrus],
-1.3.0,
+1.3.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-cirrus)
 

commit 2939b59585d96bb9b6f852ddb1eaa5ffd4df1cfb
Author: Dave Airlie airl...@redhat.com
Date:   Wed Jun 10 14:16:32 2009 +1000

cirrus: add inputstr.h explicitly

using inputInfo requires inputstr.h this got included by accident before

diff --git a/src/lg_driver.c b/src/lg_driver.c
index c154c8a..2574472 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -45,6 +45,9 @@
 /* All drivers initialising the SW cursor need this */
 #include mipointer.h
 
+/* need this for inputInfo */
+#include inputstr.h
+
 /* All drivers implementing backing store need this */
 #include mibstore.h
 

commit f07b4a3c5dd3e6834367e223aa454054c34a2ac8

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

[Julien Cristau]

 COPYING  |   68 ---
 ChangeLog|   76 +++
 Makefile.am  |   12 
 README   |   24 +
 configure.ac |   10 +++-
 debian/README.source |   73 +
 debian/changelog |9 ++-
 debian/control   |2 
 debian/xserver-xorg-video-cirrus.install |1 
 debian/xsfbs/xsfbs.sh|   12 
 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/cir_dga.c|2 
 src/cir_driver.c |8 +--
 src/cir_shadow.c |   12 ++--
 src/lg_driver.c  |2 
 21 files changed, 285 insertions(+), 51 deletions(-)

New commits:
commit 194ac77ad4f6ef01d007b761fbaacebbb40fe4c8
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 8 18:01:21 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 4d87f1c..c744a5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
 
   [ David Nusinow ]
   * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
@@ -9,7 +9,7 @@ xserver-xorg-video-cirrus (1:1.3.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Add README.source, bump Standards-Version to 3.8.1.
 
- -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 21:50:40 -0400
+ -- Julien Cristau jcris...@debian.org  Mon, 08 Jun 2009 18:00:08 +0200
 
 xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low
 

commit 3c15fe093509989a79b2a4e733e80c2d76753187
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 8 17:59:53 2009 +0200

Don't try to install the pci id list

diff --git a/debian/xserver-xorg-video-cirrus.install 
b/debian/xserver-xorg-video-cirrus.install
index a8fac35..daf7bfe 100644
--- a/debian/xserver-xorg-video-cirrus.install
+++ b/debian/xserver-xorg-video-cirrus.install
@@ -1,2 +1 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*

commit 54f7ce3a406b96eed6b49483e3bf61f05a79d061
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 8 17:58:18 2009 +0200

Bump Standards-Version

diff --git a/debian/changelog b/debian/changelog
index cd68cc6..4d87f1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-cirrus (1:1.3.0-1) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * New upstream release.
+  * Add README.source, bump Standards-Version to 3.8.1.
 
  -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 21:50:40 -0400
 
diff --git a/debian/control b/debian/control
index 5d3b8a6..3c19df8 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
 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 8dc8cbedb3c85a49cfee77b32ca9346294bd6894
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 8 17:57:38 2009 +0200

Update changelog

diff --git a/debian/changelog b/debian/changelog
index 43ce2e9..cd68cc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-xserver-xorg-video-cirrus (1:1.2.1-5) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.0-1) UNRELEASED; urgency=low
 
+  [ David Nusinow ]
   * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
 pick a driver during autoconfig.
 + Disable patch system and remove quilt from build-dep
 
+  [ Julien Cristau ]
+  * New upstream release.
+
  -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 21:50:40 -0400
 
 xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low

commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 3 03:37:37 2009 +0200

Kill custom readlink function

This was needed for very, very old versions of debianutils.
Closes: #498890

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
   fi
 }
 
-# we require a readlink command or shell function
-if ! which readlink  /dev/null 21; then
-  message The readlink command was not found.  Please install version \
-  1.13.1 or 

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

[Julien Cristau]

 debian/changelog |6 ++
 debian/copyright |   45 +
 2 files changed, 51 insertions(+)

New commits:
commit 8a0d7ba8410d06dc0186707e1732b37bf631b3b0
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 8 18:21:32 2009 +0200

Update debian/copyright from upstream's COPYING.

diff --git a/debian/changelog b/debian/changelog
index c744a5b..acc0116 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.3.0-2) UNRELEASED; urgency=low
+
+  * Update debian/copyright from upstream's COPYING.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 08 Jun 2009 18:21:18 +0200
+
 xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
 
   [ David Nusinow ]
diff --git a/debian/copyright b/debian/copyright
index bb283cf..a76e7d7 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) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+
+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 the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+
 Copyright 2000 by Egbert Eich
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -20,3 +44,24 @@ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING 
FROM LOSS OF USE,
 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 2007 George Sapountzis
+
+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
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+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 and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS 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.


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

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

[David Nusinow]

 debian/changelog   |8 
 debian/control |1 -
 debian/patches/01_gen_pci_ids.diff |   27 ---
 debian/patches/series  |1 -
 debian/rules   |4 ++--
 5 files changed, 10 insertions(+), 31 deletions(-)

New commits:
commit 5758ae416b4504d892e17b1f071a8c10d58ee5c5
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 21:51:42 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to pick a driver during autoconfig.
Disable patch system and remove quilt from build-dep

diff --git a/debian/changelog b/debian/changelog
index 120f5f4..43ce2e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-cirrus (1:1.2.1-5) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+pick a driver during autoconfig.
++ Disable patch system and remove quilt from build-dep
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 21:50:40 -0400
+
 xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 130c387..5d3b8a6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- quilt,
  xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 707426b..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: xserver-xorg-video-cirrus/src/cirrus.ids
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ xserver-xorg-video-cirrus/src/cirrus.ids   2008-05-22 08:21:10.0 
+0200
-@@ -0,0 +1,11 @@
-+101300A0
-+101300A4
-+101300A8
-+101300AC
-+101300B8
-+101300BC
-+101300D0
-+101300D4
-+101300D5
-+101300D6
-+10130038
-Index: xserver-xorg-video-cirrus/src/Makefile.am
-===
 xserver-xorg-video-cirrus.orig/src/Makefile.am 2008-05-22 
08:20:51.0 +0200
-+++ xserver-xorg-video-cirrus/src/Makefile.am  2008-05-22 08:21:10.0 
+0200
-@@ -57,3 +57,6 @@
-  lg_i2c.c \
-  lg_xaa.c \
-  lg_xaa.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = cirrus.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index 1aad3af..8476ace 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure:
dh_testdir
autoreconf -vfi
 
@@ -48,7 +48,7 @@ build-stamp: configure
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp


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

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

[Julien Cristau]

 debian/xsfbs/repack.sh |   32 +++
 debian/xsfbs/xsfbs.sh  |   66 -
 2 files changed, 32 insertions(+), 66 deletions(-)

New commits:
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\; fgrep exited with status \
-  $fgrep_status ;;
-  esac
-  set +e
-  cmp -s $ldsoconf.dpkg-tmp $ldsoconf
-  cmp_status=$?
-  set -e
-  case $cmp_status in
-0) rm $ldsoconf.dpkg-tmp ;; # files are identical
-1) mv $ldsoconf.dpkg-tmp $ldsoconf ;; # files differ
-*) die error comparing \$ldsoconf.dpkg-tmp\ to \$ldsoconf\; \
-  cmp exited with status $cmp_status ;;
-  esac
-fi
-  fi
-}
-
 make_symlink_sane () {
   # syntax: make_symlink_sane symlink target
   #

commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau jcris...@debian.org
Date:   Sun Feb 1 01:31:31 2009 +0100

xsfbs: add a repack script for uscan

This will automatically prune upstream tarballs

diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if ! [ -d debian/prune ]; then
+   exit 0
+fi
+
+if [ x$1 != x--upstream-version ]; then
+   exit 1
+fi
+
+version=$2
+filename=$3
+
+if [ -z $version ] || ! [ -f $filename ]; then
+   exit 1
+fi
+
+dir=$(pwd)
+tempdir=$(mktemp -d)
+
+cd $tempdir
+tar xf $dir/$filename
+cat $dir/debian/prune/* | while read file; do rm -f */$file; done
+
+tar czf $dir/$filename *
+cd $dir
+rm -rf $tempdir
+echo Done pruning upstream tarball
+
+exit 0


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

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

[Julien Cristau]

 Makefile.in  |  674 -
 aclocal.m4   | 8256 -
 config.guess | 1526 --
 config.h.in  |   72 
 config.sub   | 1658 --
 configure|23296 ---
 debian/changelog |   23 
 debian/control   |   18 
 debian/rules |   23 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 
 debian/xsfbs/xsfbs.mk|  127 
 debian/xsfbs/xsfbs.sh|  387 
 depcomp  |  589 
 install-sh   |  519 
 ltmain.sh| 6964 ---
 man/Makefile.in  |  426 
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  671 -
 19 files changed, 279 insertions(+), 45628 deletions(-)

New commits:
commit 7514ee5cb4256b921ecb737ad14f2ec741983370
Author: Julien Cristau jcris...@debian.org
Date:   Thu Apr 9 09:57:14 2009 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f4ce803..120f5f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 09:57:09 +0100
+
 xserver-xorg-video-cirrus (1:1.2.1-3) experimental; urgency=low
 
   * Merge changes from 1:1.2.1-1.lenny1.

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 

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

[Julien Cristau]

 debian/changelog |7 +++
 src/alp_driver.c |4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 93a3d1e7a0bccea672756f9d5c630186f1f097f6
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 25 21:10:20 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 75dc827..debe7e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-cirrus (1:1.2.1-1.lenny1) unstable; urgency=high
+
+  * Cherry-pick from upstream:
+alpine: fix order of arguments of PCI_WRITE_LONG().
+
+ -- Julien Cristau jcris...@debian.org  Sun, 25 Jan 2009 21:10:09 +0100
+
 xserver-xorg-video-cirrus (1:1.2.1-1) unstable; urgency=low
 
   * New upstream release.

commit 7fc4a9d2fde1c895303e311a0f39dadcff045e88
Author: Matthieu Herrb matthieu.he...@laas.fr
Date:   Tue Sep 16 23:48:07 2008 +0200

alpine: fix order of arguments of PCI_WRITE_LONG().
(cherry picked from commit d92459edcb8917d51435110f6b30a133d8ce7d52)

diff --git a/src/alp_driver.c b/src/alp_driver.c
index c5d2426..b7be5b2 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -591,8 +591,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
 * BIOSes tend to mess them up
 */
 
-   PCI_WRITE_LONG(pCir-PciInfo, 0x10, PCI_REGION_BASE(pCir-PciInfo, 0, 
REGION_MEM));
-   PCI_WRITE_LONG(pCir-PciInfo, 0x14, PCI_REGION_BASE(pCir-PciInfo, 1, 
REGION_MEM));
+   PCI_WRITE_LONG(pCir-PciInfo, PCI_REGION_BASE(pCir-PciInfo, 0, 
REGION_MEM), 0x10);
+   PCI_WRITE_LONG(pCir-PciInfo, PCI_REGION_BASE(pCir-PciInfo, 1, 
REGION_MEM), 0x14);

 }
 


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

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

[Brice Goglin]

 .cvsignore |   19 
 .gitignore |   20 
 ChangeLog  |   71 ++
 Makefile.in|   31 
 aclocal.m4 |  265 +--
 config.guess   |   60 +
 config.h.in|6 
 config.sub |   66 +
 configure  | 1256 +++--
 configure.ac   |   16 
 debian/changelog   |   12 
 debian/control |8 
 debian/patches/01_gen_pci_ids.diff |8 
 debian/rules   |2 
 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   |   48 +
 src/cir.h  |6 
 src/cir_driver.c   |   57 +
 src/cir_pcirename.h|  122 +++
 src/lg_driver.c|   16 
 28 files changed, 2391 insertions(+), 711 deletions(-)

New commits:
commit f0968c91ee604e3a9eb64507c7eb566611536359
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Thu May 22 08:34:55 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 9782cdb..75dc827 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * Remove XS- prefix to Vcs-* fields in debian/rules.
@@ -8,7 +8,7 @@ xserver-xorg-video-cirrus (1:1.2.1-1) UNRELEASED; urgency=low
 dpkg-shlibdeps to shut up about symbols it can't find.
 + Build-depend on dpkg-dev = 1.14.17.
 
- -- Brice Goglin [EMAIL PROTECTED]  Thu, 22 May 2008 08:27:52 +0200
+ -- Brice Goglin [EMAIL PROTECTED]  Thu, 22 May 2008 08:34:50 +0200
 
 xserver-xorg-video-cirrus (1:1.1.0-8) unstable; urgency=low
 

commit 12256edd61d9b0c9164cfd0f239cdaa20ab96fcd
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Thu May 22 08:29:08 2008 +0200

Misc debian/rules and debian/control updates

 * Remove XS- prefix to Vcs-* fields in debian/rules.
 * Bump Standards-Version to 3.7.3, no change needed.
 * 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 9b23ab9..9782cdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 xserver-xorg-video-cirrus (1:1.2.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
-
- -- Brice Goglin [EMAIL PROTECTED]  Thu, 22 May 2008 08:24:15 +0200
+  * Remove XS- prefix to Vcs-* fields in debian/rules.
+  * Bump Standards-Version to 3.7.3, no change needed.
+  * 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.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Thu, 22 May 2008 08:27:52 +0200
 
 xserver-xorg-video-cirrus (1:1.1.0-8) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 89f50cf..b0b60ad 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), 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
 
 Package: xserver-xorg-video-cirrus
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 9f72217..b072594 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ binary-arch: build install serverabi
dh_compress

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

[David Nusinow]

 Makefile.in  |  125 +--
 aclocal.m4   |  676 --
 configure| 1119 +++
 debian/changelog |   23 
 debian/control   |4 
 debian/copyright |3 
 debian/patches/01_gen_pci_ids.diff   |   27 
 debian/patches/series|1 
 debian/rules |4 
 debian/xserver-xorg-video-cirrus.install |1 
 debian/xsfbs/xsfbs.mk|   27 
 debian/xsfbs/xsfbs.sh|7 
 man/Makefile.in  |   92 +-
 src/Makefile.in  |  164 ++--
 14 files changed, 1442 insertions(+), 831 deletions(-)

New commits:
commit a7847b7641890229d92bba7b28389921a2c07688
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Sep 16 16:18:36 2007 -0400

* Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 24f4b8a..b88413e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.1.0-8) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun, 16 Sep 2007 15:43:43 -0400
+
 xserver-xorg-video-cirrus (1:1.1.0-7) experimental; urgency=low
 
   * Add 01_gen_pci_ids.diff

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@
 

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

[Brice Goglin]

 .cvsignore|   19 
 ChangeLog |  280 +
 Makefile.in   |   16 
 aclocal.m4|  379 +-
 autogen.sh|   12 
 config.guess  |  667 ++--
 config.h.in   |9 
 config.sub|  230 +
 configure | 7879 ++
 debian/changelog  |   21 
 debian/control|   14 
 debian/rules  |4 
 debian/xsfbs/xsfbs.mk |   28 
 ltmain.sh |   12 
 man/.cvsignore|2 
 man/Makefile.am   |2 
 man/Makefile.in   |   16 
 man/cirrus.man|4 
 mkinstalldirs |   89 
 src/.cvsignore|6 
 src/Makefile.in   |   14 
 src/alp.h |2 
 src/cir_driver.c  |2 
 src/lg.h  |2 
 src/lg_xaa.h  |2 
 25 files changed, 5412 insertions(+), 4299 deletions(-)

New commits:
commit 67793cf040bb0b12fbd3bc7ad12ed4a686810686
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sun Apr 29 11:00:10 2007 +0200

Update upstream ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 92ba092..c281afc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,67 +1,254 @@
-2006-04-06  Adam Jackson  [EMAIL PROTECTED]
+commit 43d9703ddf79314015b66c81c671ef254fbb3934
+Author: Alan Coopersmith [EMAIL PROTECTED]
+Date:   Thu Mar 1 10:41:58 2007 -0800
 
-   * configure.ac:
-   * src/CirrusClk.c:
-   * src/alp_driver.c:
-   * src/alp_hwcurs.c:
-   * src/alp_i2c.c:
-   * src/alp_xaa.c:
-   * src/alp_xaam.c:
-   * src/cir.h:
-   * src/cir_dga.c:
-   * src/cir_driver.c:
-   * src/cir_shadow.c:
-   * src/lg_driver.c:
-   * src/lg_hwcurs.c:
-   * src/lg_i2c.c:
-   * src/lg_xaa.c:
-   Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
+Replace references to XFree86/XF86Config in man page
 
-   * src/cir_driver.c:
-   VERSION - CIR_VERSION
+commit 1ba52ebddd605c9341ff7f0a880c272a78f467ed
+Author: Adam Jackson [EMAIL PROTECTED]
+Date:   Fri Apr 7 18:57:40 2006 +
 
-2005-12-20  Kevin E. Martin  kem-at-freedesktop-dot-org
+VERSION - CIR_VERSION
 
-   * configure.ac:
-   Update package version for X11R7 release.
+commit e6588f26e12bb737551b9448911c31129978ea85
+Author: Adam Jackson [EMAIL PROTECTED]
+Date:   Fri Apr 7 18:44:20 2006 +
 
-2005-12-14  Kevin E. Martin  kem-at-freedesktop-dot-org
+Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
 
-   * configure.ac:
-   Update package version number for final X11R7 release candidate.
+commit 9ca7e7fcfc53ae9054661219aa366409089c3f8d
+Author: Kevin E Martin [EMAIL PROTECTED]
+Date:   Wed Dec 21 02:29:59 2005 +
 
-2005-12-06  Kevin E. Martin  kem-at-freedesktop-dot-org
+Update package version for X11R7 release.
 
-   * man/Makefile.am:
-   Change *man_SOURCES == *man_PRE to fix autotools warnings.
+commit 2d8e201ee988646bd8601dbc2b8c32571fdac017
+Author: Adam Jackson [EMAIL PROTECTED]
+Date:   Mon Dec 19 16:25:52 2005 +
 
-2005-12-03  Kevin E. Martin  kem-at-freedesktop-dot-org
+Stub COPYING files
 
-   * configure.ac:
-   Update package version number for X11R7 RC3 release.
+commit dbf028bd0148d2317e7b87fad857ad0f7accd234
+Author: Kevin E Martin [EMAIL PROTECTED]
+Date:   Thu Dec 15 00:24:16 2005 +
 
-2005-12-01  Kevin E. Martin  kem-at-freedesktop-dot-org
+Update package version number for final X11R7 release candidate.
 
-   * configure.ac:
-   Remove extraneous AC_MSG_RESULT.
+commit 4456ba0a597443aed32bf686b79c22ef19ac0102
+Author: Kevin E Martin [EMAIL PROTECTED]
+Date:   Tue Dec 6 22:48:33 2005 +
 
-2005-11-29  Adam Jackson  [EMAIL PROTECTED]
+Change *man_SOURCES == *man_PRE to fix autotools warnings.
 
-   * configure.ac:
-   Only build dlloader modules by default.
+commit 134440cd4ab932803b100bf7767776fb0ffb2d0d
+Author: Kevin E Martin [EMAIL PROTECTED]
+Date:   Sat Dec 3 05:49:33 2005 +
 
-2005-11-28  Kevin E. Martin  kem-at-freedesktop-dot-org
+Update package version number for X11R7 RC3 release.
 
-   * src/Makefile.am:
-   Separate cirrus driver into _drv, _alpine and _laguna components
-   as they are in the monolithic tree.
+commit 2f48ba72c2009bc3c7b83d2b1415df897a2b26e4
+Author: Kevin E Martin [EMAIL PROTECTED]
+Date:   Fri Dec 2 02:16:07 2005 +
 
-2005-11-09  Kevin E. Martin  kem-at-freedesktop-dot-org
+Remove extraneous AC_MSG_RESULT.
 
-   * configure.ac:
-   Update package version number for X11R7 RC2 release.
+commit 444b38c206b6a7c037615694c2a7ada84380698e
+Author: Adam Jackson [EMAIL PROTECTED]
+Date:   Tue Nov 29 23:29:58 2005 +
 
-2005-11-01  Kevin E. Martin  kem-at-freedesktop-dot-org
+Only build dlloader modules by default.
 
-   * configure.ac:
-   Update pkgcheck dependencies to work with separate build roots.
+commit 6d3a17ba84343fb5c0cf75039a4e5cbd3274cfc3
+Author: Alan Coopersmith [EMAIL PROTECTED]
+Date:   Mon Nov 28 

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

[Timo Aaltonen]

 debian/changelog |6 +-
 debian/control   |3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 5f53063369014115c3af74331f210880fc3b7c07
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue Apr 24 13:05:33 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 72d09fe..507c004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-cirrus (1:1.1.0-4) 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:40 +0100
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-cirrus.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 24 Apr 2007 13:03:59 +0300
 
 xserver-xorg-video-cirrus (1:1.1.0-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0682f04..8f4bf83 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-cirrus
 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-cirrus
+Conflicts: xserver-xorg-driver-cirrus
 Description: X.Org X server -- Cirrus display driver
  This package provides the driver for the Cirrus Logic family of video
  cards.


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

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

[David Nusinow]

New branch 'debian-unstable' available with the following commits:
commit 96491782862156ba626d1a39cf697bd23e1d7e20
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 95fa5b3138bca21fb8db8f49efee48800d37787f
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Tue Sep 26 10:26:34 2006 +

Add some more watch files.

commit f450437a3025a821207d6a858c52ccf621f81cd6
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Sep 19 00:37:21 2006 +

Prepare changelog for upload to unstable

commit a9a444af8fcb7c6b73d813fc9a0b6643c97d9f1c
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Mon Sep 18 14:31:48 2006 +

  * Standards version 3.7.2.
  * Use debhelper 5.
  * Use dh_installman to install man pages.
  * Exclude .la files from dh_install.

commit e443f3e29571cc3bf9101af43ff39d473f4a031a
Author: Steve Langasek [EMAIL PROTECTED]
Date:   Mon Sep 18 10:37:35 2006 +

merge cirrus 7.1 video driver to trunk for upload to unstable

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

more fixes for unversioned directory names

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

Prepare changelogs for upload to unstable

commit 02cd66d07bd462581b905f214ec9b744869dabeb
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Mar 8 01:42:32 2006 +

Revert revision 1398 that added the obsolete loader speed hack patch port.

commit 7a01f132f3ca44564ad5d2d600d804afff365bbd
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Mar 6 02:48:55 2006 +

* Partial port of general/028_loader_speed_hack.diff to append _drv to the
  cirrus_alpine and _laguna module names.

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

Fix Branden's email address

commit 45db846eaa6fad4dd7b08abb7f8e9663a6ae6942
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 9cd264e601d1fcb1218dda4b8d0949ee9bf1d8e6
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Feb 10 03:40:14 2006 +

Change driver package names to new scheme

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

Move .install files to new naming scheme for drivers

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

Pull in and use xsfbs

commit b5a10b3842c61f702a9d5811ddadfbc037c46e21
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 bc32bf190b7f6d769d6aed68a510a20481b1d848
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 20 04:31:26 2006 +

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

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

Add packaging for various drivers

commit 0a9b342111b2fb5ecc0342d197841437c7b2b9df
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 614cb38d240e523e2a8f6bb56a86d731490d7b0d
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]