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

2012-07-18 Thread Maarten Lankhorst 
 ChangeLog  |  178 ++
 configure.ac   |   57 ++--
 debian/README.source   |   24 -
 debian/changelog   |   29 ++
 debian/compat  |2 
 debian/control |   25 +
 debian/patches/series  |1 
 debian/rules   |  103 
 debian/watch   |1 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 man/Makefile.am|   22 -
 man/neomagic.man   |1 
 src/Makefile.am|3 
 src/compat-api.h   |   99 +++
 src/neo.h  |   14 -
 src/neo_2070.c |   16 -
 src/neo_2090.c |   14 -
 src/neo_2097.c |   11 
 src/neo_2200.c |   10 
 src/neo_cursor.c   |4 
 src/neo_dga.c  |   32 +-
 src/neo_driver.c   |  129 +-
 src/neo_shadow.c   |   10 
 src/neo_video.c|   36 +-
 26 files changed, 535 insertions(+), 1225 deletions(-)

New commits:
commit 8c439b3ff1d35a71707f1895fca8e9eb485892c1
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 14:42:48 2012 +0200

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

diff --git a/debian/changelog b/debian/changelog
index f6493d4..f531574 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-neomagic (1:1.2.7-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.9.3 (no changes needed).
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
14:41:34 +0200
 
diff --git a/debian/control b/debian/control
index 5d91a0e..eb115e4 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-xext-dev,
  xutils-dev (= 1:7.5+4),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-neomagic
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-neomagic.git
 

commit fcec53d9e9552b57bb10c2a8cbb4022237463deb
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 14:42:07 2012 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 124637e..f6493d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-neomagic (1:1.2.7-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
14:41:34 +0200
+
 xserver-xorg-video-neomagic (1:1.2.6-1) unstable; urgency=medium
 
   * New upstream release, fixes compatibility with xserver 1.12.

commit 4b0cb3b6b4cdf8d8ee2d26cc2860870044819e0e
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 14:41:10 2012 +0200

Bump changelog

diff --git a/ChangeLog b/ChangeLog
index f139b6b..32f3c5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+commit 7a10cbda5a0a9ae31e33c5cc77c6b1bda8cae852
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 17 16:05:09 2012 +1000
+
+xf86-video-neomagic: bump to version 1.2.7
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit 808aa999ad78ccc3384d08d501d43688795bee5e
+Author: Dave Airlie airl...@redhat.com
+Date:   Mon Jul 16 03:29:55 2012 +0100
+
+neomagic: fix build when XAA is unavailable.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit 9b33cc9fe94d97c8b954a3614ead34622d293bc3
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Jun 6 12:21:55 2012 +0100
+
+neomagic: port to new compat API.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit 3b06ee079494b0d08913a9f724c3661f9ac35907
+Author: Adam Jackson a...@redhat.com
+Date:   Wed Apr 18 10:50:28 2012 -0400
+
+Use DamageRegion for shadow damage
+
+The 'damage' member is an ancient compatibility hack I want to destroy.
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
 commit 25c7bb8b063777f31db678db743191265f17e7be
 Author: Alan Coopersmith alan.coopersm...@oracle.com
 Date:   Fri Mar 23 19:08:03 2012 -0700

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

xf86-video-neomagic: bump to version 1.2.7

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

diff --git a/configure.ac b/configure.ac
index 48bce17..29cf772 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-neomagic],
-[1.2.6],
+[1.2.7],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-neomagic])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 808aa999ad78ccc3384d08d501d43688795bee5e
Author: Dave Airlie airl...@redhat.com
Date:   Mon Jul 16 03:29:55 2012 +0100

neomagic: fix build when XAA is unavailable.

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

diff --git a/configure.ac

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

2010-11-20 Thread Cyril Brulebois 
 debian/changelog |8 ++--
 debian/copyright |   29 -
 2 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit 2667e156fb0f6a590d59bfb7645811aed90ce44e
Author: Cyril Brulebois k...@debian.org
Date:   Sat Nov 20 17:16:06 2010 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 46fd5e8..544b105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-neomagic (1:1.2.5-1) UNRELEASED; urgency=low
+xserver-xorg-video-neomagic (1:1.2.5-1) experimental; urgency=low
 
   [ Robert Hooker ]
   * New upstream release.
@@ -6,7 +6,7 @@ xserver-xorg-video-neomagic (1:1.2.5-1) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * Update debian/copyright from upstream COPYING.
 
- -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 16:56:57 -0400
+ -- Cyril Brulebois k...@debian.org  Sat, 20 Nov 2010 17:16:01 +0100
 
 xserver-xorg-video-neomagic (1:1.2.4-4) experimental; urgency=low
 

commit 9d8820a92f06e9adfe1e2afdc37b8de6cbb0b518
Author: Cyril Brulebois k...@debian.org
Date:   Sat Nov 20 17:13:54 2010 +0100

Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index a3da057..46fd5e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 xserver-xorg-video-neomagic (1:1.2.5-1) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * New upstream release.
 
+  [ Cyril Brulebois ]
+  * Update debian/copyright from upstream COPYING.
+
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 16:56:57 -0400
 
 xserver-xorg-video-neomagic (1:1.2.4-4) experimental; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 8d5c41f..1152c70 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,7 +24,6 @@ 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 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -45,6 +44,34 @@ 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 1998, 1999 Egbert Eich
+Copyright 2000, 2001 SuSE GmbH, Author: Egbert Eich
+Copyright 2002 SuSE Linux AG, Author: Egbert Eich
+Copyright 2002 Shigehiro Nomura
+
+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.
+
+Copyright (c) 1999, 2000 The XFree86 Project Inc.
+based on code written by Mark Vojkovich ma...@valinux.com
 
 Copyright 2002 by Shigehiro Nomura.
 


-- 
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/e1pjq96-00087o...@alioth.debian.org

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

2010-10-18 Thread Robert Hooker 
 COPYING  |   99 ++-
 ChangeLog|   45 +
 Makefile.am  |2 -
 configure.ac |2 -
 debian/changelog |6 +++
 man/Makefile.am  |   41 ++
 src/neo.h|2 -
 src/neo_2070.c   |2 -
 src/neo_2097.c   |2 -
 src/neo_2200.c   |2 -
 src/neo_driver.c |   18 +-
 11 files changed, 169 insertions(+), 52 deletions(-)

New commits:
commit 63a45525053b7c95eb15047fe7f1ecb94c4c2c32
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 16:57:55 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index e1fbbf5..021ac08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+commit 77faebed86622b2d3bf5291b1a7f470b1382
+Author: Dave Airlie airl...@redhat.com
+Date:   Mon Jul 5 14:48:07 2010 +1000
+
+neomagic 1.2.5
+
+commit 73bc0507b0b772717356a7fa8a15442022a8c3c7
+Author: Jamey Sharp ja...@minilop.net
+Date:   Sun Jun 13 17:28:06 2010 -0700
+
+Revert Adding experimental pseudocolor overlay stuff to NeoMagic driver.
+
+ajax removed the key parts of that patch two years ago in commit
+dc2a372ad7edf34417d7d7042562b601e4f0041c. This patch reverts the rest of
+commit 57cea11892e956f4e6f07005e05d121fa48c3059, aside from whitespace
+changes.
+
+Signed-off-by: Jamey Sharp ja...@minilop.net
+
+commit e2234bd3d37239f5ac0182a3a8b3db23ba5ffbac
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat Jun 12 20:44:46 2010 -0400
+
+COPYING: replace stub file with actual Copyright notices.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit fdfd0902f858d068b8ee100b34249e7a53252d14
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat Mar 27 09:55:13 2010 -0400
+
+config: remove TODO from EXTRA_DIST
+
+Automake always distribute the TODO file.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 958353fc567f989a2c6c6ef73625f99de896a68d
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Jan 15 15:00:16 2010 -0800
+
+Update Sun license notices to current X.Org standard form
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
 commit dbcbef42e4ea74e20313e4f5437067cc5cfb7024
 Author: Gaetan Nadon mems...@videotron.ca
 Date:   Tue Dec 15 22:01:02 2009 -0500
diff --git a/debian/changelog b/debian/changelog
index c8bd87f..a3da057 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-neomagic (1:1.2.5-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 16:56:57 -0400
+
 xserver-xorg-video-neomagic (1:1.2.4-4) experimental; urgency=low
 
   * Build against Xserver 1.9.1 rc1.

commit 77faebed86622b2d3bf5291b1a7f470b1382
Author: Dave Airlie airl...@redhat.com
Date:   Mon Jul 5 14:48:07 2010 +1000

neomagic 1.2.5

diff --git a/configure.ac b/configure.ac
index a19183b..38cba3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-neomagic],
-1.2.4,
+1.2.5,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-neomagic)
 

commit 73bc0507b0b772717356a7fa8a15442022a8c3c7
Author: Jamey Sharp ja...@minilop.net
Date:   Sun Jun 13 17:28:06 2010 -0700

Revert Adding experimental pseudocolor overlay stuff to NeoMagic driver.

ajax removed the key parts of that patch two years ago in commit
dc2a372ad7edf34417d7d7042562b601e4f0041c. This patch reverts the rest of
commit 57cea11892e956f4e6f07005e05d121fa48c3059, aside from whitespace
changes.

Signed-off-by: Jamey Sharp ja...@minilop.net

diff --git a/src/neo.h b/src/neo.h
index 718b8a5..f3f2b4c 100644
--- a/src/neo.h
+++ b/src/neo.h
@@ -48,7 +48,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include xaa.h
 #include xaalocal.h  /* XAA internals as we replace some of XAA */
-#include xaaWrapper.h
 #include xf86Cursor.h
 
 #include shadowfb.h
@@ -268,7 +267,6 @@ typedef struct neoRec
 int overlay_offset;
 int videoKey;
 int interlace;
-SyncFunc accelSync;
 } NEORec, *NEOPtr;
 
 typedef struct {
diff --git a/src/neo_2070.c b/src/neo_2070.c
index 007a304..b3811d6 100644
--- a/src/neo_2070.c
+++ b/src/neo_2070.c
@@ -159,7 +159,7 @@ Neo2070AccelInit(ScreenPtr pScreen)
return FALSE;
 }
 
-return (xaaSetupWrapper(pScreen, infoPtr, pScrn-depth, nPtr-accelSync));
+return(XAAInit(pScreen, infoPtr));
 
 }
 
diff --git a/src/neo_2097.c b/src/neo_2097.c
index ed9014c..7d720df 100644
--- a/src/neo_2097.c
+++ b/src/neo_2097.c
@@ -248,7 +248,7 @@ Neo2097AccelInit(ScreenPtr pScreen)
return FALSE;
 }
 
-return (xaaSetupWrapper(pScreen, infoPtr, pScrn-depth, nPtr-accelSync));
+return(XAAInit(pScreen, infoPtr));
 }
 
 static void
diff --git a/src/neo_2200.c b/src/neo_2200.c
index 78b3367..4b354e7 100644
---

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

2010-10-16 Thread Cyril Brulebois 
 .gitignore|   70 +++
 ChangeLog |   98 +++
 Makefile.am   |   11 +
 configure.ac  |   12 -
 debian/README.source  |2 
 debian/changelog  |   28 +++
 debian/control|   10 -
 debian/rules  |   10 -
 debian/xsfbs/xsfbs.mk |   35 ++-
 man/.cvsignore|2 
 src/.cvsignore|6 
 src/Makefile.am   |1 
 src/neo.h |6 
 src/neo_bank.c|   92 --
 src/neo_driver.c  |  439 +-
 src/neo_video.c   |1 
 16 files changed, 428 insertions(+), 395 deletions(-)

New commits:
commit a93b98d1b460d0fb7cb7a9058ca3ff69108fda5d
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 16 19:05:21 2010 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 995c3fd..c8bd87f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-neomagic (1:1.2.4-4) UNRELEASED; urgency=low
+xserver-xorg-video-neomagic (1:1.2.4-4) experimental; urgency=low
 
   * Build against Xserver 1.9.1 rc1.
 
- -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 19:05:02 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 19:05:20 +0200
 
 xserver-xorg-video-neomagic (1:1.2.4-3) unstable; urgency=low
 

commit b26b227736c851b096e464ff7a7dd400dfe098ea
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 16 19:05:14 2010 +0200

Build against Xserver 1.9.1 rc1.

diff --git a/debian/changelog b/debian/changelog
index 0dde096..995c3fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-neomagic (1:1.2.4-4) UNRELEASED; urgency=low
+
+  * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 19:05:02 +0200
+
 xserver-xorg-video-neomagic (1:1.2.4-3) unstable; urgency=low
 
   * Update to new xsfbs, replace deprecated ${xserver:Depends} with
diff --git a/debian/control b/debian/control
index 8ebfc4b..0dd7a25 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
- xserver-xorg-dev (= 2:1.7.6.901),
+ xserver-xorg-dev (= 2:1.9.0.901),
  x11proto-video-dev,
  x11proto-xf86dga-dev,
  x11proto-core-dev,

commit 28208cfeea088f50c43fa982b527451c9522d300
Author: Mikhail Gusarov dotted...@debian.org
Date:   Fri May 7 18:58:58 2010 +0700

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

diff --git a/debian/control b/debian/control
index ae67bf0..8ebfc4b 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,5 @@ Description: X.Org X server -- Neomagic 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-neomagic driver module.

commit 7b956edef76243ff82003aa10623522c5e4f755a
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 23:38:32 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index e74094f..0dde096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-neomagic (1:1.2.4-3) UNRELEASED; urgency=low
+xserver-xorg-video-neomagic (1:1.2.4-3) unstable; urgency=low
 
   * Update to new xsfbs, replace deprecated ${xserver:Depends} with
 ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
@@ -6,7 +6,7 @@ xserver-xorg-video-neomagic (1:1.2.4-3) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Mon, 03 May 2010 23:37:53 +0200
+ -- Cyril Brulebois k...@debian.org  Mon, 03 May 2010 23:38:28 +0200
 
 xserver-xorg-video-neomagic (1:1.2.4-2) unstable; urgency=low
 

commit 2682671d18ae4c61e6e54beb746bde41d429faa8
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 23:38:19 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 901e2c5..e74094f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-neomagic (1:1.2.4-3) UNRELEASED; urgency=low
 ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
 accordingly.
   * Add myself to Uploaders.
+  * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Mon, 03 May 2010 23:37:53 +0200
 
diff --git a/debian/control b/debian/control
index 562a703..ae67bf0 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,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-neomagic
 Vcs-Browser:

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

2009-12-05 Thread Cyril Brulebois 
 ChangeLog  |   42 +++
 configure.ac   |2 
 debian/README.source   |   73 ++
 debian/changelog   |   30 ++
 debian/control |5 
 debian/patches/02_gen_pci_ids.diff |   25 --
 debian/patches/series  |1 
 debian/rules   |4 
 debian/xserver-xorg-video-neomagic.install |1 
 debian/xsfbs/repack.sh |   32 ++
 debian/xsfbs/xsfbs.mk  |   21 -
 debian/xsfbs/xsfbs.sh  |  311 -
 man/neomagic.man   |2 
 src/neo_driver.c   |  119 +--
 src/neo_shadow.c   |1 
 15 files changed, 203 insertions(+), 466 deletions(-)

New commits:
commit 28edb8b2d40fa971705c3c249c3a7305ce3bf4ba
Author: Cyril Brulebois k...@debian.org
Date:   Sun Dec 6 02:43:30 2009 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 7ae66cb..c652b05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-neomagic (1:1.2.4-1) UNRELEASED; urgency=low
+xserver-xorg-video-neomagic (1:1.2.4-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 01:49:08 +0200
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois k...@debian.org  Sun, 06 Dec 2009 02:43:23 +0100
 
 xserver-xorg-video-neomagic (1:1.2.3-1) unstable; urgency=low
 

commit 4b98420a91b177b631a6dc86b5b319ba3fbc737e
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 02:09:27 2009 +0200

Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index 1cda647..7ae66cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-neomagic (1:1.2.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 16:49:11 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:08 +0200
 
 xserver-xorg-video-neomagic (1:1.2.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3f45a6e..47b57ff 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
- xserver-xorg-dev (= 2:1.5.99.901),
+ xserver-xorg-dev (= 2:1.7),
  x11proto-video-dev,
  x11proto-xf86dga-dev,
  x11proto-core-dev,

commit 868a327a3f1030b8614146865b8f715d37b36346
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 16:50:36 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index edeeced..1cda647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-neomagic (1:1.2.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 16:49:11 +0200
 
diff --git a/debian/control b/debian/control
index 2eececd..3f45a6e 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-neomagic
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-neomagic.git
 

commit 46dc1937fc7dca6973fba8c2e4dcfb695f11685c
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 16:50:10 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 041a6f7..ccb3848 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+commit dcfff9bc194f3d86104e281a14226ff489b199ab
+Author: Dave Airlie airl...@redhat.com
+Date:   Thu Jul 30 12:04:31 2009 +1000
+
+neomagic: bump for release 1.2.4
+
+commit ee5229754f87c8859641926bee82c0141727c7c4
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 15:22:40 2009 +1000
+
+neomagic: change to using ABI version check
+
+commit 44c8d148f8a68c13a65fc989adb09b1a675f1a2a
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 13:32:31 2009 +1000
+
+neomagic: update for resources/RAC API removal
+
+commit e822477ae9cb0f7dd859a49e5da3f30993532ca5
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 10:32:59 2009 +1000
+
+neomagic: remove unneeded include
+
 commit 33997831f0ffe61452fac111b51dabffef348b76
 Author: Adam Jackson a...@redhat.com
 Date:   Thu Jul 2 11:24:20 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 948fbde..edeeced 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@

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

2009-02-09 Thread Julien Cristau 
 ChangeLog|   18 
 Makefile.in  |  674 -
 aclocal.m4   | 8256 ---
 config.guess | 1526 ---
 config.h.in  |   66 
 config.sub   | 1658 ---
 configure|23077 ---
 configure.ac |   10 
 debian/changelog |9 
 debian/control   |   17 
 debian/rules |   23 
 depcomp  |  589 -
 install-sh   |  519 -
 ltmain.sh| 6964 
 man/Makefile.in  |  426 -
 missing  |  367 
 mkinstalldirs|  161 
 src/Makefile.in  |  569 -
 src/neo_driver.c |   12 
 19 files changed, 74 insertions(+), 44867 deletions(-)

New commits:
commit 31545af4a6d03d9e4610729303d6934ef50f6db8
Author: Julien Cristau jcris...@debian.org
Date:   Mon Feb 9 20:19:55 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 5729d66..f795397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-neomagic (1:1.2.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-neomagic (1:1.2.2-1) experimental; urgency=low
 
   * New upstream release.
   * Run autoreconf on build; add build-deps on automake, libtool, xutils-dev.
   * Handle parallel builds.
   * Build against xserver 1.6 rc.
 
- -- Julien Cristau jcris...@debian.org  Mon, 09 Feb 2009 19:59:56 +0100
+ -- Julien Cristau jcris...@debian.org  Mon, 09 Feb 2009 20:19:46 +0100
 
 xserver-xorg-video-neomagic (1:1.2.1-2) experimental; urgency=low
 

commit ca8696d30ccb621c322fac636eab34d49f04266e
Author: Julien Cristau jcris...@debian.org
Date:   Mon Feb 9 20:19:20 2009 +0100

Delete generated files

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 83e4c20..000
--- a/Makefile.in
+++ /dev/null
@@ -1,674 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-...@set_make@
-
-#  Copyright 2005 Adam Jackson.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the Software),
-#  to deal in the Software without restriction, including without limitation
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, and/or sell copies of the Software, and to permit persons to whom
-#  the Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
-#  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.
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-   $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-   $(top_srcdir)/configure COPYING ChangeLog TODO config.guess \
-   config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-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 config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-   html-recursive info-recursive install-data-recursive \
-   install-dvi-recursive

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

2009-02-09 Thread Julien Cristau 
 debian/changelog|6 ++
 debian/patches/01_implicit_declaration.diff |   15 ---
 debian/patches/series   |1 -
 3 files changed, 6 insertions(+), 16 deletions(-)

New commits:
commit 57b8618dfb41d8b100ade3cec4eacf6243587ae6
Author: Julien Cristau jcris...@debian.org
Date:   Mon Feb 9 20:55:17 2009 +0100

Drop patch 01_implicit_declaration.diff.

The warning is gone (stdlib.h gets included via misc.h in the sdk).

diff --git a/debian/changelog b/debian/changelog
index f795397..54a6e20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-neomagic (1:1.2.2-2) UNRELEASED; urgency=low
+
+  * Drop patch 01_implicit_declaration.diff.  The warning is gone.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 09 Feb 2009 20:53:56 +0100
+
 xserver-xorg-video-neomagic (1:1.2.2-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/01_implicit_declaration.diff 
b/debian/patches/01_implicit_declaration.diff
deleted file mode 100644
index 151b3bd..000
--- a/debian/patches/01_implicit_declaration.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Patch stolen from
-http://bugs.freedesktop.org/show_bug.cgi?id=7873
-
 xserver-xorg-video-neomagic.orig/src/neo_driver.c
-+++ xserver-xorg-video-neomagic/src/neo_driver.c
-@@ -117,6 +117,9 @@
- #include X11/extensions/xf86dgastr.h
- #endif
- 
-+/* For abs() */
-+#include stdlib.h
-+
- /* Mandatory functions */
- static const OptionInfoRec *  NEOAvailableOptions(int chipid, int busid);
- static void NEOIdentify(int flags);
diff --git a/debian/patches/series b/debian/patches/series
index 50c99fe..84a6b5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_implicit_declaration.diff
 02_gen_pci_ids.diff


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

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

2008-09-04 Thread Julien Cristau 
 ChangeLog  |   28 ++
 aclocal.m4 |2 
 configure  |   20 -
 configure.ac   |2 
 debian/changelog   |   28 +-
 debian/control |4 
 debian/patches/02_gen_pci_ids.diff |4 
 debian/rules   |2 
 debian/xsfbs/xsfbs-autoreconf.mk   |  150 --
 debian/xsfbs/xsfbs.mk  |   51 +---
 debian/xsfbs/xsfbs.sh  |  387 +++--
 ltmain.sh  |2 
 src/neo_driver.c   |6 
 src/neo_pcirename.h|6 
 14 files changed, 295 insertions(+), 397 deletions(-)

New commits:
commit 486219189be4a9da1955621ce76b1c2e2a0f5874
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Sep 5 01:19:03 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 242eb5c..4c6bf5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-neomagic (1:1.2.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-neomagic (1:1.2.1-2) experimental; urgency=low
 
   [ Julien Cristau ]
   * Remove Branden from Uploaders with his permission.
   * Build against xserver 1.5.
   * Revive 01_implicit_declaration.diff.
 
- -- Brice Goglin [EMAIL PROTECTED]  Sat, 15 Sep 2007 01:58:15 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 05 Sep 2008 01:18:56 +0200
 
 xserver-xorg-video-neomagic (1:1.2.1-1) unstable; urgency=low
 

commit fe21511406dea70c5a4182633af10d2fed0e63ca
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Sep 5 01:09:56 2008 +0200

Build against xserver 1.5.

diff --git a/debian/changelog b/debian/changelog
index 9a74661..242eb5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ xserver-xorg-video-neomagic (1:1.2.1-2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Remove Branden from Uploaders with his permission.
-  * Build against xserver 1.5 rc1.
+  * Build against xserver 1.5.
   * Revive 01_implicit_declaration.diff.
 
  -- Brice Goglin [EMAIL PROTECTED]  Sat, 15 Sep 2007 01:58:15 +0200
diff --git a/debian/control b/debian/control
index ca226f3..dda80b0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5.0.0), quilt, pkg-config, xserver-xorg-dev (= 
2:1.4.99.901), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, 
x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, 
dpkg-dev (= 1.14.17)
+Build-Depends: debhelper (= 5.0.0), quilt, pkg-config, xserver-xorg-dev (= 
2:1.5), x11proto-video-dev, x11proto-xf86dga-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-neomagic
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-neomagic.git

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

xsfbs.mk: make 'log' a separate target

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

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

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

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

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

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed

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

2008-03-19 Thread Julien Cristau 
 .cvsignore  |   19 
 .gitignore  |   20 
 ChangeLog   |   50 +
 Makefile.in |   31 
 aclocal.m4  |  265 ---
 config.guess|   60 +
 config.sub  |   66 +
 configure   |  979 ++--
 configure.ac|   15 
 debian/changelog|   17 
 debian/control  |   10 
 debian/patches/01_implicit_declaration.diff |8 
 debian/patches/02_gen_pci_ids.diff  |   18 
 debian/xsfbs/xsfbs.mk   |  103 --
 debian/xsfbs/xsfbs.sh   |7 
 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 |   34 
 src/neo.h   |6 
 src/neo_2070.c  |1 
 src/neo_2090.c  |1 
 src/neo_2097.c  |1 
 src/neo_2200.c  |1 
 src/neo_bank.c  |1 
 src/neo_cursor.c|1 
 src/neo_dga.c   |1 
 src/neo_driver.c|   77 +-
 src/neo_i2c.c   |1 
 src/neo_macros.h|1 
 src/neo_pcirename.h |  122 +++
 src/neo_reg.h   |1 
 src/neo_shadow.c|1 
 src/neo_video.c |1 
 src/neo_video.h |1 
 40 files changed, 2081 insertions(+), 802 deletions(-)

New commits:
commit 3bcfa75fba67682e3a99b00dc5279d6173b8fa29
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Mar 19 23:19:57 2008 +0100

debian/control updates

* Remove Branden from Uploaders with his permission.
* Build against xserver 1.5 rc1.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.

diff --git a/debian/changelog b/debian/changelog
index 9950923..1bc76fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ xserver-xorg-video-neomagic (1:1.2.0-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * New upstream release.
   * Refresh patches 01_implicit_declaration.diff and 02_gen_pci_ids.diff.
+  * Remove Branden from Uploaders with his permission.
+  * Build against xserver 1.5 rc1.
+  * Bump Standards-Version to 3.7.3.
+  * Drop the XS- prefix from Vcs-* control fields.
 
  -- Brice Goglin [EMAIL PROTECTED]  Sat, 15 Sep 2007 01:58:15 +0200
 
diff --git a/debian/control b/debian/control
index 4eb85d0..86cc1dc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: xserver-xorg-video-neomagic
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED]
-Build-Depends: debhelper (= 5.0.0), quilt, pkg-config, xserver-xorg-dev (= 
2:1.4), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, 
x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
-Standards-Version: 3.7.2.2
-XS-Vcs-Git: 
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-neomagic
-XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-neomagic.git
+Uploaders: David Nusinow [EMAIL PROTECTED]
+Build-Depends: debhelper (= 5.0.0), quilt, pkg-config, xserver-xorg-dev (= 
2:1.4.99.901), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, 
x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, 
libpciaccess-dev
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-neomagic
+Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-neomagic.git
 
 Package: xserver-xorg-video-neomagic
 Architecture: any

commit 04ec0e429a21c609b630132b6fb48b12d28b9d1f
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Mar 19 23:15:19 2008 +0100

autoreconf

diff --git a/Makefile.in b/Makefile.in
index edf3ad1..83e4c20 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

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

New commits:
commit 92a763bf156da567f4d619f7bf68af0891567081
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sat Sep 15 01:58:39 2007 +0200

Add upstream URL to debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 48fcc7f..01a3a58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-neomagic (1:1.1.1-8) UNRELEASED; urgency=low
+
+  * Add upstream URL to debian/copyright.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Sat, 15 Sep 2007 01:58:15 +0200
+
 xserver-xorg-video-neomagic (1:1.1.1-7) experimental; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/copyright b/debian/copyright
index 79d0680..8d5c41f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
 Copyright 1998, 1999 by Precision Insight, Inc., Cedar Park, Texas.
 
 All Rights Reserved


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

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

2007-09-13 Thread David Nusinow 
 ChangeLog   |  353 +++-
 Makefile.in |  125 +--
 aclocal.m4  |  676 +++-
 configure   | 1119 +---
 debian/changelog|   31 
 debian/control  |   15 
 debian/patches/01_implicit_declaration.diff |   17 
 debian/patches/02_gen_pci_ids.diff  |   25 
 debian/patches/series   |2 
 debian/rules|6 
 debian/xserver-xorg-video-neomagic.install  |1 
 debian/xsfbs/xsfbs.mk   |9 
 man/Makefile.in |   92 +-
 man/neomagic.man|6 
 src/Makefile.in |  157 ++-
 src/neo_driver.c|3 
 16 files changed, 1762 insertions(+), 875 deletions(-)

New commits:
commit c115647f3892bc7ec96fb8f8af089246c1365bf0
Author: David Nusinow [EMAIL PROTECTED]
Date:   Thu Sep 13 22:01:15 2007 -0400

* Add 02_gen_pci_ids.diff. This patch provides a set of PCI ID's supported
  by this driver so that ti can be autoloaded by the xserver

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

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

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

New commits:
commit 482a1dc70ca64211ea5506a86fef3e9272413631
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Feb 21 22:08:02 2007 -0500

Generate Provides line automatically

diff --git a/debian/control b/debian/control
index 9636b64..6cff509 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.6.1
 Package: xserver-xorg-video-neomagic
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
-Provides: xserver-xorg-video-1.1
+Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- Neomagic display driver
  This package provides the driver for Neomagic MagicGraph chipsets, which are

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

Update serverabi generation to also account for driver Provides

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

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


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

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

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

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

Generate server dependencies automatically from the ABI

diff --git a/debian/changelog b/debian/changelog
index 9c77bd9..ac131c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 xserver-xorg-video-neomagic (1:1.1.1-6) UNRELEASED; urgency=low
 
-  * Bump xserver ABI metadata to 1.1 for use with server 1.2
+  * Generate server dependencies automatically from the ABI
 
- -- David Nusinow [EMAIL PROTECTED]  Sat, 10 Feb 2007 21:23:41 -0500
+ -- David Nusinow [EMAIL PROTECTED]  Tue, 20 Feb 2007 22:22:55 -0500
 
 xserver-xorg-video-neomagic (1:1.1.1-5) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
index 94c3330..9636b64 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.1
 
 Package: xserver-xorg-video-neomagic
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (= 2:1.2.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
 Provides: xserver-xorg-video-1.1
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- Neomagic display driver
diff --git a/debian/rules b/debian/rules
index b4f2116..af96940 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build install serverabi
dh_testdir
dh_testroot
 

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

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

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


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

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

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

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


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