Author: branden
Date: 2003-12-17 13:56:09 -0500 (Wed, 17 Dec 2003)
New Revision: 853
Added:
trunk/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff
Modified:
trunk/debian/changelog
Log:
debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff:
Do not include <freetype/freetype.h> directly; use the macro FT_FREETYPE_H
to include it instead, as required by FreeType 2.1.7 (thanks, Tore
Anderson). Fixes FTBFS caused by new version of FreeType.
debian/changelog:
+ Increment upload urgency and explain why.
+ Remove extraneous old conflict markers from end of file.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-12-17 18:47:30 UTC (rev 852)
+++ trunk/debian/changelog 2003-12-17 18:56:09 UTC (rev 853)
@@ -1,5 +1,7 @@
-xfree86 (4.2.1-15) unstable; urgency=low
+xfree86 (4.2.1-15) unstable; urgency=medium
+ * Urgency due to fix for FTBFS triggered by libfreetype6-dev package.
+
* Fix corrupted error message text in check_symlinks_and_warn().
(Closes: #220713)
- debian/shell-lib.sh
@@ -35,8 +37,13 @@
- debian/MANIFEST.*: updated
- debian/xfonts-base.install: ship new file in xfonts-base package
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 17 Dec 2003 13:45:10 -0500
+ * Do not include <freetype/freetype.h> directly; use the macro FT_FREETYPE_H
+ to include it instead, as required by FreeType 2.1.7 (thanks, Tore
+ Anderson). Fixes FTBFS caused by new version of FreeType.
+ - debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 17 Dec 2003 13:55:13 -0500
+
xfree86 (4.2.1-14) unstable; urgency=medium
* Urgency due to fix for FTBFS triggered by linux-kernel-headers package.
Copied: trunk/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff (from rev
850, branches/4.3.0/sid/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff)
===================================================================
--- branches/4.3.0/sid/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff
2003-12-16 18:36:47 UTC (rev 850)
+++ trunk/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff 2003-12-17
18:56:09 UTC (rev 853)
@@ -0,0 +1,19 @@
+$Id$
+
+Do not include <freetype/freetype.h> directly; use the macro FT_FREETYPE_H
+to include it instead, as required by FreeType 2.1.7.
+
+This patch by Tore Anderson. Not submitted upstream yet.
+
+--- xc/lib/Xft/XftFreetype.h~ 2003-12-17 03:26:13.000000000 -0500
++++ xc/lib/Xft/XftFreetype.h 2003-12-17 03:26:40.000000000 -0500
+@@ -26,7 +26,8 @@
+ #define _XFTFREETYPE_H_
+
+ #include <X11/Xft/Xft.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+
+ #include <X11/Xfuncproto.h>
+ #include <X11/Xosdefs.h>
Property changes on: trunk/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff
___________________________________________________________________
Name: svn:keywords
+ Id
