xserver-xorg-video-savage: Changes to 'ubuntu'
debian/changelog |7
debian/control |2 -
debian/patches/fix-ftbfs-1.17.diff | 53 +
debian/patches/series |1
4 files changed, 62 insertions(+), 1 deletion(-)
New commits:
commit db307af1abfa18a019066dbf85f00d6b020f9e48
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date: Thu Mar 12 11:48:56 2015 +0100
Rebuild against xserver 1.17.
fix-ftbfs-1.17.diff
diff --git a/debian/changelog b/debian/changelog
index 24158fb..d9dde83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-savage (1:2.3.7-2ubuntu4) vivid; urgency=medium
+
+ * Rebuild against xserver 1.17.
+- fix-ftbfs-1.17.diff
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com Thu, 12 Mar 2015
11:48:33 +0100
+
xserver-xorg-video-savage (1:2.3.7-2ubuntu3) utopic; urgency=low
* Rebuild for xorg 1.16 abi.
diff --git a/debian/control b/debian/control
index 9f98894..a7f4b53 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
debhelper (= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (= 2:1.9.99.901+git20110131),
+ xserver-xorg-dev (= 2:1.16.99.901),
x11proto-video-dev,
x11proto-xext-dev,
x11proto-gl-dev,
diff --git a/debian/patches/fix-ftbfs-1.17.diff
b/debian/patches/fix-ftbfs-1.17.diff
new file mode 100644
index 000..fed4834
--- /dev/null
+++ b/debian/patches/fix-ftbfs-1.17.diff
@@ -0,0 +1,53 @@
+diff --git a/src/savage_dri.c b/src/savage_dri.c
+index bdb78e4..0842821 100644
+--- a/src/savage_dri.c
b/src/savage_dri.c
+@@ -875,9 +875,6 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
+psav-coreWakeupHandler = pDRIInfo-wrap.WakeupHandler;
+pDRIInfo-wrap.WakeupHandler = SAVAGEWakeupHandler;
+
+- pDRIInfo-wrap.ValidateTree = NULL;
+- pDRIInfo-wrap.PostValidateTree = NULL;
+-
+pDRIInfo-createDummyCtx = TRUE;
+pDRIInfo-createDummyCtxPriv = FALSE;
+
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index bca2c60..e82794f 100644
+--- a/src/savage_driver.c
b/src/savage_driver.c
+@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn)
+ return ((unsigned int) (tmp 0x08));
+ }
+
++static void
++SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ static Bool
+ SavageDDC1(ScrnInfoPtr pScrn)
+ {
+@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn)
+ InI2CREG(byte,psav-I2CPort);
+ OutI2CREG(byte | 0x12,psav-I2CPort);
+
+-pMon =
xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read);
++pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed,
++ SavageDDC1Read);
+ if (!pMon)
+ return FALSE;
+
+diff --git a/src/savage_driver.h b/src/savage_driver.h
+index ec4b1ea..de042af 100644
+--- a/src/savage_driver.h
b/src/savage_driver.h
+@@ -54,6 +54,7 @@
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
+ #include xf86Resources.h
+ #endif
++#include xf86Modes.h
+ #include xf86Pci.h
+ #include xf86_OSproc.h
+ #include xf86Cursor.h
diff --git a/debian/patches/series b/debian/patches/series
index f420099..3ceb913 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
03_request_16bit_depth.diff
100_bustype_pci_by_default.diff
101-pointer.diff
+fix-ftbfs-1.17.diff
--
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/e1yw1a8-0007py...@moszumanska.debian.org
xserver-xorg-video-savage: Changes to 'ubuntu'
debian/changelog
|8 +
debian/patches/101-pointer.diff
| 12 ++
debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch
| 26 --
debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch
| 35
debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch
| 43 --
debian/patches/series
|4
6 files changed, 21 insertions(+), 107 deletions(-)
New commits:
commit 0e6c177f5d5e82ba6abc7a5cafbfaeeea467de09
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Tue Jan 7 16:05:56 2014 +0100
Merge released debian-unstable.
- Drop upstream patches.
- Add patch to include missing header.
diff --git a/debian/changelog b/debian/changelog
index 48ef800..9f67380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-savage (1:2.3.7-2ubuntu1) trusty; urgency=low
+
+ * Merge released debian-unstable.
+ * Drop upstream patches.
+ * Add patch to include missing header.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 07 Jan 2014
15:56:54 +0100
+
xserver-xorg-video-savage (1:2.3.7-2) unstable; urgency=low
* Actually upload with correct contents. (closes: #724675)
diff --git a/debian/patches/101-pointer.diff b/debian/patches/101-pointer.diff
new file mode 100644
index 000..1a2e8dd
--- /dev/null
+++ b/debian/patches/101-pointer.diff
@@ -0,0 +1,12 @@
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index bca2c60..92244f7 100644
+--- a/src/savage_driver.c
b/src/savage_driver.c
+@@ -53,6 +53,7 @@
+ #endif
+
+
++#include xf86Modes.h
+ #include xf86xv.h
+
+ #include savage_driver.h
diff --git
a/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch
b/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch
deleted file mode 100644
index 4d3c1be..000
---
a/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ad4db1cead50e4991c10c85628371d922a2b9d8f Mon Sep 17 00:00:00 2001
-From: Tormod Volden debian.tor...@gmail.com
-Date: Tue, 7 May 2013 22:41:31 +0200
-Subject: [PATCH] exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr
-
-Signed-off-by: Tormod Volden debian.tor...@gmail.com
- src/savage_exa.c |2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/savage_exa.c b/src/savage_exa.c
-index 33c08c7..fd70c0c 100644
a/src/savage_exa.c
-+++ b/src/savage_exa.c
-@@ -567,7 +567,7 @@ SavageUploadToScreen(PixmapPtr pDst, int x, int y, int w,
int h, char *src, int
- Bool
- SavageDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char
*dst, int dst_pitch)
- {
--unsigned char *src = pSrc-devPrivate.ptr;
-+unsigned char *src = (unsigned char *) exaGetPixmapFirstPixel(pSrc);
- int src_pitch = exaGetPixmapPitch(pSrc);
- int bpp = pSrc-drawable.bitsPerPixel;
-
---
-1.7.10.4
-
diff --git
a/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch
b/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch
deleted file mode 100644
index 6ad0a3e..000
---
a/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001
-From: Dave Airlie airl...@gmail.com
-Date: Sat, 22 Dec 2012 20:00:00 +1000
-Subject: [PATCH] savage: fix default accel arch when built with no XAA
-
-Signed-off-by: Dave Airlie airl...@redhat.com
- src/savage_driver.c |4
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/savage_driver.c b/src/savage_driver.c
-index 026bf5c..5b49e60 100644
a/src/savage_driver.c
-+++ b/src/savage_driver.c
-@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
- from = X_DEFAULT;
- char *strptr;
- if((strptr = (char *)xf86GetOptValString(psav-Options,
OPTION_ACCELMETHOD))) {
-+#ifdef HAVE_XAA_H
- if(!xf86NameCmp(strptr,XAA)) {
- from = X_CONFIG;
- psav-useEXA = FALSE;
-@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
- from = X_CONFIG;
- psav-useEXA = TRUE;
- }
-+#else
-+ psav-useEXA = TRUE;
-+#endif
-}
-xf86DrvMsg(pScrn-scrnIndex, from, Using %s acceleration
architecture\n,
- psav-useEXA ? EXA : XAA);
---
-1.7.10.4
-
diff --git
a/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch
b/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch
deleted file mode 100644
index 3fdc2b1..000
---
a/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch
+++
xserver-xorg-video-savage: Changes to 'ubuntu'
debian/changelog | 12 1 file changed, 12 insertions(+) New commits: commit 51ee8a35a4fbb18f9ec4ba20984916ca152c4b78 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Sep 10 16:47:41 2014 +0200 Rebuild for xorg 1.16 abi. diff --git a/debian/changelog b/debian/changelog index 7ff02ae..24158fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.7-2ubuntu3) utopic; urgency=low + + * Rebuild for xorg 1.16 abi. + + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Wed, 10 Sep 2014 16:47:33 +0200 + xserver-xorg-video-savage (1:2.3.7-2ubuntu2) trusty; urgency=medium * Rebuild for xorg 1.15 abi. commit f0cdfcafa4c60de5e9ed1c6392da5542f888539b Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Sep 10 16:47:19 2014 +0200 Rebuild for xorg 1.15 abi. diff --git a/debian/changelog b/debian/changelog index 9f67380..7ff02ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.7-2ubuntu2) trusty; urgency=medium + + * Rebuild for xorg 1.15 abi. + + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Wed, 05 Feb 2014 10:09:01 + + xserver-xorg-video-savage (1:2.3.7-2ubuntu1) trusty; urgency=low * Merge released debian-unstable. -- 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/e1xrjbi-hp...@moszumanska.debian.org
xserver-xorg-video-savage: Changes to 'ubuntu'
ChangeLog | 94 configure.ac|2 - debian/changelog| 16 +++- src/savage_driver.c |9 +++- src/savage_driver.h |4 +- src/savage_exa.c|2 - src/savage_video.c |8 ++-- 7 files changed, 122 insertions(+), 13 deletions(-) New commits: commit 6fdcef4a62b6693c571cdfd4b76e3a45fe320d50 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Thu Sep 26 15:44:20 2013 +0200 Actually upload with correct contents. (closes: #724675) diff --git a/debian/changelog b/debian/changelog index 06f27ab..51a28d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.7-2) unstable; urgency=low + + * Actually upload with correct contents. (closes: #724675) + + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Thu, 26 Sep 2013 15:43:11 +0200 + xserver-xorg-video-savage (1:2.3.7-1) unstable; urgency=low * New upstream release that actually works. commit eece3c79c6ce3c6103cb4aa3d2bae303bfe2bbc6 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Sep 25 17:10:53 2013 +0200 release to unstable diff --git a/debian/changelog b/debian/changelog index 6c3e47f..06f27ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-savage (1:2.3.7-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.7-1) unstable; urgency=low * New upstream release that actually works. - -- Maarten Lankhorst maarten.lankho...@ubuntu.com Wed, 25 Sep 2013 17:10:15 +0200 + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Wed, 25 Sep 2013 17:10:41 +0200 xserver-xorg-video-savage (1:2.3.6-1) unstable; urgency=low commit 5cd6e8dfd5f3901df2620aa328948bdfd3a6bb09 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Sep 25 17:10:38 2013 +0200 bump changelogs diff --git a/ChangeLog b/ChangeLog index ac40aff..b70bce3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,97 @@ +commit d27abbf74fee30ddb9a3ca0d597ca0ce16a1bc35 +Author: Tormod Volden debian.tor...@gmail.com +Date: Tue Sep 24 23:14:35 2013 +0200 + +xf86-video-savage: bump to version 2.3.7 + +Signed-off-by: Tormod Volden debian.tor...@gmail.com + +commit 966a0e95d6c420e5e0ab01e665144e66a4004846 +Author: Alexander Grothe alexander.gro...@gmail.com +Date: Sun Sep 15 11:00:41 2013 +0200 + +Drop miInitializeBackingStore() call + +It was only needed up to xserver 1.4 and is not supported in the +recent xserver versions. + +Thanks to Alexander Grothe for reporting the issue and providing +the fix. + +https://bugs.freedesktop.org/show_bug.cgi?id=65444 + + commit 1cb0261ef54b7dd6a7ef84e1c3959e424706228b + Author: Daniel Martin consume.no...@gmail.com + Date: Thu Sep 6 00:38:26 2012 +0200 + +dix: Delete mibstore.h + +Since Nov 2010 (commit c4c4676) the only purpose of mibstore.h was to +define an empty function (miInitializeBackingStore()) for backward +compatibility. Time to say goodbye. + +Signed-off-by: Tormod Volden debian.tor...@gmail.com + +commit 44581aef5f878e7f2b34d5693d50ef75263b195c +Author: Tormod Volden debian.tor...@gmail.com +Date: Wed Feb 6 22:14:59 2013 +0100 + +Fix video window height on MX/IX/SuperSavage + +Some copy-pasto caused the width to be written into the height register. + +Thanks to Hans-Jürgen Mauser for pointing out a couple of more places this +was wrong. + +Signed-off-by: Tormod Volden debian.tor...@gmail.com + +commit 3425ddb4c5dd7bbd91068c7ba0b1c001719795a5 +Author: Tormod Volden debian.tor...@gmail.com +Date: Thu May 9 12:39:58 2013 + + +Fix building with TRACEON defined + +Signed-off-by: Tormod Volden debian.tor...@gmail.com + +commit ac460e6836bdd2cd16c9d29743376c16fdc6924e +Author: Tormod Volden debian.tor...@gmail.com +Date: Tue May 7 22:41:31 2013 +0200 + +exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr + +Signed-off-by: Tormod Volden debian.tor...@gmail.com + +commit c30f9b4a61283f21f6bd230950f52961afa203cf +Author: Tormod Volden debian.tor...@gmail.com +Date: Thu May 9 12:36:33 2013 + + +Really fix default accel arch when built with no XAA + +After ca9718a887ecbc59b76869af673791ab591b849b it would +still default to XAA unless AccelMethod option was used. + +Make sure the default is EXA if there is no XAA support. + +Signed-off-by: Tormod Volden debian.tor...@gmail.com + +commit ca9718a887ecbc59b76869af673791ab591b849b +Author: Dave Airlie airl...@gmail.com +Date: Sat Dec 22 20:00:00 2012 +1000 + +savage: fix default accel arch when built with no XAA + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit 3d181030a6ba2205a57ef4665e53aed0251ccaa6 +Author: Dave Airlie airl...@gmail.com +Date: Wed Jul 18 18:52:38 2012 +1000 + +savage: move compat-api.h
xserver-xorg-video-savage: Changes to 'ubuntu'
debian/changelog
| 15 +++
debian/patches/.gitignore
|1
debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch
| 26 ++
debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch
| 35
debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch
| 43 ++
debian/patches/series
|3
6 files changed, 123 insertions(+)
New commits:
commit d3bbce9ad337b83cbb26e070a2aae80538b6df43
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Wed May 22 16:45:31 2013 +0200
Rebuild to pick up new Xserver dependencies.
diff --git a/debian/changelog b/debian/changelog
index 7ca9975..a7286e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-savage (1:2.3.6-0ubuntu3) saucy; urgency=low
+
+ * Rebuild to pick up new Xserver dependencies.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com Wed, 22 May 2013
16:43:57 +0200
+
xserver-xorg-video-savage (1:2.3.6-0ubuntu2) saucy; urgency=low
* Fix EXA and use it by default (LP: 1083032)
commit 2a53ee8cc0aad99d7e680c3104f181d0e28caca7
Author: Tormod Volden debian.tor...@gmail.com
Date: Mon May 13 13:11:29 2013 +0200
Fix EXA and use it by default (LP: 1083032)
* Fix EXA and use it by default (LP: 1083032)
- 110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch
- 120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch
- 130-Really-fix-up-default-accel-arch-when-built-with-no-.patch
Add debian/patches/.gitignore to fixup missing patch files. (mlankhorst)
diff --git a/debian/changelog b/debian/changelog
index 1e529ea..7ca9975 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-savage (1:2.3.6-0ubuntu2) saucy; urgency=low
+
+ * Fix EXA and use it by default (LP: 1083032)
+ - 110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch
+ - 120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch
+ - 130-Really-fix-up-default-accel-arch-when-built-with-no-.patch
+
+ -- Tormod Volden debian.tor...@gmail.com Tue, 07 May 2013 22:47:50 +0200
+
xserver-xorg-video-savage (1:2.3.6-0ubuntu1) quantal-proposed; urgency=low
* Merge from unreleased debian git, remaining changes:
diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore
new file mode 100644
index 000..69f1bf4
--- /dev/null
+++ b/debian/patches/.gitignore
@@ -0,0 +1 @@
+!*.patch
diff --git
a/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch
b/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch
new file mode 100644
index 000..4d3c1be
--- /dev/null
+++
b/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch
@@ -0,0 +1,26 @@
+From ad4db1cead50e4991c10c85628371d922a2b9d8f Mon Sep 17 00:00:00 2001
+From: Tormod Volden debian.tor...@gmail.com
+Date: Tue, 7 May 2013 22:41:31 +0200
+Subject: [PATCH] exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr
+
+Signed-off-by: Tormod Volden debian.tor...@gmail.com
+---
+ src/savage_exa.c |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/savage_exa.c b/src/savage_exa.c
+index 33c08c7..fd70c0c 100644
+--- a/src/savage_exa.c
b/src/savage_exa.c
+@@ -567,7 +567,7 @@ SavageUploadToScreen(PixmapPtr pDst, int x, int y, int w,
int h, char *src, int
+ Bool
+ SavageDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char
*dst, int dst_pitch)
+ {
+-unsigned char *src = pSrc-devPrivate.ptr;
++unsigned char *src = (unsigned char *) exaGetPixmapFirstPixel(pSrc);
+ int src_pitch = exaGetPixmapPitch(pSrc);
+ int bpp = pSrc-drawable.bitsPerPixel;
+
+--
+1.7.10.4
+
diff --git
a/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch
b/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch
new file mode 100644
index 000..6ad0a3e
--- /dev/null
+++
b/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch
@@ -0,0 +1,35 @@
+From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001
+From: Dave Airlie airl...@gmail.com
+Date: Sat, 22 Dec 2012 20:00:00 +1000
+Subject: [PATCH] savage: fix default accel arch when built with no XAA
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+---
+ src/savage_driver.c |4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index 026bf5c..5b49e60 100644
+--- a/src/savage_driver.c
b/src/savage_driver.c
+@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
+ from = X_DEFAULT;
+ char *strptr;
+ if((strptr = (char *)xf86GetOptValString(psav-Options,
OPTION_ACCELMETHOD))) {
++#ifdef
xserver-xorg-video-savage: Changes to 'ubuntu'
debian/changelog |7 +++ 1 file changed, 7 insertions(+) New commits: commit e00fbc4ba3be9aa5ddd0e92c668298208a170d89 Author: Timo Aaltonen Timo Aaltonen tjaal...@cc.hut.fi Date: Thu Aug 2 00:31:48 2012 +0300 release to quantal-proposed diff --git a/debian/changelog b/debian/changelog index e4685d4..1e529ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-savage (1:2.3.6-0ubuntu1) quantal-proposed; urgency=low + + * Merge from unreleased debian git, remaining changes: +- 100_bustype_pci_by_default.diff (LP: 33617, 37218) + + -- Timo Aaltonen tjaal...@ubuntu.com Thu, 02 Aug 2012 00:30:45 +0300 + xserver-xorg-video-savage (1:2.3.6-1) UNRELEASED; urgency=low * New upstream release -- 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/e1swgxp-0003qw...@vasks.debian.org
xserver-xorg-video-savage: Changes to 'ubuntu'
ChangeLog | 53 ++ configure.ac| 20 + debian/changelog|6 ++ src/Makefile.am |1 src/compat-api.h| 105 src/savage_accel.c |2 src/savage_cursor.c |4 - src/savage_dga.c| 23 +++ src/savage_dri.c| 54 ++ src/savage_driver.c | 93 +- src/savage_driver.h | 16 +-- src/savage_exa.c| 14 +++--- src/savage_hwmc.c |5 +- src/savage_i2c.c| 11 + src/savage_shadow.c |6 +- src/savage_vbe.c| 25 ++-- src/savage_video.c | 10 ++-- src/savage_xaa.c| 17 +--- 18 files changed, 343 insertions(+), 122 deletions(-) New commits: commit 3299a36b373cc6d3237b79ef42908e63f822edd1 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Jul 18 13:42:47 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index e68bc48..bb7137f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.6-1) UNRELEASED; urgency=low + + * New upstream release + + -- Maarten Lankhorst maarten.lankho...@canonical.com Wed, 18 Jul 2012 13:42:19 +0200 + xserver-xorg-video-savage (1:2.3.4-1) unstable; urgency=low * New upstream release commit 03e24e57a11ed176c845ab9c2e5308dceab08d26 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Jul 18 13:42:38 2012 +0200 Bump changelog diff --git a/ChangeLog b/ChangeLog index eda84db..ac40aff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,56 @@ +commit cb27a7a072c6e087a2e272d84c1d569dc717da8b +Author: Dave Airlie airl...@redhat.com +Date: Tue Jul 17 16:05:09 2012 +1000 + +xf86-video-savage: bump to version 2.3.6 + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit d7edd7c545473d5ed80c9a46c1405042267a7293 +Author: Dave Airlie airl...@redhat.com +Date: Mon Jul 16 03:39:32 2012 +0100 + +savage: make build with no xaa server. + +This fixes savage build against the no XAA server. + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit 508e0742b7d1ac1e4ff6b648d19bfa062c535d61 +Author: Dave Airlie airl...@redhat.com +Date: Mon Jul 2 12:29:41 2012 +0100 + +savage: bump to 2.3.5 + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit 430b956b49b6c883189074ce13bc234545b714e0 +Author: Dave Airlie airl...@redhat.com +Date: Wed Jun 6 11:24:31 2012 +0100 + +savage: i2c drop xf86Screens usage. + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit a2714fb09e1e0badbb3e98e24d4b1ed92003bdb9 +Author: Dave Airlie airl...@redhat.com +Date: Wed Jun 6 11:22:29 2012 +0100 + +savage: port to new compat API + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit de22eab9a21df80fe965dc37d21ba3ac2b9f5fd0 +Author: Tormod Volden debian.tor...@gmail.com +Date: Wed Feb 15 22:20:37 2012 +0100 + +Refactor BIOS modes retrieval to call VBEGetVBEInfo only once + +Otherwise, calling it twice would trigger a VBE bug when using +xserver 1.12. + +Signed-off-by: Tormod Volden debian.tor...@gmail.com + commit 63dd44674a28263c5d8d6aec8b72e95f94d3fe6c Author: Alan Coopersmith alan.coopersm...@oracle.com Date: Fri Mar 23 19:46:12 2012 -0700 commit cb27a7a072c6e087a2e272d84c1d569dc717da8b Author: Dave Airlie airl...@redhat.com Date: Tue Jul 17 16:05:09 2012 +1000 xf86-video-savage: bump to version 2.3.6 Signed-off-by: Dave Airlie airl...@redhat.com diff --git a/configure.ac b/configure.ac index 5e4fbe2..2b99314 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-savage], -[2.3.5], +[2.3.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-savage]) AC_CONFIG_SRCDIR([Makefile.am]) commit d7edd7c545473d5ed80c9a46c1405042267a7293 Author: Dave Airlie airl...@redhat.com Date: Mon Jul 16 03:39:32 2012 +0100 savage: make build with no xaa server. This fixes savage build against the no XAA server. Signed-off-by: Dave Airlie airl...@redhat.com diff --git a/configure.ac b/configure.ac index ca60e76..5e4fbe2 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,24 @@ if test $DRI = yes; then AC_DEFINE(SAVAGEDRI_DEVEL,1,[Enable developmental DRI driver support]) fi +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA=$enableval], + [XAA=auto]) +if test x$XAA != xno; then +save_CFLAGS=$CFLAGS +save_CPPFLAGS=$CPPFLAGS +CFLAGS=$XORG_CFLAGS +CPPFLAGS=$XORG_CFLAGS +AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) +CFLAGS=$save_CFLAGS +CPPFLAGS=$save_CPPFLAGS
xserver-xorg-video-savage: Changes to 'ubuntu'
ChangeLog| 86 + configure.ac |6 - debian/changelog | 14 src/Makefile.am |1 src/savage_accel.c |4 - src/savage_bci.h |7 -- src/savage_common.h |6 - src/savage_dri.c | 170 +++ src/savage_dri.h |6 - src/savage_dripriv.h |6 - src/savage_driver.c | 46 +++-- src/savage_driver.h | 11 ++- src/savage_drm.h | 12 +-- src/savage_exa.c |8 +- src/savage_hwmc.c|1 src/savage_i2c.c |5 - src/savage_pciids.h | 55 src/savage_regs.h|6 - src/savage_sarea.h | 12 +-- src/savage_streams.h |7 -- src/savage_vbe.h |6 - src/savage_video.c | 12 +-- 22 files changed, 287 insertions(+), 200 deletions(-) New commits: commit f988cfa5407d54c5ba133bbac10ecbf41aa71580 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Fri Jun 8 15:14:43 2012 +0200 Merge from Debian * Merge from Debian Testing. Remaining Ubuntu changes: - 100_bustype_pci_by_default.diff (LP: 33617, 37218) diff --git a/debian/changelog b/debian/changelog index 1832774..7666441 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-savage (1:2.3.4-1ubuntu1) UNRELEASED; urgency=low + + * Merge from Debian Testing. Remaining Ubuntu changes: +- 100_bustype_pci_by_default.diff (LP: 33617, 37218) + + -- Maarten Lankhorst maarten.lankho...@canonical.com Fri, 08 Jun 2012 15:13:45 +0200 + xserver-xorg-video-savage (1:2.3.4-1) unstable; urgency=low * New upstream release commit a148cd99785b5312d923ad0df34b56bf1b32063e Author: Julien Cristau jcris...@debian.org Date: Tue May 8 11:44:47 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index b3463ff..e68bc48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-video-savage (1:2.3.4-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.4-1) unstable; urgency=low * New upstream release + Fix for new vgahw ABI (closes: #671800) - -- Julien Cristau jcris...@debian.org Tue, 08 May 2012 11:32:10 +0200 + -- Julien Cristau jcris...@debian.org Tue, 08 May 2012 11:44:31 +0200 xserver-xorg-video-savage (1:2.3.3-1) unstable; urgency=low commit ddf889f135e1df01ea71d36574dcb00084f0cd71 Author: Julien Cristau jcris...@debian.org Date: Tue May 8 11:35:07 2012 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 9c3d48e..eda84db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,89 @@ +commit 63dd44674a28263c5d8d6aec8b72e95f94d3fe6c +Author: Alan Coopersmith alan.coopersm...@oracle.com +Date: Fri Mar 23 19:46:12 2012 -0700 + +xf86-video-savage 2.3.4 + +Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com + +commit dfcc325f55d580eb630f3b236eadf99f6b7d6ad6 +Author: Alan Coopersmith alan.coopersm...@oracle.com +Date: Fri Mar 23 19:38:07 2012 -0700 + +Add savage_pciids.h to src/Makefile.am to fix distcheck + +Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com + +commit c4022796ec69bb3223d435d8442f9168aebe9c3d +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Tue Jan 17 15:35:39 2012 +1000 + +Untangle XF86DRI from the driver-specific DRI define + +XF86DRI is defined by xorg-server.h, so --disable-dri in the driver +itself does exactly nothing other than not fill in the CFLAGS and thus stop +the driver from compiling. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Signed-off-by: Tormod Volden debian.tor...@gmail.com + +commit 05f74bd80018bc503ff5631b357fc0b02df6187f +Author: Andrew Turner and...@fubar.geek.nz +Date: Fri Oct 14 00:18:40 2011 +0200 + +Merge almost identical code in SAVAGEInitVisualConfigs + +https://bugs.freedesktop.org/show_bug.cgi?id=9961 + +Signed-off-by: Andrew Turner and...@fubar.geek.nz +[Tormod: Rename table to SAVAGEVisuals] +Signed-off-by: Tormod Volden debian.tor...@gmail.com + +commit 0600b7279382c66445506fa98dc50299574a1abd +Author: Tormod Volden debian.tor...@gmail.com +Date: Sun Dec 4 23:36:19 2011 +0100 + +Avoid leading underscores in #include guards + +In a user header file, the macro name should not begin with `_' +http://gcc.gnu.org/onlinedocs/cpp/Once_002dOnly-Headers.html + +Signed-off-by: Tormod Volden debian.tor...@gmail.com + +commit 10f319e43f77fef450aa723eff25bd200600c48d +Author: Tormod Volden debian.tor...@gmail.com +Date: Sun Dec 4 23:36:18 2011 +0100 + +Do not use the deprecated xf86PciInfo.h from xserver + +Instead maintain our own list of supported PCI IDs. + +Signed-off-by: Tormod Volden debian.tor...@gmail.com + +commit c3eaacd25358c225e355a1ea7d64dece8188b69a +Author: Adam Jackson a...@redhat.com +Date: Mon Dec 19 17:23:35 2011 -0500 + +Fix for new vgahw ABI + +
xserver-xorg-video-savage: Changes to 'ubuntu'
.gitignore | 78 +++ COPYING | 118 - ChangeLog | 487 + Makefile.am | 12 configure.ac| 50 +- debian/README.source| 24 - debian/changelog| 74 +++ debian/compat |2 debian/control | 24 - debian/copyright| 71 +++ debian/patches/101_fix_use_of_privates.diff | 23 - 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 | 59 -- man/savage.man |1 src/savage_accel.c |3 src/savage_cursor.c |6 src/savage_dga.c|8 src/savage_dri.c| 269 ++-- src/savage_driver.c | 47 -- src/savage_driver.h | 15 src/savage_exa.c|7 src/savage_hwmc.c | 10 src/savage_vbe.c| 10 src/savage_video.c | 79 ++- 29 files changed, 1145 insertions(+), 1376 deletions(-) New commits: commit df43dfb3c5e47901fad6fd3aafac16867e526fac Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com Date: Fri Dec 16 12:20:24 2011 +1100 Merge in changelog entries missing from git. Yay! diff --git a/debian/changelog b/debian/changelog index 0cd725c..943539b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,19 @@ xserver-xorg-video-savage (1:2.3.3-1) unstable; urgency=low -- Julien Cristau jcris...@debian.org Sun, 23 Oct 2011 17:15:11 +0200 +xserver-xorg-video-savage (1:2.3.2-3ubuntu2) natty; urgency=low + + * Rebuild to pick up new Xserver dependencies + + -- Christopher James Halse Rogers r...@ubuntu.com Wed, 09 Mar 2011 14:51:44 +1100 + +xserver-xorg-video-savage (1:2.3.2-3ubuntu1) natty; urgency=low + + * Merge from Debian unstable. Remaining changes: +- 100_bustype_pci_by_default.diff (LP: 33617, 37218) + + -- Tormod Volden debian.tor...@gmail.com Tue, 22 Feb 2011 08:12:33 +0100 + xserver-xorg-video-savage (1:2.3.2-3) unstable; urgency=low * Merge from upstream up to aff8f966c6d3f7dbad2d92d040ce7f5c4b286eef commit 18230696438fbe7a5d2d83947c594cbc3aef9970 Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com Date: Fri Dec 16 12:16:42 2011 +1100 Finish documenting merge in changelog diff --git a/debian/changelog b/debian/changelog index 225ba05..0cd725c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ xserver-xorg-video-savage (1:2.3.3-1ubuntu1) precise; urgency=low * Merge from Debian Testing. Remaining Ubuntu changes: -- +- 100_bustype_pci_by_default.diff (LP: 33617, 37218) -- Christopher James Halse Rogers r...@ubuntu.com Fri, 16 Dec 2011 12:10:26 +1100 commit 6799a197f1ecd0079002e6d24c3aaa9f6bb304a4 Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com Date: Fri Dec 16 12:13:51 2011 +1100 Remove 101_fix_use_of_privates; fixed upstream diff --git a/debian/patches/101_fix_use_of_privates.diff b/debian/patches/101_fix_use_of_privates.diff deleted file mode 100644 index 641ccd1..000 --- a/debian/patches/101_fix_use_of_privates.diff +++ /dev/null @@ -1,23 +0,0 @@ -From 830e58d086828fa0431303df32a847ddd3022654 Mon Sep 17 00:00:00 2001 -From: Keith Packard kei...@keithp.com -Date: Thu, 25 Nov 2010 01:58:06 + -Subject: savage: fix use of privates without initialisation - -Fixes bug 31614. - -Signed-off-by: Dave Airlie airl...@redhat.com -diff --git a/src/savage_driver.c b/src/savage_driver.c -index 7c3ce90..1cb91f6 100644 a/src/savage_driver.c -+++ b/src/savage_driver.c -@@ -4267,6 +4267,7 @@ SavageUpdateKey(ScrnInfoPtr pScrn, int r, int g, int b) - ol = 0; - } - if (!(pScreen = pScrn-pScreen) -+ || !psav-FBStart2nd - || !(pScrOvlPriv = fbOverlayGetScrPriv(pScreen))) - return; - key = ((Shift(r,psav-overlay.redShift) psav-overlay.redMask) --- -cgit v0.8.3-6-g21f6 diff --git a/debian/patches/series b/debian/patches/series index c063179..ddccdcf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 03_request_16bit_depth.diff 100_bustype_pci_by_default.diff -101_fix_use_of_privates.diff commit 6a72e9198a2f0e1add63c12ac65ca4127203d5c2 Author: Julien Cristau
xserver-xorg-video-savage: Changes to 'ubuntu'
debian/changelog |7 +++ debian/control |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit cee3c821690c8f5f611e014a20117b2d81809a50 Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com Date: Tue Feb 1 22:27:49 2011 +1100 Really really build against Xserver 1.10 diff --git a/debian/changelog b/debian/changelog index e73bf1d..44da688 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-savage (1:2.3.1-2ubuntu5) natty; urgency=low + + * debian/control: Bump build-depends on xserver-xorg-dev to really, +really build against Xserver 1.10 + + -- Christopher James Halse Rogers r...@ubuntu.com Tue, 01 Feb 2011 22:27:21 +1100 + xserver-xorg-video-savage (1:2.3.1-2ubuntu4) natty; urgency=low * Rebuild against Xserver 1.10 diff --git a/debian/control b/debian/control index fa2a5d1..2358ad1 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,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.99.901+git20110131), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, -- 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/e1pkep9-00016r...@alioth.debian.org
xserver-xorg-video-savage: Changes to 'ubuntu'
debian/changelog| 21 - debian/patches/101_fix_use_of_privates.diff | 23 +++ debian/patches/series |1 + 3 files changed, 44 insertions(+), 1 deletion(-) New commits: commit a409ee1e228b0da0a91193c2531ca3d83407f537 Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com Date: Tue Feb 1 16:32:00 2011 +1100 Merge changes since 1ubuntu2 into git diff --git a/debian/changelog b/debian/changelog index 5bb193a..e73bf1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +xserver-xorg-video-savage (1:2.3.1-2ubuntu4) natty; urgency=low + + * Rebuild against Xserver 1.10 + + -- Bryce Harrington br...@ubuntu.com Mon, 31 Jan 2011 18:38:53 -0800 + +xserver-xorg-video-savage (1:2.3.1-2ubuntu3) natty; urgency=low + + * 101_fix_use_of_privates.diff: From upstream, fixes crashes due to +use of uninitialized privates. LP: #635362 + + -- Tormod Volden debian.tor...@gmail.com Thu, 16 Dec 2010 00:14:17 +0100 + +xserver-xorg-video-savage (1:2.3.1-2ubuntu2) maverick; urgency=low + + * No-change rebuild against Xserver 1.9 ABI + + -- Christopher James Halse Rogers r...@ubuntu.com Mon, 09 Aug 2010 13:40:59 +1000 + xserver-xorg-video-savage (1:2.3.1-2ubuntu1) maverick; urgency=low * Merge from Debian unstable. remaining changes: diff --git a/debian/patches/101_fix_use_of_privates.diff b/debian/patches/101_fix_use_of_privates.diff new file mode 100644 index 000..641ccd1 --- /dev/null +++ b/debian/patches/101_fix_use_of_privates.diff @@ -0,0 +1,23 @@ +From 830e58d086828fa0431303df32a847ddd3022654 Mon Sep 17 00:00:00 2001 +From: Keith Packard kei...@keithp.com +Date: Thu, 25 Nov 2010 01:58:06 + +Subject: savage: fix use of privates without initialisation + +Fixes bug 31614. + +Signed-off-by: Dave Airlie airl...@redhat.com +--- +diff --git a/src/savage_driver.c b/src/savage_driver.c +index 7c3ce90..1cb91f6 100644 +--- a/src/savage_driver.c b/src/savage_driver.c +@@ -4267,6 +4267,7 @@ SavageUpdateKey(ScrnInfoPtr pScrn, int r, int g, int b) + ol = 0; + } + if (!(pScreen = pScrn-pScreen) ++ || !psav-FBStart2nd + || !(pScrOvlPriv = fbOverlayGetScrPriv(pScreen))) + return; + key = ((Shift(r,psav-overlay.redShift) psav-overlay.redMask) +-- +cgit v0.8.3-6-g21f6 diff --git a/debian/patches/series b/debian/patches/series index ddccdcf..c063179 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 03_request_16bit_depth.diff 100_bustype_pci_by_default.diff +101_fix_use_of_privates.diff commit 1d4ff03e22a23dc2f88b683cec0687fa92ebb7e0 Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com Date: Thu Jun 10 11:35:33 2010 +1000 Finalise changelog diff --git a/debian/changelog b/debian/changelog index f046cc6..5bb193a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-savage (1:2.3.1-2ubuntu1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.1-2ubuntu1) maverick; urgency=low * Merge from Debian unstable. remaining changes: - 10_bustype_pci_by_default.diff (LP: 33617, 37218) -- 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/e1pk8r5-0003cu...@alioth.debian.org
xserver-xorg-video-savage: Changes to 'ubuntu'
debian/README.source |2 +-
debian/changelog | 24
debian/control| 10 --
debian/rules | 14 +++---
debian/xsfbs/xsfbs.mk | 35 ++-
5 files changed, 58 insertions(+), 27 deletions(-)
New commits:
commit d404ae524cb59a89e72032c1d5944b675c5e7fb4
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 5e83aa8..5b3c71c 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,5 @@ Description: X.Org X server -- Savage 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-savage driver module.
commit bf54dba378b9d3bcec47b5660b1189dd915f3bbc
Author: Cyril Brulebois k...@debian.org
Date: Tue May 4 00:12:25 2010 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index afcaa05..b3467da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-savage (1:2.3.1-2) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -12,7 +12,7 @@ xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low
* Add myself to Uploaders.
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
- -- Julien Cristau jcris...@debian.org Sat, 23 Jan 2010 02:28:29 +0100
+ -- Cyril Brulebois k...@debian.org Tue, 04 May 2010 00:12:21 +0200
xserver-xorg-video-savage (1:2.3.1-1) experimental; urgency=low
commit 6bf0c9154258e5aaef1a090a9dfa44e70eccfcdb
Author: Cyril Brulebois k...@debian.org
Date: Tue May 4 00:12:07 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 de2e6e1..afcaa05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low
${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
accordingly.
* Add myself to Uploaders.
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Julien Cristau jcris...@debian.org Sat, 23 Jan 2010 02:28:29 +0100
diff --git a/debian/control b/debian/control
index 10f8630..5e83aa8 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,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-savage
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git
commit b6cbf1dcceca5cbeafc7a18ac0c6b536ae296abb
Author: Cyril Brulebois k...@debian.org
Date: Tue May 4 00:11:29 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index af319da..de2e6e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low
* Update to new xsfbs, replace deprecated ${xserver:Depends} with
${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
accordingly.
+ * Add myself to Uploaders.
-- Julien Cristau jcris...@debian.org Sat, 23 Jan 2010 02:28:29 +0100
diff --git a/debian/control b/debian/control
index 37225fb..10f8630 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-savage
Section: x11
Priority: optional
Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin
bgog...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin
bgog...@debian.org, Cyril Brulebois k...@debian.org
Build-Depends:
debhelper (= 5.0.0),
pkg-config,
commit c4de24d35380d442787ef3314a47a000e695cba2
Author: Cyril Brulebois k...@debian.org
Date: Tue May 4 00:10:53 2010 +0200
Update to new xsfbs, replace deprecated ${xserver:Depends} with
${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly.
diff --git a/debian/changelog b/debian/changelog
index 572cde6..af319da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ [ Cyril Brulebois ]
+ * Update to new xsfbs, replace deprecated ${xserver:Depends} with
+${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
+accordingly.
+
-- Julien Cristau jcris...@debian.org Sat, 23 Jan 2010 02:28:29 +0100
xserver-xorg-video-savage: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit 169c13406013b4f53be6092f2e011b57fa72651f Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Mon Dec 7 22:54:35 2009 +0200 Change the maintainer address. commit a6ccf3a5e187f7c84045901a1d5ccaec36087110 Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Mon Dec 7 22:53:19 2009 +0200 Initial merge. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
