On Sun, Jun 27, 2010 at 02:00:55PM +0200, M G Berberich wrote: > Hello, > > I attached a patch to get lua/tikz-support in the debian-package
I have uploaded to the delayed queue a gnuplot package with fixed build-dependency on libedit. Since this modifies Build-Depends line, a refreshed patch is needed. Regarding this part of the original patch, > diff -Naur II/gnuplot-4.4.0/debian/rules gnuplot-4.4.0/debian/rules > - --without-linux-vga --with-readline=bsd --without-x \ > - --disable-wxwidgets > + --without-linux-vga --with-readline=gnu --without-x \ > + --disable-wxwidgets --with-lua note that I reverted the use of GNU readline back to bsd readline. Because of license incompatibilities (See /usr/share/doc/gnuplot/README.Debian for details) we cannot distribute gnuplot linked to GNU readline. Refreshed patch is attached. P.S. Count this mail as yet another 'me too' for lua enabling. -- Agustin
diff -Nru --exclude changelog gnuplot-4.4.0/debian/control gnuplot-4.4.0/debian/control --- gnuplot-4.4.0/debian/control 2010-09-21 12:22:15.000000000 +0200 +++ gnuplot-4.4.0/debian/control 2010-09-28 15:04:54.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Bradley Smith <[email protected]> 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 +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, 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 diff -Nru --exclude changelog gnuplot-4.4.0/debian/gnuplot-nox.install gnuplot-4.4.0/debian/gnuplot-nox.install --- gnuplot-4.4.0/debian/gnuplot-nox.install 2010-03-27 12:35:04.000000000 +0100 +++ gnuplot-4.4.0/debian/gnuplot-nox.install 2010-09-28 15:05:37.000000000 +0200 @@ -2,3 +2,4 @@ debian/tmp/usr/share/man/man1/gnuplot.1 debian/tmp/usr/share/gnuplot/gnuplot/ debian/build-nox/src/gnuplot usr/bin +debian/tmp/usr/share/texmf/tex/latex/gnuplot/gnuplot-lua-tikz.sty usr/share/texmf/tex/latex/gnuplot/ diff -Nru --exclude changelog gnuplot-4.4.0/debian/patches/06_lua.diff gnuplot-4.4.0/debian/patches/06_lua.diff --- gnuplot-4.4.0/debian/patches/06_lua.diff 1970-01-01 01:00:00.000000000 +0100 +++ gnuplot-4.4.0/debian/patches/06_lua.diff 2010-09-28 15:02:46.000000000 +0200 @@ -0,0 +1,46 @@ +Description: Upstream changes introduced in version 4.4.0-1.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + gnuplot (4.4.0-1.1) unstable; urgency=low + . + * Non-maintainer upload. + * added lua-tikz + . + The person named in the Author field signed this changelog entry. +Author: M G Berberich <[email protected]> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- gnuplot-4.4.0.orig/configure.in ++++ gnuplot-4.4.0/configure.in +@@ -617,7 +617,7 @@ AC_ARG_WITH(lua,dnl + with_lua=yes) + + if test "${with_lua}" = yes ; then +- PKG_CHECK_MODULES(LUA, [lua], LUAFOUND=yes, [LUAFOUND=no]) ++ PKG_CHECK_MODULES(LUA, [lua5.1], LUAFOUND=yes, [LUAFOUND=no]) + if test $pkg_failed != no; then + AC_MSG_WARN([The lua terminal will not be compiled.]) + with_lua=no +@@ -626,7 +626,7 @@ if test "${with_lua}" = yes ; then + LIBS="$LIBS $LUA_LIBS" + fi + +- AC_SEARCH_LIBS(luaL_openlibs, lua, ++ AC_SEARCH_LIBS(luaL_openlibs, lua5.1, + [dnl found lua library + AC_DEFINE(HAVE_LUA,1, [ Define if you want the lua/TikZ terminal. ]) + AC_CHECK_HEADERS(lua.h,, diff -Nru --exclude changelog gnuplot-4.4.0/debian/patches/series gnuplot-4.4.0/debian/patches/series --- gnuplot-4.4.0/debian/patches/series 2010-03-27 12:35:04.000000000 +0100 +++ gnuplot-4.4.0/debian/patches/series 2010-09-28 15:09:35.000000000 +0200 @@ -1,3 +1,4 @@ 02_fix_man.diff 04_fix_libexecdir.diff 05_default_gd_font.diff +06_lua.diff diff -Nru --exclude changelog gnuplot-4.4.0/debian/rules gnuplot-4.4.0/debian/rules --- gnuplot-4.4.0/debian/rules 2010-03-27 12:35:04.000000000 +0100 +++ gnuplot-4.4.0/debian/rules 2010-09-28 15:16:13.000000000 +0200 @@ -41,7 +41,7 @@ --with-gihdir=\$${prefix}/share/gnuplot \ --without-lasergnu --with-png --with-gd --without-lisp-files \ --without-linux-vga --with-readline=bsd --without-x \ - --disable-wxwidgets + --disable-wxwidgets --with-lua touch $@ configure-x11: configure-x11-stamp @@ -57,7 +57,7 @@ --datadir=\$${prefix}/share/gnuplot \ --with-gihdir=\$${prefix}/share/gnuplot \ --without-lasergnu --with-png --with-gd --without-lisp-files \ - --without-linux-vga --with-readline=bsd + --without-linux-vga --with-readline=bsd --with-lua touch $@ build-nox: build-nox-stamp @@ -150,6 +150,7 @@ dh_installdocs -a dh_installmenu -a dh_installman -a + dh_installtex -p gnuplot-nox dh_installchangelogs ChangeLog -a dh_strip -a dh_link -a
