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

Proposed by Alex Valavanis on 2011-05-22
Status: Merged
Merged at revision: 20
Proposed branch: lp:~valavanisalex/ubuntu/oneiric/gnuplot/bug-627592
Merge into: lp:ubuntu/oneiric/gnuplot
Diff against target: 40 lines (+10/-1)
3 files modified
debian/changelog (+8/-0)
debian/control (+1/-1)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~valavanisalex/ubuntu/oneiric/gnuplot/bug-627592
Reviewer Review Type Date Requested Status
Luke Yelavich Approve on 2011-06-03
Ubuntu branches 2011-05-22 Pending
Review via email: mp+61905@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Luke Yelavich (themuso) wrote :

Seems this has been uploaded already.

review: Disapprove
Luke Yelavich (themuso) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-05-19 23:00:45 +0000
3+++ debian/changelog 2011-05-22 22:52:37 +0000
4@@ -1,3 +1,11 @@
5+gnuplot (4.4.3-0ubuntu2) oneiric; urgency=low
6+
7+ * Add support for TikZ driver (LP: #627592)
8+ - debian/control: Build-Depends on liblua5.1-dev
9+ - debian/rules: header path added to CPPFLAGS
10+
11+ -- Alex Valavanis <valavanisalex@googlemail.com> Sun, 22 May 2011 23:21:26 +0100
12+
13 gnuplot (4.4.3-0ubuntu1) oneiric; urgency=low
14
15 * New upstream release. (LP: #776203)
16
17=== modified file 'debian/control'
18--- debian/control 2011-05-19 23:00:45 +0000
19+++ debian/control 2011-05-22 22:52:37 +0000
20@@ -4,7 +4,7 @@
21 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
22 XSBC-Original-Maintainer: Bradley Smith <bradsmith@debian.org>
23 Standards-Version: 3.8.4
24-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
25+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
26 Homepage: http://gnuplot.sourceforge.net/
27 Vcs-Git: http://git.brad-smith.co.uk/git/debian/pkg-gnuplot.git
28 Vcs-Browser: http://git.brad-smith.co.uk/?p=debian/pkg-gnuplot.git
29
30=== modified file 'debian/rules'
31--- debian/rules 2009-03-16 17:24:48 +0000
32+++ debian/rules 2011-05-22 22:52:37 +0000
33@@ -7,6 +7,7 @@
34 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
35
36 CFLAGS = -Wall -g
37+CPPFLAGS = -I/usr/include/lua5.1
38
39 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
40 CFLAGS += -O0

Subscribers

People subscribed via source and target branches