xserver-xorg-video-dummy: Changes to 'upstream-experimental'
.cvsignore | 19 -------------------
.gitignore | 20 ++++++++++++++++++++
configure.ac | 2 +-
src/.cvsignore | 6 ------
src/.gitignore | 6 ++++++
src/dummy.h | 1 -
src/dummy_driver.c | 7 +++----
7 files changed, 30 insertions(+), 31 deletions(-)
New commits:
commit 0dcdce106d01aa6ff611436c3f8374241e7a8da8
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 17:31:28 2008 -0400
dummy 0.3.0
diff --git a/configure.ac b/configure.ac
index f019cd1..c0d0552 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-dummy],
- 0.2.0,
+ 0.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
commit ba7ab1d468e9a5ba37c064b3b128fa3bbb721044
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 17:26:51 2008 -0400
Death to RCS tags.
diff --git a/src/dummy.h b/src/dummy.h
index 17d872d..3442f63 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/* All drivers should typically include these */
#include "xf86.h"
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 77d5bea..02ba1d9 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
commit 2aeec40b3d48705bc1de9da3f06deac365c25895
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:30 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit 1874204e0c807c1686c28782d5eef62bd49fab04
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:48 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 345de2bd048fcc7b177a3b504522fe100b34f1e0
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 10:50:06 2007 +0200
Define DUMMY_*_VERSION* using PACKAGE_VERSION_*
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 6e8b3e2..77d5bea 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -85,9 +85,9 @@ static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
#define DUMMY_NAME "DUMMY"
#define DUMMY_DRIVER_NAME "dummy"
-#define DUMMY_MAJOR_VERSION 0
-#define DUMMY_MINOR_VERSION 2
-#define DUMMY_PATCHLEVEL 0
+#define DUMMY_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define DUMMY_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define DUMMY_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/*
* This is intentionally screen-independent. It indicates the binding
Reply to: