xserver-xorg-video-cirrus: Changes to 'debian-experimental'
COPYING | 68 +++++-
ChangeLog | 114 +++++++++++
Makefile.am | 12 +
README | 24 ++
configure.ac | 10
debian/README.source | 73 +++++++
debian/changelog | 42 ++++
debian/control | 5
debian/copyright | 45 ++++
debian/patches/01_gen_pci_ids.diff | 27 --
debian/patches/series | 1
debian/rules | 4
debian/xserver-xorg-video-cirrus.install | 1
debian/xsfbs/repack.sh | 32 +++
debian/xsfbs/xsfbs.mk | 21 --
debian/xsfbs/xsfbs.sh | 311 -------------------------------
man/.cvsignore | 2
man/.gitignore | 2
man/cirrus.man | 5
src/.cvsignore | 6
src/.gitignore | 6
src/CirrusClk.c | 2
src/Makefile.am | 2
src/alp_driver.c | 100 ---------
src/cir_dga.c | 2
src/cir_driver.c | 44 ----
src/cir_shadow.c | 13 -
src/lg_driver.c | 96 ---------
28 files changed, 455 insertions(+), 615 deletions(-)
New commits:
commit bda47a7168b79b7485c48468f24b2b36ab1bf21f
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 6 03:24:09 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 68c3c2e..0880270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-cirrus (1:1.3.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.2-1) experimental; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 10:53:56 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 06 Dec 2009 03:24:06 +0100
xserver-xorg-video-cirrus (1:1.3.1-1) unstable; urgency=low
commit 71bb99b800aaa1aeb9aba4dcd92e93e281539070
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 13:22:22 2009 +0200
Fix the version.
diff --git a/debian/changelog b/debian/changelog
index b56de1a..68c3c2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.2-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
commit 4d6f60994929bea1040234af454375afcd6018b2
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 10:56:32 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 9625c75..b56de1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 10:53:56 +0200
diff --git a/debian/control b/debian/control
index ecd403c..48239c4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org
Build-Depends:
debhelper (>= 5),
pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit f3fb2d13f218a45219edc9bb89a3c396e7ec9029
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 10:55:10 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 5260617..9625c75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 10:53:56 +0200
diff --git a/debian/control b/debian/control
index 2462f4c..ecd403c 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
commit e8afb9021e1b866c0615a14a19b0e904faa51208
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 10:54:13 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 912b6ba..59ef5d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+commit 5cbe6d11d11070da698a6a3ddd5d95d1cff34da1
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:26 2009 +1000
+
+ cirrus: bump for release 1.3.2
+
+commit 4ecaa548a996475fbb4c6403698b2ecaf35e9d6b
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:40 2009 +1000
+
+ cirrus: change to using ABI version check
+
+commit 2765aba56fe66038ab7de554474b8d30995f3ef0
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:29 2009 +1000
+
+ cirrus: update for resources/RAC API removal
+
commit ecdf94e86d44bdbeff1bb944fb372da92d2fa907
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 10:28:20 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 35cf87c..5260617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 10:53:56 +0200
+
xserver-xorg-video-cirrus (1:1.3.1-1) unstable; urgency=low
[ Julien Cristau ]
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@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 <jcristau@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 <jcristau@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 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
commit 5cbe6d11d11070da698a6a3ddd5d95d1cff34da1
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:26 2009 +1000
cirrus: bump for release 1.3.2
diff --git a/configure.ac b/configure.ac
index 14b3a6f..d205eb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-cirrus],
- 1.3.1,
+ 1.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cirrus)
commit 4ecaa548a996475fbb4c6403698b2ecaf35e9d6b
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
cirrus: change to using ABI version check
diff --git a/src/alp_driver.c b/src/alp_driver.c
index c5c531d..fe81757 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -36,7 +36,7 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 758e2fb..5466c48 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -21,7 +21,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
/* All drivers need this */
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 9d0850b..cfc3e65 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -39,7 +39,7 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
commit 2765aba56fe66038ab7de554474b8d30995f3ef0
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:29 2009 +1000
cirrus: update for resources/RAC API removal
diff --git a/src/alp_driver.c b/src/alp_driver.c
index a14a5e8..c5c531d 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -36,8 +36,10 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
@@ -695,7 +697,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
(unsigned long)pCir->IOAddress);
} else
xf86DrvMsg(pScrn->scrnIndex, from1, "Not Using MMIO\n");
-
+
+#ifndef XSERVER_LIBPCIACCESS
/*
* XXX Check if this is correct
*/
@@ -712,6 +715,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
+#endif
if (!xf86LoadSubModule(pScrn, "i2c")) {
AlpFreeRec(pScrn);
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 4cdce94..758e2fb 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -21,8 +21,9 @@
#include "xf86.h"
#include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
-
+#endif
/* All drivers need this */
/* Drivers for PCI hardware need this */
diff --git a/src/cir_shadow.c b/src/cir_shadow.c
index e8b8d35..b89890a 100644
--- a/src/cir_shadow.c
+++ b/src/cir_shadow.c
@@ -11,7 +11,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 2574472..9d0850b 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -39,8 +39,10 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
@@ -571,6 +573,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
pCir->FbMapSize = pScrn->videoRam * 1024;
pCir->IoMapSize = 0x4000; /* 16K for moment, will increase */
+#ifndef XSERVER_LIBPCIACCESS
pScrn->racIoFlags = RAC_COLORMAP
#ifndef EXPERIMENTAL
| RAC_VIEWPORT
@@ -584,7 +587,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
-
+#endif
if (!xf86LoadSubModule(pScrn, "ddc")) {
LgFreeRec(pScrn);
return FALSE;
commit 54fb225b3486121ae0dba31712f870ec79003cbe
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jul 19 23:53:14 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 7925bfa..35cf87c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.1-1) unstable; urgency=low
[ Julien Cristau ]
* Update debian/copyright from upstream's COPYING.
@@ -7,7 +7,7 @@ xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 23:51:59 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 23:52:36 +0200
xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
commit 63333dab6fe4068b43e145fcc60c09429aa8ed36
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jul 19 23:52:29 2009 +0200
Bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index 19a373f..7925bfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* New upstream release.
+ * Bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 23:50:20 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 23:51:59 +0200
xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3c19df8..2462f4c 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
commit e029de457044f2d469fd6be70886805b76341460
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jul 19 23:50:42 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 2ccae80..912b6ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+commit ecdf94e86d44bdbeff1bb944fb372da92d2fa907
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jul 2 10:28:20 2009 -0400
+
+ cirrus 1.3.1
+
+commit 2939b59585d96bb9b6f852ddb1eaa5ffd4df1cfb
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Jun 10 14:16:32 2009 +1000
+
+ cirrus: add inputstr.h explicitly
+
+ using inputInfo requires inputstr.h this got included by accident before
+
+commit f07b4a3c5dd3e6834367e223aa454054c34a2ac8
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 14:53:06 2009 -0400
+
+ Remove useless loader symbol lists.
+
commit 15b1632d4136d4d20e006626836fb1f73c5a61f7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu May 7 06:56:57 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index acc0116..19a373f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-xserver-xorg-video-cirrus (1:1.3.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Update debian/copyright from upstream's COPYING.
- -- Julien Cristau <jcristau@debian.org> Mon, 08 Jun 2009 18:21:18 +0200
+ [ Brice Goglin ]
+ * New upstream release.
+
+ -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 23:50:20 +0200
xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
commit ecdf94e86d44bdbeff1bb944fb372da92d2fa907
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 10:28:20 2009 -0400
cirrus 1.3.1
diff --git a/configure.ac b/configure.ac
index bc503cb..14b3a6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-cirrus],
- 1.3.0,
+ 1.3.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cirrus)
commit 2939b59585d96bb9b6f852ddb1eaa5ffd4df1cfb
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 10 14:16:32 2009 +1000
cirrus: add inputstr.h explicitly
using inputInfo requires inputstr.h this got included by accident before
diff --git a/src/lg_driver.c b/src/lg_driver.c
index c154c8a..2574472 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -45,6 +45,9 @@
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
+/* need this for inputInfo */
+#include "inputstr.h"
+
/* All drivers implementing backing store need this */
#include "mibstore.h"
commit 8a0d7ba8410d06dc0186707e1732b37bf631b3b0
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 8 18:21:32 2009 +0200
Update debian/copyright from upstream's COPYING.
diff --git a/debian/changelog b/debian/changelog
index c744a5b..acc0116 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.3.0-2) UNRELEASED; urgency=low
+
+ * Update debian/copyright from upstream's COPYING.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 08 Jun 2009 18:21:18 +0200
+
xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
[ David Nusinow ]
diff --git a/debian/copyright b/debian/copyright
index bb283cf..a76e7d7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,30 @@
This package was downloaded from
http://xorg.freedesktop.org/releases/individual/driver/
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+
Copyright 2000 by Egbert Eich
Permission to use, copy, modify, distribute, and sell this software and its
@@ -20,3 +44,24 @@ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
Reply to: