Merge lp:~valavanisalex/ubuntu/oneiric/gnuplot/bug-627592 into lp:ubuntu/oneiric/gnuplot

[Alex Valavanis]

Added support for TikZ driver in build. As far as I can tell, there is no need for the patch proposed in bug #627592 --- we can just add the correct build dependency and the path for the header in debian/control and debian/rules respectively.

[Luke Yelavich (themuso)]

Seems this has been uploaded already.

review: Disapprove

[Luke Yelavich (themuso)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-19 23:00:45 +0000
+++ debian/changelog	2011-05-22 22:52:37 +0000
@@ -1,3 +1,11 @@
+gnuplot (4.4.3-0ubuntu2) oneiric; urgency=low
+
+  * Add support for TikZ driver (LP: #627592)
+    - debian/control: Build-Depends on liblua5.1-dev
+    - debian/rules: header path added to CPPFLAGS
+
+ -- Alex Valavanis <[e-mail]>  Sun, 22 May 2011 23:21:26 +0100
+
 gnuplot (4.4.3-0ubuntu1) oneiric; urgency=low
 
   * New upstream release. (LP: #776203)
 
=== modified file 'debian/control'
--- debian/control	2011-05-19 23:00:45 +0000
+++ debian/control	2011-05-22 22:52:37 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Bradley Smith <[e-mail]>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7), libpng12-dev, libx11-dev, libxt-dev, pkg-config, texinfo (>= 4.8), texlive-latex-base, texlive-latex-recommended, zlib1g-dev, libgd2-noxpm-dev, quilt, libwxgtk2.8-dev, libcairo2-dev, libpango1.0-dev, libedit-dev (>= 2.11-20080614-2), autoconf, automake, texlive-latex-extra, libtool
+Build-Depends: debhelper (>= 7), libpng12-dev, libx11-dev, libxt-dev, pkg-config, texinfo (>= 4.8), texlive-latex-base, texlive-latex-recommended, zlib1g-dev, libgd2-noxpm-dev, quilt, libwxgtk2.8-dev, libcairo2-dev, libpango1.0-dev, libedit-dev (>= 2.11-20080614-2), autoconf, automake, texlive-latex-extra, libtool, liblua5.1-dev
 Homepage: http://gnuplot.sourceforge.net/
 Vcs-Git: http://git.brad-smith.co.uk/git/debian/pkg-gnuplot.git
 Vcs-Browser: http://git.brad-smith.co.uk/?p=debian/pkg-gnuplot.git
 
=== modified file 'debian/rules'
--- debian/rules	2009-03-16 17:24:48 +0000
+++ debian/rules	2011-05-22 22:52:37 +0000
@@ -7,6 +7,7 @@
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = -Wall -g
+CPPFLAGS = -I/usr/include/lua5.1
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0