[gnuplot] 03/07: Use wrap-and-sort.

Anton Gladky gladk at alioth.debian.org
Sat Oct 12 18:59:16 UTC 2013


This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository gnuplot.

commit d005afcd18db6e4c759d2ea7030debc37725246f
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Oct 12 14:49:11 2013 +0200

    Use wrap-and-sort.
---
 debian/control             |  124 ++++++++++++++++++++++++++++++--------------
 debian/gnuplot-nox.install |    2 +-
 debian/gnuplot-qt.install  |    4 +-
 debian/gnuplot-x11.install |    4 +-
 4 files changed, 90 insertions(+), 44 deletions(-)

diff --git a/debian/control b/debian/control
index 8207ff8..6d6d59c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,22 +2,44 @@ Source: gnuplot
 Section: math
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Anton Gladky <gladk at debian.org>
+Uploaders:
+ Anton Gladky <gladk at debian.org>
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9), libpng-dev, libx11-dev, libxt-dev, 
- pkg-config, texinfo, texlive-latex-base, texlive-latex-recommended, 
- texlive-latex-extra, liblua5.1-dev,
- zlib1g-dev, libgd2-dev, libwxgtk2.8-dev, libcairo2-dev, 
- libpango1.0-dev, libedit-dev, autoconf, automake,
- libqt4-dev (>=4:4.5), dh-autoreconf
+Build-Depends:
+ autoconf,
+ automake,
+ debhelper (>= 9),
+ dh-autoreconf,
+ libcairo2-dev,
+ libedit-dev,
+ libgd2-dev,
+ liblua5.1-dev,
+ libpango1.0-dev,
+ libpng-dev,
+ libqt4-dev (>=4:4.5),
+ libwxgtk2.8-dev,
+ libx11-dev,
+ libxt-dev,
+ pkg-config,
+ texinfo,
+ texlive-latex-base,
+ texlive-latex-extra,
+ texlive-latex-recommended,
+ zlib1g-dev
 Homepage: http://gnuplot.sourceforge.net/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/gnuplot.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gnuplot.git
 
 Package: gnuplot
 Architecture: all
-Depends: gnuplot-nox | gnuplot-x11 | gnuplot-qt, ${misc:Depends}
-Suggests: gnuplot-doc, python-gnuplot, feedgnuplot, libgnuplot-iostream-dev
+Depends:
+ gnuplot-nox | gnuplot-x11 | gnuplot-qt,
+ ${misc:Depends}
+Suggests:
+ feedgnuplot,
+ gnuplot-doc,
+ libgnuplot-iostream-dev,
+ python-gnuplot
 Description: Command-line driven interactive plotting program
  Gnuplot is a portable command-line driven interactive data and function
  plotting utility that supports lots of output formats, including drivers
@@ -31,51 +53,63 @@ 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-nox
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, aglfn
-Conflicts: gnuplot-x11, gnuplot-qt
-Recommends: groff, fonts-liberation
-Suggests: gnuplot-doc
-Description: Command-line driven interactive plotting program. No-X package
+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. The QT-output is packaged in gnuplot-qt.
+ 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 is for working without an X server.
+ This package contains the additional documentation.
 
-Package: gnuplot-x11
+Package: gnuplot-nox
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, aglfn
-Conflicts: gnuplot-qt, gnuplot-nox
-Suggests: gnuplot-doc
-Provides: gnuplot-nox
-Description: Command-line driven interactive plotting program. X-package
+Depends:
+ aglfn,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ gnuplot-qt,
+ gnuplot-x11
+Recommends:
+ fonts-liberation,
+ groff
+Suggests:
+ gnuplot-doc
+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.
+ 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 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.
+ This package is for working without an X server.
 
 Package: gnuplot-qt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, aglfn
-Conflicts: gnuplot-x11, gnuplot-nox
-Suggests: gnuplot-doc
-Provides: gnuplot-nox, gnuplot-x11
+Depends:
+ aglfn,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ gnuplot-nox,
+ gnuplot-x11
+Suggests:
+ gnuplot-doc
+Provides:
+ gnuplot-nox,
+ gnuplot-x11
 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
@@ -93,11 +127,20 @@ Description: Command-line driven interactive plotting program. QT-package
  The package provides gnuplot-x11 and gnuplot-nox terminals plus an
  additional QT-terminal for output (not default one).
 
-Package: gnuplot-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Command-line driven interactive plotting program. Doc-package
+Package: gnuplot-x11
+Architecture: any
+Depends:
+ aglfn,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ gnuplot-nox,
+ gnuplot-qt
+Suggests:
+ gnuplot-doc
+Provides:
+ 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
@@ -107,4 +150,7 @@ Description: Command-line driven interactive plotting program. Doc-package
  C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
  and can work with complex numbers.
  .
- This package contains the additional documentation.
+ 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.
diff --git a/debian/gnuplot-nox.install b/debian/gnuplot-nox.install
index dbfc8f6..d809f47 100644
--- a/debian/gnuplot-nox.install
+++ b/debian/gnuplot-nox.install
@@ -1,4 +1,4 @@
+debian/tmp/NOX/usr/bin/ usr
 debian/tmp/NOX/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
 debian/tmp/NOX/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
 debian/tmp/NOX/usr/share/texmf/tex/       usr/share/texmf/
-debian/tmp/NOX/usr/bin/ usr
diff --git a/debian/gnuplot-qt.install b/debian/gnuplot-qt.install
index 6bd9cc6..30d0242 100644
--- a/debian/gnuplot-qt.install
+++ b/debian/gnuplot-qt.install
@@ -1,6 +1,6 @@
+debian/tmp/QT/usr/bin usr
+debian/tmp/QT/usr/lib usr
 debian/tmp/QT/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
 debian/tmp/QT/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
 debian/tmp/QT/usr/share/texmf/tex/       usr/share/texmf/
-debian/tmp/QT/usr/lib usr
-debian/tmp/QT/usr/bin usr
 pm3d/contrib/* usr/share/gnuplot/pm3d
diff --git a/debian/gnuplot-x11.install b/debian/gnuplot-x11.install
index 44be02d..ab11167 100644
--- a/debian/gnuplot-x11.install
+++ b/debian/gnuplot-x11.install
@@ -1,6 +1,6 @@
+debian/tmp/X11/usr/bin usr
+debian/tmp/X11/usr/lib usr
 debian/tmp/X11/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
 debian/tmp/X11/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
 debian/tmp/X11/usr/share/texmf/tex/       usr/share/texmf/
-debian/tmp/X11/usr/lib usr
-debian/tmp/X11/usr/bin usr
 pm3d/contrib/* usr/share/gnuplot/pm3d

-- 
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