xserver-xorg-video-rendition: Changes to 'debian-unstable'
COPYING | 27 +++--
ChangeLog | 36 +++++++
configure.ac | 2
debian/README.source | 73 ++++++++++++++
debian/changelog | 7 +
debian/control | 2
debian/xsfbs/xsfbs.mk | 21 ----
debian/xsfbs/xsfbs.sh | 245 --------------------------------------------------
src/rendition.c | 85 -----------------
src/rendition.h | 2
10 files changed, 144 insertions(+), 356 deletions(-)
New commits:
commit 7d4b054c4a823df78a66ae86c8585661c73138b1
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 1 10:03:10 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 9469add..95786bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-rendition (1:4.2.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 09:54:00 +0200
diff --git a/debian/control b/debian/control
index abce664..fa23be2 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
libtool,
xutils-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-rendition
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-rendition.git
commit 020e55aa9d29dd0745136bc03b488405f795a5fb
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 1 09:54:24 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index b88d8ab..2c112c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+commit 2d62a81b452641999207c0576a08d82aee41cf06
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Sep 7 14:42:11 2009 +1000
+
+ rendition 4.2.3
+
+commit 47b68f542c836a76f4adb0d7951b7f0b6aaeabd1
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:41 2009 +1000
+
+ rendition: change to using ABI version check
+
+commit d9e34c59faf63162f18dc87f599e36de024f557c
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:35 2009 +1000
+
+ rendition: update for resources/RAC API removal
+
+commit 2013e650484bd66c238a497f241c23d82361e49e
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jul 2 11:28:29 2009 -0400
+
+ rendition 4.2.2
+
+commit c22f51f750dc495b9c58f8390c6a0d9fff756829
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 15:13:38 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 560e4fd2d289615297b7529bcbd61799db5b277b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 11 22:24:37 2009 -0700
+
+ Fill in COPYING file
+
commit 7ad4b3479433de0cbfca7ba756b07df09678b22a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 24 10:17:19 2009 -0500
diff --git a/debian/changelog b/debian/changelog
index da02c20..9469add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-rendition (1:4.2.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 09:54:00 +0200
+
xserver-xorg-video-rendition (1:4.2.1-1) unstable; urgency=low
* Use xsfbs/repack.sh to prune upstream tarball.
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 2d62a81b452641999207c0576a08d82aee41cf06
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 7 14:42:11 2009 +1000
rendition 4.2.3
diff --git a/configure.ac b/configure.ac
index 84e5c7b..e209b16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.2.2,
+ 4.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-rendition)
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 47b68f542c836a76f4adb0d7951b7f0b6aaeabd1
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
rendition: change to using ABI version check
diff --git a/src/rendition.h b/src/rendition.h
index 84809fa..ba0a22e 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -37,7 +37,7 @@
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
commit d9e34c59faf63162f18dc87f599e36de024f557c
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:35 2009 +1000
rendition: update for resources/RAC API removal
diff --git a/src/rendition.c b/src/rendition.c
index db62f8e..7a9e18b 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -538,7 +538,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
pRendition->PciInfo = xf86GetPciInfoForEntity(pRendition->pEnt->index);
pRendition->pcitag= pciTag(pRendition->PciInfo->bus,
pRendition->PciInfo->device, pRendition->PciInfo->func);
-#endif
/*
* XXX This could be refined if some VGA memory resources are not
@@ -549,11 +548,12 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (xf86RegisterResources(pRendition->pEnt->index, NULL, ResExclusive))
return FALSE;
+
/* Operations for which memory access is required. */
pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR;
/* Operations for which I/O access is required. (XXX Check this) */
pScreenInfo->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-
+#endif
/* determine depth, bpp, etc. */
if (!xf86SetDepthBpp(pScreenInfo, 0, 0, 0, Support32bppFb))
return FALSE;
diff --git a/src/rendition.h b/src/rendition.h
index 2b43cba..84809fa 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -37,11 +37,13 @@
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
+#ifndef XSERVER_LIBPCIACCESS
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
/* Several predefined resource lists */
#include "xf86Resources.h"
+#endif
/* Needed by the Shadow Framebuffer */
#include "shadowfb.h"
commit 2013e650484bd66c238a497f241c23d82361e49e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:28:29 2009 -0400
rendition 4.2.2
diff --git a/configure.ac b/configure.ac
index d69aef2..84e5c7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.2.1,
+ 4.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-rendition)
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcristau@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 c22f51f750dc495b9c58f8390c6a0d9fff756829
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:13:38 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/rendition.c b/src/rendition.c
index 594c7b8..db62f8e 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -200,72 +200,6 @@ _X_EXPORT DriverRec RENDITION={
#endif
};
-static const char *vgahwSymbols[]={
- "vgaHWBlankScreen",
- "vgaHWDPMSSet",
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWUnlock",
- "vgaHWHandleColormaps",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-#if defined(XFree86LOADER) || USE_ACCEL
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-#endif
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86PrintEDID",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *fbSymbols[]={
- "fbScreenInit",
- "fbPictureInit",
- NULL
-};
-
-static const char *shadowfbSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-
-
#ifdef XFree86LOADER
/* Module loader interface */
@@ -297,9 +231,6 @@ renditionSetup(pointer Module, pointer Options, int *ErrorMajor,
if (!Initialised) {
Initialised = TRUE;
xf86AddDriver(&RENDITION, Module, 1);
- LoaderRefSymLists(vgahwSymbols, ramdacSymbols,
- fbSymbols, xaaSymbols, ddcSymbols, int10Symbols,
- shadowfbSymbols, vbeSymbols, NULL);
return (pointer) TRUE;
}
@@ -597,8 +528,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (xf86LoadSubModule(pScreenInfo, "int10")){
xf86Int10InfoPtr pInt=NULL;
- xf86LoaderReqSymLists(int10Symbols, NULL);
-
xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Initializing int10\n");
pInt = xf86InitInt10(pRendition->pEnt->index);
xf86FreeInt10(pInt);
@@ -678,8 +607,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (!xf86LoadSubModule(pScreenInfo, "fb"))
return FALSE;
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
/* determine colour weights */
pScreenInfo->rgbBits=8;
@@ -727,7 +654,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (!xf86LoadSubModule(pScreenInfo, "vgahw")){
return FALSE;
}
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
if (!vgaHWGetHWRec(pScreenInfo))
return FALSE;
@@ -827,7 +753,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
"Oops, \"ShadowFB\" module loading failed, disabling ShadowFB!\n");
}
else{
- xf86LoaderReqSymLists(shadowfbSymbols, NULL);
pRendition->board.shadowfb=TRUE;
xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
"Using \"Shadow Framebuffer\"\n");
@@ -846,7 +771,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (!xf86LoadSubModule(pScreenInfo, "ramdac")) {
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
#if 0
@@ -857,7 +781,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
("Loading of DDC library failed, skipping DDC-probe\n"));
}
else {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
pScreenInfo->monitor->DDC = renditionDDC(pScreenInfo);
}
}
@@ -874,7 +797,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
}
else {
xf86MonPtr mon;
- xf86LoaderReqSymLists(ddcSymbols, NULL);
mon = renditionProbeDDC(pScreenInfo, pRendition->pEnt->index);
xf86PrintEDID(mon);
xf86SetDDCproperties(pScreenInfo, mon);
@@ -951,7 +873,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
!pRendition->board.shadowfb) {
/* Load XAA if needed */
if (xf86LoadSubModule(pScreenInfo, "xaa")) {
- xf86LoaderReqSymLists(xaaSymbols, NULL);
renditionMapMem(pScreenInfo);
RENDITIONAccelPreInit (pScreenInfo);
renditionUnmapMem(pScreenInfo);
@@ -1551,8 +1472,6 @@ renditionProbeDDC(ScrnInfoPtr pScreenInfo, int index)
xf86MonPtr mon = NULL;
if (xf86LoadSubModule(pScreenInfo, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
-
pVbe = VBEInit(NULL,index);
mon = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);
commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau <jcristau@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.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 8840ff9..197eb74 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -57,8 +57,6 @@ EOF
exit $SHELL_LIB_USAGE_ERROR
fi
-ARCHITECTURE="$(dpkg --print-installation-architecture)"
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 25 20:08:50 2009 -0400
Add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit"
+ (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+ may be git'cherry-picked into the Debian repository. In this
+ case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+ with quilt as documented in /usr/share/doc/quilt/README.source.
+
+quilt is actually invoked by the Debian X packaging through a larger
+set of scripts called XSFBS. XSFBS brings some other X specific
+features such as managing dependencies and conflicts due to the video
+and input driver ABIs.
+XSFBS itself is maintained in a separate repository at
+ git://git.debian.org/pkg-xorg/xsfbs.git
+and it is pulled inside the other Debian X repositories when needed.
+
+The XSFBS patching system requires a build dependency on quilt. Also
+a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+so that the XSFBS patching occurs before the actual build. So the
+very first target of the build (likely the one running autoreconf)
+should depend on $(STAMP_DIR)/patch. It should also not depend on
+anything so that parallel builds are correctly supported (nothing
+should probably run while patching is being done). And finally, the
+clean target should depend on the xsfclean target so that patches
+are unapplied on clean.
+
+When the upstream sources contain some DFSG-nonfree files, they are
+listed in text files in debian/prune/ in the "debian-*" branch of
+the Debian repository. XSFBS' scripts then take care of removing
+these listed files during the build so as to generate a modified
+DFSG-free .orig.tar.gz tarball.
commit 560e4fd2d289615297b7529bcbd61799db5b277b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon May 11 22:24:37 2009 -0700
Fill in COPYING file
diff --git a/COPYING b/COPYING
index 7f33cbf..c513618 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,23 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
+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:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of the XFree86 Project shall not
Reply to: