xserver-xorg-video-cyrix: Changes to 'debian-unstable'
debian/changelog | 13 - debian/copyright |3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) New commits: commit 27be8975b981c0fd2e148433983f74ad31f09e2d Author: Brice Goglin [EMAIL PROTECTED] Date: Sat Sep 15 01:51:58 2007 +0200 Add upstream URL to debian/copyright diff --git a/debian/changelog b/debian/changelog index 1272855..10d3dfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-cyrix (1:1.1.0-8) UNRELEASED; urgency=low + + * Add upstream URL to debian/copyright. + + -- Brice Goglin [EMAIL PROTECTED] Sat, 15 Sep 2007 01:51:44 +0200 + xserver-xorg-video-cyrix (1:1.1.0-7) experimental; urgency=low * Build against and build-dep on xserver 1.4 diff --git a/debian/copyright b/debian/copyright index 87bcb8b..7b2f3cb 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 Richard A. Hecker, California, United States Copyright 2002 by Red Hat Inc. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-cyrix: Changes to 'debian-unstable'
Makefile.in | 129 +--
aclocal.m4 | 676 ---
configure | 1127 +++-
debian/changelog| 16
debian/control |4
debian/patches/02_gen_pci_ids.diff | 15
debian/patches/series |1
debian/xserver-xorg-video-cyrix.install |1
man/Makefile.in | 96 +-
src/Makefile.in | 162 ++--
10 files changed, 1401 insertions(+), 826 deletions(-)
New commits:
commit 1e733b2b8483f1a18cd0ba3e99d799fae1db921a
Author: David Nusinow [EMAIL PROTECTED]
Date: Sun Sep 16 16:18:36 2007 -0400
* Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 80892c4..9101059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cyrix (1:1.1.0-8) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- David Nusinow [EMAIL PROTECTED] Sun, 16 Sep 2007 15:43:43 -0400
+
xserver-xorg-video-cyrix (1:1.1.0-7) UNRELEASED; urgency=low
[ Julien Cristau ]
commit d481a76ca7734ef9788d3fd816b3de49d8dd9081
Author: David Nusinow [EMAIL PROTECTED]
Date: Fri Sep 14 00:08:42 2007 -0400
* Add 02_gen_pci_ids.diff
This patch adds a set of PCI ID's supported by this driver so that it can
be autoloaded by the X server
diff --git a/Makefile.in b/Makefile.in
index ac46fca..37fea39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR) cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
@@ -73,10 +69,13 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive\
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -94,8 +93,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -104,10 +101,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
-BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
-BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
-BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
CC
xserver-xorg-video-cyrix: Changes to 'debian-unstable'
.cvsignore| 19 ChangeLog | 272 + Makefile.in | 16 aclocal.m4| 379 +- autogen.sh| 12 config.guess | 667 ++-- config.h.in |9 config.sub| 230 + configure | 7992 ++ debian/changelog | 23 debian/control| 14 debian/rules |4 debian/xsfbs/xsfbs.mk | 28 ltmain.sh | 12 man/.cvsignore|2 man/Makefile.am |2 man/Makefile.in | 16 man/cyrix.man |6 mkinstalldirs | 89 src/.cvsignore|6 src/Makefile.in | 14 src/cyrix_driver.c|2 22 files changed, 5473 insertions(+), 4341 deletions(-) New commits: commit de7d88bb0af9a6284854a95535f1104a13674243 Author: Brice Goglin [EMAIL PROTECTED] Date: Sun Apr 29 14:35:11 2007 +0200 Update upstream ChangeLog diff --git a/ChangeLog b/ChangeLog index 344113a..0ff33cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,59 +1,254 @@ -2006-04-06 Adam Jackson [EMAIL PROTECTED] +commit 23eae9e5dedfe2a5930d30af0de1b7a1ba21fc1a +Author: Alan Coopersmith [EMAIL PROTECTED] +Date: Thu Mar 1 10:44:00 2007 -0800 - * configure.ac: - * src/cyrix.h: - * src/cyrix_accel.c: - * src/cyrix_bank.c: - * src/cyrix_driver.c: - * src/cyrix_helper.c: - * src/cyrix_shadow.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. +Replace references to XFree86/XF86Config in man page - * src/cyrix_driver.c: - VERSION - CYRIX_VERSION +commit 933fac699a3ba9257c87fb209b6dd21c29d15a4a +Author: Adam Jackson [EMAIL PROTECTED] +Date: Fri Apr 7 18:58:45 2006 + -2005-12-20 Kevin E. Martin kem-at-freedesktop-dot-org +VERSION - CYRIX_VERSION - * configure.ac: - Update package version for X11R7 release. +commit a878ca340afd5c94519ced8db60bac873e69d313 +Author: Adam Jackson [EMAIL PROTECTED] +Date: Fri Apr 7 18:47:44 2006 + -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 88e18c25be3fe2c4d10b1a46e311a9882eda690a +Author: Kevin E Martin [EMAIL PROTECTED] +Date: Wed Dec 21 02:29:59 2005 + -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 2af4143f802821cd9dd949fd6c7f72b68b78acd0 +Author: Adam Jackson [EMAIL PROTECTED] +Date: Mon Dec 19 16:25:52 2005 + -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 ce65256a7fe3f11aee520b9201713f73ef1e84da +Author: Kevin E Martin [EMAIL PROTECTED] +Date: Thu Dec 15 00:24:16 2005 + -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 f60b42c8b25aa9689cc9877b41df38e9ff8bcf2f +Author: Kevin E Martin [EMAIL PROTECTED] +Date: Tue Dec 6 22:48:34 2005 + -2005-11-29 Adam Jackson [EMAIL PROTECTED] +Change *man_SOURCES == *man_PRE to fix autotools warnings. - * configure.ac: - Only build dlloader modules by default. +commit 04e4e6d732d92ea302fdc9bef2cb0b8fde29aa01 +Author: Kevin E Martin [EMAIL PROTECTED] +Date: Sat Dec 3 05:49:33 2005 + -2005-11-15 Kevin E. Martin kem-at-freedesktop-dot-org +Update package version number for X11R7 RC3 release. - * configure.ac: - Add check for DGA extension to fix issues when building with - separate build roots. +commit 0e23a439bfbe4ae475f6dd9bffdaec72c0e410f2 +Author: Kevin E Martin [EMAIL PROTECTED] +Date: Fri Dec 2 02:16:07 2005 + -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 a8f3112f3a4df72cfc44d3a882e901c24feae5de +Author: Adam Jackson [EMAIL PROTECTED] +Date: Tue Nov 29 23:29:58 2005 + -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 3c3b656e7df9e8d07750f38cefa68d5d5a039fbd +Author: Alan Coopersmith [EMAIL PROTECTED] +Date: Mon Nov 28 22:04:08 2005 + + +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 e3872d1097829989e211d3f06351f4c659143c48 +Author: Eric Anholt [EMAIL PROTECTED] +Date: Mon Nov 21 10:49:11
xserver-xorg-video-cyrix: Changes to 'debian-unstable'
debian/changelog |6 +-
debian/control |3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 525b14fa28035acab7216c77ef233c7a7f7fb75a
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Tue Apr 24 13:12:59 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-cyrix
diff --git a/debian/changelog b/debian/changelog
index 3a4b3e7..9991198 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
xserver-xorg-video-cyrix (1:1.1.0-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 [EMAIL PROTECTED] Tue, 7 Nov 2006 07:30:40 +0100
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-cyrix.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 13:11:10 +0300
xserver-xorg-video-cyrix (1:1.1.0-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b3926bb..555925c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-cyrix
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-cyrix
+Conflicts: xserver-xorg-driver-cyrix
Description: X.Org X server -- Cyrix display driver
This package provides the driver for the Cyrix family of video cards.
.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-cyrix: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit e9e91d6281370311da437d6ea0fc528d71d6bfa2 Author: Julien Cristau [EMAIL PROTECTED] Date: Tue Nov 7 06:46:29 2006 + For each driver, add a symlink to xserver-xorg-core's bug script, so that each new bugreport contains the user's config and log files. Bump dependencies on xserver-xorg-core to = 2:1.1.1-11, to make sure that the bug script is present. commit 10d4e49222b96b8f5bf1856b0739d4e1444cfc39 Author: Thierry Reding [EMAIL PROTECTED] Date: Tue Sep 26 10:26:34 2006 + Add some more watch files. commit 59860eae56bbec6d587041a2043e6b935ac0952c Author: David Nusinow [EMAIL PROTECTED] Date: Thu Sep 21 00:55:31 2006 + Prepare changelog for upload commit 9e00b6716aa8aa3c21e133180218c6ad66657d9e Author: Steve Langasek [EMAIL PROTECTED] Date: Thu Sep 21 00:21:15 2006 + Document numbers of fixed bugs commit 71a9c3cb1a7e0639c05228637d9a55b24d6693c3 Author: Drew Parsons [EMAIL PROTECTED] Date: Wed Sep 20 14:56:30 2006 + * Build-Depends: quilt. commit 214aed7f6ac62290b3e66e3b79c8b52ff7340843 Author: David Nusinow [EMAIL PROTECTED] Date: Tue Sep 19 00:37:25 2006 + Prepare changelog for upload to unstable commit cde342f79ed17a55bfddb6c610ed8071c633e790 Author: Drew Parsons [EMAIL PROTECTED] Date: Mon Sep 18 14:58:02 2006 + * Standards version 3.7.2. * Use debhelper 5. * Use dh_installman to install man pages. * Exclude cyrix_drv.la from dh_install. * Patch 1-man-typo fixes typo in man page. Closes: #364557. * Use patch and xsfclean rules in debian/rules. commit 8d008e1aea65d41dd4f718d970db559c4dc82f59 Author: Steve Langasek [EMAIL PROTECTED] Date: Mon Sep 18 10:43:38 2006 + merge cyrix 7.1 video driver to trunk for upload to unstable commit 0f657e1fae4e2a1bffc6f573c28ea23714c3d3b3 Author: Steve Langasek [EMAIL PROTECTED] Date: Mon Sep 18 06:33:05 2006 + more fixes for unversioned directory names commit ae5700e2bad437dd59f800470fb859c9fcf64943 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Apr 5 00:10:22 2006 + Prepare changelogs for upload to unstable commit 51147a8da15e07205d057ed6c644a2fccac20c81 Author: David Nusinow [EMAIL PROTECTED] Date: Mon Feb 13 03:46:16 2006 + Fix Branden's email address commit 0efb7def6656491a723fe911b51e226c1a694c95 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Feb 12 16:24:02 2006 + Move all install files for renaming scheme and delete v4l driver which doesn't currently have packaging commit 842faff41984b661c9cb4ca77017183628bad7fd Author: David Nusinow [EMAIL PROTECTED] Date: Fri Feb 10 03:40:14 2006 + Change driver package names to new scheme commit 06e4668fe3d93e1eb614b4f30eedebe287f4e74d Author: David Nusinow [EMAIL PROTECTED] Date: Mon Jan 30 02:24:55 2006 + Move .install files to new naming scheme for drivers commit 91e8df7f29b2748de3ef79916efbe5bbd2af8370 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Jan 29 21:21:32 2006 + Pull in and use xsfbs commit 8e51073188010c718260ebb09b67c76e764777fe Author: David Nusinow [EMAIL PROTECTED] Date: Sun Jan 29 20:36:06 2006 + * Rename driver packages to be more consistent and intuitive + Video drivers are now named xorg-video-driver-foo and input drivers are now named xorg-input-driver-foo + Video drivers provide xorg-video-driver and input drivers provide xorg-input-driver + xorg-server-core depends on xorg-video-drivers-all | xorg-video-driver and also xorg-input-drivers-all | xorg-input-drivers commit 90dff6342c5f491f278c13396a51b7ef7fa4e0a8 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Jan 20 04:31:26 2006 + Fix maintainer and uploader fields. God, I love sed. commit 43c5aff3e9782418033b457fd94117d7fb1267a7 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Jan 20 01:04:43 2006 + Add more copyright info commit 037c329293414af5b41a160cfc8c569d4b16693b Author: David Nusinow [EMAIL PROTECTED] Date: Fri Jan 13 05:48:42 2006 + Add packaging for various drivers commit 1e478df308f560e7ae211731f48d91392bb15cf2 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Jan 13 04:05:21 2006 + Update drivers in modular branch. We'll re-pull the ubuntu packaging properly commit 8299e77ffe679e243e70ee86b3316bba3006a399 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Dec 30 18:14:25 2005 + Vendor drop of the rest of 7.0 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
