debian/changelog | 5 +++-- src/AtomBios/includes/CD_Common_Types.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit 7d03d3baeaa453b3c77a632ff0554a6af0b1ceba Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun May 11 13:00:43 2008 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index bb1d569..c89236d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-radeonhd (1.2.1-2) UNRELEASED; urgency=low +xserver-xorg-video-radeonhd (1.2.1-2) unstable; urgency=low * Install the upstream README files for the driver and for rhd_conntest in the package. @@ -7,7 +7,7 @@ xserver-xorg-video-radeonhd (1.2.1-2) UNRELEASED; urgency=low * Change pciutils-dev build-dep to libpci-dev for gratuitous name change. * Cherry-pick patch applied upstream to fix FTBFS on hurd and kfreebsd. - -- Julien Cristau <[EMAIL PROTECTED]> Sun, 20 Apr 2008 22:20:21 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Sun, 11 May 2008 13:00:30 +0200 xserver-xorg-video-radeonhd (1.2.1-1) unstable; urgency=low commit ddc10da75b3e1f1642b93ac71b85622a00a791f1 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun May 11 13:00:27 2008 +0200 Update changelog diff --git a/debian/changelog b/debian/changelog index 70683e8..bb1d569 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xserver-xorg-video-radeonhd (1.2.1-2) UNRELEASED; urgency=low * Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings (closes: #477433). * Change pciutils-dev build-dep to libpci-dev for gratuitous name change. + * Cherry-pick patch applied upstream to fix FTBFS on hurd and kfreebsd. -- Julien Cristau <[EMAIL PROTECTED]> Sun, 20 Apr 2008 22:20:21 +0200 commit 796168107dbd620789158a2a01128fe52c3202fa Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Apr 28 20:32:46 2008 +0200 Add a test for __GLIBC__ to CD_Common_Types.h. Atombios redefines the standard types but the definitions conflict with the ones from glibc (causes build failures on GNU/Hurd and GNU/kFreeBSD). (cherry picked from commit 0697b366bd3c5ac7bfffdf1128af57e0baa163a0) diff --git a/src/AtomBios/includes/CD_Common_Types.h b/src/AtomBios/includes/CD_Common_Types.h index 3b58360..32d01ef 100644 --- a/src/AtomBios/includes/CD_Common_Types.h +++ b/src/AtomBios/includes/CD_Common_Types.h @@ -49,7 +49,7 @@ Revision History: typedef __int32 int32_t; #elif defined (__linux__) || defined (__NetBSD__) \ || defined(__sun) || defined(__OpenBSD__) \ - || defined (__FreeBSD__) || defined(__DragonFly__) + || defined (__FreeBSD__) || defined(__DragonFly__) || defined(__GLIBC__) typedef unsigned int uint32_t; typedef int int32_t; #else -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]