xserver-xorg-video-chips: Changes to 'debian-experimental'
ChangeLog | 491 ++++++++++++++++++++++++++++++++++++++++++++------
debian/changelog | 33 ++-
debian/control | 13 -
debian/copyright | 3
debian/rules | 2
debian/xsfbs/xsfbs.mk | 36 ++-
debian/xsfbs/xsfbs.sh | 7
src/ct_video.c | 4
8 files changed, 495 insertions(+), 94 deletions(-)
New commits:
commit a256584014939af90f59c00db15d729d4ca6b251
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 22:00:02 2007 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index b6af2be..c2a7d4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-chips (1:1.1.1-7) UNRELEASED; urgency=low
+xserver-xorg-video-chips (1:1.1.1-7) experimental; urgency=low
[ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -15,11 +15,12 @@ xserver-xorg-video-chips (1:1.1.1-7) UNRELEASED; urgency=low
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-video-chips
module in the long description.
- * Remove Fabio from uploaders with his permission. He's always welcome back.
* Build against xserver 1.4.
* Add upstream URL to debian/copyright.
+ * Add myself to uploaders, and remove Branden and Fabio with their
+ permission.
- -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 21:47:24 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 21:47:42 +0200
xserver-xorg-video-chips (1:1.1.1-6) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 3a4c719..ad898d4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-chips
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-chips
commit 53938c792a2fbe70af0faf49713ce06728e68c99
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 21:47:36 2007 +0200
Build against xserver 1.4
diff --git a/debian/changelog b/debian/changelog
index 8f8d321..b6af2be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,10 @@ xserver-xorg-video-chips (1:1.1.1-7) UNRELEASED; urgency=low
* Add a link to www.X.org and a reference to the xf86-video-chips
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
+ * Build against xserver 1.4.
+ * Add upstream URL to debian/copyright.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sun, 29 Apr 2007 04:06:50 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 21:47:24 +0200
xserver-xorg-video-chips (1:1.1.1-6) experimental; urgency=low
diff --git a/debian/control b/debian/control
index bf8f1f2..3a4c719 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, quilt, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (>= 5), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-chips
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-chips.git
diff --git a/debian/copyright b/debian/copyright
index 877ae5f..312a710 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
Copyright 1993 by Jon Block <block@frc.com>
Modified by Mike Hollick <hollick@graphics.cis.upenn.edu>
Modified 1994 by Régis Cridlig <cridlig@dmi.ens.fr>
commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 29 09:36:00 2007 +0200
Do not call laptop-detect, let the only user call it directly
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
ARCHITECTURE="$(dpkg --print-installation-architecture)"
-LAPTOP=""
-if [ -n "$(which laptop-detect)" ]; then
- if laptop-detect >/dev/null; then
- LAPTOP=true
- fi
-fi
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 12 16:06:22 2007 +0200
Fix "display the output of quilt push/pop".
Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \
if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ cat $(STAMP_DIR)/log/patch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/patch; \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
exit 1; \
fi; \
@@ -164,9 +166,11 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
exit 1; \
fi; \
commit e29b56820909668b062fdba72458ee9483a4ae44
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 21:50:47 2007 +0200
Minor fixes in the patching system.
* Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920).
* Display which patches are applied and removed instead of just the first one (for #428090).
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2930c1e..5f13302 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,6 +21,11 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
+# force quilt to not use ~/.quiltrc
+QUILT = quilt --quiltrc /dev/null
+# force QUILT_PATCHES to the default in case it is exported in the environment
+QUILT_PATCHES = patches/
+
# Set up parameters for the upstream build environment.
# Determine (source) package name from Debian changelog.
@@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next >/dev/null 2>&1; then \
+ if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +164,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
@@ -295,17 +300,17 @@ patch-audit: prepare unpatch
@echo -n "Auditing patches..."; \
>$(STAMP_DIR)/log/patch; \
FUZZY=; \
- while [ -n "$$(quilt next)" ]; do \
- RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+ while [ -n "$$($(QUILT) next)" ]; do \
+ RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
case "$$RESULT" in \
succeeded) \
- echo "fuzzy patch: $$(quilt top)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt top); \
+ echo "fuzzy patch: $$($(QUILT) top)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
FUZZY=yes; \
;; \
FAILED) \
- echo "broken patch: $$(quilt next)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt next); \
+ echo "broken patch: $$($(QUILT) next)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
exit 1; \
;; \
esac; \
commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 19:06:05 2007 +0200
Fix displaying of patches applied by quilt.
As requested in bug #428090, we silence the output of quilt next
and display the output of quilt push/pop.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 63dde45..2930c1e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next; then \
+ if quilt next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +159,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
commit aecdb814a0f1e4cad220a89608d4ad7659c27469
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sun Apr 29 04:17:07 2007 +0200
Remove obsolete changelog item.
diff --git a/debian/changelog b/debian/changelog
index 33608c8..8f8d321 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,6 @@ xserver-xorg-video-chips (1:1.1.1-7) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
the user's config and log files.
- * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
- versions don't have the bug script.
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-chips.
commit ea28f420e1e49461a75b12a9a8d3115b33bf699a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sun Apr 29 04:11:01 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 42d5dc1..cb2f45c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,84 +1,463 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 242a378d6c0bead85b0b6e94f40c51849ba8f43b
+Author: Petteri Aimonen <jpa@bfd.mail.kapsi.fi>
+Date: Fri Mar 16 21:39:54 2007 -0400
- * configure.ac:
- * src/ct_driver.c:
- Bump to 1.1.1 for Xv changes.
+ Fix Xv with scaling
+
+ Fixes Bug 10225
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit 06b16bbfa010c66ee6ff76f11ce53b90678d7dec
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:21:18 2006 +0000
- * src/ct_video.c: (CHIPSPutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ Bump to 1.1.1 for Xv changes.
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
+commit c13ae9c043919c33f2770e58db01903a6a9826bf
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:06:47 2006 +0000
- * configure.ac:
- * src/ct_accel.c:
- * src/ct_bank.c:
- * src/ct_cursor.c:
- * src/ct_ddc.c:
- * src/ct_dga.c:
- * src/ct_driver.c:
- * src/ct_driver.h:
- * src/ct_regs.c:
- * src/ct_shadow.c:
- * src/ct_video.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
- * src/ct_driver.c:
- VERSION -> CHIPS_VERSION
+commit c19d1b6306f3cd28ef069ac25c1fc5442b7a7eb6
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 18:56:44 2006 +0000
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ VERSION -> CHIPS_VERSION
- * configure.ac:
- Update package version for X11R7 release.
+commit 9c768c7de5fa5e337cdfb91d099b79389dc7a473
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 18:41:11 2006 +0000
-2005-12-19 Alan Coopersmith <alan.coopersmith@sun.com>
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
- * README.sgml:
- Fix typo.
+commit eb58cfaf1a474fb171b2a628b6a92443a35022c5
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:59 2005 +0000
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version for X11R7 release.
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit 03e0cdd459ea05f71fabacfd7cb5f597fc2128bc
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:52 2005 +0000
-2005-12-08 Adam Jackson <ajax@freedesktop.org>
+ Stub COPYING files
- * src/Makefile.am:
- Re-fix for #4588, this one actually works.
+commit f8e6e3221db7de83f612533fccef07899bfdac36
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Dec 19 09:07:50 2005 +0000
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Typo fixes, mailing list & url updates, and other changes to prepare for
+ X11R6.9 & 7.0 releases.
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit 78d667cd1f70317edd99fa2be9f872d16d7c261d
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:16 2005 +0000
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version number for final X11R7 release candidate.
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit c2c12ea61c2eab7b4e93a3eb249206592234fee8
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu Dec 8 22:51:31 2005 +0000
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Re-fix for #4588, this one actually works.
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+commit d6455cca874579ee0a6092e20d95f620306fc2f0
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:33 2005 +0000
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
- * configure.ac:
- Only build dlloader modules by default.
+commit 47b3b2be8affaa16f0d71271d6a30ce5609f801f
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:32 2005 +0000
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version number for X11R7 RC3 release.
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 40b686b18c29e3fee384521f3f495bd05ccdd784
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:07 2005 +0000
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Remove extraneous AC_MSG_RESULT.
- * configure.ac:
- Update pkgcheck depedencies to work with separate build roots.
+commit af6258df5710dc0bbe85d55cc50fe829435db8ad
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:29:58 2005 +0000
-2005-10-04 Adam Jackson <ajax@freedesktop.org>
+ Only build dlloader modules by default.
- * src/Makefile.am:
- Bug #4588: N-way build of ct_accel.c, as in monolith.
+commit d56c594474a5cf411f831b25ff6be3b4e7c546bb
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:08 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 4d75a9d8c5bfb9d8a1b9faf475b6228bf57b0e38
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:10 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 223319630ada3435fe3f2a85be812590ed9ad699
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:31:20 2005 +0000
+
+ Bump version numbers for X11R6.9/X11R7 RC2.
+
+commit 65c7a923e3be45be2617e72c07d43f0d78fb0c17
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:14 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 6e95e7efbce398d71381067f03b180e4f0d69c30
+Author: Kean Johnson <kean@armory.com>
+Date: Tue Nov 8 06:33:28 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit e7cf9f29514df4c94670e68df2aeaf85865a5ce1
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:52 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 19c8cb7e20cf4c1ca8416b9d0d9931007ad689c3
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:02 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b3cb9f5a0cd3e73e879aa057302a939b2c33e1d9
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:53 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 34e9d68c45bd308ae635d2339048bec86fc669a3
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:32 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 4c4fead49dabaeccfa076858d200f09670cb7a9f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:02 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 7acccac366100af7679430e540a530d638c12a9f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Oct 6 23:08:00 2005 +0000
+
+ Don't build utils if inb and friends aren't available
+
+commit ad3f384d6d95a50dcf99ef6c395499fcdf0ceec6
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Oct 5 01:07:23 2005 +0000
+
+ Bug #4038: Unbreak the SYSVIPC check for cross builds. (Detlef Vollman)
+
+commit b005b6550a7af480324d66e48e41f1507900eae4
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Oct 4 20:01:03 2005 +0000
+
+ Check in generated README files
+
+commit f7a845eca6b6aad5bd393b76426134a290cd2b13
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Oct 3 21:22:07 2005 +0000
+
+ - For all drivers that have a <driver>.sgml file, add code in their build
+ system to build the README file at make dist time
+ - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that
+ will check if the required tools and files exist, and if so set a
+ conditional.
+ - util/modular/symlink.sh
+ - Link all the <driver>.sgml to xf86-video-<driver>/README.sgml
+ - Add all the README.<driver> to the list of excluded files
+ - xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make
+ it spew less warnings when the text file is built.
+
+commit 5ced0a935cbcb0a64bdf89b8ad73b3d9f248f944
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Sep 29 14:07:14 2005 +0000
+
+ Build, but don't install, the driver utils
+
+commit e0b348468ac0ef0659eb938439787683d2efb47d
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Thu Sep 29 13:53:06 2005 +0000
+
+ Add Makefile.am for xf86-video/chips/util
+
+commit c4faaed659071be10a6afc990045965317c64ff8
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Sep 27 20:53:19 2005 +0000
+
+ Update build system for apm, chips, cirrus, glint, i740, mga, neomagic,
+ newport to accomodate various new documentation and utility files.
+
+commit 18b83b4bf95c257fefd7d11b92162677be62a8cc
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:46 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit a435001829623dcb0e7db8d1ceab8416ff0b619b
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:42 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit deca4a65b17e6728201eb3ce859c5adfd796cb08
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Jul 25 23:43:02 2005 +0000
+
+ Add src/Makefile.am
+
+commit fa72456e6a8e11c7b88df05cbd6cee6e30b0a839
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Jul 25 23:42:45 2005 +0000
+
+ Add man/Makefile.am
+
+commit 1f768d9a56734414a4277f150e257271fab6dd05
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Jul 25 23:42:08 2005 +0000
+
+ Build system for Chips and Tech
+
+commit f82bfa5a95cdc0e2b1a0e578a97b501d57b260d9
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 13 18:20:12 2005 +0000
+
+ Add accidentally left out PKG_CHECK_MODULES
+
+commit 71992bc3c47c8a28b5af9a267273dfcc0c3667cc
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 13 17:45:32 2005 +0000
+
+ Build system for chips-and-technologies video driver
+
+commit 8826d34f0bf1306b0769340cbec1e704abbe39bb
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:29:46 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit e3cc3456c128db6f0da06be84355d67cddf00c1f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:53 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit b9c4a3ddd1fe26da0e7b4c0e87f603d6c645b17d
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:23 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit 447cb9ac1433d9dee68e8f1fc9171a0ef3cc0512
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Jan 21 12:17:19 2005 +0000
+
+ Comparing the C&T driver code with the original BE support patch by Rob
+ Taylor and Jean-Laurent Gazelle it looks like the handling of the
+ availability of a dual endian fb aperture and the byte swapping control
+ bit appears to be slightly wrong. This patch attempts to fix it
+ (Bugzilla #2346).
+
+commit c832080b84cc58826a39cf9d18fa2e83f5f8c9df
+Author: Egbert Eich <eich@suse.de>
+Date: Tue Jan 11 17:18:55 2005 +0000
+
+ - typo fix: added missing 'l'.
+
+commit a5f965dab4948bdc207867e31ef11faf7065640f
+Author: Egbert Eich <eich@suse.de>
+Date: Tue Jan 11 15:10:24 2005 +0000
+
+ Explain the FpMode option.
+
+commit 9d8837bdd953799ea471db6b043e12788cb97449
+Author: Egbert Eich <eich@suse.de>
+Date: Tue Jan 11 15:02:56 2005 +0000
+
+ - backing out patches that need to go in separately.
+
+commit 7577c837c8f20460ca5ca3bbda2fdb61c556e12a
+Author: Egbert Eich <eich@suse.de>
+Date: Tue Jan 11 14:59:02 2005 +0000
+
+ Minor format fix.
+ Added explanatory comment and debug code.
+ Added comment.
+
+commit 946a44f6273cb420a52e32f2d9ffa482e2b4585c
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date: Sat Dec 4 00:42:59 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit 6ad4ec186e01d699ba0e8d886b4f7375c32baae5
+Author: Egbert Eich <eich@suse.de>
+Date: Tue Nov 2 08:54:53 2004 +0000
+
+ Removing unneeded private FreeType2 symbol.
+ Updating to EDID 1.3. (Bugzilla# 1490, Jay Cotton, Egbert Eich).
+ Removing unneeded code.
+ Fixed KGA handling for i810. KGA handling for chips derived from C&T chips
+ is slightly different. The changes make the code consistent with the
+ C&T (chips) and i740 drivers.
+
+commit a60309619fdff1cbeafb40bb9a2a42b0b8ffa15c
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon Oct 4 21:14:44 2004 +0000
+
+ Manual pages fixes (XFree86 bugzilla #1487, Nicolas Joly).
+
+commit deddbe4bfec2da7af91e4760eb13fb580fe5d5ad
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Aug 16 09:13:13 2004 +0000
+
+ Bug #1087: Make sure all the *Weak symbols are documented in the import
+ list, so the loader knows not to complain about unresolved symbols when
+ an optional module isn't loaded. This typically manifests as warnings
+ about fbdevHW symbols when the user isn't using the framebuffer
+ console.
+
+commit a38d228403909ae74b7f66e418da4371bedc7349
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Aug 3 02:44:20 2004 +0000
+
+ Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
+ DoLoadableServer NO builds work again.
+
+commit b76bed367ed818d68d33dd0fc102358d96cfc37a
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jul 31 01:21:18 2004 +0000
+
+ Change several LoaderSymbol calls introduced by the bug #400 patch to
+ *Weak() resolver functions.
+
+commit 07a2c34503f98a110aee409f04f2104495aefab7
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Jul 30 21:36:39 2004 +0000
+
+ Improved BE support in C&T driver (Rob Taylor, Jean-Laurent Gazelle). (Code
+ adapted Egbert Eich).
+ Do I810EmitFlush() during screen init to make sure 2D engine is in a sane
+ state (Peter Kunzmann).
+
+commit 3dd9b6eaf95d075ae0459433b11f47cae015220f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Jul 30 20:30:52 2004 +0000
+
+ Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
+ framebuffer formats except cfb and the overlay modes should work, and
+ r128 and radeon need to be loaded from the ati driver (both issues to
+ be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
+ drivers. elfloader users shouldn't be affected.
+
+commit 652a987a9f10fd78c7b0833275567d7f5eaadc5f
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Jul 30 18:32:45 2004 +0000
+
+ Fixed log messages.
+
+commit 8a63c956592ee31c6fa121a5090f1cbc3fe3814a
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:23:00 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 2c023bf4d63b2a427e8140ca7613eae5a2e141c1
+Author: Egbert Eich <eich@suse.de>
+Date: Wed May 26 16:24:08 2004 +0000
+
+ Fixing setting of physical framebuffer base for several drivers. C&T
+ driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic
+ driver: improved support for lowres double scan modes.
+
+commit 0d54abec7d7088197a51bcb20bb7305c79480e23
+Author: Egbert Eich <eich@suse.de>
+Date: Mon May 24 19:00:03 2004 +0000
+
+ Fixed Segfault on video mode switching when pScrn->currentMode did not
+ contain a valid mode. Fixed video overlays for double scan modes.
+
+commit e3026f7b66d94dc849339e4e150a24986732d1ee
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:27:51 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 1d261a4e420d80cb2ee1fc51e562746644e3d48d
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:20 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 870c66de7b44292e6557a8acb049ff256423c4e2
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:18 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 434c61ca3b6f0c353eb54607bb556ad068773c34
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:52 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 4ca9c98863d131395c46d2c85abb49a3990a3bb6
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:18 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 46cb95cf8d22a953117fc6fc6a94f9ea765c2e37
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:08:34 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 7778781ee5c123faa4567c36c36807b43d994d65
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:36 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 1266a1de4dd446776023de95f9b3be8bb55648ed
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 0a3d86ee8123b4ba2c54abbae6675b4bc010f428
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
+
+commit 607c7f48bd004450fda196cd1e8029210cfba0c2
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:49 2003 +0000
+
+ R6.6 is the Xorg base-line
commit 0cba02f4f88fec06eeb1207ddba31e907ff807bd
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sun Apr 29 04:10:10 2007 +0200
Pull upstream fix 242a378d6c0bead85b0b6e94f40c51849ba8f43b
diff --git a/debian/changelog b/debian/changelog
index fa36c28..33608c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-chips (1:1.1.1-7) UNRELEASED; urgency=low
* Replaces/Conflicts: xserver-xorg-driver-chips.
[ Brice Goglin ]
+ * Pull upstream fix 242a378d6c0bead85b0b6e94f40c51849ba8f43b
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
commit dbd42ca32f4c657d375fe61f294ef228da5a1b35
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sun Apr 29 04:07:44 2007 +0200
Miscellaneous fixed in debian/control and debian/rules.
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-video-chips
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
diff --git a/debian/changelog b/debian/changelog
index f2f13e6..fa36c28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,16 @@ xserver-xorg-video-chips (1:1.1.1-7) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-chips.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:02:19 +0300
+ [ Brice Goglin ]
+ * Install the upstream changelog.
+ * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+ (needed to let xsfbs get access to serverminver).
+ * Add XS-Vcs-*.
+ * Add a link to www.X.org and a reference to the xf86-video-chips
+ module in the long description.
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sun, 29 Apr 2007 04:06:50 +0200
xserver-xorg-video-chips (1:1.1.1-6) experimental; urgency=low
diff --git a/debian/control b/debian/control
index ecd800a..bf8f1f2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-chips
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 5), pkg-config, quilt, xserver-xorg-dev (>= 2:1.2.0), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Build-Depends: debhelper (>= 5), pkg-config, quilt, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
Standards-Version: 3.7.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-chips
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-chips.git
Package: xserver-xorg-video-chips
Architecture: any
@@ -17,8 +19,8 @@ Description: X.Org X server -- Chips display driver
of video cards.
.
More information about X.Org can be found at:
+ <URL:http://www.X.org>
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
- This module can be found as the module 'driver/xf86-video-chips' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ This package is built from the X.org xf86-video-chips driver module.
diff --git a/debian/rules b/debian/rules
index 4356aba..3259c9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=chips_drv.la --exclude=usr/share/man/man4
dh_installman
dh_link
commit b7ef93cb7ff8f7c5ba3504a7f95a083fea3fd7d6
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 13:03:09 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-chips.
diff --git a/debian/changelog b/debian/changelog
index 50bbea8..f370627 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
xserver-xorg-video-chips (1:1.1.1-5) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
the user's config and log files.
* Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
versions don't have the bug script.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 7 Nov 2006 07:30:40 +0100
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-chips.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:02:19 +0300
xserver-xorg-video-chips (1:1.1.1-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f85d143..c9a2801 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-chips
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.1.1-11)
Provides: xserver-xorg-video-1.0
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-chips
+Conflicts: xserver-xorg-driver-chips
Description: X.Org X server -- Chips display driver
This package provides the driver for the Chips & Technologies family
of video cards.
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
Reply to: