xserver-xorg-video-vesa: Changes to 'debian-unstable'
ChangeLog | 40 +++++++++++++++++++++++++++++++++++++++
configure.ac | 12 +----------
debian/changelog | 11 ++++++++++
debian/compat | 2 -
debian/control | 9 +++-----
debian/rules | 4 ++-
debian/upstream/signing-key.asc | 41 ++++++++++++++++++++++++++++++++++++++++
debian/watch | 1
src/vesa.c | 2 -
src/vesa.h | 3 --
10 files changed, 103 insertions(+), 22 deletions(-)
New commits:
commit c9c610f658193b1fa0e17a997a0fb960ca7a2dbd
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 16:55:52 2015 +0000
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 8f282e9..835678b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-xserver-xorg-video-vesa (1:2.3.4-1) UNRELEASED; urgency=medium
+xserver-xorg-video-vesa (1:2.3.4-1) unstable; urgency=medium
+ * Team upload.
* New upstream release.
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
* Bump debhelper compat level to 9.
* Bump Standards-Version to 3.9.6 and update Vcs-* control fields.
- -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 16:41:17 +0000
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 16:55:39 +0000
xserver-xorg-video-vesa (1:2.3.3-1) unstable; urgency=low
commit 2f7771fa4f03be854a0e4f308809a2a2741f7f39
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 16:55:04 2015 +0000
Bump Standards-Version to 3.9.6 and update Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 25faab1..8f282e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-vesa (1:2.3.4-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
* Bump debhelper compat level to 9.
+ * Bump Standards-Version to 3.9.6 and update Vcs-* control fields.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 16:41:17 +0000
diff --git a/debian/control b/debian/control
index b65618e..4441002 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,9 @@ Build-Depends:
xutils-dev (>= 1:7.5+4),
quilt,
libpciaccess-dev (>= 0.12.901),
-Standards-Version: 3.9.4
-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-video-vesa.git
Package: xserver-xorg-video-vesa
Architecture: any
commit e49ba6643066b44a5a60846286726af3120b7f6e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 16:54:29 2015 +0000
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index a8435a7..25faab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-vesa (1:2.3.4-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
+ * Bump debhelper compat level to 9.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 16:41:17 +0000
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 36c3576..b65618e 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>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
pkg-config,
xserver-xorg-dev (>= 2:1.11),
diff --git a/debian/rules b/debian/rules
index 496a59a..07b1eab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
#!/usr/bin/make -f
override_dh_auto_configure:
- dh_auto_configure -- --disable-silent-rules
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ --libdir=/usr/lib
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
commit 04d296a6dd8306cf2189699337aef2e52048dafc
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 16:53:29 2015 +0000
Remove Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index e9fbfff..a8435a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-vesa (1:2.3.4-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
+ * Remove Cyril from Uploaders.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 16:41:17 +0000
diff --git a/debian/control b/debian/control
index f35f0b0..36c3576 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-video-vesa
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
commit 00bf5597f233ab5278b92090395300745293eb26
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 16:53:14 2015 +0000
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 19aec4e..e625fcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+commit b49c293e67cd88424ff40a2ca4e58b28528691d7
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 16 11:56:32 2015 -0400
+
+ vesa 2.3.4
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 190fdaaa1d6d317be3ef78855df805b3b3e5a239
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 16 11:57:59 2015 -0400
+
+ Don't include deprecated xf86PciInfo.h
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit e667a9a2e5b61b2edd8643c7eed1d64d3948bc42
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jun 11 09:56:59 2015 -0400
+
+ configure: Drop PanelID test
+
+ vbe grew PanelID support in xserver 1.4; since we now require 1.6 we can
+ remove the test. Which is good, because it appears to have been broken
+ by the scrnIndex->pScrn conversion, as vbe.h doesn't include xf86str.h
+ so ScrnInfoPtr was never defined and the test failed.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit e36a0a8bcfd2bfa0b3878068f16361b3fd34b5d4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jan 30 15:42:52 2014 -0800
+
+ Raise required version of xorg-server to >= 1.6
+
+ Needed for Xorg to define/export xf86GTFMode(), introduced in
+ xorg-server release 1.6.0 / commit ca5625b911e65fdfd4.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit 3e5d56d94720db7a9b97809f15e2432014d94553
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 9 21:14:03 2013 +0200
diff --git a/debian/changelog b/debian/changelog
index c6a3a92..e9fbfff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-vesa (1:2.3.3-2) UNRELEASED; urgency=medium
+xserver-xorg-video-vesa (1:2.3.4-1) UNRELEASED; urgency=medium
+ * New upstream release.
* Let uscan verify tarball signatures.
- -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 16:40:16 +0000
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 16:41:17 +0000
xserver-xorg-video-vesa (1:2.3.3-1) unstable; urgency=low
commit 96534bf26083978e1a4d885d75ed8a7692ff6825
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 16:40:31 2015 +0000
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index a285ed1..c6a3a92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vesa (1:2.3.3-2) UNRELEASED; urgency=medium
+
+ * Let uscan verify tarball signatures.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 16:40:16 +0000
+
xserver-xorg-video-vesa (1:2.3.3-1) unstable; urgency=low
[ Maarten Lankhorst ]
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..88e240c
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+GBF1
+=bYOv
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 5794695..0aaa6b2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-vesa
version=3
+opts="pgpsigurlmangle=s/$/.sig/" \
http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-vesa-(.*)\.tar\.gz
commit b49c293e67cd88424ff40a2ca4e58b28528691d7
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 16 11:56:32 2015 -0400
vesa 2.3.4
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 0b22eff..4aad8a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vesa],
- [2.3.3],
+ [2.3.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vesa])
AC_CONFIG_SRCDIR([Makefile.am])
commit 190fdaaa1d6d317be3ef78855df805b3b3e5a239
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 16 11:57:59 2015 -0400
Don't include deprecated xf86PciInfo.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/vesa.h b/src/vesa.h
index bcc9e37..6332c6c 100644
--- a/src/vesa.h
+++ b/src/vesa.h
@@ -43,9 +43,6 @@
#include "compiler.h"
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
#include "vgaHW.h"
/* Drivers that need to access the PCI config space directly need this */
commit e667a9a2e5b61b2edd8643c7eed1d64d3948bc42
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 11 09:56:59 2015 -0400
configure: Drop PanelID test
vbe grew PanelID support in xserver 1.4; since we now require 1.6 we can
remove the test. Which is good, because it appears to have been broken
by the scrnIndex->pScrn conversion, as vbe.h doesn't include xf86str.h
so ScrnInfoPtr was never defined and the test failed.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 79532ab..0b22eff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,14 +75,6 @@ CFLAGS="$save_CFLAGS"
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
-AC_CHECK_DECL(VBEReadPanelID,
- [AC_DEFINE(HAVE_PANELID, 1, [Have VBE PanelID call])],
- [],
- [#include "vbe.h"])
-CFLAGS="$save_CFLAGS"
-
-save_CFLAGS="$CFLAGS"
-CFLAGS="$XORG_CFLAGS"
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
[#include "xorg-server.h"])
diff --git a/src/vesa.c b/src/vesa.c
index 9e3a112..564bb06 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -733,13 +733,11 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
if ((pScrn->monitor->DDC = pVesa->monitor) != NULL)
xf86SetDDCproperties(pScrn, pVesa->monitor);
-#ifdef HAVE_PANELID
else {
void *panelid = VBEReadPanelID(pVesa->pVbe);
VBEInterpretPanelID(SCRN_OR_INDEX_ARG(pScrn), panelid);
free(panelid);
}
-#endif
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB,
"Searching for matching VESA mode(s):\n");
commit e36a0a8bcfd2bfa0b3878068f16361b3fd34b5d4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jan 30 15:42:52 2014 -0800
Raise required version of xorg-server to >= 1.6
Needed for Xorg to define/export xf86GTFMode(), introduced in
xorg-server release 1.6.0 / commit ca5625b911e65fdfd4.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 6ac2333..79532ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Obtain compiler/linker options for the driver dependencies
-PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES)
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes", HAVE_XEXTPROTO_71="no")
Reply to: