.gitignore | 69 +++++++++++++++++++++++++++--- COPYING | 12 ----- ChangeLog | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 9 +++ configure.ac | 19 +++----- debian/README.source | 2 debian/changelog | 27 +++++++++++ debian/control | 10 +--- debian/rules | 10 ++-- debian/xsfbs/xsfbs.mk | 35 +++++++++------ src/.gitignore | 6 -- src/Makefile.am | 3 + src/dummy_driver.c | 21 ++++++--- 13 files changed, 272 insertions(+), 66 deletions(-)
New commits: commit b78a7628fcd78b80ed56871262d2226afdfff286 Author: Christopher James Halse Rogers <[email protected]> Date: Wed Aug 4 10:50:23 2010 +1000 Changelog entry for 0.3.4 diff --git a/debian/changelog b/debian/changelog index 3f74844..66f6a72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-dummy (1:0.3.4-1) UNRELEASED; urgency=low + + * New upstream release + - Fix build against Xserver 1.9 + * Bump Standards-Version to 3.9.1 + + -- Christopher James Halse Rogers <[email protected]> Wed, 04 Aug 2010 10:44:28 +1000 + xserver-xorg-video-dummy (1:0.3.3-2) unstable; urgency=medium * Update xsfbs, use new ${xviddriver:Depends} substvar. diff --git a/debian/control b/debian/control index c0dec2a..52caaaa 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-dummy Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-dummy.git commit 51642de730f264fdfaf1c78f68a767a9347e1520 Author: Dave Airlie <[email protected]> Date: Mon Jul 5 12:05:40 2010 +1000 dummy 0.3.4 diff --git a/configure.ac b/configure.ac index 62666c6..d793a52 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-dummy], - 0.3.3, + 0.3.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-dummy) commit 77ae177fd77e90a6eaeebde9df88911256264329 Author: Jamey Sharp <[email protected]> Date: Fri Jun 4 16:09:34 2010 -0700 Use new server API to find the root window. Signed-off-by: Jamey Sharp <[email protected]> diff --git a/src/dummy_driver.c b/src/dummy_driver.c index e32c1c7..804e41e 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -779,7 +779,11 @@ DUMMYCreateWindow(WindowPtr pWin) return(ret); if(dPtr->prop == FALSE) { +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8 pWinRoot = WindowTable[DUMMYScrn->pScreen->myNum]; +#else + pWinRoot = DUMMYScrn->pScreen->root; +#endif if (! ValidAtom(VFB_PROP)) VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1); commit 2503a68673c6012a0bf2abba58aa5060654965f9 Author: Gaetan Nadon <[email protected]> Date: Sat Jun 12 15:39:03 2010 -0400 COPYING: replace stub file with actual Copyright notice Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/COPYING b/COPYING index 7f33cbf..3c1ef48 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,2 @@ -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 2002, SuSE Linux AG, Author: Egbert Eich -Please submit updated COPYING files to the Xorg bugzilla: - -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - -All licensing questions regarding this software should be directed at the -Xorg mailing list: - -http://lists.freedesktop.org/mailman/listinfo/xorg commit 1b8078f7141e55a50bdb4fee57672775a22dac29 Author: Julien Cristau <[email protected]> Date: Fri May 14 12:55:08 2010 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 94ea9fe..3f74844 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-dummy (1:0.3.3-2) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.3-2) unstable; urgency=medium * Update xsfbs, use new ${xviddriver:Depends} substvar. - -- Julien Cristau <[email protected]> Fri, 14 May 2010 12:33:29 +0200 + -- Julien Cristau <[email protected]> Fri, 14 May 2010 12:54:43 +0200 xserver-xorg-video-dummy (1:0.3.3-1) unstable; urgency=low commit b6851d7ea9559f2a6813a6b90d8d316454367c39 Author: Julien Cristau <[email protected]> Date: Fri May 14 12:33:45 2010 +0200 Update xsfbs, use new ${xviddriver:Depends} substvar. diff --git a/debian/changelog b/debian/changelog index 31b6e8a..94ea9fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-dummy (1:0.3.3-2) UNRELEASED; urgency=low + + * Update xsfbs, use new ${xviddriver:Depends} substvar. + + -- Julien Cristau <[email protected]> Fri, 14 May 2010 12:33:29 +0200 + xserver-xorg-video-dummy (1:0.3.3-1) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index 835570a..c0dec2a 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected] Build-Depends: debhelper (>= 5.0.0), pkg-config, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, @@ -23,7 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-dummy.g Package: xserver-xorg-video-dummy Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} Provides: ${xviddriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-dummy Conflicts: xserver-xorg-driver-dummy commit fff2f7d57fc6f2ee889f643931afcc0034f3c86e Author: Mikhail Gusarov <[email protected]> Date: Fri May 7 18:58:57 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index a0e826d..835570a 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,5 @@ Description: X.Org X server -- dummy display driver . 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 package is built from the X.org xf86-video-dummy driver module. commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <[email protected]> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze 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-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <[email protected]> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit b229ad98ae65c512955bf453a345eba80d65cf0e Author: Cyril Brulebois <[email protected]> Date: Tue Apr 6 04:42:10 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 3b7e3b8..31b6e8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-dummy (1:0.3.3-1) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.3-1) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -9,7 +9,7 @@ xserver-xorg-video-dummy (1:0.3.3-1) UNRELEASED; urgency=low * New upstream release. * Add myself to Uploaders. - -- Cyril Brulebois <[email protected]> Tue, 06 Apr 2010 04:35:46 +0200 + -- Cyril Brulebois <[email protected]> Tue, 06 Apr 2010 04:41:45 +0200 xserver-xorg-video-dummy (1:0.3.2-1) experimental; urgency=low commit 081cabdd17d1814791a867361e4fe2bd8f4f989e Author: Cyril Brulebois <[email protected]> Date: Tue Apr 6 04:39:13 2010 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index df82c9e..3b7e3b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xserver-xorg-video-dummy (1:0.3.3-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. + * Add myself to Uploaders. -- Cyril Brulebois <[email protected]> Tue, 06 Apr 2010 04:35:46 +0200 diff --git a/debian/control b/debian/control index f3d64fe..a0e826d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-dummy Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]> +Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit 5ec5e5ad3a3d16a2b6b3eeb2c990cb403160377e Author: Cyril Brulebois <[email protected]> Date: Tue Apr 6 04:37:50 2010 +0200 Update ChangeLog (and remove it from .gitignore). diff --git a/.gitignore b/.gitignore index 537929d..f35100a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ aclocal.m4 autom4te.cache/ autoscan.log -ChangeLog compile config.guess config.h diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..39733e3 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,416 @@ +commit 483db0376d08be806c9bd51646f226f9510a4e48 +Author: Adam Jackson <[email protected]> +Date: Tue Dec 1 10:51:30 2009 -0500 + + dummy 0.3.3 + + Signed-off-by: Adam Jackson <[email protected]> + +commit 1ea8367691e69b289c2b5ca67d8ace39994347f8 +Author: Adam Jackson <[email protected]> +Date: Tue Dec 1 10:36:35 2009 -0500 + + Don't try to make an INSTALL file + + INSTALL_CMD is empty. This breaks make distcheck. I don't know why, + but I also don't care. + + Signed-off-by: Adam Jackson <[email protected]> + +commit 84b8dac3e6d869aa7e7b012add892fad9c3ce136 +Author: Gaetan Nadon <[email protected]> +Date: Mon Nov 23 09:25:05 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit be0e614859c5754a18dc7c8ad2dd55090ab166c7 +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:41:41 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Automake 'foreign' option is specified in configure.ac. + Remove from Makefile.am + +commit 2fc665b979a56faaac388b065c4cd91e0d2994d3 +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:09:09 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 27946998e6ec8537e7137fd453e229d81c092f54 +Author: Gaetan Nadon <[email protected]> +Date: Mon Oct 26 12:54:21 2009 -0400 + + Several driver modules do not have a ChangeLog target in Makefile.am #23814 + + The git generated ChangeLog replaces the hand written one. + Update configure.ac to xorg-macros level 1.3. + Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros + Update Makefile.am to add ChangeLog target if missing + Remove ChangeLog from EXTRA_DIST or *CLEAN variables + This is a pre-req for the INSTALL_CMD + +commit 50b546f499ae1cafbdf8e890234616733e2e6633 +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 13:00:42 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 7aefb53beeaac7de52c44be0032a5a699706b74b +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 12:34:16 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 4d4e41812e21490e39da34ac123b2c66bf20598c +Author: Adam Jackson <[email protected]> +Date: Wed Nov 18 09:37:49 2009 -0500 + + Canonically re-wrap too. + + Signed-off-by: Adam Jackson <[email protected]> + +commit b5983dbbd5f0cb4416b0e484fb43c80208feca25 +Author: Adam Jackson <[email protected]> +Date: Wed Nov 18 09:36:34 2009 -0500 + + Compile fix. + + Signed-off-by: Adam Jackson <[email protected]> + +commit e39d9a265572c273915f1803a729e7211d7b247b +Author: Adam Jackson <[email protected]> +Date: Tue Nov 17 13:46:27 2009 -0500 + + Add support for HW_SKIP_CONSOLE + + Acked-by: Aaron Plattner <[email protected]> + Signed-off-by: Adam Jackson <[email protected]> + +commit a8366277a70797a7fa9c8c0b739a5fdac066816f +Author: Adam Jackson <[email protected]> +Date: Tue Nov 17 13:36:30 2009 -0500 + + Properly un/rewrap CreateWindow + + Acked-by: Aaron Plattner <[email protected]> + Signed-off-by: Adam Jackson <[email protected]> + +commit ecf513ae11399c5778ff7d988e838a2b6211a88b +Author: Adam Jackson <[email protected]> +Date: Thu Jul 2 11:08:25 2009 -0400 + + dummy 0.3.2 + +commit 8fe24e48acc7ec03972ee0acb5d7ab205ecbf7e0 +Author: Adam Jackson <[email protected]> +Date: Thu May 28 14:54:17 2009 -0400 + + Remove useless loader symbol lists. + +commit 17885c5cb1dbcfb48ee593260bcd1b1ff2887989 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 30 20:38:25 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit d876e719969e9d33e7e4502448a544f12eb0fab8 +Author: Julien Cristau <[email protected]> +Date: Sun Jan 25 23:25:33 2009 +0100 + + dummy 0.3.1 + +commit 33e86171bd1815a23f35bb992a91c02785c22402 +Author: Adam Jackson <[email protected]> +Date: Fri Aug 15 14:05:04 2008 -0400 + + Uninclude xf86Version.h + +commit 0dcdce106d01aa6ff611436c3f8374241e7a8da8 +Author: Adam Jackson <[email protected]> +Date: Wed Mar 19 17:31:28 2008 -0400 + + dummy 0.3.0 + +commit ba7ab1d468e9a5ba37c064b3b128fa3bbb721044 +Author: Adam Jackson <[email protected]> +Date: Wed Mar 19 17:26:51 2008 -0400 + + Death to RCS tags. + +commit 2aeec40b3d48705bc1de9da3f06deac365c25895 +Author: James Cloos <[email protected]> +Date: Mon Sep 3 05:52:30 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 1874204e0c807c1686c28782d5eef62bd49fab04 +Author: James Cloos <[email protected]> +Date: Thu Aug 23 19:25:48 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 345de2bd048fcc7b177a3b504522fe100b34f1e0 +Author: Brice Goglin <[email protected]> +Date: Tue Aug 7 10:50:06 2007 +0200 + + Define DUMMY_*_VERSION* using PACKAGE_VERSION_* + +commit 22e38bed8cd2d1e54c47d0763436012eeccb2d32 +Author: Adam Jackson <[email protected]> +Date: Fri Apr 7 18:59:48 2006 +0000 + + VERSION -> DUMMY_VERSION + +commit 7432eaf48b70437bd55e5cc98833cce224d9e131 +Author: Adam Jackson <[email protected]> +Date: Fri Apr 7 18:50:19 2006 +0000 + + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + +commit 474af880791908da7e006c4d500bc7318107bbd1 +Author: Kevin E Martin <[email protected]> +Date: Wed Dec 21 02:29:59 2005 +0000 + + Update package version for X11R7 release. + +commit 9b9ea496e698e4d078c67b8f5674fd6479e3b2bb +Author: Adam Jackson <[email protected]> +Date: Mon Dec 19 16:25:53 2005 +0000 + + Stub COPYING files + +commit d2cff58c1e7ff03109bd17c5f8247b9b166b71f2 +Author: Kevin E Martin <[email protected]> +Date: Thu Dec 15 00:24:17 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 39f1e4449acb3e5da96aaaaa86e2544e9be968b1 +Author: Kevin E Martin <[email protected]> +Date: Sat Dec 3 05:49:33 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 1b47f2e8f47501122a3b613b95ea5de99f76a8c2 +Author: Kevin E Martin <[email protected]> +Date: Fri Dec 2 02:16:08 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit c2c245b18409db7013dee0b0b4b7176daae7e290 +Author: Adam Jackson <[email protected]> +Date: Tue Nov 29 23:29:58 2005 +0000 + + Only build dlloader modules by default. + +commit e6887d858e8b837c29c7833ab4b55034b736c6d8 +Author: Eric Anholt <[email protected]> +Date: Mon Nov 21 10:49:12 2005 +0000 + + Add .cvsignores for drivers. + +commit ec562722d0ae21f82a0dcc1a4a3e45ed52592aed +Author: Kevin E Martin <[email protected]> +Date: Tue Nov 15 05:42:03 2005 +0000 + + Add check for DGA extension to fix issues when building with separate build + roots. + +commit 1073cc5a2bd62b6972fcda4d4d9ccbe43f2506d4 +Author: Kevin E Martin <[email protected]> +Date: Wed Nov 9 21:15:14 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 5ced29a35f7571899f281af094fbd1f242f95e7d +Author: Kevin E Martin <[email protected]> +Date: Tue Nov 1 15:08:52 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit ffa97f23462ff045834b4abae33cf645ed6c3517 +Author: Kevin E Martin <[email protected]> +Date: Wed Oct 19 02:48:02 2005 +0000 + + Update package version number for RC1 release. + +commit 4bb6048d8d0d87f3d91a93fef737882434702bb0 +Author: Alan Coopersmith <[email protected]> +Date: Mon Oct 17 00:09:02 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit f586bde47b9ed6561b5350c03b088acfe2e227f6 +Author: Daniel Stone <[email protected]> +Date: Thu Aug 18 09:03:46 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit d43c40d00ab34ae85e4684cc3860f641b0bea65c +Author: Søren Sandmann Pedersen <[email protected]> +Date: Wed Aug 10 14:07:24 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit ef552d7e1765386c652748a97df67f4ba00beef0 +Author: Kevin E Martin <[email protected]> +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 c5f63f703d838cfae54269c595e14a06ea04f243 +Author: Søren Sandmann Pedersen <[email protected]> +Date: Wed Jul 13 21:52:24 2005 +0000 + + Add Makefile.am here. Also, for the record, CVS needs a bullet through its + head + +commit 30a2cce4b61e2b0e550479ee87f25c895cbca513 +Author: Søren Sandmann Pedersen <[email protected]> +Date: Wed Jul 13 21:45:21 2005 +0000 + + Build system for dummy video driver + +commit ec9e85771609d6ec8a94b777fc784db4d1026f20 +Author: Adam Jackson <[email protected]> +Date: Mon Jul 11 02:29:47 2005 +0000 + + Prep for modular builds by adding guarded #include "config.h" everywhere. + +commit 7b856f1c89ceae998c2133fcd9bba2c1493744e0 +Author: Adam Jackson <[email protected]> +Date: Sat Jun 25 21:16:54 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit a467602c6c419bd7288d80ad50a6fa62aeff3ec8 +Author: Daniel Stone <[email protected]> +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 53407449153e20f7529ed9b403cee5aab25880d0 +Author: Adam Jackson <[email protected]> +Date: Fri Feb 25 16:38:34 2005 +0000 + + Bug #2605: Make the cyrix, dummy, glint, neomagic, tga, and trident drivers + build when BuildXF86DGA NO. + (also fix some datestamps in the changelog) + +commit 73816949f2a28a0b8fe39108a8e493f9e47f7718 +Author: Egbert Eich <[email protected]> +Date: Fri Jan 28 16:12:59 2005 +0000 + + Modifying X.Org Xserver DDX to allow to run X with ordinary user + permissions when no access to HW registers is required. For API changes + which mostly involve the modifications to make the RRFunc (introduced + with 6.8) more flexible please check Bugzilla #2407. NOTE: This patch + applies changes to OS specific files for other OSes which I cannot + test. + +commit 720c9b05f47c3529aa2561ab4c88319322893780 +Author: Markus Kuhn <[email protected]> +Date: Sat Dec 4 00:43:05 2004 +0000 + + Encoding of numerous files changed to UTF-8 + +commit b227226476ae94d094376c561d77e85589592fe6 +Author: Stuart Kreitman <[email protected]> +Date: Fri Oct 15 21:09:00 2004 +0000 + + Bugzilla #1644: Attach an atom "VFB" to root window of dummy driver. + Committing in Head. + Modified Files: dummy.h dummy_driver.c + +commit a571d5efb53cfe793d61d1b48c2bddc8d337d381 +Author: Eric Anholt <[email protected]> +Date: Wed Jun 16 09:23:03 2004 +0000 + + DRI XFree86-4_3_99_12-merge import + +commit 289ef4abc51e6ba8e902db4093cb5380721cbfe7 +Author: Egbert Eich <[email protected]> +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 5d8038b2977b7c0ab0ea17e263b3720cef83db59 +Author: Egbert Eich <[email protected]> +Date: Fri Apr 23 19:30:15 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit f8e1ff3e00a773139aa1ab0ae72c83dc7792c175 +Author: Egbert Eich <[email protected]> +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 d268ada4b7e5c48cf48825a632af7f0faeaff6d0 +Author: Egbert Eich <[email protected]> +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 2ba39037fa8840a654432f032cc97b6830946cf9 +Author: Egbert Eich <[email protected]> +Date: Thu Feb 26 13:35:52 2004 +0000 + + readding XFree86's cvs IDs + +commit f352d52a2a89e4c55689a90db83a9f7e03e562c1 +Author: Egbert Eich <[email protected]> +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 77748634e71f2c42d03d708515e65351f0b755cb +Author: Kaleb Keithley <[email protected]> +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 106069b23188837f06b1057e03db24cad2018ea3 +Author: Kaleb Keithley <[email protected]> +Date: Fri Nov 14 16:48:55 2003 +0000 + + XFree86 4.3.0.1 + +commit ca3b63783fc4aa1df725dbd0e560a446dcc17913 +Author: Kaleb Keithley <[email protected]> +Date: Fri Nov 14 16:48:55 2003 +0000 + + Initial revision commit bb0329c6b6822957ba4bfb76c2db887204d3f57d Author: Cyril Brulebois <[email protected]> Date: Tue Apr 6 04:36:11 2010 +0200 New upstream release: 0.3.3 diff --git a/debian/changelog b/debian/changelog index 08f1cfa..df82c9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -xserver-xorg-video-dummy (1:0.3.2-2) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.3-1) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders - -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:02:36 +0100 + [ Cyril Brulebois ] + * New upstream release. + + -- Cyril Brulebois <[email protected]> Tue, 06 Apr 2010 04:35:46 +0200 xserver-xorg-video-dummy (1:0.3.2-1) experimental; urgency=low commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ 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 +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit c4134a6cb6bf3d9364fd2374e79647859dbd57c3 Author: Gaetan Nadon <[email protected]> Date: Mon Feb 8 20:08:52 2010 -0500 config: move compiler flags from configure.ac to Makefile.am CFLAGS is an automake defined variable that should not be set by the module. It should not be AC_SUBST either, it already is. Use AM_CFLAGS in Makefile.am. This will allow the user to override the flags as they will be in the right order. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index f2329a0..62666c6 100644 --- a/configure.ac +++ b/configure.ac @@ -62,9 +62,6 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) -CFLAGS="$CFLAGS $XORG_CFLAGS " -AC_SUBST([CFLAGS]) - # Checks for libraries. # Checks for header files. diff --git a/src/Makefile.am b/src/Makefile.am index 8cf4f1f..6705742 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,9 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. + +AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) + dummy_drv_la_LTLIBRARIES = dummy_drv.la dummy_drv_la_LDFLAGS = -module -avoid-version dummy_drv_ladir = @moduledir@/drivers commit 3370539eea599ff51a556507ec16a1570b8ed076 Author: Gaetan Nadon <[email protected]> Date: Mon Feb 8 19:07:22 2010 -0500 config: remove unrequired '-I$(top_srcdir)/src' The current dir is already included by default in the makefile top_builddir = .. DEFAULT_INCLUDES = -I. -I$(top_builddir) Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 35abfbf..f2329a0 100644 --- a/configure.ac +++ b/configure.ac @@ -62,7 +62,7 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' +CFLAGS="$CFLAGS $XORG_CFLAGS " AC_SUBST([CFLAGS]) # Checks for libraries. commit ea7cc253b0f4ea97a197ec36b3ac06279b0b95f6 Author: Gaetan Nadon <[email protected]> Date: Mon Feb 8 18:42:52 2010 -0500 config: remove unused INCLUDES='-I$(top_srcdir)/src' This statement is redundant and not used in the makefile Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 23ea18d..35abfbf 100644 --- a/configure.ac +++ b/configure.ac @@ -63,9 +63,7 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -INCLUDES='-I$(top_srcdir)/src' AC_SUBST([CFLAGS]) -AC_SUBST([INCLUDES]) # Checks for libraries. commit bff6fc2f25648df0bbc0ea0723636260df987d34 Author: Gaetan Nadon <[email protected]> Date: Mon Feb 8 17:45:42 2010 -0500 config: remove unused variable XORG_INCS Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index d85184a..23ea18d 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,7 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src' +INCLUDES='-I$(top_srcdir)/src' AC_SUBST([CFLAGS]) AC_SUBST([INCLUDES]) commit f32785f3ab5449c8dd9c1314df3ea5e994447bfe Author: Julien Cristau <[email protected]> Date: Sat Jan 23 01:46:30 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index a90ac6a..50b7094 100644 --- a/debian/changelog +++ b/debian/changelog -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
