xserver-xorg-video-cirrus: Changes to 'debian-experimental'
ChangeLog | 281 +++++++++++++++++++++++++++++++++++++++++---------
debian/changelog | 35 ++++--
debian/control | 13 +-
debian/copyright | 3
debian/rules | 2
debian/xsfbs/xsfbs.mk | 36 +++---
debian/xsfbs/xsfbs.sh | 7 -
man/cirrus.man | 6 -
8 files changed, 297 insertions(+), 86 deletions(-)
New commits:
commit 8a74643b63087b7ac29e5ac1ed083f4e4accf3eb
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 22:11:21 2007 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index c22b438..fa44465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.1.0-6) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.1.0-6) experimental; urgency=low
[ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -17,11 +17,12 @@ xserver-xorg-video-cirrus (1:1.1.0-6) UNRELEASED; urgency=low
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-video-cirrus
module in the long description.
- * Remove Fabio from uploaders with his permission. He's always welcome back.
+ * Add myself to uploaders, and remove Branden and Fabio with their
+ permission.
* Build against xserver 1.4.
* Add upstream URL to debian/copyright.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sun, 29 Apr 2007 10:53:55 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 22:09:13 +0200
xserver-xorg-video-cirrus (1:1.1.0-5) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 007e095..c238bb5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-cirrus
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, 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-cirrus
commit feff017b4ae383bbb12ee02c37f1f39a3ff6a3ff
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 22:08:51 2007 +0200
Build against xserver 1.4
diff --git a/debian/changelog b/debian/changelog
index b342bd0..c22b438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ xserver-xorg-video-cirrus (1:1.1.0-6) UNRELEASED; urgency=low
* Add a link to www.X.org and a reference to the xf86-video-cirrus
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 10:53:55 +0200
diff --git a/debian/control b/debian/control
index e4e7557..007e095 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, 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, 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-cirrus
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
diff --git a/debian/copyright b/debian/copyright
index 64e5acd..bb283cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
Copyright 2000 by Egbert Eich
Permission to use, copy, modify, distribute, and sell this software and its
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 67793cf040bb0b12fbd3bc7ad12ed4a686810686
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sun Apr 29 11:00:10 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 92ba092..c281afc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,67 +1,254 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
+commit 43d9703ddf79314015b66c81c671ef254fbb3934
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Mar 1 10:41:58 2007 -0800
- * configure.ac:
- * src/CirrusClk.c:
- * src/alp_driver.c:
- * src/alp_hwcurs.c:
- * src/alp_i2c.c:
- * src/alp_xaa.c:
- * src/alp_xaam.c:
- * src/cir.h:
- * src/cir_dga.c:
- * src/cir_driver.c:
- * src/cir_shadow.c:
- * src/lg_driver.c:
- * src/lg_hwcurs.c:
- * src/lg_i2c.c:
- * src/lg_xaa.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+ Replace references to XFree86/XF86Config in man page
- * src/cir_driver.c:
- VERSION -> CIR_VERSION
+commit 1ba52ebddd605c9341ff7f0a880c272a78f467ed
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 18:57:40 2006 +0000
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ VERSION -> CIR_VERSION
- * configure.ac:
- Update package version for X11R7 release.
+commit e6588f26e12bb737551b9448911c31129978ea85
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 18:44:20 2006 +0000
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit 9ca7e7fcfc53ae9054661219aa366409089c3f8d
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:59 2005 +0000
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version for X11R7 release.
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit 2d8e201ee988646bd8601dbc2b8c32571fdac017
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:52 2005 +0000
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Stub COPYING files
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit dbf028bd0148d2317e7b87fad857ad0f7accd234
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:16 2005 +0000
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version number for final X11R7 release candidate.
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+commit 4456ba0a597443aed32bf686b79c22ef19ac0102
+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 134440cd4ab932803b100bf7767776fb0ffb2d0d
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:33 2005 +0000
-2005-11-28 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version number for X11R7 RC3 release.
- * src/Makefile.am:
- Separate cirrus driver into _drv, _alpine and _laguna components
- as they are in the monolithic tree.
+commit 2f48ba72c2009bc3c7b83d2b1415df897a2b26e4
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:07 2005 +0000
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Remove extraneous AC_MSG_RESULT.
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 444b38c206b6a7c037615694c2a7ada84380698e
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:29:58 2005 +0000
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Only build dlloader modules by default.
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+commit 6d3a17ba84343fb5c0cf75039a4e5cbd3274cfc3
+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 2820e709f8d2366cdaf2aa7df8b9ad44fafc1886
+Author: Kevin E Martin <kem@kem.org>
+Date: Mon Nov 28 16:05:38 2005 +0000
+
+ Separate cirrus driver into _drv, _alpine and _laguna components as they
+ are in the monolithic tree.
+
+commit 53e79befceacccee15bfa47b56b34b180f3039cb
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:11 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit ad036f9f6ef53fa454f63f4426a17e55d7598343
+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 4c88ee7e2f5297a260b8d4871869cfa0494d157f
+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 44e282ad51518a06f6c5cd8c871b0bcd08ec0477
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:02 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 2fe8297b577524e052987756a4902a20b7f41606
+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 2b3c8a3d754b4511ae7f90051c5ed995b1e45765
+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 a5f509023c24021c5eb1a272a4423cbfe4b634c5
+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 96c957a338d3aca2756b86680c052f602fee1e10
+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 60d397b933810bf2a377c00b3b2ce1ea5048b384
+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 31a03e7fac786df5b3e51586a9f338cf019210a9
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:43 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 269bb85534031d11bd008b530e39e52b86734832
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Jul 25 23:46:27 2005 +0000
+
+ src/Makefile.am
+
+commit 6ced8240c5d328b1edc2ba54d49f3d362e596244
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Jul 25 23:46:15 2005 +0000
+
+ man/Makefile.am
+
+commit c8160cf29932bef0a9b850c068587d1f1ad579ba
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Jul 25 23:45:41 2005 +0000
+
+ Build system for Cirrus driver
+
+commit 133e8b674546c50db80cb39d0ca526d6fb1ed12b
+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 88c1e79c6b3fff064ca5ba2cc500714707d605be
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sun Jun 26 04:38:12 2005 +0000
+
+ Bug #3628: Fix video driver submodule visibility.
+
+commit 57144d6c9ea250b1d9a40bac4c70180593c1ca2c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:54 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 264b155fdc7f0f860a5cfa5932fb683e5d1934ef
+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 979f1e0c830891c9e4f0b4837980766cc7eac3d7
+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 c15b8a386fc6915e2ec13b0b8b9a15eb7277d665
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:23:02 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 5308a983f77e8cd96538c4637062aa29a705caa3
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:28:21 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit fb8a70faaa717c7b998ad531e8b0c0620f56a731
+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 d54af9086282437c9928ba667a763bff2cbaf740
+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 cc1c352f76fc1138223cab6449bdbf5538400e27
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:52 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 99774def5b55af0af2d53f78c4e09000c9105c29
+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 08e4d07d7203d7db746839725d632756ede8816d
+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 2c120fef2e3e4fa5751e29e6e80e70edba6e3e7a
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 97c9ec2c1201ec09c359f92817033281045c537e
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
commit 090f7af9715dbef2f83e1638eb7c0c8160f7af3e
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sun Apr 29 10:56:10 2007 +0200
Pull upstream manpage fix 43d9703ddf79314015b66c81c671ef254fbb3934
diff --git a/debian/changelog b/debian/changelog
index a314c74..b342bd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-cirrus (1:1.1.0-6) UNRELEASED; urgency=low
* Replaces/Conflicts: xserver-xorg-driver-cirrus.
[ Brice Goglin ]
+ * Pull upstream manpage fix 43d9703ddf79314015b66c81c671ef254fbb3934
* 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 b1b62bd4e29748949d324541b01e8fb755b41e01
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 10:41:58 2007 -0800
Replace references to XFree86/XF86Config in man page
diff --git a/man/cirrus.man b/man/cirrus.man
index 5035b02..2c5e4a0 100644
--- a/man/cirrus.man
+++ b/man/cirrus.man
@@ -14,17 +14,17 @@ cirrus \- Cirrus Logic video driver
.fi
.SH DESCRIPTION
.B cirrus
-is an XFree86 driver for Cirrus Logic video chips.
+is an __xservername__ driver for Cirrus Logic video chips.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B cirrus
driver supports...
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
commit ceb6c9afa286c4e7a90617db245fc4049e178879
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sun Apr 29 10:54:27 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-cirrus
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 0ec1326..a314c74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,16 @@ xserver-xorg-video-cirrus (1:1.1.0-6) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-cirrus.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:03:59 +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-cirrus
+ 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 10:53:55 +0200
xserver-xorg-video-cirrus (1:1.1.0-5) experimental; urgency=low
diff --git a/debian/control b/debian/control
index b4e587d..e4e7557 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-cirrus
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, 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, 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-cirrus
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
Package: xserver-xorg-video-cirrus
Architecture: any
@@ -17,8 +19,8 @@ Description: X.Org X server -- Cirrus display driver
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-cirrus' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ This package is built from the X.org xf86-video-cirrus driver module.
diff --git a/debian/rules b/debian/rules
index dc5e837..a140bf9 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=.la --exclude=usr/share/man/man4
dh_installman
dh_link
commit 5f53063369014115c3af74331f210880fc3b7c07
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 13:05:33 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-cirrus.
diff --git a/debian/changelog b/debian/changelog
index 72d09fe..507c004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
xserver-xorg-video-cirrus (1:1.1.0-4) 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-cirrus.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:03:59 +0300
xserver-xorg-video-cirrus (1:1.1.0-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0682f04..8f4bf83 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-cirrus
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-cirrus
+Conflicts: xserver-xorg-driver-cirrus
Description: X.Org X server -- Cirrus display driver
This package provides the driver for the Cirrus Logic 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; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
Reply to: