[gnuplot] 02/08: Update install-files for gnuplot v.5. (Closes: #812906)
Anton Gladky
gladk at moszumanska.debian.org
Tue Jun 7 20:39:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gnuplot.
commit 9595f8123280a5dc8055e87facf7631e1bbbf6eb
Author: Anton Gladky <gladk at debian.org>
Date: Tue Jun 7 21:41:06 2016 +0200
Update install-files for gnuplot v.5. (Closes: #812906)
---
debian/NEWS | 31 ++----
debian/README.Debian | 68 -------------
debian/TODO | 16 ---
debian/changelog | 128 +++++++++++++++++++++++
debian/control | 152 +++++++++++++++++++++++++++-
debian/copyright | 107 +++++++-------------
debian/gnuplot-data.install | 1 +
debian/gnuplot-data.links | 2 +-
debian/gnuplot-doc.doc-base.gnuplot-html | 9 --
debian/gnuplot-doc.doc-base.gnuplot-pdf | 8 --
debian/gnuplot-doc.docs | 12 +--
debian/gnuplot-nox.docs | 4 -
debian/gnuplot-nox.install | 2 +-
debian/gnuplot-nox.manpages | 2 +-
debian/gnuplot-nox.menu | 11 --
debian/gnuplot-nox.postinst | 14 +--
debian/gnuplot-nox.prerm | 4 +-
debian/gnuplot-qt.docs | 4 -
debian/gnuplot-qt.install | 2 +-
debian/gnuplot-qt.manpages | 2 +-
debian/gnuplot-qt.menu | 11 --
debian/gnuplot-qt.postinst | 14 +--
debian/gnuplot-qt.prerm | 4 +-
debian/gnuplot-tex.install | 1 -
debian/gnuplot-x11.docs | 4 -
debian/gnuplot-x11.install | 2 +-
debian/gnuplot-x11.manpages | 2 +-
debian/gnuplot-x11.menu | 11 --
debian/gnuplot-x11.postinst | 14 +--
debian/gnuplot-x11.prerm | 4 +-
debian/patches/04_fix_libexecdir.diff | 8 +-
debian/patches/05_default_gd_font.diff | 10 +-
debian/patches/07_doc.patch | 17 ++++
debian/patches/08_disable_demo_plugin.patch | 58 +++++++++++
debian/patches/09_force_texinfo.patch | 37 -------
debian/patches/09_remove_beos.patch | 44 ++++++++
debian/patches/10_removepicins.patch | 33 ++++++
debian/patches/11_fix_linkage_wx.patch | 17 ++++
debian/patches/12_info.patch | 88 ++++++++++++++++
debian/patches/series | 7 +-
debian/rules | 76 +++++++++++++-
debian/watch | 3 +-
42 files changed, 713 insertions(+), 331 deletions(-)
diff --git a/debian/NEWS b/debian/NEWS
index 0940c39..d9fafbc 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,27 +1,12 @@
-gnuplot (4.6.5-7) unstable; urgency=medium
+gnuplot5 (5.0.0~rc+dfsg-1) unstable; urgency=medium
- /usr/bin/gnuplot binary is managed now through update-alternatives
- mechanism and depends on installed gnuplot configuration
- (-nox, -x11 or -qt).
+ gnuplot version 5 is providing /usr/bin/gnuplot symlink
+ through update-alternatives and has higher priority than
+ gnuplot version 4.
- gnuplot version 4 provides also /usr/bin/gnuplot4 symlink.
- It points on installed gnuplot binary variant (-nox, -x11 or -qt).
+ gnuplot5 provides also /usr/bin/gnuplot5 symlink.
+ It points on installed gnuplot5i binary variant (-nox, -x11 or -qt).
- To be sure you are using gnuplot of version 4 please type
- gnuplot4 in command line.
+ Both gnuplot4 and gnuplot5 can be installed together.
- These changes are needed due to a new gnuplot major version 5 and
- allows one to install both versions simultaneously.
-
- -- Anton Gladky <gladk at debian.org> Sat, 12 Jul 2014 10:46:21 +0200
-
-gnuplot (4.6.5-4) unstable; urgency=medium
-
- We stop to provide wxt-terminal because wxwidgets 3.0 is not compatible
- with gnuplot [1], [2]. wxt-terminal will be enabled again if the bug
- will be fixed.
-
- [1] https://sourceforge.net/p/gnuplot/bugs/1401
- [2] https://bugs.debian.org/750045
-
- -- Anton Gladky <gladk at debian.org> Wed, 04 Jun 2014 22:46:22 +0200
+ -- Anton Gladky <gladk at debian.org> Fri, 11 Jul 2014 23:36:40 +0200
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 089f22d..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,68 +0,0 @@
-gnuplot for Debian
-==================
-
-Documentation
--------------
-
-The full documentation including all examples, the info-pages and a
-tutorial has been split off to a separate gnuplot-doc package.
-
-You can also find useful information on the following websites:
-
-- the original FAQ:
-
- http://gnuplot.sourceforge.net/faq/faq.html
-
-- not so Frequently Asked Questions:
-
- http://t16web.lanl.gov/Kawano/gnuplot/index-e.html
-
-- Tutorial (in german)
-
- http://www.we.fh-osnabrueck.de/fbwe/vorlesung/edv2/gplot/gplot.html
-
-- collection of websites with gnuplot-help/more tutorials
-
- http://gnuplot.sourceforge.net/help.html
-
-
-SVGAlib
--------
-
-I've dropped the svgalib-support for the following reasons:
-
-a) the SUID-bit has to be set which is a security risk
-b) the dependency on both svgalib and svgalib-dummy has to be crudely
- hacked into the package
-c) all these tricks only have to be done to support graphics no one
- uses on only one architecture :-(
-d) even upstream decided to disable svgalib by default
-
-
-libreadline
------------
-
-Yes, the built in readline of gnuplot is bad. However, libreadline
-cannot be used instead because it is licensed under the GPL, whereas
-gnuplot has special licenses (patches only). Distribution of those
-programs linked together is legally impossible but you may rebuild
-your own custom package with readline. Please don't file bugs telling
-me to use libreadline in gnuplot...
-
-Interfaces to other languages
------------------------------
-
-If you want to send gnuplot commands from inside your program, the
-following packages may help you (Beware: I haven't tested them!):
-
-Available as Debian package:
-
- python-gnuplot
-
-Not available as Debian package:
-
- interface to ANSI C: http://ndevilla.free.fr/gnuplot/
-
-Feel free to send me more information to be included in this place!
-
- -- Cyril Bouthors <cyril at bouthors.org>, Fri, 31 Mar 2006 18:48:52 +0200
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 21ada30..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,16 +0,0 @@
-ecrire aux mainteneurs pour le problème de license
-tagger le bug forwarded upstream
-retitle 75403 Unable to link gnuplot with libreadline because of
- licensing issues
-
-faire un wget -m de http://gnuplot.info/ et le mettre ds debian
-
-- regression testing
-
-- use libeditline for commandline editing
-
-- write better documentation about "binary"-format, remove reference
- to source-files... or tell upstream to do this :)
-
-- maybe move menu-entry to apps/Science (well, it's kinda both math
- and science...)
diff --git a/debian/changelog b/debian/changelog
index d391afb..2d197d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,131 @@
+gnuplot (5.0.3+dfsg2-1) unstable; urgency=medium
+
+ * [e835fa1] Update d/watch.
+ * [f9c5d19] Imported Upstream version 5.0.3+dfsg2
+ * [29a7ef2] Remove patch, applied by upstrem.
+
+ -- Anton Gladky <gladk at debian.org> Mon, 22 Feb 2016 18:59:57 +0100
+
+gnuplot5 (5.0.3+dfsg1-2) unstable; urgency=medium
+
+ * [5b904ca] Revert previous "provides-option". (Closes: #814415)
+
+ -- Anton Gladky <gladk at debian.org> Fri, 12 Feb 2016 20:25:36 +0100
+
+gnuplot5 (5.0.3+dfsg1-1) unstable; urgency=medium
+
+ * [4b3a3ce] Imported Upstream version 5.0.3+dfsg1
+ * [8767584] Update patches.
+ * [1bcf48b] Fix format not a string error.
+ * [0e4ff3f] Apply cme fix dpkg.
+ * [6a42bd9] Add Provides-section for gnuplot4. Prepare for gnuplot4 removal.
+
+ -- Anton Gladky <gladk at debian.org> Mon, 08 Feb 2016 13:30:56 +0100
+
+gnuplot5 (5.0.2+dfsg1-2) unstable; urgency=medium
+
+ * [7bb549d] Fix font size on wxt-terminal. (Closes: #810943)
+ * [5a638de] Update d/copyright.
+
+ -- Anton Gladky <gladk at debian.org> Mon, 18 Jan 2016 09:08:36 +0100
+
+gnuplot5 (5.0.2+dfsg1-1) unstable; urgency=medium
+
+ * [d183a84] Remove so-files from d/copyright (fixed by upstream)
+ * [9a496d5] Imported Upstream version 5.0.2+dfsg1. (Closes: #806039)
+ * [5be40e0] Refresh patches.
+ * [65d724b] Update d/copyright.
+ * [09f724d] Add dh-lua to BD.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 12 Jan 2016 08:11:01 +0100
+
+gnuplot5 (5.0.1+dfsg1-3) unstable; urgency=medium
+
+ [ Martin Pitt <martin.pitt at ubuntu.com> ]
+ * Add 13_no_pie.patch: Don't build with -fPIE, Qt barfs on that with
+ gcc >= 5. (http://code.qt.io/cgit/qt/qtbase.git/commit/?id=3eca75d)
+ (Closes: #795076)
+ * debian/rules: Also drop "pie" from hardening flags. Instead, build with
+ -fPIC; it's conceptually wrong, but it's what the above Qt check insists
+ on.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 11 Aug 2015 22:07:13 +0200
+
+gnuplot5 (5.0.1+dfsg1-2) unstable; urgency=medium
+
+ [ Vincent Lefevre ]
+ * Team upload.
+ * [1171a98] Provide info manual. (Closes: #778757)
+
+ -- Anton Gladky <gladk at debian.org> Mon, 29 Jun 2015 23:36:42 +0200
+
+gnuplot5 (5.0.1+dfsg1-1) unstable; urgency=medium
+
+ * [c0fd77e] Imported Upstream version 5.0.1+dfsg
+ * [be6c05e] Add suffix to uscan tarball.
+ * [47f23a2] Refresh patches.
+
+ -- Anton Gladky <gladk at debian.org> Wed, 17 Jun 2015 17:54:45 +0200
+
+gnuplot5 (5.0.0+dfsg1-1) unstable; urgency=medium
+
+ * [6654139] Update description of doc.patch.
+ * [d62554c] Remove docs/gnuplot.doc from Files-Excluded.
+ * [0bde847] Update watch-file.
+ * [094380f] Update d/copyright.
+ * [03fde84] Use cme fix dpkg-control.
+ * [5b554ce] Fix package build with -A option.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 28 Apr 2015 21:38:18 +0200
+
+gnuplot5 (5.0.0+dfsg1-1~exp1) experimental; urgency=medium
+
+ * [852f781] Imported Upstream version 5.0.0+dfsg1
+ * [ebf57b8] Remove doc-patch.
+ * [a4d5d14] Update d/watch.
+ * [6b6db31] Update d/copyright.
+ * [7907a7a] Update doc-generation.
+ * [e56cfca] Enable wxt-terminal.
+
+ -- Anton Gladky <gladk at debian.org> Thu, 22 Jan 2015 23:15:42 +0100
+
+gnuplot5 (5.0.0~rc+dfsg3-1) experimental; urgency=medium
+
+ [ Anton Gladky ]
+ * [3071bf2] Imported Upstream version 5.0~rc3
+ * [d89f2c1] Set Standards-Version: 3.9.6. No changes.
+
+ [ Mattia Rizzolo ]
+ * [8770897] Do not build-depend on qt5-default. (Closes: #769235)
+
+ -- Anton Gladky <gladk at debian.org> Tue, 18 Nov 2014 19:18:52 +0100
+
+gnuplot5 (5.0.0~rc+dfsg2-1) unstable; urgency=medium
+
+ * [6c51a9d] Update copyright-file.
+ * [796b51a] Replace binary by Source-version in d/control.
+ * [5e8c834] Remove README.Debian and TODO.
+ * [5e486cc] Update debian/watch.
+ * [947cf8e] Add Files-Excluded into d/copyright.
+ * [f90ab32] Imported Upstream version 5.0.0~rc2+dfsg. (Closes: #763504)
+ * [163b2af] Remove beos-specific code.
+ * [52c53de] Remove gnuplot.doc from source and binary.
+ * [0bc7e41] Refresh patches.
+ * [f69cc4e] Simplify autopkgtest.
+
+ -- Anton Gladky <gladk at debian.org> Mon, 29 Sep 2014 22:49:44 +0200
+
+gnuplot5 (5.0.0~rc+dfsg-1) unstable; urgency=medium
+
+ * Initial packaging. (Closes: #754506)
+
+ -- Anton Gladky <gladk at debian.org> Fri, 11 Jul 2014 23:36:40 +0200
+
+
+=====================================
+=====================================
+Old changelog, gnuplot4
+
gnuplot (4.6.6-4) unstable; urgency=medium
* [701337b] Remove gnuplot4 binaries in favor of gnuplot5.
diff --git a/debian/control b/debian/control
index 79ad03f..97fa936 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,48 @@ Uploaders: Anton Gladky <gladk at debian.org>
Section: math
Testsuite: autopkgtest
Priority: optional
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.8
+Build-Depends: autoconf,
+ automake,
+ debhelper (>= 9),
+ dh-autoreconf,
+ dh-lua,
+ libcairo2-dev,
+ libedit-dev,
+ libgd2-dev,
+ liblua5.1-dev,
+ libpango1.0-dev,
+ libpng-dev,
+ qtbase5-dev,
+ qtbase5-dev-tools,
+ qttools5-dev-tools,
+ latex2html,
+ libqt5webkit5-dev,
+ libqt5opengl5-dev,
+ libqt5svg5-dev,
+ libx11-dev,
+ libxt-dev,
+ pkg-config,
+ texinfo,
+ texlive-fonts-recommended,
+ texlive-font-utils,
+ texlive-latex-base,
+ texlive-latex-extra,
+ texlive-latex-recommended,
+ libwxgtk3.0-dev,
+ zlib1g-dev,
+ emacs24
+Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/gnuplot.git
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/gnuplot.git
Homepage: http://gnuplot.sourceforge.net/
Package: gnuplot
Architecture: all
-Depends: gnuplot5-qt | gnuplot5-x11 | gnuplot5-nox,
+Depends: gnuplot-qt | gnuplot-x11 | gnuplot-nox,
${misc:Depends}
-Description: Command-line driven interactive plotting program
+Suggests: gnuplot-doc
+Provides: gnuplot5
+Description: Command-line driven interactive plotting program, version 5
Gnuplot is a portable command-line driven interactive data and function
plotting utility that supports lots of output formats, including drivers
for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
@@ -26,3 +57,116 @@ Description: Command-line driven interactive plotting program
.
This package is for transition and to install a full-featured gnuplot
supporting the X11-output.
+
+Package: gnuplot-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Command-line driven interactive plotting program. Doc-package
+ Gnuplot is a portable command-line driven interactive data and function
+ plotting utility that supports lots of output formats, including drivers
+ for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
+ is packaged in gnuplot-x11.
+ .
+ Data files and self-defined functions can be manipulated by the internal
+ C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
+ and can work with complex numbers.
+ .
+ This package contains the additional documentation.
+
+Package: gnuplot-nox
+Architecture: any
+Depends: gnuplot-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: fonts-liberation,
+ groff
+Suggests: gnuplot-doc
+Conflicts: gnuplot-qt,
+ gnuplot-x11
+Replaces: gnuplot-qt,
+ gnuplot-x11
+Description: Command-line driven interactive plotting program. No-X package
+ Gnuplot is a portable command-line driven interactive data and function
+ plotting utility that supports lots of output formats, including drivers
+ for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
+ is packaged in gnuplot-x11. The QT-output is packaged in gnuplot-qt.
+ .
+ Data files and self-defined functions can be manipulated by the internal
+ C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
+ and can work with complex numbers.
+ .
+ This package is for working without an X server.
+
+Package: gnuplot-qt
+Architecture: any
+Depends: gnuplot-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests: gnuplot-doc
+Conflicts: gnuplot-x11,
+ gnuplot-nox
+Provides: gnuplot-nox, gnuplot5-qt
+Replaces: gnuplot-x11,
+ gnuplot-nox
+Description: Command-line driven interactive plotting program. QT-package
+ Gnuplot is a portable command-line driven interactive data and function
+ plotting utility that supports lots of output formats, including drivers
+ for many printers, (La)TeX, (x)fig, Postscript, and so on.
+ .
+ Data files and self-defined functions can be manipulated by the internal
+ C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
+ and can work with complex numbers.
+ .
+ This package contains the terminal driver that enables gnuplot to plot
+ images interactively under X11. Most users will want this, it is however
+ packaged separately so that low-end systems don't need X installed to use
+ gnuplot.
+ .
+ The package provides gnuplot-x11 and gnuplot-nox terminals plus an
+ additional QT-terminal for output (not default one).
+
+Package: gnuplot-x11
+Architecture: any
+Depends: gnuplot-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests: gnuplot-doc
+Conflicts: gnuplot-qt,
+ gnuplot-nox
+Provides: gnuplot-nox, gnuplot5-x11
+Replaces: gnuplot-qt,
+ gnuplot-nox
+Description: Command-line driven interactive plotting program. X-package
+ Gnuplot is a portable command-line driven interactive data and function
+ plotting utility that supports lots of output formats, including drivers
+ for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
+ is packaged in gnuplot-x11.
+ .
+ Data files and self-defined functions can be manipulated by the internal
+ C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
+ and can work with complex numbers.
+ .
+ This package contains the terminal driver that enables gnuplot to plot
+ images interactively under X11. Most users will want this, it is however
+ packaged separately so that low-end systems don't need X installed to use
+ gnuplot.
+
+Package: gnuplot-data
+Architecture: all
+Section: doc
+Depends: aglfn,
+ ${misc:Depends}
+Breaks: gnuplot5-data
+Replaces: gnuplot5-data
+Description: Command-line driven interactive plotting program. Data-files
+ Gnuplot is a portable command-line driven interactive data and function
+ plotting utility that supports lots of output formats, including drivers
+ for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
+ is packaged in gnuplot-x11.
+ .
+ Data files and self-defined functions can be manipulated by the internal
+ C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
+ and can work with complex numbers.
+ .
+ This package contains data-files which are used by -nox, -x11 and -qt.
diff --git a/debian/copyright b/debian/copyright
index 71553fc..dce49fc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,16 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: http://gnuplot.sourceforge.net/
+Files-Excluded:
+ FAQ.pdf
+ docs/README.ja
+ docs/figure_missing.pdf
+ docs/gnuplot.pdf
+ src/NeXT
+ src/OpenStep
+ src/win
+ win
+ src/os2
+ src/beos
Files: *
Copyright: Copyright 1986-1993, 1998, 2004 Thomas Williams, Colin Kelley
@@ -31,70 +42,11 @@ License: other
Files: src/wxterminal/*
Copyright: Copyright 2005,2006 Timothee Lecomte
-License: other
- Permission to use, copy, and distribute this software and its
- documentation for any purpose with or without fee is hereby granted,
- .
- provided that the above copyright notice appear in all copies and that
- both that copyright notice and this permission notice appear in supporting
- documentation.
- .
- Permission to modify the software is granted, but not the right to
- distribute the complete modified source code. Modifications are to be
- distributed as patches to the released version. Permission to distribute
- binaries produced by compiling modified sources is granted, provided you
- 1. distribute the corresponding source modifications from the released
- version in the form of a patch file along with the binaries,
- 2. add special version identification to distinguish your version in
- addition to the base release version number,
- 3. provide your name and address as the primary contact for the support
- of your modified version, and
- 4. retain our contact information in regard to use of the base software.
- Permission to distribute the released version of the source code along
- with corresponding source modifications in the form of a patch file is
- granted with same provisions 2 through 4 for binary distributions.
- .
- This software is provided "as is" without express or implied warranty to
- the extent permitted by applicable law.
- .
- Alternatively, the contents of this file may be used under the terms of
- the GNU General Public License Version 2 or later (the "GPL"), in which
- case the provisions of GPL are applicable instead of those above. If you
- wish to allow use of your version of this file only under the terms of the
- GPL and not to allow others to use your version of this file under the
- above gnuplot license, indicate your decision by deleting the provisions
- above and replace them with the notice and other provisions required by
- the GPL. If you do not delete the provisions above, a recipient may use
- your version of this file under either the GPL or the gnuplot license.
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-
-Files: lisp/*
-Copyright:
- gnuplot.el: (C) 1998 Phil Type and Bruce Ravel, 1999-2002 Bruce Ravel
- gnuplot-gui.el: (C) 1998-2000 Bruce Ravel
- info-look.20.2.el: (C) 1995,1996,1997 Ralph Schleicher.
- info-look.20.3.el: (C) 1995,1996,1997, 1998 Free Software Foundation, Inc.
-License: GPL-2+.
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
- Software Foundation; either version 2 of the License, or (at your option)
- any later version.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+License: BSD-4-clause or GPL-2
Files: term/PostScript/aglfn.txt
Copyright: 2003,2005,2006,2007 Adobe Systems Incorporated
-License: BSD-like
+License: BSD-like-aglfn
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this documentation file to use, copy, publish, distribute,
# sublicense, and/or sell copies of the documentation, and to permit
@@ -128,7 +80,7 @@ Files: term/object.h
Copyright: 1985 by Supoj Sutanthavibul,
Parts Copyright (c) 1994 by Brian V. Smith,
Parts Copyright (c) 1991 by Paul King
-License: BSD-like
+License: BSD-like-X
* The X Consortium, and any party obtaining a copy of these files from
* the X Consortium, directly or indirectly, is granted, free of charge, a
* full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -143,7 +95,17 @@ License: BSD-like
Files: term/fig.trm
Copyright: 1990 - 1993, 1998, 2004 Micah Beck, David Kotz
-License: BSD-like
+License: BSD-4-clause
+
+Files: pm3d/contrib/pm3dConvertToImage.awk
+Copyright: 2002 Petr Mikulik, mikulik at physics.muni.cz
+License: public-domain
+ Distribution policy: this script belongs to the distribution of pm3d and
+ gnuplot programs.
+ .
+ License: public domain.
+
+License: BSD-4-clause
* Permission to use, copy, and distribute this software and its
* documentation for any purpose with or without fee is hereby granted,
* provided that the above copyright notice appear in all copies and
@@ -170,10 +132,17 @@ License: BSD-like
* This software is provided "as is" without express or implied warranty
* to the extent permitted by applicable law.
-Files: pm3d/contrib/pm3dConvertToImage.awk
-Copyright: 2002 Petr Mikulik, mikulik at physics.muni.cz
-License: public-domain
- Distribution policy: this script belongs to the distribution of pm3d and
- gnuplot programs.
+License: GPL-2
+ Alternatively, the contents of this file may be used under the terms of
+ the GNU General Public License Version 2 or later (the "GPL"), in which
+ case the provisions of GPL are applicable instead of those above. If you
+ wish to allow use of your version of this file only under the terms of the
+ GPL and not to allow others to use your version of this file under the
+ above gnuplot license, indicate your decision by deleting the provisions
+ above and replace them with the notice and other provisions required by
+ the GPL. If you do not delete the provisions above, a recipient may use
+ your version of this file under either the GPL or the gnuplot license.
.
- License: public domain.
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/gnuplot-data.install b/debian/gnuplot-data.install
index 0cd2a0f..d8c6f64 100644
--- a/debian/gnuplot-data.install
+++ b/debian/gnuplot-data.install
@@ -1,2 +1,3 @@
pm3d/contrib/* usr/share/gnuplot/pm3d
debian/tmp/QT/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
+debian/tmp/QT/usr/share/texmf/tex/ usr/share/texmf/
diff --git a/debian/gnuplot-data.links b/debian/gnuplot-data.links
index 05fca59..784bded 100644
--- a/debian/gnuplot-data.links
+++ b/debian/gnuplot-data.links
@@ -1 +1 @@
-usr/share/aglfn/aglfn.txt usr/share/gnuplot/gnuplot/4.6/PostScript/aglfn.txt
+usr/share/aglfn/aglfn.txt usr/share/gnuplot/gnuplot/5.0/PostScript/aglfn.txt
diff --git a/debian/gnuplot-doc.doc-base.gnuplot-html b/debian/gnuplot-doc.doc-base.gnuplot-html
deleted file mode 100644
index b03795d..0000000
--- a/debian/gnuplot-doc.doc-base.gnuplot-html
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: gnuplot-html
-Title: Gnuplot HTML Documentation
-Author: Various
-Abstract: This documentation describes the gnuplot plotting system
-Section: Science/Mathematics
-
-Format: HTML
-Index: /usr/share/doc/gnuplot-doc/htmldocs/index.html
-Files: /usr/share/doc/gnuplot-doc/htmldocs/*.html
diff --git a/debian/gnuplot-doc.doc-base.gnuplot-pdf b/debian/gnuplot-doc.doc-base.gnuplot-pdf
deleted file mode 100644
index 3dbb703..0000000
--- a/debian/gnuplot-doc.doc-base.gnuplot-pdf
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: gnuplot-pdf
-Title: FAQ
-Author: Various
-Abstract: Frequently Asked Question
-Section: Science/Mathematics
-
-Format: PDF
-Files: /usr/share/doc/gnuplot-doc/FAQ.pdf.gz
diff --git a/debian/gnuplot-doc.docs b/debian/gnuplot-doc.docs
index 147066c..a3dcd92 100644
--- a/debian/gnuplot-doc.docs
+++ b/debian/gnuplot-doc.docs
@@ -1,14 +1,12 @@
+debian/build-x11/docs/gnuplot.dvi
+debian/build-x11/docs/gnuplot.pdf
debian/build-x11/docs/gnuplot.ps
+debian/build-x11/docs/gnuplot.gih
debian/build-x11/docs/gpcard.ps
+debian/build-x11/docs/htmldocs
debian/build-x11/tutorial/tutorial.dvi
+debian/build-x11/tutorial/tutorial.pdf
debian/build-x11/tutorial/tutorial.ps
-docs/psdoc/ps_guide.ps
-docs/psdoc/ps_symbols.gpi
-docs/psdoc/ps_file.doc
-docs/psdoc/ps_fontfile_doc.ps
-docs/htmldocs
-FAQ.pdf
BUGS
NEWS
README
-README.1ST
diff --git a/debian/gnuplot-nox.docs b/debian/gnuplot-nox.docs
deleted file mode 100644
index 785f73b..0000000
--- a/debian/gnuplot-nox.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-BUGS
-NEWS
-README
-README.1ST
diff --git a/debian/gnuplot-nox.install b/debian/gnuplot-nox.install
index 230e8d2..57d0557 100644
--- a/debian/gnuplot-nox.install
+++ b/debian/gnuplot-nox.install
@@ -1,2 +1,2 @@
debian/tmp/NOX/usr/bin/ usr
-debian/tmp/NOX/usr/share/gnuplot/gnuplot4-nox.gih usr/share/gnuplot
+debian/tmp/NOX/usr/share/gnuplot/gnuplot-nox.gih usr/share/gnuplot
diff --git a/debian/gnuplot-nox.manpages b/debian/gnuplot-nox.manpages
index cd12f7c..c2c297a 100644
--- a/debian/gnuplot-nox.manpages
+++ b/debian/gnuplot-nox.manpages
@@ -1 +1 @@
-debian/tmp/NOX/usr/share/man/man1/gnuplot4-nox.1
+debian/tmp/NOX/usr/share/man/man1/gnuplot-nox.1
diff --git a/debian/gnuplot-nox.menu b/debian/gnuplot-nox.menu
deleted file mode 100644
index 086d932..0000000
--- a/debian/gnuplot-nox.menu
+++ /dev/null
@@ -1,11 +0,0 @@
-?package(gnuplot-nox):\
- needs="text"\
- section="Applications/Science/Mathematics"\
- title="Gnuplot"\
- longtitle="Gnuplot - interactive plotting program"\
- hints="Graphs"\
- description="A command-line driven interactive plotting program.\
- Package for making 2D and 3D graphs from data and functions.\
- Supports lots of output formats, including drivers for many\
- printers , (La)TeX, (x)fig, X11, PostScript, and so on."\
- command="/usr/bin/gnuplot4-nox"
diff --git a/debian/gnuplot-nox.postinst b/debian/gnuplot-nox.postinst
index a54feba..4832ae4 100644
--- a/debian/gnuplot-nox.postinst
+++ b/debian/gnuplot-nox.postinst
@@ -3,15 +3,15 @@
set -e
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
- update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot4-nox 20 \
+ update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot-nox 50 \
--slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
- /usr/share/man/man1/gnuplot4-nox.1.gz
+ /usr/share/man/man1/gnuplot-nox.1.gz \
+ --slave /usr/share/gnuplot/gnuplot.gih gnuplot.gih \
+ /usr/share/gnuplot/gnuplot-nox.gih
- update-alternatives --install /usr/bin/gnuplot4 gnuplot4 /usr/bin/gnuplot4-nox 20 \
- --slave /usr/share/man/man1/gnuplot4.1.gz gnuplot4.1.gz \
- /usr/share/man/man1/gnuplot4-nox.1.gz \
- --slave /usr/share/gnuplot/gnuplot.gih gnuplot4.gih \
- /usr/share/gnuplot/gnuplot4-nox.gih
+ update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot-nox 50 \
+ --slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
+ /usr/share/man/man1/gnuplot-nox.1.gz
fi
#DEBHELPER#
diff --git a/debian/gnuplot-nox.prerm b/debian/gnuplot-nox.prerm
index 77fc1ac..56dbd9d 100644
--- a/debian/gnuplot-nox.prerm
+++ b/debian/gnuplot-nox.prerm
@@ -3,8 +3,8 @@
set -e
if [ "$1" != "upgrade" ]; then
- update-alternatives --remove gnuplot /usr/bin/gnuplot4-nox
- update-alternatives --remove gnuplot4 /usr/bin/gnuplot4-nox
+ update-alternatives --remove gnuplot /usr/bin/gnuplot-nox
+ update-alternatives --remove gnuplot5 /usr/bin/gnuplot-nox
fi
#DEBHELPER#
diff --git a/debian/gnuplot-qt.docs b/debian/gnuplot-qt.docs
deleted file mode 100644
index 785f73b..0000000
--- a/debian/gnuplot-qt.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-BUGS
-NEWS
-README
-README.1ST
diff --git a/debian/gnuplot-qt.install b/debian/gnuplot-qt.install
index 7c940cb..f0b0693 100644
--- a/debian/gnuplot-qt.install
+++ b/debian/gnuplot-qt.install
@@ -1,3 +1,3 @@
debian/tmp/QT/usr/bin usr
debian/tmp/QT/usr/lib usr
-debian/tmp/QT/usr/share/gnuplot/gnuplot4-qt.gih usr/share/gnuplot
+debian/tmp/QT/usr/share/gnuplot/gnuplot-qt.gih usr/share/gnuplot
diff --git a/debian/gnuplot-qt.manpages b/debian/gnuplot-qt.manpages
index 3f5bb5d..ceacea4 100644
--- a/debian/gnuplot-qt.manpages
+++ b/debian/gnuplot-qt.manpages
@@ -1 +1 @@
-debian/tmp/QT/usr/share/man/man1/gnuplot4-qt.1
+debian/tmp/QT/usr/share/man/man1/gnuplot-qt.1
diff --git a/debian/gnuplot-qt.menu b/debian/gnuplot-qt.menu
deleted file mode 100644
index 2c30357..0000000
--- a/debian/gnuplot-qt.menu
+++ /dev/null
@@ -1,11 +0,0 @@
-?package(gnuplot-qt):\
- needs="text"\
- section="Applications/Science/Mathematics"\
- title="Gnuplot"\
- longtitle="Gnuplot - interactive plotting program"\
- hints="Graphs"\
- description="A command-line driven interactive plotting program.\
- Package for making 2D and 3D graphs from data and functions.\
- Supports lots of output formats, including drivers for many\
- printers , (La)TeX, (x)fig, X11, PostScript, and so on."\
- command="/usr/bin/gnuplot4-qt"
diff --git a/debian/gnuplot-qt.postinst b/debian/gnuplot-qt.postinst
index ce17e61..4d9c875 100644
--- a/debian/gnuplot-qt.postinst
+++ b/debian/gnuplot-qt.postinst
@@ -3,15 +3,15 @@
set -e
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
- update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot4-qt 40 \
+ update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot-qt 70 \
--slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
- /usr/share/man/man1/gnuplot4-qt.1.gz
+ /usr/share/man/man1/gnuplot-qt.1.gz \
+ --slave /usr/share/gnuplot/gnuplot.gih gnuplot.gih \
+ /usr/share/gnuplot/gnuplot-qt.gih
- update-alternatives --install /usr/bin/gnuplot4 gnuplot4 /usr/bin/gnuplot4-qt 40 \
- --slave /usr/share/man/man1/gnuplot4.1.gz gnuplot4.1.gz \
- /usr/share/man/man1/gnuplot4-qt.1.gz \
- --slave /usr/share/gnuplot/gnuplot.gih gnuplot4.gih \
- /usr/share/gnuplot/gnuplot4-qt.gih
+ update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot-qt 70 \
+ --slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
+ /usr/share/man/man1/gnuplot-qt.1.gz
fi
#DEBHELPER#
diff --git a/debian/gnuplot-qt.prerm b/debian/gnuplot-qt.prerm
index a66864f..10f7f94 100644
--- a/debian/gnuplot-qt.prerm
+++ b/debian/gnuplot-qt.prerm
@@ -3,8 +3,8 @@
set -e
if [ "$1" != "upgrade" ]; then
- update-alternatives --remove gnuplot /usr/bin/gnuplot4-qt
- update-alternatives --remove gnuplot4 /usr/bin/gnuplot4-qt
+ update-alternatives --remove gnuplot /usr/bin/gnuplot-qt
+ update-alternatives --remove gnuplot5 /usr/bin/gnuplot-qt
fi
#DEBHELPER#
diff --git a/debian/gnuplot-tex.install b/debian/gnuplot-tex.install
deleted file mode 100644
index f4fbf2f..0000000
--- a/debian/gnuplot-tex.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/QT/usr/share/texmf/tex/ usr/share/texmf/
diff --git a/debian/gnuplot-x11.docs b/debian/gnuplot-x11.docs
deleted file mode 100644
index 785f73b..0000000
--- a/debian/gnuplot-x11.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-BUGS
-NEWS
-README
-README.1ST
diff --git a/debian/gnuplot-x11.install b/debian/gnuplot-x11.install
index d3fc247..051161f 100644
--- a/debian/gnuplot-x11.install
+++ b/debian/gnuplot-x11.install
@@ -1,3 +1,3 @@
debian/tmp/X11/usr/bin usr
debian/tmp/X11/usr/lib usr
-debian/tmp/X11/usr/share/gnuplot/gnuplot4-x11.gih usr/share/gnuplot
+debian/tmp/X11/usr/share/gnuplot/gnuplot-x11.gih usr/share/gnuplot
diff --git a/debian/gnuplot-x11.manpages b/debian/gnuplot-x11.manpages
index 859c61b..c4f42ef 100644
--- a/debian/gnuplot-x11.manpages
+++ b/debian/gnuplot-x11.manpages
@@ -1 +1 @@
-debian/tmp/X11/usr/share/man/man1/gnuplot4-x11.1
+debian/tmp/X11/usr/share/man/man1/gnuplot-x11.1
diff --git a/debian/gnuplot-x11.menu b/debian/gnuplot-x11.menu
deleted file mode 100644
index 4ef7195..0000000
--- a/debian/gnuplot-x11.menu
+++ /dev/null
@@ -1,11 +0,0 @@
-?package(gnuplot-x11):\
- needs="text"\
- section="Applications/Science/Mathematics"\
- title="Gnuplot"\
- longtitle="Gnuplot - interactive plotting program"\
- hints="Graphs"\
- description="A command-line driven interactive plotting program.\
- Package for making 2D and 3D graphs from data and functions.\
- Supports lots of output formats, including drivers for many\
- printers , (La)TeX, (x)fig, X11, PostScript, and so on."\
- command="/usr/bin/gnuplot4-x11"
diff --git a/debian/gnuplot-x11.postinst b/debian/gnuplot-x11.postinst
index 9fa2db2..26af04a 100644
--- a/debian/gnuplot-x11.postinst
+++ b/debian/gnuplot-x11.postinst
@@ -3,15 +3,15 @@
set -e
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
- update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot4-x11 30 \
+ update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot-x11 60 \
--slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
- /usr/share/man/man1/gnuplot4-x11.1.gz
+ /usr/share/man/man1/gnuplot-x11.1.gz \
+ --slave /usr/share/gnuplot/gnuplot.gih gnuplot.gih \
+ /usr/share/gnuplot/gnuplot-x11.gih
- update-alternatives --install /usr/bin/gnuplot4 gnuplot4 /usr/bin/gnuplot4-x11 30 \
- --slave /usr/share/man/man1/gnuplot4.1.gz gnuplot4.1.gz \
- /usr/share/man/man1/gnuplot4-x11.1.gz \
- --slave /usr/share/gnuplot/gnuplot.gih gnuplot4.gih \
- /usr/share/gnuplot/gnuplot4-x11.gih
+ update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot-x11 60 \
+ --slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
+ /usr/share/man/man1/gnuplot-x11.1.gz
fi
#DEBHELPER#
diff --git a/debian/gnuplot-x11.prerm b/debian/gnuplot-x11.prerm
index 12ca66a..f11a468 100644
--- a/debian/gnuplot-x11.prerm
+++ b/debian/gnuplot-x11.prerm
@@ -3,8 +3,8 @@
set -e
if [ "$1" != "upgrade" ]; then
- update-alternatives --remove gnuplot /usr/bin/gnuplot4-x11
- update-alternatives --remove gnuplot4 /usr/bin/gnuplot4-x11
+ update-alternatives --remove gnuplot /usr/bin/gnuplot-x11
+ update-alternatives --remove gnuplot5 /usr/bin/gnuplot-x11
fi
#DEBHELPER#
diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index 57bc285..9f0983f 100644
--- a/debian/patches/04_fix_libexecdir.diff
+++ b/debian/patches/04_fix_libexecdir.diff
@@ -1,9 +1,11 @@
Description: fix libexecdir
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-16
-Index: gnuplot/src/Makefile.am
+Index: gnuplot-5.0.3/src/Makefile.am
===================================================================
---- gnuplot.orig/src/Makefile.am
-+++ gnuplot/src/Makefile.am
+--- gnuplot-5.0.3.orig/src/Makefile.am
++++ gnuplot-5.0.3/src/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign subdir-objects
diff --git a/debian/patches/05_default_gd_font.diff b/debian/patches/05_default_gd_font.diff
index f3ee21d..636e157 100644
--- a/debian/patches/05_default_gd_font.diff
+++ b/debian/patches/05_default_gd_font.diff
@@ -1,10 +1,12 @@
Description: change the default font
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-16
-Index: gnuplot/term/gd.trm
+Index: gnuplot-5.0.3/term/gd.trm
===================================================================
---- gnuplot.orig/term/gd.trm
-+++ gnuplot/term/gd.trm
-@@ -981,7 +981,7 @@ PNG_options()
+--- gnuplot-5.0.3.orig/term/gd.trm
++++ gnuplot-5.0.3/term/gd.trm
+@@ -990,7 +990,7 @@ PNG_options()
if (external_default)
png_state.ttffont = gp_strdup(external_default);
else /* Might as well try some plausible font; it's no worse than failing immediately */
diff --git a/debian/patches/07_doc.patch b/debian/patches/07_doc.patch
new file mode 100644
index 0000000..7edc1c9
--- /dev/null
+++ b/debian/patches/07_doc.patch
@@ -0,0 +1,17 @@
+Description: Fix path in documentation generation
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-16
+
+Index: gnuplot-5.0.3/docs/Makefile.am
+===================================================================
+--- gnuplot-5.0.3.orig/docs/Makefile.am
++++ gnuplot-5.0.3/docs/Makefile.am
+@@ -345,7 +345,7 @@ ${ELCS}: gnuplot-eldoc.el
+ fi
+
+ gnuplot.info: gnuplot.texi
+- $(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --output=$@
++ $(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --force --output=$@
+
+ install-info: gnuplot.info
+ $(AM_V_at) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
diff --git a/debian/patches/08_disable_demo_plugin.patch b/debian/patches/08_disable_demo_plugin.patch
new file mode 100644
index 0000000..ae0d7a8
--- /dev/null
+++ b/debian/patches/08_disable_demo_plugin.patch
@@ -0,0 +1,58 @@
+Description: temporarly disable demo plugin
+ this patch should be removed, when a new
+ version appears, where already no binaries
+ in demo/plugin folder.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-16
+
+Index: gnuplot-5.0.3/demo/Makefile.in
+===================================================================
+--- gnuplot-5.0.3.orig/demo/Makefile.in
++++ gnuplot-5.0.3/demo/Makefile.in
+@@ -328,7 +328,6 @@ epslatex.ps epslatex.tex random.tmp stri
+
+ BINARY_FILES = binary1 binary2 binary3
+ SUBDIRS = $(PLUGIN_DIR)
+-DIST_SUBDIRS = plugin
+ DEMO = all.dem
+ GNUPLOT = gnuplot
+ EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin sine.bin \
+@@ -366,7 +365,6 @@ density.fnc hexa.fnc line.fnc reflect.fn
+ GM1_sugar.pdb bldg.png GM1_bonds.r3d blutux.rgb lena.rgb sound.par \
+ sound2.par start.par gnuplot.rot gnu-valley random-points gpdemos.tcl html
+
+- at BUILD_PLUGIN_TRUE@PLUGIN_DIR = plugin
+ all: all-recursive
+
+ .SUFFIXES:
+Index: gnuplot-5.0.3/demo/Makefile.am
+===================================================================
+--- gnuplot-5.0.3.orig/demo/Makefile.am
++++ gnuplot-5.0.3/demo/Makefile.am
+@@ -9,7 +9,6 @@ epslatex.ps epslatex.tex random.tmp stri
+ BINARY_FILES = binary1 binary2 binary3
+
+ SUBDIRS = $(PLUGIN_DIR)
+-DIST_SUBDIRS = plugin
+
+ DEMO = all.dem
+
+@@ -115,6 +114,3 @@ Makefile.am: Makefile.am.in
+ chmod og-w $@t
+ mv $@t $@
+
+-if BUILD_PLUGIN
+-PLUGIN_DIR = plugin
+-endif
+Index: gnuplot-5.0.3/demo/Makefile.am.in
+===================================================================
+--- gnuplot-5.0.3.orig/demo/Makefile.am.in
++++ gnuplot-5.0.3/demo/Makefile.am.in
+@@ -9,7 +9,6 @@ epslatex.ps epslatex.tex random.tmp stri
+ BINARY_FILES = binary1 binary2 binary3
+
+ SUBDIRS = $(PLUGIN_DIR)
+-DIST_SUBDIRS = plugin
+
+ DEMO = all.dem
+
diff --git a/debian/patches/09_force_texinfo.patch b/debian/patches/09_force_texinfo.patch
deleted file mode 100644
index a321df0..0000000
--- a/debian/patches/09_force_texinfo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: force makeinfo not to fail on warnings. Remove mkinstalldirs.
-Bug-Debian: 711067
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-06-04
-
-Index: gnuplot/docs/Makefile.in
-===================================================================
---- gnuplot.orig/docs/Makefile.in
-+++ gnuplot/docs/Makefile.in
-@@ -390,7 +390,7 @@ wxhelp/doc2html: wxhelp/doc2html.o termd
- info: gnuplot.info
-
- gnuplot.info: gnuplot.texi
-- $(MAKEINFO) -I$(srcdir) $< --no-split --output=$@
-+ $(MAKEINFO) -I$(srcdir) $< --no-split --force --output=$@
-
- # Thanks to Bruce Ravel for doc2texi.el!
- gnuplot.texi $(srcdir)/gnuplot-eldoc.el $(srcdir)/gnuplot-eldoc.elc: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
-@@ -454,18 +454,15 @@ checkdoc.o: checkdoc.c $(BUILT_SOURCES)
- install: install-gih install-pdf
-
- install-gih: gnuplot.gih
-- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
- $(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih
-
- install-pdf:
-- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
- if test -f gnuplot.pdf ; then \
- $(INSTALL_DATA) gnuplot.pdf $(DESTDIR)$(GIHDIR)/gnuplot.pdf; \
- fi
-
- install-info: gnuplot.info gnuplot-eldoc.el gnuplot-eldoc.elc
- @if test "$(EMACS)" != no; then \
-- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) $(DESTDIR)$(lispdir); \
- $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info; \
- $(INSTALL_DATA) gnuplot-eldoc.el $(DESTDIR)$(lispdir)/gnuplot-eldoc.el; \
- $(INSTALL_DATA) gnuplot-eldoc.elc $(DESTDIR)$(lispdir)/gnuplot-eldoc.elc; \
diff --git a/debian/patches/09_remove_beos.patch b/debian/patches/09_remove_beos.patch
new file mode 100644
index 0000000..91ec168
--- /dev/null
+++ b/debian/patches/09_remove_beos.patch
@@ -0,0 +1,44 @@
+Description: remove beos-specific code
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-16
+
+Index: gnuplot-5.0.3/configure.in
+===================================================================
+--- gnuplot-5.0.3.orig/configure.in
++++ gnuplot-5.0.3/configure.in
+@@ -1319,7 +1319,6 @@ AC_OUTPUT([Makefile
+ share/Makefile
+ share/LaTeX/Makefile
+ src/Makefile
+- src/beos/Makefile
+ src/wxterminal/Makefile
+ src/qtterminal/Makefile
+ term/Makefile
+@@ -1427,10 +1426,6 @@ if test "$is_msdos" = yes; then
+ AC_MSG_RESULT([ svga terminal (MSDOS/djgpp): yes])
+ fi
+
+-if test "$build_src_beos_subdir" = yes; then
+- AC_MSG_RESULT([ be terminal (BeOS): yes])
+-fi
+-
+ if test "$is_next" = yes; then
+ AC_MSG_RESULT([ next terminal: yes])
+ fi
+Index: gnuplot-5.0.3/src/Makefile.am
+===================================================================
+--- gnuplot-5.0.3.orig/src/Makefile.am
++++ gnuplot-5.0.3/src/Makefile.am
+@@ -73,11 +73,7 @@ endif
+ bf_test_SOURCES = bf_test.c
+ bf_test_LIBS = -lm
+
+-if BUILD_SRC_BEOS_SUBDIR
+-d_beos = beos
+-endif
+-
+-SUBDIRS = $(d_beos) wxterminal qtterminal
++SUBDIRS = wxterminal qtterminal
+
+ EXTRA_gnuplot_SOURCES = strftime.c vms.c
+
diff --git a/debian/patches/10_removepicins.patch b/debian/patches/10_removepicins.patch
new file mode 100644
index 0000000..bccc8cb
--- /dev/null
+++ b/debian/patches/10_removepicins.patch
@@ -0,0 +1,33 @@
+Description: removes picins latex include
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-16
+
+Index: gnuplot-5.0.3/docs/Makefile.am
+===================================================================
+--- gnuplot-5.0.3.orig/docs/Makefile.am
++++ gnuplot-5.0.3/docs/Makefile.am
+@@ -189,7 +189,6 @@ gnuplot.pdf: figures.tex pdf_figures $(s
+ touch figures.idx ; \
+ rm -f pdffigures.tex ; \
+ ( echo "\usepackage{graphicx}" > pdffigures.tex ; \
+- echo "\usepackage{picins}" >> pdffigures.tex ; \
+ ) ; \
+ TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
+ TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
+Index: gnuplot-5.0.3/docs/doc2tex.c
+===================================================================
+--- gnuplot-5.0.3.orig/docs/doc2tex.c
++++ gnuplot-5.0.3/docs/doc2tex.c
+@@ -168,12 +168,6 @@ process_line( char *line, FILE *b)
+ break;
+
+ case 'F': /* embedded figure */
+- if (figures) {
+- line[strlen(line)-1]=NUL;
+- (void) fputs("\\parpic[r][rt]{\\includegraphics[width=3in,keepaspectratio]{",b);
+- fputs(line+1, b);
+- (void) fputs("}}\n",b);
+- }
+ break;
+
+ case '@':{ /* start/end table */
diff --git a/debian/patches/11_fix_linkage_wx.patch b/debian/patches/11_fix_linkage_wx.patch
new file mode 100644
index 0000000..750e111
--- /dev/null
+++ b/debian/patches/11_fix_linkage_wx.patch
@@ -0,0 +1,17 @@
+Description: Add missing linkage against X11 libs.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-16
+
+Index: gnuplot-5.0.3/src/Makefile.am
+===================================================================
+--- gnuplot-5.0.3.orig/src/Makefile.am
++++ gnuplot-5.0.3/src/Makefile.am
+@@ -87,6 +87,8 @@ $(EXTRA_gnuplot_SOURCES)
+
+ if BUILD_WXWIDGETS
+ gnuplot_SOURCES += wxterminal/wxt_gui.cpp
++XLIBS = @LIBRARIES_FOR_X@
++gnuplot_LDADD += $(XLIBS)
+ endif
+
+ if BUILD_GPCAIRO
diff --git a/debian/patches/12_info.patch b/debian/patches/12_info.patch
new file mode 100644
index 0000000..a9c3685
--- /dev/null
+++ b/debian/patches/12_info.patch
@@ -0,0 +1,88 @@
+Description: generate info-file
+Author: Vincent Lefevre <vincent at vinc17.net>
+Reviewed-By: Anton Gladky <gladk at debian.org>
+Bug-Debian: http://bugs.debian.org/778757
+Last-Update: 2015-06-29
+
+Index: gnuplot-5.0.3/docs/Makefile.am
+===================================================================
+--- gnuplot-5.0.3.orig/docs/Makefile.am
++++ gnuplot-5.0.3/docs/Makefile.am
+@@ -90,7 +90,7 @@ gpcard.log pdffigures.tex pdffigures.aux
+
+ CLEANFILES = allterm.h gnuplot.dvi figures.tex nofigures.tex \
+ gnuplot.tex gnuplot.idx gnuplot.ilg gnuplot.ps gpcard.dvi gpcard.ps \
+-gnuplot.gih gnuplot.hlp gnuplot.info* gnuplot.ipf gnuplot.ms \
++gnuplot.gih gnuplot.hlp gnuplot5.info* gnuplot.ipf gnuplot.ms \
+ gnuplot.rnh gnuplot.rtf gnuplot.nroff gnuplot.txt gnuplot-groff.dvi \
+ gnuplot-groff.ps gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct \
+ gnuplot.idv gnuplot.xref gnuplot.lg gnuplot.pdf wxhelp_figures \
+@@ -323,7 +323,7 @@ wxhelp_figures: $(GNUPLOT_EXE) $(srcdir)
+ $(AM_V_GEN)touch $@
+
+ ### GNU info format
+-info: gnuplot.info
++info: gnuplot5.info
+
+ # Thanks to Bruce Ravel for doc2texi.el!
+ gnuplot.texi gnuplot-eldoc.el: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
+@@ -343,15 +343,15 @@ ${ELCS}: gnuplot-eldoc.el
+ echo "No emacs found - cannot create gnuplot-eldoc.elc file" ; \
+ fi
+
+-gnuplot.info: gnuplot.texi
++gnuplot5.info: gnuplot.texi
+ $(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --force --output=$@
+
+-install-info: gnuplot.info
++install-info: gnuplot5.info
+ $(AM_V_at) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
+- $(AM_V_at) $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info
++ $(AM_V_at) $(INSTALL_DATA) gnuplot5.info $(DESTDIR)$(infodir)/gnuplot5.info
+ $(AM_V_at) if (install-info --version && \
+ install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
+- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || : ;\
++ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot5.info || : ;\
+ else : ; fi
+
+ # this is how to make OS/2 ipfc documentation
+Index: gnuplot-5.0.3/docs/doc2texi.el
+===================================================================
+--- gnuplot-5.0.3.orig/docs/doc2texi.el
++++ gnuplot-5.0.3/docs/doc2texi.el
+@@ -79,7 +79,7 @@
+ ;;
+ ;; Then you can do
+ ;;
+-;; makeinfo gnuplot.info
++;; makeinfo gnuplot5.info
+ ;;
+ ;; You may want to use the --no-split option.
+ ;;
+@@ -155,7 +155,7 @@ If PATTERN is omitted, it defaults to \"
+ "\\input texinfo @c -*-texinfo-*-
+
+ @c %**start of header
+- at setfilename gnuplot.info
++ at setfilename gnuplot5.info
+ @settitle Gnuplot: An Interactive Plotting Program
+ @setchapternewpage odd
+ @c %**end of header
+@@ -167,7 +167,7 @@ If PATTERN is omitted, it defaults to \"
+
+ @dircategory Math
+ @direntry
+-* GNUPLOT: (gnuplot). An Interactive Plotting Program
++* GNUPLOT5: (gnuplot5). An Interactive Plotting Program
+ @end direntry
+
+ @ifnottex
+@@ -460,7 +460,7 @@ particular conversion chore."
+ ("sun" "sun")
+ ("vms" "vws"))
+
+- "Additional terminals to add to the converted gnuplot.info file.
++ "Additional terminals to add to the converted gnuplot5.info file.
+
+ The CARs of the items are strings to match against
+ `system-configuration', and the CDRs are the elements to add to
diff --git a/debian/patches/series b/debian/patches/series
index 4d8fb88..519eb43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,8 @@
04_fix_libexecdir.diff
05_default_gd_font.diff
-09_force_texinfo.patch
+07_doc.patch
+08_disable_demo_plugin.patch
+09_remove_beos.patch
+10_removepicins.patch
+11_fix_linkage_wx.patch
+12_info.patch
diff --git a/debian/rules b/debian/rules
index da6274d..bd4a982 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,85 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --parallel --with autoreconf
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all,-pie
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+# Tell compiler where should find lua headers
+export DEB_CFLAGS_MAINT_APPEND = -I/usr/include/lua5.1
+
+# Force the use of qt5
+export QT_SELECT=qt5
+
+# Qt insists on using -fPIC
+export DEB_CXXFLAGS_MAINT_APPEND = -fPIC
+
+BUILDDIR_NOX = $(CURDIR)/debian/build-nox
+BUILDDIR_X11 = $(CURDIR)/debian/build-x11
+BUILDDIR_QT = $(CURDIR)/debian/build-qt
+MANPNOX = $(CURDIR)/debian/gnuplot-nox/usr/share/man/man1/gnuplot-nox.1
+
+conf_opts += \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --libexecdir=\$${prefix}/lib/gnuplot \
+ --datadir=\$${prefix}/share/gnuplot \
+ --with-gihdir=\$${prefix}/share/gnuplot \
+ --without-lasergnu \
+ --with-png \
+ --with-gd \
+ --without-lisp-files \
+ --without-linux-vga \
+ --with-readline=bsd
override_dh_auto_configure:
+ mkdir -p $(BUILDDIR_NOX)
+ cd $(BUILDDIR_NOX); ./../../configure $(conf_opts) --with-qt=no --without-x --disable-wxwidgets
+ mkdir -p $(BUILDDIR_X11)
+ cd $(BUILDDIR_X11); ../../configure $(conf_opts) --with-qt=no --with-tutorial
+ mkdir -p $(BUILDDIR_QT)
+ cd $(BUILDDIR_QT); ../../configure $(conf_opts) --enable-qt
override_dh_auto_build:
+ dh_auto_build -a -- -C $(BUILDDIR_NOX)/src
+ dh_auto_build -a -- -C $(BUILDDIR_X11) pkglibexecdir='$$(libexecdir)'
+ dh_auto_build -a -- -C $(BUILDDIR_QT) pkglibexecdir='$$(libexecdir)'
+ cd $(BUILDDIR_X11)/docs; $(MAKE) pdf; $(MAKE) ps; $(MAKE) html; $(MAKE) info; ls
+ cd $(BUILDDIR_X11)/tutorial; $(MAKE) pdf; $(MAKE) ps; ls
override_dh_auto_install:
+ $(MAKE) -C $(BUILDDIR_NOX) install DESTDIR=$(CURDIR)/debian/tmp/NOX/ \
+ pkglibexecdir='$$(libexecdir)'
+ mv $(CURDIR)/debian/tmp/NOX/usr/bin/gnuplot $(CURDIR)/debian/tmp/NOX/usr/bin/gnuplot-nox
+ mv $(CURDIR)/debian/tmp/NOX/usr/share/man/man1/gnuplot.1 $(CURDIR)/debian/tmp/NOX/usr/share/man/man1/gnuplot-nox.1
+ mv $(CURDIR)/debian/tmp/NOX/usr/share/gnuplot/gnuplot.gih $(CURDIR)/debian/tmp/NOX/usr/share/gnuplot/gnuplot-nox.gih
+ $(MAKE) -C $(BUILDDIR_X11) install DESTDIR=$(CURDIR)/debian/tmp/X11/ \
+ pkglibexecdir='$$(libexecdir)'
+ mv $(CURDIR)/debian/tmp/X11/usr/bin/gnuplot $(CURDIR)/debian/tmp/X11/usr/bin/gnuplot-x11
+ mv $(CURDIR)/debian/tmp/X11/usr/share/man/man1/gnuplot.1 $(CURDIR)/debian/tmp/X11/usr/share/man/man1/gnuplot-x11.1
+ mv $(CURDIR)/debian/tmp/X11/usr/share/gnuplot/gnuplot.gih $(CURDIR)/debian/tmp/X11/usr/share/gnuplot/gnuplot-x11.gih
+ $(MAKE) -C $(BUILDDIR_QT) install DESTDIR=$(CURDIR)/debian/tmp/QT/ \
+ pkglibexecdir='$$(libexecdir)'
+ mv $(CURDIR)/debian/tmp/QT/usr/bin/gnuplot $(CURDIR)/debian/tmp/QT/usr/bin/gnuplot-qt
+ mv $(CURDIR)/debian/tmp/QT/usr/share/man/man1/gnuplot.1 $(CURDIR)/debian/tmp/QT/usr/share/man/man1/gnuplot-qt.1
+ mv $(CURDIR)/debian/tmp/QT/usr/share/gnuplot/gnuplot.gih $(CURDIR)/debian/tmp/QT/usr/share/gnuplot/gnuplot-qt.gih
+
+override_dh_installinfo:
+ dh_installinfo -pgnuplot-doc $(BUILDDIR_X11)/docs/gnuplot5.info
+
+override_installchangelogs:
+ dh_installchangelogs -pgnuplot-doc ChangeLog
+
+override_dh_installman-arch:
+ dh_installman -a
+ # Fix manpage for nox-version. (Closes: #744218)
+ sed -i 's/\[X11 options\] //g' $(MANPNOX)
+ sed -i 's/plotting program/plotting program (no-X version)/g' $(MANPNOX)
+ sed -i '/SH\ X11\ OPTIONS/,/command line\./ d' $(MANPNOX)
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf $(BUILDDIR_NOX)
+ rm -rf $(BUILDDIR_X11)
+ rm -rf $(BUILDDIR_QT)
diff --git a/debian/watch b/debian/watch
index 6e2574d..88ac8cb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://sf.net/gnuplot/gnuplot-([\d.]+)\.tar\.gz
+opts=repacksuffix=+dfsg2,dversionmangle=s/\+dfsg\d*$// \
+http://sf.net/gnuplot/gnuplot-([\d.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot.git
More information about the debian-science-commits
mailing list