xserver-xorg-video-dummy: Changes to 'debian-experimental'
ChangeLog | 69 configure.ac |4 +- debian/changelog | 18 + debian/control |2 - src/Makefile.am|2 + src/compat-api.h | 101 + src/dummy.h| 10 - src/dummy_cursor.c |4 +- src/dummy_dga.c| 10 ++--- src/dummy_driver.c | 65 +- 10 files changed, 241 insertions(+), 44 deletions(-) New commits: commit 54a8e8937fa00a876fe82306cad7444e1cc496a0 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Jul 18 15:58:12 2012 +0200 Bump Standards-Version to 3.9.3 (no changes needed) diff --git a/debian/changelog b/debian/changelog index bc5afb9..8771957 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-dummy (1:0.3.6-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.9.3 (no changes needed) -- Maarten Lankhorst maarten.lankho...@canonical.com Wed, 18 Jul 2012 15:57:12 +0200 diff --git a/debian/control b/debian/control index 080964e..022cc01 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: x11proto-randr-dev, x11proto-render-dev, xutils-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 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 9e9c4fccc138077817d9b2069df271652700a1f8 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Jul 18 15:57:51 2012 +0200 New upstream release. diff --git a/debian/changelog b/debian/changelog index ff8fa03..bc5afb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-dummy (1:0.3.6-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Maarten Lankhorst maarten.lankho...@canonical.com Wed, 18 Jul 2012 15:57:12 +0200 + xserver-xorg-video-dummy (1:0.3.5-2) unstable; urgency=high * Merge upstream master up to 02918fd534: commit 50811dbdc765b7e2a81d332109ef405b8058db25 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Jul 18 15:57:40 2012 +0200 Bump changelog diff --git a/ChangeLog b/ChangeLog index 4e09967..a5bcc2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,59 @@ +commit fee6b520a620eed80e22840b8149abc50815f771 +Author: Dave Airlie airl...@gmail.com +Date: Wed Jul 18 19:39:32 2012 +1000 + +dummy: bump to 0.3.6 for release + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit 1491470ee0745bf8303fa085bd30f7464098f1f2 +Author: Dave Airlie airl...@redhat.com +Date: Tue Jun 5 11:14:37 2012 +0100 + +dummy: convert to the new server APIs. + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit 6ff612955a1a8591bf21f6aa56e7b6ebd8e2db48 +Author: Dave Airlie airl...@redhat.com +Date: Wed May 23 11:37:01 2012 +0100 + +dummy: convert to new scrn conversion APIs. + +Generated from util/modular/x-driver-screen-scrn-conv.sh + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit 20fcd59d3f8d7393586d8b64bfac18adede726ca +Author: Dave Airlie airl...@redhat.com +Date: Wed May 23 11:36:22 2012 +0100 + +dummy: add scrn conversion api compat header. + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit a78d524cfb332909dba89df5d709081515f0ed36 +Author: Yaakov Selkowitz yselkow...@users.sourceforge.net +Date: Wed Mar 28 00:07:28 2012 -0500 + +Add XORG_LIBS to LIBADD + +This affects only Cygwin, where drivers must be linked against the +Xorg implib. On other systems, XORG_LIBS will be empty. + +Signed-off-by: Yaakov Selkowitz yselkow...@users.sourceforge.net +Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com +Reviewed-by: Jeremy Huddleston jerem...@apple.com + +commit 668223a665af38600b8b20152c7e53e731c76234 +Author: Yaakov Selkowitz yselkow...@users.sourceforge.net +Date: Wed Mar 28 00:06:32 2012 -0500 + +Only include Xv headers if server supports it + +Signed-off-by: Yaakov Selkowitz yselkow...@users.sourceforge.net +Reviewed-by: Jeremy Huddleston jerem...@apple.com + commit 02918fd53434a23a72fe878a90f4ec48ef0e0416 Author: Jeremy Huddleston jerem...@apple.com Date: Mon Jan 9 01:00:40 2012 -0800 commit fee6b520a620eed80e22840b8149abc50815f771 Author: Dave Airlie airl...@gmail.com Date: Wed Jul 18 19:39:32 2012 +1000 dummy: bump to 0.3.6 for release Signed-off-by: Dave Airlie airl...@redhat.com diff --git a/configure.ac b/configure.ac index 6861485..c74f3a0 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-dummy], -[0.3.5], +[0.3.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-dummy]) AC_CONFIG_SRCDIR([Makefile.am]) commit
xserver-xorg-video-dummy: Changes to 'debian-experimental'
Rebased ref, commits from common ancestor: commit 39874ceebe882e17081d35ccba1d3c7d2f4fdcd0 Author: Cyril Brulebois k...@debian.org Date: Sun Jan 1 07:33:20 2012 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index abe40f9..9602c9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-dummy (1:0.3.5-1+exp1) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.5-1+exp1) experimental; urgency=low * Build against Xserver 1.12 RC1. - -- Cyril Brulebois k...@debian.org Sun, 01 Jan 2012 07:33:07 +0100 + -- Cyril Brulebois k...@debian.org Sun, 01 Jan 2012 07:33:16 +0100 xserver-xorg-video-dummy (1:0.3.5-1) unstable; urgency=low commit e741c4bf2f0c54e0af556356044b3b45e8a53f6d Author: Cyril Brulebois k...@debian.org Date: Sun Jan 1 07:33:12 2012 +0100 Build against Xserver 1.12 RC1. diff --git a/debian/changelog b/debian/changelog index aa60ac8..abe40f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-dummy (1:0.3.5-1+exp1) UNRELEASED; urgency=low + + * Build against Xserver 1.12 RC1. + + -- Cyril Brulebois k...@debian.org Sun, 01 Jan 2012 07:33:07 +0100 + xserver-xorg-video-dummy (1:0.3.5-1) unstable; urgency=low * New upstream release: diff --git a/debian/control b/debian/control index a138cc9..080964e 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: dh-autoreconf, quilt, pkg-config, - xserver-xorg-dev (= 2:1.9.4), + xserver-xorg-dev (= 2:1.11.99.901), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, commit eadc48cced2a8d69565baa7e6c8c45b50c079be2 Author: Cyril Brulebois k...@debian.org Date: Sun Jan 1 07:26:56 2012 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 6f81d54..aa60ac8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xserver-xorg-video-dummy (1:0.3.5-1) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.5-1) unstable; urgency=low * New upstream release: - Add support for big resolutions. - Allow disabling DGA. * Disable DGA support, it has been dead for a while. - -- Cyril Brulebois k...@debian.org Sun, 01 Jan 2012 07:19:53 +0100 + -- Cyril Brulebois k...@debian.org Sun, 01 Jan 2012 07:26:54 +0100 xserver-xorg-video-dummy (1:0.3.4-2) unstable; urgency=low commit 516de113c054f861c98513e699eaa51809fe5448 Author: Cyril Brulebois k...@debian.org Date: Sun Jan 1 07:26:40 2012 +0100 Disable DGA support, it has been dead for a while. diff --git a/debian/changelog b/debian/changelog index 696efbb..6f81d54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-video-dummy (1:0.3.5-1) UNRELEASED; urgency=low * New upstream release: - Add support for big resolutions. - Allow disabling DGA. + * Disable DGA support, it has been dead for a while. -- Cyril Brulebois k...@debian.org Sun, 01 Jan 2012 07:19:53 +0100 diff --git a/debian/rules b/debian/rules index 3d192dc..2da44f9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,9 @@ #!/usr/bin/make -f +# Disable DGA support, it's been on the way out for a while already: +override_dh_auto_configure: + dh_auto_configure -- --disable-dga + # Install in debian/tmp to retain control through dh_install: override_dh_auto_install: dh_auto_install --destdir=debian/tmp commit 636e00e80d096ff096c9eb804fc33c40ac1ce0cf Author: Cyril Brulebois k...@debian.org Date: Sun Jan 1 07:20:45 2012 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 39733e3..35d1689 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,227 @@ +commit bccf37f052748386902112b770b89d81bddfaeb8 +Author: Cyril Brulebois k...@debian.org +Date: Sun Jan 1 07:15:36 2012 +0100 + +dummy 0.3.5 + +Signed-off-by: Cyril Brulebois k...@debian.org + +commit dd9be3b21842aacdee5501cd2e0bfafb11b5ec08 +Author: Jeremy Huddleston jerem...@apple.com +Date: Wed Sep 14 14:50:36 2011 -0500 + +Add a configure option to disable dga + +Signed-off-by: Jeremy Huddleston jerem...@apple.com +Reviewed-by: Jamey Sharp ja...@minilop.net +Signed-off-by: Jamey Sharp ja...@minilop.net + +commit dd598ca433d2386687f9543457e4c6ffdb16d7c4 +Author: Jeremy Huddleston jerem...@apple.com +Date: Wed Sep 14 14:32:02 2011 -0500 + +Use malloc/free instead of deprecated X versions + +Signed-off-by: Jeremy Huddleston jerem...@apple.com +Reviewed-by: Jamey Sharp ja...@minilop.net +Signed-off-by: Jamey Sharp ja...@minilop.net + +commit d70dde48087a0d5c3930860ab97585d39de7b57e +Author: Jeremy Huddleston jerem...@apple.com +Date: Wed Sep 14 14:30:55 2011 -0500 + +Dummy drivers don't need PCI. + +Signed-off-by: Jeremy Huddleston jerem...@apple.com +Reviewed-by: Jamey Sharp ja...@minilop.net +Signed-off-by: Jamey Sharp ja...@minilop.net + +commit bdc59411136b16ca3447336f22e95010bf709a53 +Author:
xserver-xorg-video-dummy: Changes to 'debian-experimental'
debian/changelog |6 ++ debian/control |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit f5a5ba4f8adef509f702786234e32dd20b498be8 Author: Cyril Brulebois k...@debian.org Date: Fri Mar 4 02:33:16 2011 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 1df8634..f22d262 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-dummy (1:0.3.4-2+exp2) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.4-2+exp2) experimental; urgency=low * Rebuild against Xserver 1.10 rc3. - -- Cyril Brulebois k...@debian.org Fri, 04 Mar 2011 02:32:50 +0100 + -- Cyril Brulebois k...@debian.org Fri, 04 Mar 2011 02:33:14 +0100 xserver-xorg-video-dummy (1:0.3.4-2+exp1) experimental; urgency=low commit 18bd29255263ad6beddecbb468be8224c8811196 Author: Cyril Brulebois k...@debian.org Date: Fri Mar 4 02:33:04 2011 +0100 Rebuild against Xserver 1.10 rc3. diff --git a/debian/changelog b/debian/changelog index 335cd09..1df8634 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-dummy (1:0.3.4-2+exp2) UNRELEASED; urgency=low + + * Rebuild against Xserver 1.10 rc3. + + -- Cyril Brulebois k...@debian.org Fri, 04 Mar 2011 02:32:50 +0100 + xserver-xorg-video-dummy (1:0.3.4-2+exp1) experimental; urgency=low * Rebuild against Xserver 1.10 rc2. diff --git a/debian/control b/debian/control index 72df3ac..7f9b4e8 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: dh-autoreconf, quilt, pkg-config, - xserver-xorg-dev (= 2:1.9.99.902), + xserver-xorg-dev (= 2:1.9.99.903), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pvk0w-xh...@alioth.debian.org
xserver-xorg-video-dummy: Changes to 'debian-experimental'
debian/README.source | 24 - debian/changelog | 21 + debian/compat |2 debian/control | 21 - debian/patches/series |1 debian/rules | 103 debian/watch |1 debian/xsfbs/repack.sh | 32 -- debian/xsfbs/xsfbs.mk | 285 -- debian/xsfbs/xsfbs.sh | 622 - 10 files changed, 46 insertions(+), 1066 deletions(-) New commits: commit f7acd332dd69f5a3db718546941c65825410349d Author: Cyril Brulebois k...@debian.org Date: Sun Feb 20 20:30:09 2011 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index e8bbb78..335cd09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-dummy (1:0.3.4-2+exp1) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.4-2+exp1) experimental; urgency=low * Rebuild against Xserver 1.10 rc2. - -- Cyril Brulebois k...@debian.org Sun, 20 Feb 2011 20:28:15 +0100 + -- Cyril Brulebois k...@debian.org Sun, 20 Feb 2011 20:30:02 +0100 xserver-xorg-video-dummy (1:0.3.4-2) unstable; urgency=low commit 6bf8729365e3d545394d6c90165683b7be1ef582 Author: Cyril Brulebois k...@debian.org Date: Sun Feb 20 20:29:55 2011 +0100 Rebuild against Xserver 1.10 rc2. diff --git a/debian/changelog b/debian/changelog index ba8deb2..e8bbb78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-dummy (1:0.3.4-2+exp1) UNRELEASED; urgency=low + + * Rebuild against Xserver 1.10 rc2. + + -- Cyril Brulebois k...@debian.org Sun, 20 Feb 2011 20:28:15 +0100 + xserver-xorg-video-dummy (1:0.3.4-2) unstable; urgency=low * Switch to dh: diff --git a/debian/control b/debian/control index a138cc9..72df3ac 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: dh-autoreconf, quilt, pkg-config, - xserver-xorg-dev (= 2:1.9.4), + xserver-xorg-dev (= 2:1.9.99.902), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, commit b784f1f98f6ed0b4fcffc5b8bb8a195d43b7e723 Author: Cyril Brulebois k...@debian.org Date: Sat Feb 5 14:43:31 2011 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index bfbe076..ba8deb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-dummy (1:0.3.4-2) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.4-2) unstable; urgency=low * Switch to dh: - Use debhelper 8. @@ -11,7 +11,7 @@ xserver-xorg-video-dummy (1:0.3.4-2) UNRELEASED; urgency=low * Wrap Depends/Provides. * Add quilt build-dep for future use. - -- Cyril Brulebois k...@debian.org Thu, 03 Feb 2011 11:52:52 +0100 + -- Cyril Brulebois k...@debian.org Sat, 05 Feb 2011 14:43:31 +0100 xserver-xorg-video-dummy (1:0.3.4-1) experimental; urgency=low commit 12ded0cc5299883c91ca75af670d3b4d4afe614c Author: Cyril Brulebois k...@debian.org Date: Sat Feb 5 09:32:09 2011 +0100 Add a placeholding series file. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..fdffa2a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +# placeholder commit 73639f6a313da443fd1d7af5c33f8b25c9a0173e Author: Cyril Brulebois k...@debian.org Date: Fri Feb 4 11:43:07 2011 +0100 Fix sequence ordering. Since both the autoreconf and quilt sequences insert a command before dh_auto_configure, it is important that we use the quilt one in the first place, so that autoreconf is run on a patched tree. Ditto for dh_clean. diff --git a/debian/rules b/debian/rules index 63d3106..3d192dc 100755 --- a/debian/rules +++ b/debian/rules @@ -14,4 +14,4 @@ override_dh_shlibdeps: dh_shlibdeps -- --warnings=6 %: - dh $@ --with autoreconf,quilt,xsf --builddirectory=build/ + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ commit 7e35dd5ee8803de98f0275b1ccba8bbb12a68247 Author: Cyril Brulebois k...@debian.org Date: Fri Feb 4 11:43:05 2011 +0100 Add quilt build-dep for future use. diff --git a/debian/changelog b/debian/changelog index b4e4af1..bfbe076 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xserver-xorg-video-dummy (1:0.3.4-2) UNRELEASED; urgency=low * Update Uploaders list. Thanks, David Brice! * Remove long obsolete Replaces/Conflicts. * Wrap Depends/Provides. + * Add quilt build-dep for future use. -- Cyril Brulebois k...@debian.org Thu, 03 Feb 2011 11:52:52 +0100 diff --git a/debian/control b/debian/control index 2fa0a5a..a138cc9 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Cyril Brulebois k...@debian.org Build-Depends: debhelper (= 8), dh-autoreconf, + quilt, pkg-config, xserver-xorg-dev (= 2:1.9.4), x11proto-video-dev, commit 4af8b8ca94bc0362c1d92d971f7c383819ed29c3 Author: Cyril Brulebois k...@debian.org Date: Thu Feb 3 11:57:36 2011 +0100 Wrap Depends/Provides. diff
xserver-xorg-video-dummy: Changes to 'debian-experimental'
debian/changelog |8 ++-- debian/control |2 +- 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 1d129c167acdd485218b95c888228f79217d8a83 Author: Cyril Brulebois k...@debian.org Date: Sat Oct 16 17:49:05 2010 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 17d0fbd..f998d19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-dummy (1:0.3.4-1) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.4-1) experimental; urgency=low [ Christopher James Halse Rogers ] * New upstream release @@ -8,7 +8,7 @@ xserver-xorg-video-dummy (1:0.3.4-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * Build against Xserver 1.9.1 rc1. - -- Christopher James Halse Rogers r...@ubuntu.com Wed, 04 Aug 2010 10:44:28 +1000 + -- Cyril Brulebois k...@debian.org Sat, 16 Oct 2010 17:49:03 +0200 xserver-xorg-video-dummy (1:0.3.3-2) unstable; urgency=medium commit 7b414645ee396b129caa85b93996ed480f32b50b Author: Cyril Brulebois k...@debian.org Date: Sat Oct 16 17:44:41 2010 +0200 Build against Xserver 1.9.1 rc1. diff --git a/debian/changelog b/debian/changelog index 66f6a72..17d0fbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ xserver-xorg-video-dummy (1:0.3.4-1) UNRELEASED; urgency=low + [ Christopher James Halse Rogers ] * New upstream release - Fix build against Xserver 1.9 * Bump Standards-Version to 3.9.1 + [ Cyril Brulebois ] + * Build against Xserver 1.9.1 rc1. + -- Christopher James Halse Rogers r...@ubuntu.com Wed, 04 Aug 2010 10:44:28 +1000 xserver-xorg-video-dummy (1:0.3.3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 52c..26599c1 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin bgog...@debian.org Build-Depends: debhelper (= 5.0.0), pkg-config, - xserver-xorg-dev (= 2:1.7.6.901), + xserver-xorg-dev (= 2:1.9.0.901), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1p792s-0007vb...@alioth.debian.org
xserver-xorg-video-dummy: Changes to 'debian-experimental'
.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 r...@ubuntu.com 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 r...@ubuntu.com 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..52c 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 airl...@redhat.com 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 ja...@minilop.net Date: Fri Jun 4 16:09:34 2010 -0700 Use new server API to find the root window. Signed-off-by: Jamey Sharp ja...@minilop.net 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 mems...@videotron.ca Date: Sat Jun 12 15:39:03 2010 -0400 COPYING: replace stub file with actual Copyright notice Signed-off-by: Gaetan Nadon mems...@videotron.ca 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 jcris...@debian.org 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 jcris...@debian.org Fri, 14 May 2010 12:33:29 +0200 + -- Julien Cristau jcris...@debian.org 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 jcris...@debian.org 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 jcris...@debian.org Fri, 14 May
xserver-xorg-video-dummy: Changes to 'debian-experimental'
ChangeLog | 18 ++ README | 20 +++ configure.ac |2 debian/README.source | 73 +++ debian/changelog | 18 ++ debian/control |4 debian/xsfbs/repack.sh | 32 + debian/xsfbs/xsfbs.mk | 21 --- debian/xsfbs/xsfbs.sh | 311 - src/dummy_driver.c | 31 10 files changed, 167 insertions(+), 363 deletions(-) New commits: commit ac99c668e453a51b6e79000f5741931e5c57a4e2 Author: Cyril Brulebois k...@debian.org Date: Sun Dec 6 03:12:50 2009 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 131f0c0..09f2d1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -xserver-xorg-video-dummy (1:0.3.2-1) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.2-1) experimental; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. - -- Timo Aaltonen tjaal...@ubuntu.com Sat, 05 Dec 2009 01:49:06 +0200 + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois k...@debian.org Sun, 06 Dec 2009 03:12:44 +0100 xserver-xorg-video-dummy (1:0.3.1-2) unstable; urgency=low commit e9a6c159c2206a52697b2a64b3dc52c85b93f494 Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Sat Dec 5 02:09:25 2009 +0200 Build against Xserver 1.7. diff --git a/debian/changelog b/debian/changelog index d71fb51..131f0c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ xserver-xorg-video-dummy (1:0.3.2-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. - -- Timo Aaltonen tjaal...@ubuntu.com Mon, 30 Nov 2009 16:10:28 +0200 + -- Timo Aaltonen tjaal...@ubuntu.com Sat, 05 Dec 2009 01:49:06 +0200 xserver-xorg-video-dummy (1:0.3.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index adbef03..d264b81 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin bgog...@debian.org Build-Depends: debhelper (= 5.0.0), pkg-config, - xserver-xorg-dev (= 2:1.5.99.901), + xserver-xorg-dev (= 2:1.7), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, commit febc5f52854e878386ebbcb1eaf8512475e26b1c Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Mon Nov 30 16:12:09 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index cb8488e..d71fb51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-dummy (1:0.3.2-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.8.3. -- Timo Aaltonen tjaal...@ubuntu.com Mon, 30 Nov 2009 16:10:28 +0200 diff --git a/debian/control b/debian/control index 9c34639..adbef03 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.3 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 c667ed012c2a5eceabead5d47e343131d9b579f5 Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Mon Nov 30 16:10:49 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index ffb1ec3..e4fdedb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +commit ecf513ae11399c5778ff7d988e838a2b6211a88b +Author: Adam Jackson a...@redhat.com +Date: Thu Jul 2 11:08:25 2009 -0400 + +dummy 0.3.2 + +commit 8fe24e48acc7ec03972ee0acb5d7ab205ecbf7e0 +Author: Adam Jackson a...@redhat.com +Date: Thu May 28 14:54:17 2009 -0400 + +Remove useless loader symbol lists. + +commit 17885c5cb1dbcfb48ee593260bcd1b1ff2887989 +Author: Alan Coopersmith alan.coopersm...@sun.com +Date: Fri Jan 30 20:38:25 2009 -0800 + +Add README with pointers to mailing list, bugzilla git repos + commit d876e719969e9d33e7e4502448a544f12eb0fab8 Author: Julien Cristau jcris...@debian.org Date: Sun Jan 25 23:25:33 2009 +0100 diff --git a/debian/changelog b/debian/changelog index 51aaa84..cb8488e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-dummy (1:0.3.2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Timo Aaltonen tjaal...@ubuntu.com Mon, 30 Nov 2009 16:10:28 +0200 + xserver-xorg-video-dummy (1:0.3.1-2) unstable; urgency=low * Upload to unstable. commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau jcris...@debian.org Date: Fri Sep 25 16:39:23 2009 +0200 xsfbs.mk: remove more obsolete code We can use plain debconf-updatepo, and don't need to clean the 'imports' directory or shlibs.local. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 82eb45f..5e16b10 100755 --- a/debian/xsfbs/xsfbs.mk +++
xserver-xorg-video-dummy: Changes to 'debian-experimental'
ChangeLog | 12 Makefile.in| 672 - aclocal.m4 | 8256 --- config.guess | 1526 --- config.h.in| 66 config.sub | 1658 --- configure |22815 - configure.ac |2 debian/changelog |9 debian/control | 15 debian/rules | 21 depcomp| 589 - install-sh | 519 - ltmain.sh | 6964 missing| 367 mkinstalldirs | 161 src/Makefile.in| 520 - src/dummy_driver.c |3 18 files changed, 50 insertions(+), 44125 deletions(-) New commits: commit c9a1f864c34a3f29c9347e12515c73003a9ffd27 Author: Julien Cristau jcris...@debian.org Date: Sun Jan 25 23:53:42 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index f11adcd..bb4e8e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xserver-xorg-video-dummy (1:0.3.1-1) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.1-1) experimental; urgency=low * New upstream release. * Run autoreconf on build; build-depend on automake, libtool and xutils-dev. * Handle parallel builds. * Build against xserver 1.6 rc1. - -- Julien Cristau jcris...@debian.org Sun, 25 Jan 2009 23:43:27 +0100 + -- Julien Cristau jcris...@debian.org Sun, 25 Jan 2009 23:53:40 +0100 xserver-xorg-video-dummy (1:0.3.0-2) experimental; urgency=low commit ee01044f0d0f0fc69f6cf4a12aca1949b2c05caa Author: Julien Cristau jcris...@debian.org Date: Sun Jan 25 23:53:34 2009 +0100 delete generated files diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 024a8f5..000 --- a/Makefile.in +++ /dev/null @@ -1,672 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -...@set_make@ - -# Copyright 2005 Adam Jackson. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the Software), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -# 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. -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR) cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = . -DIST_COMMON = $(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 -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 config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive
xserver-xorg-video-dummy: Changes to 'debian-experimental'
debian/changelog| 19 + debian/compat |2 debian/control |4 debian/rules|2 debian/xserver-xorg-video-dummy.install |1 debian/xsfbs/xsfbs-autoreconf.mk| 150 debian/xsfbs/xsfbs.mk | 49 +--- debian/xsfbs/xsfbs.sh | 387 +--- 8 files changed, 243 insertions(+), 371 deletions(-) New commits: commit e065c477dd41bc047d8d9cd79c5da315bbc55f27 Author: Julien Cristau [EMAIL PROTECTED] Date: Thu Sep 4 19:29:40 2008 +0200 Build against xserver 1.5. diff --git a/debian/changelog b/debian/changelog index cfbec59..5ecd734 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-dummy (1:0.3.0-2) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau [EMAIL PROTECTED] Thu, 04 Sep 2008 19:29:32 +0200 + xserver-xorg-video-dummy (1:0.3.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index ba3089d..0e59739 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 [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED], Julien Cristau [EMAIL PROTECTED] -Build-Depends: debhelper (= 5.0.0), pkg-config, xserver-xorg-dev (= 2:1.4), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, dpkg-dev (= 1.14.17) +Build-Depends: debhelper (= 5.0.0), pkg-config, xserver-xorg-dev (= 2:1.5), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, dpkg-dev (= 1.14.17) Standards-Version: 3.7.3 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 86e7669f5d912824e341ea487a6257ec5433eb90 Author: Julien Cristau [EMAIL PROTECTED] Date: Thu Jul 17 15:44:45 2008 +0200 xsfbs.mk: make 'log' a separate target 'prepare' runs genscripts, and we don't want that in unpatch, so create stampdir/log in a separate target, and make unpatch depend on that instead of prepare. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 984e81c..f0f8953 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts - mkdir -p $(STAMP_DIR)/log +$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts $@ +.PHONY: log +stampdir_targets+=log +log: $(STAMP_DIR)/log +$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir + mkdir -p $(STAMP_DIR)/log + # Apply all patches to the upstream source. .PHONY: patch stampdir_targets+=patch @@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/prepare +unpatch: $(STAMP_DIR)/log rm -f $(STAMP_DIR)/patch @echo -n Unapplying patches...; \ if $(QUILT) applied /dev/null 2/dev/null; then \ commit 50619e730fcaf422ffa4451468520526b2a830b8 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Jul 16 18:42:14 2008 +0200 xsfbs.mk: update the list of releases, and drop some unused code we haven't had a separate source tree since modularization. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 2350f80..984e81c 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo [EMAIL PROTECTED](cat /etc/mailname 2/dev/null))}}) # Find out if this is an official build; an official build has nothing but -# digits, dots, and/or the strings woody or sarge in the Debian part of the +# digits, dots, and/or the codename of a release in the Debian part of the # version number. Anything else indicates an unofficial build. -OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr $$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g') : .*[^0-9.].* /dev/null 21; then echo yes; fi) +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr $$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g') : .*[^0-9.].* /dev/null 21; then echo yes; fi) # Set up parameters for the Debian build environment. @@ -69,16 +69,6 @@ endif # $(STAMP_DIR) houses stamp files for complex targets. STAMP_DIR:=stampdir -# $(SOURCE_DIR) houses one or more source trees. -SOURCE_DIR:=build-tree - -# $(SOURCE_TREE) is the location of the source tree to be compiled. If there -# is more than one, others are found using this name
xserver-xorg-video-dummy: Changes to 'debian-experimental'
.cvsignore| 19 .gitignore| 20 ChangeLog | 287 ++- Makefile.in | 152 ++-- aclocal.m4| 911 config.guess | 60 + config.sub| 66 + configure | 1837 ++ configure.ac |2 debian/changelog | 47 + debian/control| 15 debian/copyright |3 debian/rules |2 debian/xsfbs/xsfbs.mk | 114 --- debian/xsfbs/xsfbs.sh |7 depcomp | 93 ++ install-sh| 514 + ltmain.sh | 277 +-- missing | 61 - mkinstalldirs |5 src/.cvsignore|6 src/.gitignore|6 src/Makefile.in | 139 ++- src/dummy.h |1 src/dummy_driver.c|7 25 files changed, 3128 insertions(+), 1523 deletions(-) New commits: commit a3f4b9adcd479faa521264f7b130f93ed46f3261 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 21 14:44:50 2008 +0100 debian/control updates * Build against xserver 1.4.99.901. * Bump Standards-Version to 3.7.3. * Drop the XS- prefix from Vcs-* control fields. diff --git a/debian/changelog b/debian/changelog index 63779ae..a7c30b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ xserver-xorg-video-dummy (1:0.3.0-1) UNRELEASED; urgency=low * New upstream release. + * Build against xserver 1.4.99.901. + * Bump Standards-Version to 3.7.3. + * Drop the XS- prefix from Vcs-* control fields. -- Julien Cristau [EMAIL PROTECTED] Fri, 21 Mar 2008 14:42:50 +0100 diff --git a/debian/control b/debian/control index 2d1b977..478e1d2 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,10 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED] -Build-Depends: debhelper (= 4.0.0), pkg-config, xserver-xorg-dev (= 2:1.4), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev -Standards-Version: 3.6.1 -XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-dummy -XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-dummy.git +Build-Depends: debhelper (= 4.0.0), pkg-config, xserver-xorg-dev (= 2:1.4.99.901), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev +Standards-Version: 3.7.3 +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 Package: xserver-xorg-video-dummy Architecture: any commit 090fea5398586eba4fa24a1eba0c96c3da0663e4 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 21 14:43:09 2008 +0100 Update changelogs. diff --git a/ChangeLog b/ChangeLog index 89f15c8..575a705 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,52 +1,271 @@ -2006-04-06 Adam Jackson [EMAIL PROTECTED] +commit 0dcdce106d01aa6ff611436c3f8374241e7a8da8 +Author: Adam Jackson [EMAIL PROTECTED] +Date: Wed Mar 19 17:31:28 2008 -0400 - * configure.ac: - * src/dummy.h: - * src/dummy_cursor.c: - * src/dummy_dga.c: - * src/dummy_driver.c: - Unlibcwrap. Bump server version requirement. Bump to 0.2.0. +dummy 0.3.0 - * src/dummy_driver.c: - VERSION - DUMMY_VERSION +commit ba7ab1d468e9a5ba37c064b3b128fa3bbb721044 +Author: Adam Jackson [EMAIL PROTECTED] +Date: Wed Mar 19 17:26:51 2008 -0400 -2005-12-20 Kevin E. Martin kem-at-freedesktop-dot-org +Death to RCS tags. - * configure.ac: - Update package version for X11R7 release. +commit 2aeec40b3d48705bc1de9da3f06deac365c25895 +Author: James Cloos [EMAIL PROTECTED] +Date: Mon Sep 3 05:52:30 2007 -0400 -2005-12-14 Kevin E. Martin kem-at-freedesktop-dot-org +Add *~ to .gitignore to skip patch/emacs droppings - * configure.ac: - Update package version number for final X11R7 release candidate. +commit 1874204e0c807c1686c28782d5eef62bd49fab04 +Author: James Cloos [EMAIL PROTECTED] +Date: Thu Aug 23 19:25:48 2007 -0400 -2005-12-03 Kevin E. Martin kem-at-freedesktop-dot-org +Rename .cvsignore to .gitignore - * configure.ac: - Update package version number for X11R7 RC3 release. +commit 345de2bd048fcc7b177a3b504522fe100b34f1e0 +Author: Brice Goglin [EMAIL PROTECTED] +Date: Tue Aug 7 10:50:06 2007 +0200 -2005-12-01 Kevin E. Martin kem-at-freedesktop-dot-org +Define DUMMY_*_VERSION* using PACKAGE_VERSION_* - * configure.ac: - Remove extraneous AC_MSG_RESULT. +commit 22e38bed8cd2d1e54c47d0763436012eeccb2d32 +Author: Adam Jackson [EMAIL PROTECTED] +Date: Fri Apr 7 18:59:48 2006 + -2005-11-29 Adam Jackson [EMAIL PROTECTED] +
xserver-xorg-video-dummy: Changes to 'debian-experimental'
debian/control|2 +- debian/xsfbs/xsfbs.mk |5 - 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 20d6238e95d685117017649ee9cdd510ca6bc18c Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 22:07:58 2007 -0500 Generate Provides line automatically diff --git a/debian/control b/debian/control index 025dff1..0c1641d 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Standards-Version: 3.6.1 Package: xserver-xorg-video-dummy Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} -Provides: xserver-xorg-video-1.1 +Provides: ${xviddriver:Provides} Replaces: xserver-xorg ( 6.8.2-35) Description: X.Org X server -- dummy display driver This package provides a 'dummy' display driver, which does not actually commit dacefd5a6bb9f786c78f35358273e3214c7492e9 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 21:37:52 2007 -0500 Update serverabi generation to also account for driver Provides * Have the drivers use the file serverminver instead of serverabiver in order to generate the versioned dependency on the server. This is clearer naming. * Use serverabiver to actually store the server's video ABI version. This is used to generate the Provides: line for drivers so the server can depend on them properly. This goes in to the substvar xviddriver:Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index dbb2872..ae767b1 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -354,8 +354,10 @@ # Generate the shlibs.local file. debian/shlibs.local: cat debian/*.shlibs $@ +SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2/dev/null) SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2/dev/null) -SERVER_DEPENDS = xserver-xorg-core (= $(SERVERABI)) +SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS)) +DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI) ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' debian/control) endif @@ -367,6 +369,7 @@ ifeq ($(SERVERABI),) @exit 1 else echo xserver:Depends=$(SERVER_DEPENDS) debian/$(PACKAGE).substvars + echo xviddriver:Provides=$(DRIVER_PROVIDES) debian/$(PACKAGE).substvars endif include debian/xsfbs/xsfbs-autoreconf.mk -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-dummy: Changes to 'debian-experimental'
debian/changelog |4 ++-- debian/control|2 +- debian/rules |2 +- debian/xsfbs/xsfbs.mk | 15 +++ 4 files changed, 19 insertions(+), 4 deletions(-) New commits: commit 55474b3357ed30a67cf03674239d598de244e1cb Author: David Nusinow [EMAIL PROTECTED] Date: Tue Feb 20 22:28:25 2007 -0500 Generate server dependencies automatically from the ABI diff --git a/debian/changelog b/debian/changelog index 9ef2b3b..52832b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ xserver-xorg-video-dummy (1:0.2.0-5) UNRELEASED; urgency=low - * Bump xserver ABI metadata to 1.1 for use with server 1.2 * Minor updates from upstream + * Generate server dependencies automatically from the ABI - -- David Nusinow [EMAIL PROTECTED] Sun, 11 Feb 2007 21:45:53 -0500 + -- David Nusinow [EMAIL PROTECTED] Tue, 20 Feb 2007 22:20:22 -0500 xserver-xorg-video-dummy (1:0.2.0-4) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 68a4b26..025dff1 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.1 Package: xserver-xorg-video-dummy Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (= 2:1.2.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} Provides: xserver-xorg-video-1.1 Replaces: xserver-xorg ( 6.8.2-35) Description: X.Org X server -- dummy display driver diff --git a/debian/rules b/debian/rules index 8241a4c..8152e21 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ install: build cd obj-$(DEB_BUILD_GNU_TYPE) $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. -binary-arch: build install +binary-arch: build install serverabi dh_testdir dh_testroot commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb Author: Julien Cristau [EMAIL PROTECTED] Date: Sat Feb 17 16:01:41 2007 +0100 Add new serverabi rule to generate drivers dependency on the server. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 7b8206e..dbb2872 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -354,6 +354,21 @@ # Generate the shlibs.local file. debian/shlibs.local: cat debian/*.shlibs $@ +SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2/dev/null) +SERVER_DEPENDS = xserver-xorg-core (= $(SERVERABI)) +ifeq ($(PACKAGE),) +PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' debian/control) +endif + +.PHONY: serverabi +serverabi: +ifeq ($(SERVERABI),) + @echo error: xserver-xorg-dev needs to be installed + @exit 1 +else + echo xserver:Depends=$(SERVER_DEPENDS) debian/$(PACKAGE).substvars +endif + include debian/xsfbs/xsfbs-autoreconf.mk # vim:set noet ai sts=8 sw=8 tw=0: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-dummy: Changes to 'debian-experimental'
New branch 'debian-experimental' available with the following commits: commit fc4894b38da268db9690de029767ffe676181e4d Author: David Nusinow [EMAIL PROTECTED] Date: Sat Feb 10 21:25:01 2007 -0500 Prepare drivers for use with xserver 1.2, which has a new ABI (version 1.1) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-dummy: Changes to 'debian-experimental'
.cvsignore | 19 +++ ChangeLog |3 +++ autogen.sh | 12 src/.cvsignore |6 ++ src/dummy_driver.c |2 +- 5 files changed, 41 insertions(+), 1 deletion(-) New commits: commit 22e38bed8cd2d1e54c47d0763436012eeccb2d32 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:59:48 2006 + VERSION - DUMMY_VERSION diff --git a/ChangeLog b/ChangeLog index 3d6ca24..89f15c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ * src/dummy_driver.c: Unlibcwrap. Bump server version requirement. Bump to 0.2.0. + * src/dummy_driver.c: + VERSION - DUMMY_VERSION + 2005-12-20 Kevin E. Martin kem-at-freedesktop-dot-org * configure.ac: diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 2846aa6..6e8b3e2 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -281,7 +281,7 @@ DUMMYProbe(DriverPtr drv, int flags) /* Allocate a ScrnInfoRec and claim the slot */ if ((pScrn = xf86AllocateScreen(drv,0 ))) { xf86AddEntityToScreen(pScrn,entityIndex); - pScrn-driverVersion = VERSION; + pScrn-driverVersion = DUMMY_VERSION; pScrn-driverName= DUMMY_DRIVER_NAME; pScrn-name = DUMMY_NAME; pScrn-Probe = DUMMYProbe; commit 7432eaf48b70437bd55e5cc98833cce224d9e131 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:50:19 2006 + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. diff --git a/ChangeLog b/ChangeLog index 5fd68a6..3d6ca24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-04-06 Adam Jackson [EMAIL PROTECTED] + + * configure.ac: + * src/dummy.h: + * src/dummy_cursor.c: + * src/dummy_dga.c: + * src/dummy_driver.c: + Unlibcwrap. Bump server version requirement. Bump to 0.2.0. + 2005-12-20 Kevin E. Martin kem-at-freedesktop-dot-org * configure.ac: diff --git a/configure.ac b/configure.ac index 8fd2885..f019cd1 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ # Process this file with autoconf to pro AC_PREREQ(2.57) AC_INIT([xf86-video-dummy], -0.1.0.5, +0.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-dummy) @@ -54,7 +54,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, xorg-server xproto fontsproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server = 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) CFLAGS=$CFLAGS $XORG_CFLAGS ' -I$(top_srcdir)/src' diff --git a/src/dummy.h b/src/dummy.h index e9dabe0..17d872d 100644 --- a/src/dummy.h +++ b/src/dummy.h @@ -3,12 +3,12 @@ /* All drivers should typically include these */ #include xf86.h #include xf86_OSproc.h -#include xf86_ansic.h #include xf86Cursor.h #include xf86xv.h #include X11/extensions/Xv.h +#include string.h /* Supported chipsets */ typedef enum { diff --git a/src/dummy_cursor.c b/src/dummy_cursor.c index 58fa18a..aa6021f 100644 --- a/src/dummy_cursor.c +++ b/src/dummy_cursor.c @@ -5,7 +5,6 @@ #endif /* All drivers should typically include these */ #include xf86.h #include xf86_OSproc.h -#include xf86_ansic.h #include xf86Cursor.h #include cursorstr.h diff --git a/src/dummy_dga.c b/src/dummy_dga.c index 98131ed..2c74600 100644 --- a/src/dummy_dga.c +++ b/src/dummy_dga.c @@ -4,7 +4,6 @@ #endif #include xf86.h #include xf86_OSproc.h -#include xf86_ansic.h #include xf86Pci.h #include xf86PciInfo.h #include dgaproc.h diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 0c5fd71..2846aa6 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -11,7 +11,6 @@ #endif /* All drivers should typically include these */ #include xf86.h #include xf86_OSproc.h -#include xf86_ansic.h /* This is used for module versioning */ #include xf86Version.h @@ -82,12 +81,12 @@ static Bool dummyDriverFunc(ScrnInfoPtr /* static void DUMMYDisplayPowerManagementSet(ScrnInfoPtr pScrn, */ /* int PowerManagementMode, int flags); */ -#define VERSION 4000 +#define DUMMY_VERSION 4000 #define DUMMY_NAME DUMMY #define DUMMY_DRIVER_NAME dummy #define DUMMY_MAJOR_VERSION 0 -#define DUMMY_MINOR_VERSION 1 +#define DUMMY_MINOR_VERSION 2 #define DUMMY_PATCHLEVEL 0 /* @@ -106,7 +105,7 @@ static int pix24bpp = 0; */ _X_EXPORT DriverRec DUMMY = { -VERSION, +DUMMY_VERSION, DUMMY_DRIVER_NAME, DUMMYIdentify, DUMMYProbe, commit 474af880791908da7e006c4d500bc7318107bbd1 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Dec 21 02:29:59 2005 + Update package version for X11R7 release. diff --git a/ChangeLog b/ChangeLog index 28f1c53..5fd68a6 100644 --- a/ChangeLog
xserver-xorg-video-dummy: Changes to 'debian-experimental'
debian/changelog |3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 3f3cd29d4d2b89ba139ec969f84ef8fd2c72d484 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Feb 11 21:46:16 2007 -0500 Note merge from upstream in changelog diff --git a/debian/changelog b/debian/changelog index bef5d1a..9ef2b3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ xserver-xorg-video-dummy (1:0.2.0-5) UNRELEASED; urgency=low * Bump xserver ABI metadata to 1.1 for use with server 1.2 + * Minor updates from upstream - -- David Nusinow [EMAIL PROTECTED] Sat, 10 Feb 2007 21:23:38 -0500 + -- David Nusinow [EMAIL PROTECTED] Sun, 11 Feb 2007 21:45:53 -0500 xserver-xorg-video-dummy (1:0.2.0-4) UNRELEASED; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]