ChangeLog | 62
Makefile.in | 673
README | 20
aclocal.m4 | 8256 -----------
config.guess | 1526 --
config.h.in | 72
config.sub | 1658 --
configure |23300 --------------------------------
configure.ac | 2
debian/README.source | 73
debian/changelog | 23
debian/control | 18
debian/patches/01_gen_pci_ids.diff | 17
debian/patches/series | 1
debian/rules | 20
debian/xserver-xorg-video-tseng.install | 1
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 311
depcomp | 589
install-sh | 519
ltmain.sh | 6964 ---------
man/Makefile.in | 426
man/tseng.man | 2
missing | 367
mkinstalldirs | 161
src/Makefile.in | 552
src/tseng.h | 3
src/tseng_driver.c | 86
29 files changed, 257 insertions(+), 45498 deletions(-)
New commits:
commit cc80e1781f023b47ecf7f370120e9754c82820b3
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Dec 6 01:07:25 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index d8730c4..f9d6b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-xserver-xorg-video-tseng (1:1.2.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-tseng (1:1.2.3-1) experimental; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
choose a driver during autoconfiguration.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:13 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <k...@debian.org> Sun, 06 Dec 2009 01:07:18 +0100
xserver-xorg-video-tseng (1:1.2.1-1) unstable; urgency=low
commit 7e04b042cfb3083afb3b6d4fe0bafd224f920582
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat Dec 5 14:44:40 2009 +0200
Don't try to install the pci-ids.
diff --git a/debian/xserver-xorg-video-tseng.install
b/debian/xserver-xorg-video-tseng.install
index 8a9f4ba..614cfb4 100644
--- a/debian/xserver-xorg-video-tseng.install
+++ b/debian/xserver-xorg-video-tseng.install
@@ -1,3 +1,2 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
-usr/share/xserver-xorg/pci/*
commit 1b30d911c702ca75c32aadfbd4e98b42496dac28
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat Dec 5 10:08:21 2009 +0200
Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
choose a driver during autoconfiguration.
diff --git a/debian/changelog b/debian/changelog
index 5b8a0cb..d8730c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xserver-xorg-video-tseng (1:1.2.3-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
+ * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+ choose a driver during autoconfiguration.
-- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:13 +0200
diff --git a/debian/patches/01_gen_pci_ids.diff
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index d6d9a10..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- /dev/null
-+++ xserver-xorg-video-tseng/src/tseng.ids
-@@ -0,0 +1,5 @@
-+100C3202
-+100C3205
-+100C3206
-+100C3207
-+100C3208
---- xserver-xorg-video-tseng.orig/src/Makefile.am
-+++ xserver-xorg-video-tseng/src/Makefile.am
-@@ -37,3 +37,6 @@
- tseng.h \
- tseng_mode.c \
- tseng_pcirename.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = tseng.ids
diff --git a/debian/patches/series b/debian/patches/series
index b55d79f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
commit 4b5fb7f342d23531cef04d44b50a62f2070a1cc8
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat Dec 5 02:09:32 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 839127c..5b8a0cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-tseng (1:1.2.3-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 01 Dec 2009 10:54:05 +0200
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:13 +0200
xserver-xorg-video-tseng (1:1.2.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7d7dba0..6163906 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
automake,
libtool,
xutils-dev,
- xserver-xorg-dev (>= 2:1.5),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit dfdbcc6f44dccb64dedf7894358656635236e9aa
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Dec 1 10:54:59 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 89f86f1..839127c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-tseng (1:1.2.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 01 Dec 2009 10:54:05 +0200
diff --git a/debian/control b/debian/control
index fcb2ef0..7d7dba0 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
x11proto-render-dev,
x11proto-xext-dev,
dpkg-dev (>= 1.14.17)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tseng
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tseng.git
commit a66268f1002df4b864ddca783f48234cb733e4b8
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Dec 1 10:54:34 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index af47d82..5da6e54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+commit 5734845c91179a1138d75aaad48102cb077a2b12
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Sep 7 14:52:01 2009 +1000
+
+ bump version to 1.2.3
+
+commit d095c1d51b1a895471ce0b1970ae21ee6499ae51
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 28 15:22:41 2009 +1000
+
+ tseng: change to using ABI version check
+
+commit 17ebee6804a99af32747b801c5b979ba5248a9d8
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 28 13:32:40 2009 +1000
+
+ tseng: update for resources/RAC API removal
+
+commit 25548be8814796925625b11f390dca29b1e47358
+Author: Adam Jackson <a...@redhat.com>
+Date: Thu Jul 2 11:53:03 2009 -0400
+
+ tseng 1.2.2
+
+commit 1ce0bf811255b1faa00aa279e8972a1a027849ab
+Author: Adam Jackson <a...@redhat.com>
+Date: Thu May 28 15:23:41 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 7addf8709202634ac45b4c51d910e2798054271c
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Jan 30 21:05:06 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+commit 9d4aea1211de81fb27069d087bd4393d27355239
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Jan 9 16:37:31 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
commit 7f7e48cf5cf7512b5c1f5f3bf31eeafb201a9ad8
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Dec 22 15:02:32 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index cda66b9..89f86f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tseng (1:1.2.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 01 Dec 2009 10:54:05 +0200
+
xserver-xorg-video-tseng (1:1.2.1-1) unstable; urgency=low
* Run autoreconf on build.
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper
operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
commit 5734845c91179a1138d75aaad48102cb077a2b12
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Sep 7 14:52:01 2009 +1000
bump version to 1.2.3
diff --git a/configure.ac b/configure.ac
index 3707413..7a0da70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-tseng],
- 1.2.2,
+ 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-tseng)
commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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
commit d095c1d51b1a895471ce0b1970ae21ee6499ae51
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
tseng: change to using ABI version check
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index 1b61da8..445c17e 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -42,7 +42,7 @@
#include "fb.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
commit 17ebee6804a99af32747b801c5b979ba5248a9d8
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 13:32:40 2009 +1000
tseng: update for resources/RAC API removal
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index efa19c8..1b61da8 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -42,8 +42,10 @@
#include "fb.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
#include "xf86int10.h"
#include "xf86xv.h"
@@ -889,10 +891,12 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
pTseng->FbAddress = PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM);
+#ifndef XSERVER_LIBPCIACCESS
if (xf86RegisterResources(pTseng->pEnt->index,NULL,ResNone)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot register FB memory.\n");
return FALSE;
}
+#endif
/* The W32 linear map address space is always 4Mb (mainly because the
* memory-mapped registers are located near the top of the 4MB area).
@@ -1089,13 +1093,14 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
else
VGAHWPTR(pScrn)->MapSize = 0x10000;
+#ifndef XSERVER_LIBPCIACCESS
/*
* XXX At least part of this range does appear to be disabled,
* but to play safe, it is marked as "unused" for now.
* Changed this to "disable". Otherwise it might interfere with DGA.
*/
xf86SetOperatingState(resVgaMem, pTseng->pEnt->index, ResDisableOpr);
-
+#endif
/* hibit processing (TsengProcessOptions() must have been called first) */
pTseng->save_divide = 0x40; /* default */
if (pTseng->ChipType == ET4000) {
@@ -1466,9 +1471,10 @@ TsengScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
if (pScrn->depth == 4 || pScrn->depth == 8) { /* fb and xf4bpp */
vgaHWHandleColormaps(pScreen);
}
+#ifndef XSERVER_LIBPCIACCESS
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
pScrn->racMemFlags = pScrn->racIoFlags;
-
+#endif
/* Wrap the current CloseScreen and SaveScreen functions */
pScreen->SaveScreen = TsengSaveScreen;
commit 25548be8814796925625b11f390dca29b1e47358
Author: Adam Jackson <a...@redhat.com>
Date: Thu Jul 2 11:53:03 2009 -0400
tseng 1.2.2
diff --git a/configure.ac b/configure.ac
index 2fd20f7..3707413 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-tseng],
- 1.2.1,
+ 1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-tseng)
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jun 3 03:37:37 2009 +0200
Kill custom readlink function
This was needed for very, very old versions of debianutils.
Closes: #498890
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
fi
}
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
- message "The readlink command was not found. Please install version" \
- "1.13.1 or later of the debianutils package."
- readlink () {
- # returns what symlink in $1 actually points to
- perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless
$r; print "$r\n"' "$1"
- }
-fi
-
check_symlink () {
# syntax: check_symlink symlink
#
commit 1ce0bf811255b1faa00aa279e8972a1a027849ab
Author: Adam Jackson <a...@redhat.com>
Date: Thu May 28 15:23:41 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index 46fc3ae..efa19c8 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -180,58 +180,6 @@ static const OptionInfoRec TsengOptions[] =
{0}, FALSE}
};
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *vgaHWSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWHandleColormaps",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWUnlock",
- "vgaHWUnmapMem",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char* miscfbSymbols[] = {
- "xf1bppScreenInit",
- "xf4bppScreenInit",
- NULL
-};
-#endif
-
-static const char* fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(tsengSetup);
@@ -267,17 +215,6 @@ tsengSetup(pointer module, pointer opts, int *errmaj, int
*errmin)
xf86AddDriver(&TSENG, module, 0);
/*
- * Modules that this driver always requires can be loaded here
- * by calling LoadSubModule().
- */
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgaHWSymbols, miscfbSymbols, fbSymbols, xaaSymbols,
- int10Symbols, ramdacSymbols, NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -1020,7 +957,6 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
#if 1
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(int10Symbols, NULL);
#if 1
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
pInt = xf86InitInt10(pTseng->pEnt->index);
@@ -1031,7 +967,6 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgaHWSymbols, NULL);
/*
* Allocate a vgaHWRec
*/
@@ -1240,21 +1175,18 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymbols("xf1bppScreenInit", NULL);
break;
case 4:
if (xf86LoadSubModule(pScrn, "xf4bpp") == NULL) {
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymbols("xf4bppScreenInit", NULL);
break;
default:
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
break;
}
@@ -1264,7 +1196,6 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
if (pTseng->HWCursor) {
@@ -1272,7 +1203,6 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* TsengLock(pScrn); */
commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau <jcris...@debian.org>
Date: Tue May 26 15:58:19 2009 +0200
xsfbs: don't run dpkg --print-installation-architecture
This is deprecated in new dpkg, and had no users anyway.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
