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

2013-09-19 Thread Julien Cristau 
 .gitignore |3 
 ChangeLog  |  109 +++
 configure.ac   |2 
 debian/changelog   |   10 
 debian/rules   |4 
 src/glide_driver.c | 1475 ++---
 6 files changed, 847 insertions(+), 756 deletions(-)

New commits:
commit 18e5ec8e092682633dd08aa5026f0f23948bf7da
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 19 22:29:10 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index ad25c65..3ba1073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-glide (1.2.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.2.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -11,7 +11,7 @@ xserver-xorg-video-glide (1.2.2-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Disable silent build rules.
 
- -- Julien Cristau jcris...@debian.org  Thu, 19 Sep 2013 22:22:04 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 19 Sep 2013 22:25:31 +0200
 
 xserver-xorg-video-glide (1.2.0-1) unstable; urgency=low
 

commit 5ade046998707172835c00e723f5287bc325270c
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 19 22:29:06 2013 +0200

Disable silent build rules.

diff --git a/debian/changelog b/debian/changelog
index 63e2979..ad25c65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ xserver-xorg-video-glide (1.2.2-1) UNRELEASED; urgency=low
   [ Michele Cane ]
   * Bump Standards-Version to 3.9.4, no changes needed.
 
+  [ Julien Cristau ]
+  * Disable silent build rules.
+
  -- Julien Cristau jcris...@debian.org  Thu, 19 Sep 2013 22:22:04 +0200
 
 xserver-xorg-video-glide (1.2.0-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 1d8183b..6947889 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,9 @@
 
 # Use glide3 explicitly:
 override_dh_auto_configure:
-   dh_auto_configure -- --with-glide-include-dir=/usr/include/glide3
+   dh_auto_configure -- \
+   --with-glide-include-dir=/usr/include/glide3 \
+   --disable-silent-rules
 
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:

commit f1815c2e0d22bc41e587873090df7aaf9ec49108
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 19 22:22:34 2013 +0200

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 3fa5086..1f538b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,112 @@
+commit 44047d72706c1a9ac80cff7714241c1934437c6f
+Author: Guillem Jover guil...@hadrons.org
+Date:   Thu Sep 19 06:46:23 2013 +0200
+
+Bump to 1.2.2
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit 6af93046dabc8ef63bbabd266841cb34d5eb174a
+Author: Guillem Jover guil...@hadrons.org
+Date:   Wed Sep 18 19:50:54 2013 +0200
+
+Add compile, *.tar.bz2 and *.tar.gz to .gitignore
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit 00bd4faaf963806f7b322e90fd33b57834a6dbe1
+Author: Guillem Jover guil...@hadrons.org
+Date:   Wed Sep 18 19:43:19 2013 +0200
+
+Move miSetVisualTypes() call outside an if conditional
+
+The function call is a bit long, take it out of the conditional and use
+a ret variable instead.
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit 9ff6c53d427c785898ccf34f7e322be0c8d0c2c3
+Author: Guillem Jover guil...@hadrons.org
+Date:   Wed Sep 18 19:36:00 2013 +0200
+
+Do not assign to variables inside if conditionals
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit 6250d5c052768b706dd897e5db399fa9ee4c2c1e
+Author: Guillem Jover guil...@hadrons.org
+Date:   Wed Sep 18 19:30:48 2013 +0200
+
+Unify return value variable name to ret
+
+Use that instead of r or i, which is way more clear.
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit 45a85c82c66b2435606bf0cb712f5b18f5094404
+Author: Guillem Jover guil...@hadrons.org
+Date:   Wed Sep 18 19:49:31 2013 +0200
+
+Remove unused bool typedef
+
+We are already using the X Bool type.
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit fa72126d3736f557becea8f5707e639be1d6f6f4
+Author: Guillem Jover guil...@hadrons.org
+Date:   Wed Sep 18 19:38:30 2013 +0200
+
+Remove dead loader code
+
+The function LoaderCheckUnresolved() was removed from the X server in
+2009, and had been a stub since 2006.
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit 601d6af9fcefa69d7a76c6f968a153bac6f33c61
+Author: Guillem Jover guil...@hadrons.org
+Date:   Wed Sep 18 19:22:48 2013 +0200
+
+Remove unreachable error check code branch
+
+There's no framebuffer locking funcion being called, and the last value
+assigned to r is from grSstWinOpen(), so there has already been an error
+check, and doing it later on will never trigger again. Just remove the
+error check and error call.
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+

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

2013-09-07 Thread Michele Cane 
 ChangeLog |   24 
 configure.ac  |2 -
 debian/changelog  |   11 +
 debian/control|2 -
 debian/patches/series |1 
 src/Makefile.am   |1 
 src/compat-api.h  |   94 ++
 src/glide_driver.c|   41 ++---
 8 files changed, 153 insertions(+), 23 deletions(-)

New commits:
commit e0ece8262166ad8e924773b64cdb4e30c762b6d4
Author: Michele Cane michele.c...@gmail.com
Date:   Sat Sep 7 16:34:29 2013 +0200

Bump Standards-Version to 3.9.4, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index b19ce7e..7f6260f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-video-glide (1.2.1-1) UNRELEASED; urgency=low
 
+  [ Maarten Lankhorst ]
   * New upstream release.
   * Bump Standards-Version to 3.9.3
 
+  [ Michele Cane ]
+  * Bump Standards-Version to 3.9.4, no changes needed.
+
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
15:59:52 +0200
 
 xserver-xorg-video-glide (1.2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e37dd47..6fdd91d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-render-dev,
  xutils-dev (= 1:7.5+4),
  libglide3-dev,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glide
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glide.git
 

commit b791b65e2e21ceeac3baa446f62c171cad3dcd7b
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 16:00:41 2012 +0200

Bump Standards-Version to 3.9.3

diff --git a/debian/changelog b/debian/changelog
index 7482618..b19ce7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-glide (1.2.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.9.3
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
15:59:52 +0200
 
diff --git a/debian/control b/debian/control
index eda32cc..e37dd47 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-render-dev,
  xutils-dev (= 1:7.5+4),
  libglide3-dev,
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glide
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glide.git
 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder

commit 5c38da6680896f92650c9dc7f263084234c1763c
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 16:00:17 2012 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 5d52a17..7482618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-glide (1.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
15:59:52 +0200
+
 xserver-xorg-video-glide (1.2.0-1) unstable; urgency=low
 
   * New upstream release.

commit 94d7f0127e1b109a17df24c4618b372954e8eaf4
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 15:59:44 2012 +0200

Bump changelog

diff --git a/ChangeLog b/ChangeLog
index 7cf9a52..3fa5086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+commit 02d1981149c4feb27f2a662f14b94185bada0e33
+Author: Guillem Jover guil...@hadrons.org
+Date:   Tue Jul 17 15:17:01 2012 +0200
+
+Bump to 1.2.1
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit e705a91181ee0c9a838277b946bea68ffe8fffe6
+Author: Guillem Jover guil...@hadrons.org
+Date:   Wed Jun 6 16:08:16 2012 +0200
+
+Use new X server compat API
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit 0b815ca532bbc746a91ffce0bcf7b14ff11abfe8
+Author: Guillem Jover guil...@hadrons.org
+Date:   Fri Jan 20 15:14:55 2012 +0100
+
+Remove unused xaa.h, xf86Cursor.h and xf86DDC.h inclusions
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
 commit 517e9252f3200f3e96bbfcfe84812b532c1b2933
 Author: Guillem Jover guil...@hadrons.org
 Date:   Fri Dec 30 06:21:19 2011 +0100

commit 02d1981149c4feb27f2a662f14b94185bada0e33
Author: Guillem Jover guil...@hadrons.org
Date:   Tue Jul 17 15:17:01 2012 +0200

Bump to 1.2.1

Signed-off-by: Guillem Jover guil...@hadrons.org

diff --git a/configure.ac b/configure.ac
index 594d711..cf5f896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-glide],
-[1.2.0],
+[1.2.1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-glide])
 

commit e705a91181ee0c9a838277b946bea68ffe8fffe6
Author: Guillem Jover

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

2011-12-30 Thread Cyril Brulebois 
 COPYING|4 -
 ChangeLog  |   57 ++
 configure.ac   |   14 ++-
 debian/changelog   |7 +
 debian/copyright   |4 -
 man/Makefile.am|2 
 src/Makefile.am|3 
 src/glide_driver.c |  206 ++---
 8 files changed, 124 insertions(+), 173 deletions(-)

New commits:
commit 0376b763e6bb65d559d575d41df2668274e4cb63
Author: Cyril Brulebois k...@debian.org
Date:   Fri Dec 30 17:00:13 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index ce08fde..5d52a17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-glide (1.2.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.2.0-1) unstable; urgency=low
 
   * New upstream release.
   * Update debian/copyright.
 
- -- Cyril Brulebois k...@debian.org  Fri, 30 Dec 2011 16:54:37 +0100
+ -- Cyril Brulebois k...@debian.org  Fri, 30 Dec 2011 17:00:05 +0100
 
 xserver-xorg-video-glide (1.1.0-2) unstable; urgency=low
 

commit 3bac662e048cbdd07048b4962dd52cfb39c08b84
Author: Cyril Brulebois k...@debian.org
Date:   Fri Dec 30 16:56:38 2011 +0100

Update debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index e8d607e..ce08fde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-glide (1.2.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Update debian/copyright.
 
  -- Cyril Brulebois k...@debian.org  Fri, 30 Dec 2011 16:54:37 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 6d7b284..67a431a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
 Copyright © 2005 Adam Jackson.
-Copyright © 2007-2010 Guillem Jover.
+Copyright © 2007-2011 Guillem Jover.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the Software),
@@ -46,7 +46,7 @@ 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.
 
 
-Copyright © 2005 Sun Microsystems, Inc.  All rights reserved.
+Copyright (c) 2005, Oracle and/or its affiliates. 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),

commit e39f96cec86eb706cab37049c011678e5c9fb596
Author: Cyril Brulebois k...@debian.org
Date:   Fri Dec 30 16:54:49 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 00e81aa..7cf9a52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+commit 517e9252f3200f3e96bbfcfe84812b532c1b2933
+Author: Guillem Jover guil...@hadrons.org
+Date:   Fri Dec 30 06:21:19 2011 +0100
+
+Bump to 1.2.0
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit 7fdaec9032cc069c8dabc719ada40c03aacda2de
+Author: Guillem Jover guil...@hadrons.org
+Date:   Fri Dec 30 06:20:30 2011 +0100
+
+Update copyright years
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit e42689244fd5e1b23e641de46c4dc6d38a243a3b
+Author: Guillem Jover guil...@hadrons.org
+Date:   Fri Dec 30 05:59:46 2011 +0100
+
+Pass SST number through GLIDERec instead of casting it to driverPrivate
+
+Allocate GLIDERec in GLIDEProbe() instead of in GLIDEPreInit() to pass
+the SST number through the SST_Index member instead of casting it to
+the driverPrivate pointer back and forth.
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit 518b189f31ee7b85d28541bf32bbcf10b5337289
+Author: Guillem Jover guil...@hadrons.org
+Date:   Tue Jul 19 15:32:56 2011 +0200
+
+Stop using the deprecated LoaderSymbol() function
+
+Instead of using dlsym() to replace LoaderSymbol() and keep loading
+libglide at run-time, just switch to dyamically linking it.
+
+This in effect makes the module stop using LoaderSymbol() function,
+and as a bonus makes it start using proper linker dependencies.
+
+Reported-by: Daniel Stone dan...@fooishbar.org
+Signed-off-by: Guillem Jover guil...@hadrons.org
+
+commit 8ffb28cda58be37d52ed8f7c3b9967574f0a4233
+Author: Guillem Jover guil...@hadrons.org
+Date:   Tue Jul 19 17:56:32 2011 +0200
+
+build: Define GLIDE3_ALPHA when using glide3
+
+commit 76a838e31d3b702b0489792e9cc13018fa331749
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sun Nov 21 11:38:44 2010 -0800
+
+Sun's copyrights belong to Oracle now
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
 commit d8045b0815167b2204c0a00a49ae84d1b673d8d3
 Author: Guillem Jover guil...@hadrons.org
 Date:   Sat Nov 6 22:51:55 2010 +0100
diff --git a/debian/changelog b/debian/changelog
index 1f8259b..e8d607e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-glide (1.2.0-1) UNRELEASED;

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

2011-02-05 Thread Cyril Brulebois 
 COPYING  |   37 -
 ChangeLog|  168 
 Makefile.am  |1 
 configure.ac |   44 --
 debian/README.source |   24 -
 debian/changelog |   38 +
 debian/compat|2 
 debian/control   |   29 -
 debian/copyright |   43 --
 debian/rules |  107 -
 debian/xserver-xorg-video-glide.install  |1 
 debian/xserver-xorg-video-glide.manpages |1 
 debian/xsfbs/repack.sh   |   32 -
 debian/xsfbs/xsfbs.mk|  285 --
 debian/xsfbs/xsfbs.sh|  622 ---
 man/Makefile.am  |   69 +--
 src/glide_driver.c   |  100 +++-
 17 files changed, 394 insertions(+), 1209 deletions(-)

New commits:
commit ac5308a547e003684de1c7394c7cb5fde9593834
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 14:45:48 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 99e4ac7..1f8259b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-glide (1.1.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.1.0-2) unstable; urgency=low
 
   * Switch to dh:
 - Use debhelper 8.
@@ -12,7 +12,7 @@ xserver-xorg-video-glide (1.1.0-2) UNRELEASED; urgency=low
   * Wrap Depends/Recommends/Provides.
   * Bump Standards-Version to 3.9.1 (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 12:01:28 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 14:45:48 +0100
 
 xserver-xorg-video-glide (1.1.0-1) experimental; urgency=low
 

commit 8d2e086c56abb82c75b15350cc5ec3d1c20a69f9
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 11:43:20 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 ac2d978..1d8183b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,4 +18,4 @@ override_dh_shlibdeps:
dh_shlibdeps -- --warnings=6
 
 %:
-   dh $@ --with autoreconf,quilt,xsf --builddirectory=build/
+   dh $@ --with quilt,autoreconf,xsf --builddirectory=build/

commit aa6d71e9affcf6bc58ba05a33ff62be9eb23b466
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 12:13:33 2011 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 39488b0..18538ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-glide (1.1.0-2) UNRELEASED; urgency=low
   * Remove xsfbs accordingly.
   * Update Uploaders list. Thanks, Brice!
   * Wrap Depends/Recommends/Provides.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 12:01:28 +0100
 
diff --git a/debian/control b/debian/control
index 383f9f0..eda32cc 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-render-dev,
  xutils-dev (= 1:7.5+4),
  libglide3-dev,
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glide
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glide.git
 

commit daccd802f424554d4a08d729431c9370402ade27
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 12:13:15 2011 +0100

Wrap Depends/Recommends/Provides.

diff --git a/debian/changelog b/debian/changelog
index fbc7489..39488b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-glide (1.1.0-2) UNRELEASED; urgency=low
   * Stop passing --enable-maintainer-mode.
   * Remove xsfbs accordingly.
   * Update Uploaders list. Thanks, Brice!
+  * Wrap Depends/Recommends/Provides.
 
  -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 12:01:28 +0100
 
diff --git a/debian/control b/debian/control
index 4acb322..383f9f0 100644
--- a/debian/control
+++ b/debian/control
@@ -21,9 +21,15 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glide.g
 
 Package: xserver-xorg-video-glide
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}, libglide3,
-Recommends: device3dfx-source
-Provides: ${xviddriver:Provides}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+ libglide3,
+Recommends:
+ device3dfx-source,
+Provides:
+ ${xviddriver:Provides}
 Description: X.Org X server -- Glide display driver
  This driver for the X.Org X server (see xserver-xorg for a further 
description)
  provides support for Voodoo 1 and Voodoo 2 boards.

commit

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

2010-11-04 Thread Cyril Brulebois 
 debian/changelog   |   10 ++
 debian/control |2 +-
 src/glide_driver.c |   29 -
 3 files changed, 11 insertions(+), 30 deletions(-)

New commits:
commit 43e0d819c76fce64b6eb9bd64cdcfe27e001201f
Author: Cyril Brulebois k...@debian.org
Date:   Fri Nov 5 01:30:19 2010 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 8908d6f..1cc4797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; urgency=high
+xserver-xorg-video-glide (1.0.3-2+squeeze1) unstable; urgency=high
 
   * Cherry-pick 5e09be624b from upstream: “Drop useless symbol
 lists”. Those functions are neither available or useful anymore, and
@@ -6,7 +6,7 @@ xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; 
urgency=high
   * Set urgency to “high” accordingly.
   * Add myself to Uploaders.
 
- -- Cyril Brulebois k...@debian.org  Fri, 05 Nov 2010 01:23:41 +0100
+ -- Cyril Brulebois k...@debian.org  Fri, 05 Nov 2010 01:30:06 +0100
 
 xserver-xorg-video-glide (1.0.3-2) unstable; urgency=medium
 

commit 40d3fc6872133eac8232ea4badd92e6b2d7a07cd
Author: Cyril Brulebois k...@debian.org
Date:   Fri Nov 5 01:30:03 2010 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 76892c0..8908d6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; 
urgency=high
 lists”. Those functions are neither available or useful anymore, and
 they cause symbol lookup error (Closes: #602373).
   * Set urgency to “high” accordingly.
+  * Add myself to Uploaders.
 
  -- Cyril Brulebois k...@debian.org  Fri, 05 Nov 2010 01:23:41 +0100
 
diff --git a/debian/control b/debian/control
index 59806eb..1850529 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-glide
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Brice Goglin bgog...@debian.org
+Uploaders: Brice Goglin bgog...@debian.org, Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,

commit b7c6fe1f8606f3a07249cc91ce059b7bd0880d5c
Author: Cyril Brulebois k...@debian.org
Date:   Fri Nov 5 01:29:36 2010 +0100

Set urgency to “high” accordingly.

diff --git a/debian/changelog b/debian/changelog
index 3267a20..76892c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; urgency=high
 
   * Cherry-pick 5e09be624b from upstream: “Drop useless symbol
 lists”. Those functions are neither available or useful anymore, and
 they cause symbol lookup error (Closes: #602373).
+  * Set urgency to “high” accordingly.
 
  -- Cyril Brulebois k...@debian.org  Fri, 05 Nov 2010 01:23:41 +0100
 

commit a946cbf1935144c296d881a15b59de3a6375d295
Author: Cyril Brulebois k...@debian.org
Date:   Fri Nov 5 01:29:09 2010 +0100

Document the cherry-pick of 5e09be624b from upstream to close #602373.

diff --git a/debian/changelog b/debian/changelog
index ff0b662..3267a20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; urgency=low
+
+  * Cherry-pick 5e09be624b from upstream: “Drop useless symbol
+lists”. Those functions are neither available or useful anymore, and
+they cause symbol lookup error (Closes: #602373).
+
+ -- Cyril Brulebois k...@debian.org  Fri, 05 Nov 2010 01:23:41 +0100
+
 xserver-xorg-video-glide (1.0.3-2) unstable; urgency=medium
 
   * Update xsfbs and use new ${xviddriver:Depends} substvar.

commit 3e4bdb848ca8a5b2c32967a4565f742923b31772
Author: Guillem Jover guil...@hadrons.org
Date:   Thu Oct 21 03:27:34 2010 +0200

Drop useless symbol lists

The functions are not available anymore.
(cherry picked from commit 5e09be624bd6c064e425f2aeeb0693285a76cf9a)

diff --git a/src/glide_driver.c b/src/glide_driver.c
index e88a1b5..bebbb8f 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -202,26 +202,6 @@ static SymTabRec GLIDEChipsets[] = {
 };
 
 
-/*
- * List of symbols from other modules that this module references.  This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists().  The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *fbSymbols[] = {
-  fbScreenInit,
-  fbPictureInit,
-  NULL
-};
-
-static const char *shadowSymbols[] = {
-  ShadowFBInit,
-  NULL
-};
-
 #ifdef XFree86LOADER
 
 static MODULESETUPPROTO(glideSetup);
@@ -294,12 +274,6 @@ glideSetup(pointer module, pointer opts, int *errmaj, int 
*errmin)

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

2010-05-21 Thread Julien Cristau 
 debian/README.source  |2 +-
 debian/changelog  |6 ++
 debian/control|4 ++--
 debian/xsfbs/xsfbs.mk |   35 ++-
 4 files changed, 31 insertions(+), 16 deletions(-)

New commits:
commit 044a4bacdeaaa2c6bd3946fb1f241145d36348da
Author: Julien Cristau jcris...@debian.org
Date:   Fri May 21 16:33:08 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index cbf0d3e..ff0b662 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-glide (1.0.3-2) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.0.3-2) unstable; urgency=medium
 
   * Update xsfbs and use new ${xviddriver:Depends} substvar.
 
- -- Julien Cristau jcris...@debian.org  Fri, 21 May 2010 16:31:57 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 21 May 2010 16:32:22 +0200
 
 xserver-xorg-video-glide (1.0.3-1) unstable; urgency=low
 

commit 9467ae49c6b129412ce60f163f68a7b0f4298de8
Author: Julien Cristau jcris...@debian.org
Date:   Fri May 21 16:32:16 2010 +0200

Update xsfbs and use new ${xviddriver:Depends} substvar.

diff --git a/debian/changelog b/debian/changelog
index dc39505..cbf0d3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-glide (1.0.3-2) UNRELEASED; urgency=low
+
+  * Update xsfbs and use new ${xviddriver:Depends} substvar.
+
+ -- Julien Cristau jcris...@debian.org  Fri, 21 May 2010 16:31:57 +0200
+
 xserver-xorg-video-glide (1.0.3-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 27eaf74..59806eb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5),
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.7),
+ xserver-xorg-dev (= 2:1.7.6.901),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-randr-dev,
@@ -24,7 +24,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glide.g
 
 Package: xserver-xorg-video-glide
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, libglide2
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}, libglide2
 Recommends: device3dfx-source
 Provides: ${xviddriver:Provides}
 Description: X.Org X server -- Glide display driver

commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois k...@debian.org
Date:   Sun May 2 02:14:45 2010 +0200

Add xorg-driver-{video,input} to Provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 
2/dev/null)
 # these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
 
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)

commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau jcris...@debian.org
Date:   Fri Apr 16 22:14:46 2010 +0200

Update serverabi rule for xserver 1.7.6.901

Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers.  The ${xserver:Depends} variable is deprecated.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2/dev/null)
+
+# these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS))
 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
 INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)
 endif
 
 .PHONY: serverabi
 serverabi: install
-ifeq ($(SERVERMINVERS),)
-   @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+   @echo 'error: xserver-xorg-dev = 1.7.6.901 needs to be installed'
@exit 1
 else
-   echo xserver:Depends=$(SERVER_DEPENDS)  debian/$(PACKAGE).substvars
+   echo xviddriver:Depends=$(VIDEODEP)  debian/$(PACKAGE).substvars
+   echo

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

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

New commits:
commit e0c7048df705d7e32b2cee56993dd84f4665a0f3
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 de94e6b..27eaf74 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,6 @@ Description: X.Org X server -- Glide 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-glide 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/e1oamoi-0008sh...@alioth.debian.org

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

2010-01-25 Thread Brice Goglin 
 debian/changelog  |7 +--
 debian/patches/001_no_ansiheader.diff |   12 
 debian/patches/series |1 -
 3 files changed, 5 insertions(+), 15 deletions(-)

New commits:
commit b4b029b6596f5186c8ef69062b730593a5542e6f
Author: Brice Goglin bgog...@debian.org
Date:   Mon Jan 25 19:50:09 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 96fd619..dc39505 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-glide (1.0.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.0.3-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * New upstrem release.
@@ -12,7 +12,7 @@ xserver-xorg-video-glide (1.0.3-1) UNRELEASED; urgency=low
   [ Brice Goglin ]
   * Drop 001_no_ansiheader.diff, applied upstream.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:06 +0200
+ -- Brice Goglin bgog...@debian.org  Mon, 25 Jan 2010 19:50:04 +0100
 
 xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
 

commit b0c9381f91f478d5678f0e3559d56ab78ca1b99e
Author: Brice Goglin bgog...@debian.org
Date:   Mon Jan 25 19:49:57 2010 +0100

Drop 001_no_ansiheader.diff

diff --git a/debian/changelog b/debian/changelog
index 8f189b3..96fd619 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ xserver-xorg-video-glide (1.0.3-1) UNRELEASED; urgency=low
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
 
+  [ Brice Goglin ]
+  * Drop 001_no_ansiheader.diff, applied upstream.
+
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:06 +0200
 
 xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
diff --git a/debian/patches/001_no_ansiheader.diff 
b/debian/patches/001_no_ansiheader.diff
deleted file mode 100644
index 4bc1369..000
--- a/debian/patches/001_no_ansiheader.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/glide_driver.c b/src/glide_driver.c
-index fac93b2..6d6aac4 100644
 a/src/glide_driver.c
-+++ b/src/glide_driver.c
-@@ -54,7 +54,6 @@
- #include colormapst.h
- #include xf86.h
- #include xf86_OSproc.h
--#include xf86_ansic.h
- #include mipointer.h
- #include mibstore.h
- #include micmap.h
diff --git a/debian/patches/series b/debian/patches/series
index 8e80199..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-001_no_ansiheader.diff


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

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

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

New commits:
commit 4e084bbbd2f7646d9ccb7c0776462d67e47a1f1c
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:48:45 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 3ae3a3e..8f189b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xserver-xorg-video-glide (1.0.3-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstrem 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 01:49:06 +0200
 
 xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 27cc179..5902393 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,13 +38,13 @@ build-stamp: $(STAMP_DIR)/patch
 
autoreconf -vfi
 
-   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) \
 --enable-maintainer-mode \
 CFLAGS=$(CFLAGS) 
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd build  $(MAKE)
 
touch build-stamp
 
@@ -57,7 +57,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf obj-*
+   rm -rf build
rm -rf configure config.guess config.sub config.h.in
rm -rf $$(find -name Makefile.in)
rm -rf aclocal.m4 missing depcomp install-sh ltmain.sh
@@ -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-glide: Changes to 'debian-unstable'

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

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

Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index cdcf196..3ae3a3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-glide (1.0.3-1) UNRELEASED; urgency=low
 
   * New upstrem release.
   * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 16:18:15 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:06 +0200
 
 xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3f50c68..de94e6b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5),
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.6),
+ xserver-xorg-dev (= 2:1.7),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-randr-dev,


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

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

2009-11-30 Thread Timo Aaltonen 
 ChangeLog |   23 
 configure.ac  |6 +
 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 src/glide_driver.c|6 +
 8 files changed, 117 insertions(+), 266 deletions(-)

New commits:
commit 13578c4b4e9f9babbb1ded9b23e1f6b631281d7d
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 16:18:58 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 81f8471..cdcf196 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-glide (1.0.3-1) UNRELEASED; urgency=low
 
   * New upstrem release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 16:18:15 +0200
 
diff --git a/debian/control b/debian/control
index 90b7245..3f50c68 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  libtool,
  xutils-dev (= 1:7.4+4),
  libglide2-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glide
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glide.git
 

commit 9fbd9a42b5dca7729d2198acbd0d140d1e2daa42
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 16:18:36 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 7a29dd1..7237e4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+commit 5b9a71341522cee5984061affb1a8d38c220c414
+Author: Guillem Jover guil...@hadrons.org
+Date:   Thu Aug 27 13:07:33 2009 +0300
+
+Bump to 1.0.3
+
+commit c8b97d2f53501903bfa06cc396e97443e5bfe8e3
+Author: Guillem Jover guil...@hadrons.org
+Date:   Thu Aug 27 13:06:02 2009 +0300
+
+Remove inclusion of obsolete and now inexistent xf86_ansic.h
+
+commit 48fddeb136aba247e06688d8127ee133ae3b8dd2
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu Jul 16 11:38:29 2009 +1000
+
+Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). 
Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
 commit e20cb5035996b392b010f2b52aa14d004868825a
 Author: Guillem Jover guil...@hadrons.org
 Date:   Wed Feb 25 01:23:03 2009 +0200
diff --git a/debian/changelog b/debian/changelog
index e815408..81f8471 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-glide (1.0.3-1) UNRELEASED; urgency=low
+
+  * New upstrem release.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 16:18:15 +0200
+
 xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
 
   [ Julien Cristau ]

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

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

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

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

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

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

2009-04-12 Thread Julien Cristau 
 COPYING|8 -
 ChangeLog  |  224 +
 Makefile.am|   10 --
 configure.ac   |   12 +-
 debian/changelog   |9 +
 debian/control |   15 +++
 debian/rules   |9 +
 debian/xsfbs/repack.sh |   32 +++
 debian/xsfbs/xsfbs.mk  |   29 ++
 debian/xsfbs/xsfbs.sh  |   66 --
 man/Makefile.am|2 
 man/glide.man  |2 
 src/Makefile.am|2 
 src/glide_driver.c |8 -
 14 files changed, 319 insertions(+), 109 deletions(-)

New commits:
commit d6f26ba2bc0d4c022b9dea2b75e7c3ee53ebbdbb
Author: Julien Cristau jcris...@debian.org
Date:   Sun Apr 12 12:17:46 2009 +0100

Allow parallel builds.

diff --git a/debian/changelog b/debian/changelog
index 427acc8..be241a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-glide (1.0.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump build-dep on xutils-dev to = 1:7.4+4.
   * Build against xserver 1.6.
+  * Allow parallel builds.
 
  -- Julien Cristau jcris...@debian.org  Sun, 12 Apr 2009 12:12:29 +0100
 
diff --git a/debian/rules b/debian/rules
index 28e275e..cc98542 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,14 @@
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+   NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+   MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -37,7 +38,7 @@ build-stamp:
 
autoreconf -vfi
 
-   test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
+   mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE)  \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \

commit d07dfcd942873a03741a9c91decb19146e758e19
Author: Julien Cristau jcris...@debian.org
Date:   Sun Apr 12 12:15:48 2009 +0100

Build against xserver 1.6.

diff --git a/debian/changelog b/debian/changelog
index f6c64f8..427acc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-glide (1.0.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump build-dep on xutils-dev to = 1:7.4+4.
+  * Build against xserver 1.6.
 
  -- Julien Cristau jcris...@debian.org  Sun, 12 Apr 2009 12:12:29 +0100
 
diff --git a/debian/control b/debian/control
index 7e67878..ed274be 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Brice Goglin bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.4),
+ xserver-xorg-dev (= 2:1.6),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-randr-dev,

commit 40da34e82540adca138b9130db3a6cfa64027fef
Author: Julien Cristau jcris...@debian.org
Date:   Sun Apr 12 12:15:26 2009 +0100

Bump build-dep on xutils-dev to = 1:7.4+4.

diff --git a/debian/changelog b/debian/changelog
index 7bc243a..f6c64f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-glide (1.0.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump build-dep on xutils-dev to = 1:7.4+4.
 
  -- Julien Cristau jcris...@debian.org  Sun, 12 Apr 2009 12:12:29 +0100
 
diff --git a/debian/control b/debian/control
index 4ce22e6..7e67878 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  automake,
  autoconf,
  libtool,
- xutils-dev,
+ xutils-dev (= 1:7.4+4),
  libglide2-dev
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glide

commit 505d22817d3994bd5a4c640785ac517e89ec3008
Author: Julien Cristau jcris...@debian.org
Date:   Sun Apr 12 12:14:44 2009 +0100

debian/control: wrap Build-Depends

diff --git a/debian/control b/debian/control
index 950dfb5..4ce22e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,20 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Brice Goglin bgog...@debian.org
-Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, 
dpkg-dev (= 1.14.17), automake, autoconf, libtool, xutils-dev, libglide2-dev
+Build-Depends:
+ debhelper (= 5),
+ pkg-config,
+ xserver-xorg-dev (= 2:1.4),
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ dpkg-dev (= 1.14.17),
+ automake,
+ autoconf,
+ libtool,
+ xutils-dev,
+ libglide2-dev
 Standards-Version: 3.7.3
 Vcs-Git:

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

2009-04-12 Thread David Nusinow 
 debian/changelog  |9 +++--
 debian/control|1 +
 debian/patches/001_no_ansiheader.diff |   12 
 debian/patches/series |1 +
 debian/rules  |4 ++--
 5 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit 1d568d48a213ea49ea4657651471de71c3326d2d
Author: David Nusinow dnusi...@debian.org
Date:   Sun Apr 12 11:31:45 2009 -0400

Add 001_no_ansiheader.diff to fix build. Enable quilt to use this.
Also add quilt to build-depends.

diff --git a/debian/changelog b/debian/changelog
index 25533c9..e815408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,11 @@ xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
   * Build against xserver 1.6.
   * Allow parallel builds.
 
- -- David Nusinow dnusi...@debian.org  Sun, 12 Apr 2009 10:36:12 -0400
+  [ David Nusinow ]
+  * Add 001_no_ansiheader.diff to fix build. Enable quilt to use this.
+Also add quilt to build-depends.
+
+ -- David Nusinow dnusi...@debian.org  Sun, 12 Apr 2009 11:16:04 -0400
 
 xserver-xorg-video-glide (1.0.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ed274be..90b7245 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Brice Goglin bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
+ quilt,
  xserver-xorg-dev (= 2:1.6),
  x11proto-core-dev,
  x11proto-fonts-dev,
diff --git a/debian/patches/001_no_ansiheader.diff 
b/debian/patches/001_no_ansiheader.diff
new file mode 100644
index 000..4bc1369
--- /dev/null
+++ b/debian/patches/001_no_ansiheader.diff
@@ -0,0 +1,12 @@
+diff --git a/src/glide_driver.c b/src/glide_driver.c
+index fac93b2..6d6aac4 100644
+--- a/src/glide_driver.c
 b/src/glide_driver.c
+@@ -54,7 +54,6 @@
+ #include colormapst.h
+ #include xf86.h
+ #include xf86_OSproc.h
+-#include xf86_ansic.h
+ #include mipointer.h
+ #include mibstore.h
+ #include micmap.h
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..8e80199
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_no_ansiheader.diff
diff --git a/debian/rules b/debian/rules
index cc98542..27cc179 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
 confflags += --disable-static
 
 build: build-stamp
-build-stamp:
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
 
autoreconf -vfi
@@ -48,7 +48,7 @@ build-stamp:
 
touch build-stamp
 
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp

commit a8d363fb1e297ef94f612549a6390adcfd186d00
Author: David Nusinow dnusi...@debian.org
Date:   Sun Apr 12 10:36:31 2009 -0400

Prepare for upload to unstable

diff --git a/debian/changelog b/debian/changelog
index be241a0..25533c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xserver-xorg-video-glide (1.0.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
 
+  [ Julien Cristau ]
   * New upstream release.
   * Bump build-dep on xutils-dev to = 1:7.4+4.
   * Build against xserver 1.6.
   * Allow parallel builds.
 
- -- Julien Cristau jcris...@debian.org  Sun, 12 Apr 2009 12:12:29 +0100
+ -- David Nusinow dnusi...@debian.org  Sun, 12 Apr 2009 10:36:12 -0400
 
 xserver-xorg-video-glide (1.0.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-glide: Changes to 'debian-unstable'

2008-06-25 Thread Brice Goglin 
New branch 'debian-unstable' available with the following commits:
commit 0a277b9e9af7af4e0908280b34de2094d622afde
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Wed Jun 25 07:56:44 2008 +0200

Prepare changelog for upload

commit 6d7fb57a5daa42925cf7c585a46fd9f07a86ad4e
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Wed Jun 18 19:29:37 2008 +0200

First packaging of the xserver-xorg-video-glide package

commit b4578dce7790dc2b211bcc3a7f371834db1cb7ad
Merge: ce31b3e87032253ef8c77a8738014b8e981f01e5 
4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Wed Jun 18 19:28:27 2008 +0200

Merge branch 'debian-unstable' of git://git.debian.org/git/pkg-xorg/xsfbs 
into debian-unstable

commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sat May 31 13:23:24 2008 +0200

Update xsfbs/quilt patching rules to be compatible with the
3.0 (quilt) source package.

Thanks to Raphael Hertzog.
See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.

commit dcf4204d5328834172df80951a18de014b0f74ef
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri May 30 12:26:18 2008 +0200

xsfbs.sh: use 'local' now that policy allows it

Policy 3.7.3 allows /bin/sh scripts to use 'local'.

commit d9066a28b95e1a74e9f6ebac8e71e07fca321cd1
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue May 20 18:53:28 2008 +0200

xsfbs.sh: add remove_conffile_lookup

This variant of remove_conffile_prepare looks for the given conffile's
canonical md5sum in dpkg's status database itself instead of using
provided values.

commit 9d66b3441b36e5a47ffc288ba21f2fd929e869d0
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri May 23 11:12:20 2008 +0200

Remove the .pc directory properly

commit c87ea43906787791a87a659c0a9d6312945ffb32
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Apr 13 03:12:18 2008 +0200

Remove xsfbs-autoreconf.mk

It has never been used, and that doesn't look likely to change.

commit bef8b301bf7649b4156bef2dc26ebf9f7f9244ad
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 21 11:53:16 2008 +0100

xsfbs.mk: make 'serverabi' depend on 'install'

See bug#471193, thanks to Bernhard R. Link [EMAIL PROTECTED]

commit 844199da71f29556be3436fa0fead2f0cc0bfc1b
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Jan 8 20:18:49 2008 -0500

Kill the manifest code.
It served its purpose for the monolith and is now dead.

commit 331c032528ba1faebef1d8eaa56db47f533f0426
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sat Sep 22 23:49:11 2007 -0400

Remove make-orig-tar-gz target

This target wasn't kept up to date and was totally broken for the git
world. The way we use git has made this target pretty well impossible to
use in any form, so it's been supersceded by a script that is currently
located at
http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz

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

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

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

Fix display the output of quilt push/pop.

Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.

commit e29b56820909668b062fdba72458ee9483a4ae44
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Mon Jul 9 21:50:47 2007 +0200

Minor fixes in the patching system.

 * Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as 
in #369920).
 * Display which patches are applied and removed instead of just the first 
one (for #428090).

commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Mon Jul 9 19:06:05 2007 +0200

Fix displaying of patches applied by quilt.

As requested in bug #428090, we silence the output of quilt next
and display the output of quilt push/pop.

commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson [EMAIL PROTECTED](none)
Date:   Thu Apr 12 23:18:32 2007 -0400

Test for existence of debian/patches directory before creating a symlink to 
it.

This prevents packages that apply no patches from ending up with a broken
symlink in them.

Remove SVN keyword.

Update copyright notice.

commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 2 20:28:15 2007 +0100

Fix copy/paste typo in the input driver provides.

commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow [EMAIL PROTECTED]
Date:   Thu Mar 1 22:06:04 2007 -0500

Fix one missed bit from the serverabiver - serverminver rename

commit 1344bb9deda5ba54215d0ec5b164706999236b0b
Author: David Nusinow