xserver-xorg-video-savage: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/savage_driver.c | 2 ++
src/savage_driver.h | 8 ++++----
3 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit bf5e2a5d33fbab07bc3606927c58a3a04a5c9b1e
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 17 03:25:48 2007 +0200
Include <unistd.h> to get a declaration for usleep()
diff --git a/src/savage_driver.c b/src/savage_driver.c
index c56edf1..ab91bc4 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -39,6 +39,8 @@
#include "config.h"
#endif
+#include <unistd.h>
+
#include "xf86RAC.h"
#include "shadowfb.h"
commit 83f3db97b107a84d79e21c64039328c05095719e
Author: Alex Deucher <alex@botch2.com>
Date: Thu Aug 16 20:45:12 2007 -0400
update for 2.1.3 release
diff --git a/configure.ac b/configure.ac
index 6566a57..42d447a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-savage],
- 2.1.2,
+ 2.1.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-savage)
commit 1f6258c7f4c4073de0bdd72f06c1e94bb6895c73
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 09:54:47 2007 +0200
Define SAVAGE_VERSION* using PACKAGE_VERSION*
diff --git a/src/savage_driver.h b/src/savage_driver.h
index 247dedb..06b3689 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -178,10 +178,10 @@ typedef struct
#define SAVAGE_TV_ON 4
#define SAVAGE_DRIVER_NAME "savage"
-#define SAVAGE_DRIVER_VERSION "2.1.2"
-#define SAVAGE_VERSION_MAJOR 2
-#define SAVAGE_VERSION_MINOR 1
-#define SAVAGE_PATCHLEVEL 2
+#define SAVAGE_DRIVER_VERSION PACKAGE_VERSION
+#define SAVAGE_VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define SAVAGE_VERSION_MINOR PACKAGE_VERSION_MINOR
+#define SAVAGE_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#define SAVAGE_VERSION ((SAVAGE_VERSION_MAJOR << 24) | \
(SAVAGE_VERSION_MINOR << 16) | \
SAVAGE_PATCHLEVEL)
Reply to: