aclocal.m4 | 12 ++++++++----
configure | 48 ++++++++++++++++++++++++++----------------------
configure.ac | 4 ++--
debian/changelog | 8 ++++++--
debian/rules | 2 +-
5 files changed, 43 insertions(+), 31 deletions(-)
New commits:
commit 1e81b66ae59664b9a9f51017ee57a9ca9a98cb41
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Apr 13 02:10:28 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 09390a7..bd5d07b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.2.1-2) unstable; urgency=low
* Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to
bring in libpciaccess0 (closes: #467215).
@@ -9,7 +9,7 @@ xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
/usr/bin/Xorg and other modules, and that's not a bug, so we want
dpkg-shlibdeps to shut up about symbols it can't find.
- -- Julien Cristau <[EMAIL PROTECTED]> Sun, 24 Feb 2008 10:29:49 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]> Sun, 13 Apr 2008 02:10:18 +0200
xserver-xorg-video-intel (2:2.2.1-1) unstable; urgency=low
commit b151ec7d6d05b508f541f747d3e5bbc60b61eab2
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Apr 13 02:09:44 2008 +0200
Run dpkg-shlibdeps with --warnings=6
Drivers reference symbols from /usr/bin/Xorg and other modules, and
that's not a bug, so we want dpkg-shlibdeps to shut up about symbols it
can't find.
diff --git a/debian/changelog b/debian/changelog
index 9500ad5..09390a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
* Only build on x86, this package doesn't make sense anywhere else.
* The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix.
* configure: check for pciaccess 0.10 instead of 0.10.0 (closes: #470266).
+ * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
+ /usr/bin/Xorg and other modules, and that's not a bug, so we want
+ dpkg-shlibdeps to shut up about symbols it can't find.
-- Julien Cristau <[EMAIL PROTECTED]> Sun, 24 Feb 2008 10:29:49 +0100
diff --git a/debian/rules b/debian/rules
index 3ffd87f..fdaddeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_makeshlibs
- dh_shlibdeps
+ dh_shlibdeps -- --warnings=6
dh_installdeb
dh_gencontrol
dh_md5sums
commit b805eef766acdd095f4ab5d6e44abc246635eec4
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Apr 13 01:54:19 2008 +0200
Add bug closer
diff --git a/debian/changelog b/debian/changelog
index 56df6e0..9500ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
bring in libpciaccess0 (closes: #467215).
* Only build on x86, this package doesn't make sense anywhere else.
* The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix.
+ * configure: check for pciaccess 0.10 instead of 0.10.0 (closes: #470266).
-- Julien Cristau <[EMAIL PROTECTED]> Sun, 24 Feb 2008 10:29:49 +0100
commit 95ec757cae67f1cb1ca25e89b1541b0c2cc7ada7
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Mar 18 15:14:53 2008 +0100
autoreconf
diff --git a/aclocal.m4 b/aclocal.m4
index 9dc3d33..0d079c3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6876,7 +6876,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed
's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e
's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least
${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.5
+ [XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//'
-e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7025,7 +7025,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -7346,14 +7350,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
diff --git a/configure b/configure
index 4944cb6..f03d207 100755
--- a/configure
+++ b/configure
@@ -21807,12 +21807,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10.0"
2>/dev/null`
+ pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10"
2>/dev/null`
else
pkg_failed=yes
fi
@@ -21825,12 +21825,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10.0" 2>/dev/null`
+ pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21849,14 +21849,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "pciaccess >= 0.10"`
else
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "pciaccess >= 0.10"`
fi
# Put the nasty error message in config.log where it belongs
echo "$PCIACCESS_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (pciaccess >=
0.10.0) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements (pciaccess >=
0.10) were not met:
$PCIACCESS_PKG_ERRORS
@@ -21867,7 +21867,7 @@ Alternatively, you may set the environment variables
PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-echo "$as_me: error: Package requirements (pciaccess >= 0.10.0) were not met:
+echo "$as_me: error: Package requirements (pciaccess >= 0.10) were not met:
$PCIACCESS_PKG_ERRORS
@@ -21919,12 +21919,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10.0"
2>/dev/null`
+ pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10"
2>/dev/null`
else
pkg_failed=yes
fi
@@ -21937,12 +21937,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10.0" 2>/dev/null`
+ pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21961,9 +21961,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "pciaccess >= 0.10"`
else
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "pciaccess >= 0.10"`
fi
# Put the nasty error message in config.log where it belongs
echo "$PCIACCESS_PKG_ERRORS" >&5
@@ -22382,7 +22382,7 @@ DRIVER_NAME=intel
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e
's/^[0-9]*\.//' -e 's/\..*$//'`
{ echo "$as_me:$LINENO: checking if xorg-macros used to generate
configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}"
>&5
echo $ECHO_N "checking if xorg-macros used to generate configure is at least
${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}... $ECHO_C" >&6; }
- XORG_MACROS_version=1.1.5
+ XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//'
-e 's/\..*$//'`
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -22489,7 +22489,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
@@ -22498,7 +22498,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -22513,7 +22513,10 @@ _ACEOF
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
echo $ECHO_N "checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6; }
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -22536,6 +22539,7 @@ if test `eval echo '${'$as_ac_File'}'` = yes; then
HAVE_DEFS_ENT=yes
fi
+fi
# Extract the first word of "linuxdoc", so it can be a program name with args.
set dummy linuxdoc; ac_word=$2
commit 5928a54b77878157c0d670b926870b17c3d2f4e2
Author: Dave Airlie <[EMAIL PROTECTED]>
Date: Fri Mar 7 08:04:37 2008 +1000
fixup pciaccess version detect
(cherry picked from commit 81b2de05db0d17f356f551ccb5363317c1d821e3)
diff --git a/configure.ac b/configure.ac
index 5278f0b..dfe3e64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,9 +115,9 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
CFLAGS="$save_CFLAGS"
if test x$XSERVER_LIBPCIACCESS = xyes; then
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0])
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
else
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0],
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10],
have_libpciaccess=yes,
have_libpciaccess=no)
fi
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
