From 851885d913085d08cf908c91ac8e067f5940f045 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sat, 12 May 2007 22:22:00 +0000
Subject: [PATCH] merge r6394-6399 from trunk

---
 Makefile.am     | 32 +++++++++++++++++++++++++++++++-
 configure.ac    |  6 +++++-
 render/render.c |  6 +++---
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c6e47bbe..2c69b95e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,7 @@ bin_SCRIPTS = \
 
 render_rendertest_CPPFLAGS = \
 	$(PANGO_CFLAGS) \
+	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -46,6 +47,7 @@ render_rendertest_LDADD = \
 	render/libobrender.la \
 	$(GLIB_LIBS) \
 	$(PANGO_LIBS) \
+	$(XFT_LIBS) \
 	$(XML_LIBS) \
 	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -55,6 +57,7 @@ render_libobrender_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
+	$(XFT_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -63,6 +66,7 @@ render_libobrender_la_LIBADD = \
 	parser/libobparser.la \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
+	$(XFT_LIBS) \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -341,6 +345,7 @@ dist_rc_DATA = \
 	data/menu.xml
 
 edit = $(SED) \
+	-e 's!@time\@!$(shell date "+%a, %d %B %Y %T %z")!' \
 	-e 's!@version\@!$(VERSION)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
@@ -362,6 +367,12 @@ data/xsession/openbox-kde-session: Makefile data \
 	@$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
 	@chmod +x $@
 
+debian/changelog: debian debian/changelog.in
+	@echo make: creating $@
+	@rm -f $@
+	@mkdir debian 2>/dev/null || true
+	@$(edit) $(srcdir)/debian/changelog.in >$@
+
 dist_gnomewmfiles_DATA = \
 	data/gnome-wm-properties/openbox.desktop \
 	data/gnome-wm-properties/openbox-gnome.desktop \
@@ -373,6 +384,21 @@ dist_xsessions_DATA = \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
+	debian/changelog.in
+	debian/compat
+	debian/control
+	debian/copyright
+	debian/dirs
+	debian/docs
+	debian/menu.ex
+	debian/openbox-default.ex
+	debian/openbox.doc-base.EX
+	debian/postinst.ex
+	debian/postrm.ex
+	debian/preinst.ex
+	debian/prerm.ex
+	debian/rules
+	debian/watch.ex
 	version.h.in \
 	data/rc.xsd \
 	data/menu.xsd \
@@ -419,4 +445,8 @@ distclean-local:
 		done \
 	done
 
-.PHONY: doc
+deb:	dist debian/changelog
+	fakeroot debian/rules binary
+#	dpkg-buildpackage -b -rfakeroot -f openbox-$(VERSION).tar.gz
+
+.PHONY: doc deb
diff --git a/configure.ac b/configure.ac
index b6c7803f..afca4d8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.4.0], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.3.990], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
@@ -78,6 +78,10 @@ PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0 pangoxft >= 1.8.0])
 AC_SUBST(PANGO_CFLAGS)
 AC_SUBST(PANGO_LIBS)
 
+PKG_CHECK_MODULES(XFT, [xft])
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(XFT_LIBS)
+
 PKG_CHECK_MODULES(XML, [libxml-2.0])
 AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
diff --git a/render/render.c b/render/render.c
index d34ddccb..ecb07ada 100644
--- a/render/render.c
+++ b/render/render.c
@@ -18,9 +18,6 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
 #include "render.h"
 #include "gradient.h"
 #include "font.h"
@@ -30,6 +27,9 @@
 #include "theme.h"
 
 #include <glib.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xft/Xft.h>
 
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
-- 
2.34.1