xserver-xorg-video-glint: Changes to 'debian-unstable'
ChangeLog | 12 ++++++++++++
aclocal.m4 | 2 +-
configure | 20 ++++++++++----------
configure.ac | 2 +-
debian/changelog | 8 ++++++++
debian/control | 2 +-
ltmain.sh | 2 +-
src/glint_driver.c | 2 +-
8 files changed, 35 insertions(+), 15 deletions(-)
New commits:
commit 12ba29b87081affd36e11ef90031c641cdca83bb
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 1 20:11:30 2008 +0200
Prepare changelog for upload
and add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 0c218b5..cd8fb73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xserver-xorg-video-glint (1:1.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-glint (1:1.2.1-1) unstable; urgency=low
* New upstream release.
+ Fix regression from pciaccess conversion, closes: #486786.
+ * Add myself to Uploaders.
- -- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 20:10:02 +0200
+ -- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 20:12:04 +0200
xserver-xorg-video-glint (1:1.2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f095cc6..47ab754 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-glint
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, libgl1-mesa-dev | libgl-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev, dpkg-dev (>= 1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glint
commit 9bde9775f210a114c44de265b032f383a9e6a058
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 1 20:11:21 2008 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index c028306..03f7684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+commit a68acd796e14742615eb071819b2910f69346a2b
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Jun 30 17:56:27 2008 +0200
+
+ Bump to 1.2.1
+
+commit 9c4f5ec0c8a5b48b9b923798175cc6e66932f8ed
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue Jun 24 03:17:32 2008 +0200
+
+ Fix regression from pciaccess conversion (bug#16060)
+
commit 27da4e81ea2eceed69b37a5c6a19def9d1146258
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 14:01:42 2008 -0400
diff --git a/aclocal.m4 b/aclocal.m4
index ef947f1..62b902b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/configure b/configure
index bb4b311..0edc555 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-glint 1.2.0.
+# Generated by GNU Autoconf 2.61 for xf86-video-glint 1.2.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-glint'
PACKAGE_TARNAME='xf86-video-glint'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='xf86-video-glint 1.2.0'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='xf86-video-glint 1.2.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1428,7 +1428,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-glint 1.2.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-glint 1.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1498,7 +1498,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-glint 1.2.0:";;
+ short | recursive ) echo "Configuration of xf86-video-glint 1.2.1:";;
esac
cat <<\_ACEOF
@@ -1617,7 +1617,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-glint configure 1.2.0
+xf86-video-glint configure 1.2.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1631,7 +1631,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-glint $as_me 1.2.0, which was
+It was created by xf86-video-glint $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2326,7 +2326,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-glint'
- VERSION='1.2.0'
+ VERSION='1.2.1'
cat >>confdefs.h <<_ACEOF
@@ -22318,7 +22318,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-glint $as_me 1.2.0, which was
+This file was extended by xf86-video-glint $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22371,7 +22371,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-glint config.status 1.2.0
+xf86-video-glint config.status 1.2.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 3b9a98b..0c218b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-glint (1:1.2.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ + Fix regression from pciaccess conversion, closes: #486786.
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 20:10:02 +0200
+
xserver-xorg-video-glint (1:1.2.0-1) unstable; urgency=low
[ Brice Goglin ]
diff --git a/ltmain.sh b/ltmain.sh
index 5def351..0bf3848 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-1"
+VERSION="1.5.26 Debian 1.5.26-4"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
commit a68acd796e14742615eb071819b2910f69346a2b
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 30 17:56:27 2008 +0200
Bump to 1.2.1
diff --git a/configure.ac b/configure.ac
index aa46117..238e5b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-glint],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-glint)
commit 9c4f5ec0c8a5b48b9b923798175cc6e66932f8ed
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 24 03:17:32 2008 +0200
Fix regression from pciaccess conversion (bug#16060)
diff --git a/src/glint_driver.c b/src/glint_driver.c
index eb375ec..47127f9 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -1408,7 +1408,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
pGlint->IOAddress = pGlint->pEnt->device->IOBase;
from = X_CONFIG;
} else {
- pGlint->IOAddress = PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0, REGION_MEM) & 0xFFFFC000;
+ pGlint->IOAddress = PCI_REGION_BASE(pGlint->PciInfo, 0, REGION_MEM) & 0xFFFFC000;
}
if ((IS_J2000) && (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)) {
Reply to: