Fix for debian freetype linking

-- Peter Hirdina <Peter.Hirdina@gmx.net>

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@278 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/debian/changelog b/debian/changelog
index e2d76b5..4d86445 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rrdtool (1.1.0-1) unstable; urgency=low
+
+  * Fixed build dependencies
+  * Added libfreetype6-dev to build dependencies
+  * Changed rules file to compile against Debian version of freetype.
+
+ -- Peter Hirdina <Peter.Hirdina@gmx.net>  Mon,  7 Jun 2004 17:10:10 +0200
+
 rrdtool (1.1.0) unstable; urgency=low
 
   * grafted "debian" directory from 1.0.46 source 

diff --git a/debian/control b/debian/control
index cb852dd..3a80bc5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: utils
 Priority: extra
 Maintainer: Matt Zimmerman <mdz@debian.org>
 Standards-Version: 3.2.1
-Build-Depends: debhelper (>= 3.0.5), cgilib (>= 0.5), zlib1g-dev (>= 1.2.1), tcl8.4-dev, perl (>= 5.8.0)
-Build-Depends: libart-2.0-dev (>= 2.3.16), libpng12-dev (>= 1.2.5)
+Build-Depends: debhelper (>= 3.0.5), cgilib (>= 0.5), zlib1g-dev (>= 1.2.1), tcl8.4-dev, perl (>= 5.8.0), libart-2.0-dev (>= 2.3.16), libpng12-dev (>= 1.2.5), libfreetype6-dev (>= 2.1.7)
 
 Package: rrdtool
 Architecture: any

diff --git a/debian/rules b/debian/rules
index 9207d8d..6ddfafe 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ CFLAGS += -g
 endif
 
 # Whack the flags to compile additional dependent pieces
-CFLAGS += -I/usr/include/libart-2.0 -I/usr/local/include/freetype2
+CFLAGS += -I/usr/include/libart-2.0 -I/usr/include/freetype2
 
 ##NO_TCL CFLAGS += -I/usr/include/tcl8.4