xserver-xorg-video-mga: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst 
 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 0be10fc8a0dcec2235c6275b83258675f70be373
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Thu Mar 12 12:23:06 2015 +0100

Kill off modesetting recommends too.

diff --git a/debian/control b/debian/control
index 738c9ee..6abd046 100644
--- a/debian/control
+++ b/debian/control
@@ -32,8 +32,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${xviddriver:Depends},
-Recommends:
- xserver-xorg-video-modesetting,
 Provides:
  ${xviddriver:Provides}
 Suggests:


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

xserver-xorg-video-mga: Changes to 'ubuntu'

2012-10-01 Thread Timo Aaltonen 
 ChangeLog  |   37 +
 configure.ac   |2 -
 debian/changelog   |   21 --
 debian/patches/fix-driver-loading.diff |   30 --
 debian/patches/series  |1 
 src/Makefile.am|4 +--
 src/mga_dri.c  |6 +
 src/mga_driver.c   |9 
 src/mga_storm.c|   22 ++-
 9 files changed, 77 insertions(+), 55 deletions(-)

New commits:
commit 53cd649d5262338f0d3146a2ba60f7e4fcd6ec56
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Oct 1 12:37:53 2012 +0300

Merge from unreleased debian git.

* Merge from unreleased debian git.
* Drop fix-driver-load.diff, upstream.

diff --git a/debian/changelog b/debian/changelog
index d2083cb..5b80268 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-mga (1:1.6.2-0ubuntu1) quantal; urgency=low
+
+  * Merge from unreleased debian git.
+  * Drop fix-driver-load.diff, upstream.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 01 Oct 2012 12:36:54 +0300
+
 xserver-xorg-video-mga (1:1.6.2-1) UNRELEASED; urgency=low
 
   * New upstream release
diff --git a/debian/patches/fix-driver-loading.diff 
b/debian/patches/fix-driver-loading.diff
deleted file mode 100644
index b1e1004..000
--- a/debian/patches/fix-driver-loading.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-commit e777a2845bfeefad386db35d694e4b1cd74a0dd5
-Author: Dave Airlie airl...@redhat.com
-Date:   Wed Sep 26 15:18:44 2012 +1000
-
-mga: add stub storm functions if not using XAA
-
-If we aren't using XAA just add stub storm init/sync functions.
-
-This lets the driver load yay.
-
-Signed-off-by: Dave Airlie airl...@redhat.com
-
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index f4f54a1..3db3a74 100644
 a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -4185,3 +4185,13 @@ MGAG100BlackMagic(ScrnInfoPtr pScrn)
- usleep(10);
- }
- 
-+#ifndef HAVE_XAA_H
-+void MGAStormEngineInit( ScrnInfoPtr pScrn )
-+{
-+}
-+
-+void
-+MGAStormSync(ScrnInfoPtr pScrn)
-+{
-+}
-+#endif
diff --git a/debian/patches/series b/debian/patches/series
index 6abb0c5..7b69d6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_no_nonfree.diff
 02_tentatively_unbreak_dual_head.diff
-fix-driver-loading.diff

commit 3eace93f42c365ee3b561aa47e50653edca2755f
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Oct 1 12:35:09 2012 +0300

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index ae101dc..d806b51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+commit fcd27b2b4ab2a181d5263296e71cda2d8772ba2d
+Author: Dave Airlie airl...@redhat.com
+Date:   Fri Sep 28 11:36:44 2012 +1000
+
+mga: bump release to 1.6.2
+
+commit 29de36da0ed031815bd302f55f2ef5cc0cce6cc6
+Author: Dave Airlie airl...@redhat.com
+Date:   Fri Sep 28 10:54:00 2012 +1000
+
+mga: bring dri1 back to life.
+
+we need to at least setup the memory manager bits so dri1 clients
+get a backbuffer. this at least gets gears working again without XAA.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit e777a2845bfeefad386db35d694e4b1cd74a0dd5
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Sep 26 15:18:44 2012 +1000
+
+mga: add stub storm functions if not using XAA
+
+If we aren't using XAA just add stub storm init/sync functions.
+
+This lets the driver load yay.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit 220e06fefe77175d9827954e61549eadda245d9a
+Author: Adam Jackson a...@redhat.com
+Date:   Tue Sep 25 08:54:42 2012 -0400
+
+Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
 commit cd41eacaeabf8227197d605b055713ca654633d5
 Author: Dave Airlie airl...@redhat.com
 Date:   Tue Jul 17 16:05:09 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index 81bb0dd..1bb8207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.2-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Bump Standards-Version to 3.9.3 (no changes needed).

commit fcd27b2b4ab2a181d5263296e71cda2d8772ba2d
Author: Dave Airlie airl...@redhat.com
Date:   Fri Sep 28 11:36:44 2012 +1000

mga: bump release to 1.6.2

diff --git a/configure.ac b/configure.ac
index 1b6c20f..fca1a9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-mga],
-[1.6.1],
+[1.6.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-mga])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 29de36da0ed031815bd302f55f2ef5cc0cce6cc6
Author: Dave Airlie airl...@redhat.com
Date:   Fri Sep 28 10:54:00 2012 +1000

xserver-xorg-video-mga: Changes to 'ubuntu'

2012-09-26 Thread Timo Aaltonen 
 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 712458b836c1894a7317191b2fe157059ba1f46c
Author: Timo Aaltonen Timo Aaltonen tjaal...@cc.hut.fi
Date:   Wed Sep 26 11:08:21 2012 +0300

uploaded to quantal

diff --git a/debian/changelog b/debian/changelog
index ca43f6b..0a79113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-mga (1:1.6.0-0ubuntu1) quantal-proposed; urgency=low
+
+  * Sync from unreleased debian git.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 01 Aug 2012 18:37:52 +0300
+
 xserver-xorg-video-mga (1:1.6.0-1) UNRELEASED; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d833c29..c1ae3fc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: xserver-xorg-video-mga
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force debian-x@lists.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders:
  Cyril Brulebois k...@debian.org,
  Tormod Volden debian.tor...@gmail.com


-- 
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/e1tgmgu-0001zw...@vasks.debian.org

xserver-xorg-video-mga: Changes to 'ubuntu'

2012-09-26 Thread Timo Aaltonen 
 debian/changelog   |   19 +++
 debian/patches/fix-driver-loading.diff |   30 ++
 debian/patches/series  |1 +
 3 files changed, 38 insertions(+), 12 deletions(-)

New commits:
commit 7924cd3004ef2f28b5fe97c7175c2581b72ab105
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Sep 26 11:24:10 2012 +0300

fix the version

diff --git a/debian/changelog b/debian/changelog
index ca43f6b..81bb0dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.1-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Bump Standards-Version to 3.9.3 (no changes needed).

commit d0452b4474f997e4081f7ebf6c41a0a81507f8f7
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Sep 26 11:15:44 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 3728717..a69f9a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.0-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.0-0ubuntu2) quantal; urgency=low
 
   * Added fix-driver-load.diff, fixes loading the driver when the
 xserver it was built against has no support for XAA anymore. (LP:

commit 1c06b2dddca780f4925134862053ba0dbb36e1ee
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Sep 26 11:15:07 2012 +0300

Added fix-driver-load.diff, fixes loading the driver when the xserver it 
was built against has no support for XAA anymore. (LP: #1044797)

diff --git a/debian/changelog b/debian/changelog
index bfb5329..3728717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-mga (1:1.6.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * Added fix-driver-load.diff, fixes loading the driver when the
+xserver it was built against has no support for XAA anymore. (LP:
+#1044797)
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 26 Sep 2012 11:14:51 +0300
+
 xserver-xorg-video-mga (1:1.6.0-0ubuntu1) quantal-proposed; urgency=low
 
   * Sync from unreleased debian git.
diff --git a/debian/patches/fix-driver-loading.diff 
b/debian/patches/fix-driver-loading.diff
new file mode 100644
index 000..b1e1004
--- /dev/null
+++ b/debian/patches/fix-driver-loading.diff
@@ -0,0 +1,30 @@
+commit e777a2845bfeefad386db35d694e4b1cd74a0dd5
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Sep 26 15:18:44 2012 +1000
+
+mga: add stub storm functions if not using XAA
+
+If we aren't using XAA just add stub storm init/sync functions.
+
+This lets the driver load yay.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+diff --git a/src/mga_driver.c b/src/mga_driver.c
+index f4f54a1..3db3a74 100644
+--- a/src/mga_driver.c
 b/src/mga_driver.c
+@@ -4185,3 +4185,13 @@ MGAG100BlackMagic(ScrnInfoPtr pScrn)
+ usleep(10);
+ }
+ 
++#ifndef HAVE_XAA_H
++void MGAStormEngineInit( ScrnInfoPtr pScrn )
++{
++}
++
++void
++MGAStormSync(ScrnInfoPtr pScrn)
++{
++}
++#endif
diff --git a/debian/patches/series b/debian/patches/series
index 7b69d6a..6abb0c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_no_nonfree.diff
 02_tentatively_unbreak_dual_head.diff
+fix-driver-loading.diff


-- 
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/e1tgn5k-0001hj...@vasks.debian.org

xserver-xorg-video-mga: Changes to 'ubuntu'

2012-07-18 Thread Maarten Lankhorst 
 .gitignore   |   75 +
 ChangeLog|  540 
 Makefile.am  |   12 
 configure.ac |   85 -
 debian/README.source |   26 
 debian/changelog |  107 +
 debian/compat|2 
 debian/control   |   32 
 debian/patches/02_tentatively_unbreak_dual_head.diff |  175 ++
 debian/patches/100_add_200EH_support.patch   |  428 ---
 debian/patches/series|2 
 debian/rules |  103 -
 debian/watch |3 
 debian/xsfbs/xsfbs.mk|  276 
 debian/xsfbs/xsfbs.sh|  622 --
 man/Makefile.am  |   63 -
 man/mga.man  |1 
 src/Makefile.am  |8 
 src/binding.h|   32 
 src/client.h |   40 
 src/clientlx.c   |  848 --
 src/compat-api.h |   99 +
 src/mga.h|  109 -
 src/mga_arc.c|2 
 src/mga_bios.c   |3 
 src/mga_common.h |2 
 src/mga_dac3026.c|3 
 src/mga_dacG.c   |  395 +-
 src/mga_dga.c|   26 
 src/mga_dh.c |3 
 src/mga_dri.c|  110 -
 src/mga_dri.h|2 
 src/mga_dripriv.h|2 
 src/mga_driver.c | 1141 +--
 src/mga_esc.c|  778 
 src/mga_exa.c|   21 
 src/mga_g450pll.c|3 
 src/mga_hwcurs.c |3 
 src/mga_macros.h |   17 
 src/mga_merge.c  |  132 --
 src/mga_merge.h  |6 
 src/mga_reg.h|   21 
 src/mga_sarea.h  |2 
 src/mga_shadow.c |7 
 src/mga_storm.c  |   21 
 src/mga_vga.c|8 
 src/mga_video.c  |   58 
 src/mgareg_flags.h   |1 
 util/.gitignore  |2 
 util/stormdwg.c  |5 
 50 files changed, 2011 insertions(+), 4451 deletions(-)

New commits:
commit a08b53521d69acf9f7d9833385bb2bc4818fc056
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 14:36:09 2012 +0200

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

diff --git a/debian/changelog b/debian/changelog
index d34c6ea..ca43f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-mga (1:1.6.0-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:33:10 +0200
 
diff --git a/debian/control b/debian/control
index 539353e..d833c29 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
  x11proto-xf86dri-dev,
  quilt,
  xutils-dev (= 1:7.5+4)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mga
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mga.git
 

commit cc980e5a84fd63a3546769f34ffeb63058fff123
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 14:34:13 2012 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index c599f7b..d34c6ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-mga (1:1.6.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
14:33:10 +0200
+
 xserver-xorg-video-mga (1:1.5.0-2) unstable; urgency=low
 
   * mga: don't bind to device if there is a kernel driver, to avoid conflicts

commit 10b0f1e596e07aeee9d51a6b235e91db7c37ebae
Author: Maarten Lankhorst

xserver-xorg-video-mga: Changes to 'ubuntu'

2012-07-18 Thread Maarten Lankhorst 
 debian/control |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 35ec123ae404bbf294e6f92f35f4e77eca45e808
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 15:29:20 2012 +0200

Fix duplicate maintainers

Oops.

diff --git a/debian/control b/debian/control
index 41401e4..c1ae3fc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: x11
 Priority: optional
 Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
 XSBC-Original-Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders:
  Cyril Brulebois k...@debian.org,
  Tormod Volden debian.tor...@gmail.com


-- 
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/e1srujl-0003zb...@vasks.debian.org

xserver-xorg-video-mga: Changes to 'ubuntu'

2010-03-30 Thread Christopher Halse Rogers 
New branch 'ubuntu' available with the following commits:
commit b4acd5460740706495f42306b8b1a8411b249f2a
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Wed Mar 31 11:59:21 2010 +1100

Add support for G200EH from upstream git.

It looks like a new upstream version should be released soon, and we can 
drop this


-- 
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/e1nwmhs-00021o...@alioth.debian.org