xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/changelog | 10
debian/control | 5
debian/patches/disable-uxa-render-accel-on-i8xx.patch | 27 --
debian/patches/series | 1
debian/rules | 2
debian/xsfbs/xsfbs.mk | 4
debian/xsfbs/xsfbs.sh | 229 ------------------
7 files changed, 14 insertions(+), 264 deletions(-)
New commits:
commit 147607344aef41eb33b99390048dc51bb5362888
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 17 20:55:49 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 692cb1c..d0e5dab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.8.1-2) unstable; urgency=low
* Re-enable render accel on 8xx. The major problem turned out to be related
to agp chipset flushing (see #541307), so hopefully this should work now.
@@ -6,7 +6,7 @@ xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.3 (no changes).
* Mention intel_reg_dumper in the debug package's long description.
- -- Julien Cristau <jcristau@debian.org> Thu, 17 Sep 2009 20:43:00 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 17 Sep 2009 20:55:47 +0200
xserver-xorg-video-intel (2:2.8.1-1) unstable; urgency=low
commit 1407fc2b995dd3a675d62684c90e1d5f8510b77b
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 17 20:55:45 2009 +0200
Mention intel_reg_dumper in the debug package's long description.
diff --git a/debian/changelog b/debian/changelog
index e1a6c70..692cb1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
to agp chipset flushing (see #541307), so hopefully this should work now.
* Add missing xsfclean dependency to debian/rules clean.
* Bump Standards-Version to 3.8.3 (no changes).
+ * Mention intel_reg_dumper in the debug package's long description.
-- Julien Cristau <jcristau@debian.org> Thu, 17 Sep 2009 20:43:00 +0200
diff --git a/debian/control b/debian/control
index 4708052..59ff804 100644
--- a/debian/control
+++ b/debian/control
@@ -65,4 +65,5 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver (debug symbols)
This driver provides support for the Intel i8xx and i9xx family of chipsets,
including i810, i815, i830, i845, i855, i865, i915, and i945 series chips.
.
- This package provides debugging symbols for this Xorg X driver.
+ This package provides debugging symbols for this Xorg X driver, and the
+ intel_reg_dumper helper.
commit 81fe356496798c1d448ccd2522844a44bd1bf64b
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 17 20:54:47 2009 +0200
Bump Standards-Version to 3.8.3 (no changes).
diff --git a/debian/changelog b/debian/changelog
index 462c866..e1a6c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
* Re-enable render accel on 8xx. The major problem turned out to be related
to agp chipset flushing (see #541307), so hopefully this should work now.
* Add missing xsfclean dependency to debian/rules clean.
+ * Bump Standards-Version to 3.8.3 (no changes).
-- Julien Cristau <jcristau@debian.org> Thu, 17 Sep 2009 20:43:00 +0200
diff --git a/debian/control b/debian/control
index 2423310..4708052 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
commit 3784cf39a9dea434538fb8ba22c9b77fbc40d478
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 17 20:52:52 2009 +0200
Add missing xsfclean dependency to debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index 39f59bf..462c866 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
* Re-enable render accel on 8xx. The major problem turned out to be related
to agp chipset flushing (see #541307), so hopefully this should work now.
+ * Add missing xsfclean dependency to debian/rules clean.
-- Julien Cristau <jcristau@debian.org> Thu, 17 Sep 2009 20:43:00 +0200
diff --git a/debian/rules b/debian/rules
index a907d80..e58d55a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
>$@
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
commit b201b6b07abecac8cca8108fb3d7d517e75ce3b3
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 17 20:44:38 2009 +0200
Re-enable render accel on 8xx.
The major problem turned out to be related to agp chipset flushing (see
#541307), so hopefully this should work now.
diff --git a/debian/changelog b/debian/changelog
index 6542682..39f59bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
+
+ * Re-enable render accel on 8xx. The major problem turned out to be related
+ to agp chipset flushing (see #541307), so hopefully this should work now.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 17 Sep 2009 20:43:00 +0200
+
xserver-xorg-video-intel (2:2.8.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/disable-uxa-render-accel-on-i8xx.patch b/debian/patches/disable-uxa-render-accel-on-i8xx.patch
deleted file mode 100644
index 6cb74f2..0000000
--- a/debian/patches/disable-uxa-render-accel-on-i8xx.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cb66b0945fcb86027cf74d22c1c061bf611564c4 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Fri, 31 Jul 2009 21:24:12 +0200
-Subject: [PATCH] disable uxa render accel on i8xx
-
----
- src/i830_uxa.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/i830_uxa.c b/src/i830_uxa.c
-index 2050c48..5ab266f 100644
---- a/src/i830_uxa.c
-+++ b/src/i830_uxa.c
-@@ -709,8 +709,8 @@ i830_uxa_init (ScreenPtr pScreen)
-
- /* Composite */
- if (!IS_I9XX(i830)) {
-- i830->uxa_driver->check_composite = i830_check_composite;
-- i830->uxa_driver->prepare_composite = i830_prepare_composite;
-+ i830->uxa_driver->check_composite = NULL;
-+ i830->uxa_driver->prepare_composite = NULL;
- i830->uxa_driver->composite = i830_composite;
- i830->uxa_driver->done_composite = i830_done_composite;
- } else if (IS_I915G(i830) || IS_I915GM(i830) ||
---
-1.6.3.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 7601b0f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-disable-uxa-render-accel-on-i8xx.patch
commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
- # does the operand contain any whitespace?
- if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- msg
-
- reject_whitespace "$1"
- message "Searching for overlapping packages..."
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
- if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
- "(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$possible_culprits" ]; then
- smoking_guns=$(grep -l "$1" $possible_culprits || true)
- if [ -n "$smoking_guns" ]; then
- bad_packages=$(printf "\\n")
- for f in $smoking_guns; do
- # too bad you can't nest parameter expansion voodoo
- p=${f%*.list} # strip off the trailing ".list"
- package=${p##*/} # strip off the directories
- bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
- done
- msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy. Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install". If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove". If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System. You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
- message "$msg"
- message "The overlapping packages are: $bad_packages"
- else
- message "no overlaps found."
- fi
- fi
- else
- message "cannot search; no matches for $dpkg_info_dir/*.list."
- fi
- else
- message "cannot search; $dpkg_info_dir does not exist."
- fi
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:06 2009 +0200
xsfbs.sh: remove unused maplink function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-
-maplink () {
- # returns what symlink should point to; i.e., what the "sane" answer is
- # Keep this in sync with the debian/*.links files.
- # This is only needed for symlinks to directories.
- #
- # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
- # If we've stopped using this function, fixing it might enable us to re-enable
- # it again and catch more errors.
- case "$1" in
- /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
- /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
- /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
- /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
- /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
- /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
- /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
- /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
- /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
- /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
- /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
- /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
- /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
- /usr/bin/X11) echo ../X11R6/bin ;;
- /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
- /usr/include/X11) echo ../X11R6/include/X11 ;;
- /usr/lib/X11) echo ../X11R6/lib/X11 ;;
- *) internal_error "maplink() called with unknown path \"$1\"" ;;
- esac
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:21:34 2009 +0200
xsfbs.sh: remove unused analyze_path
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 4461b1a..f869274 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -230,32 +230,6 @@ maplink () {
esac
}
-analyze_path () {
- # given a supplied set of pathnames, break each one up by directory and do an
- # ls -dl on each component, cumulatively; i.e.
- # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
- # Thanks to Randolph Chung for this clever hack.
-
- local f g
-
- while [ -n "$1" ]; do
- reject_whitespace "$1"
- g=
- message "Analyzing $1:"
- for f in $(echo "$1" | tr / \ ); do
- if [ -e /$g$f ]; then
- ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
- g=$g$f/
- else
- message "/$g$f: nonexistent; directory contents of /$g:"
- ls -l /$g
- break
- fi
- done
- shift
- done
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:20:11 2009 +0200
xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 781826f..4461b1a 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,115 +303,6 @@ EOF
fi
}
-check_symlink () {
- # syntax: check_symlink symlink
- #
- # See if specified symlink points where it is supposed to. Return 0 if it
- # does, and 1 if it does not.
- #
- # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
-
- local symlink
-
- # validate arguments
- if [ $# -ne 1 ]; then
- usage_error "check_symlink() called with wrong number of arguments;" \
- "expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- symlink="$1"
-
- if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then
- return 0
- else
- return 1
- fi
-}
-
-check_symlinks_and_warn () {
- # syntax: check_symlinks_and_warn symlink ...
- #
- # For each argument, check for symlink sanity, and warn if it isn't sane.
- #
- # Call this function from a preinst script in the event $1 is "upgrade" or
- # "install".
-
- local errmsg symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_warn() called with wrong number of" \
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- observe "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink"); removing"
- rm "$symlink"
- fi
- elif [ -e "$symlink" ]; then
- errmsg="$symlink exists and is not a symbolic link; this package cannot"
- errmsg="$errmsg be installed until this"
- if [ -f "$symlink" ]; then
- errmsg="$errmsg file"
- elif [ -d "$symlink" ]; then
- errmsg="$errmsg directory"
- else
- errmsg="$errmsg thing"
- fi
- errmsg="$errmsg is removed"
- die "$errmsg"
- fi
- shift
- done
-}
-
-check_symlinks_and_bomb () {
- # syntax: check_symlinks_and_bomb symlink ...
- #
- # For each argument, check for symlink sanity, and bomb if it isn't sane.
- #
- # Call this function from a postinst script.
-
- local problem symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_bomb() called with wrong number of"
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- problem=
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- problem=yes
- warn "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink")"
- fi
- elif [ -e "$symlink" ]; then
- problem=yes
- warn "$symlink is not a symbolic link"
- else
- problem=yes
- warn "$symlink symbolic link does not exist"
- fi
- if [ -n "$problem" ]; then
- analyze_path "$symlink" "$(readlink "$symlink")"
- find_culprits "$symlink"
- die "bad symbolic links on system"
- fi
- shift
- done
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
Reply to: