[plplot] 01/03: Another wrap-and-sort
Ole Streicher
olebole at moszumanska.debian.org
Thu Jul 13 13:14:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository plplot.
commit d5cdbabaed121855d78b275ea937d4486bc38fdd
Author: Ole Streicher <olebole at debian.org>
Date: Wed Jul 12 22:20:50 2017 +0200
Another wrap-and-sort
---
debian/control | 76 ++++++++++++++++++++++++----------
debian/libcsiro0.install | 1 -
debian/libplplot-ada1-dev.install | 2 +-
debian/libplplot-d.install | 1 -
debian/libplplot-dev.examples | 2 +-
debian/libplplot-dev.install | 4 +-
debian/libplplot-lua.install | 1 -
debian/libplplot-ocaml.install | 4 +-
debian/libplplot14.install | 2 -
debian/libqsastime-dev.install | 2 +-
debian/octave-plplot.install | 4 +-
debian/plplot-doc.docs | 2 +-
debian/plplot-driver-qt.install | 2 +-
debian/plplot-driver-wxwidgets.install | 4 +-
debian/plplot-driver-xwin.install | 2 -
debian/plplot-tcl-dev.install | 4 +-
debian/plplot-tcl.install | 2 +-
17 files changed, 69 insertions(+), 46 deletions(-)
diff --git a/debian/control b/debian/control
index 3c3e731..197b044 100644
--- a/debian/control
+++ b/debian/control
@@ -60,13 +60,14 @@ Section: libs
Conflicts: libplplot11
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: plplot-tcl,
- plplot-driver-cairo,
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Suggests: plplot-driver-cairo,
plplot-driver-gd,
plplot-driver-qt,
plplot-driver-wxwidgets,
- plplot-driver-xwin
+ plplot-driver-xwin,
+ plplot-tcl
Replaces: plplot-bin (<< 5.9.6-1)
Breaks: plplot-bin (<<5.9.6-1)
Description: Scientific plotting library
@@ -84,15 +85,19 @@ Description: Scientific plotting library
Package: libplplot-dev
Architecture: any
Section: libdevel
-Recommends: cmake, libplplot-d, libplplot-lua, libplplot-ocaml, pkg-config
+Recommends: cmake,
+ libplplot-d,
+ libplplot-lua,
+ libplplot-ocaml,
+ pkg-config
Suggests: plplot-doc
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: libfreetype6-dev,
libltdl3-dev,
+ libplplot14 (= ${binary:Version}),
libplplotcxx13 (= ${binary:Version}),
libplplotf95-13 (= ${binary:Version}),
- libplplot14 (= ${binary:Version}),
libqhull-dev,
libqsastime-dev,
plplot-driver-qt (= ${binary:Version}),
@@ -119,10 +124,14 @@ Description: Scientific plotting library (development files)
Package: libplplotcxx13
Architecture: any
Section: libs
-Conflicts: libplplot-c++10, libplplot-c++9, libplplot-c++9c2, libplplot5
+Conflicts: libplplot-c++10,
+ libplplot-c++9,
+ libplplot-c++9c2,
+ libplplot5
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Description: Scientific plotting library (C++ binding)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@ -139,7 +148,8 @@ Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Description: Scientific plotting library (fortran bindings)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@ -158,7 +168,8 @@ Architecture: any
Section: java
Conflicts: libplplot9-java
Replaces: libplplot9-java
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Description: Scientific plotting library (Java bindings)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@ -175,7 +186,8 @@ Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Description: Scientific plotting library (CSIRO libraries)
This package contains two libraries developed by Pavel Sakov, from the
CSIRO Marine Research, used in geometry applications:
@@ -192,7 +204,8 @@ Section: libs
Conflicts: libplplot9
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Description: Time format conversion library
The qsastime library is a simple library for handling time format
conversion. It overcomes the limitations of the POSIX time handling
@@ -210,7 +223,9 @@ Section: libdevel
Breaks: libplplot-dev (<< 5.9.8-1)
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: libqsastime0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libqsastime0 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Time format conversion library (development files)
The qsastime library is a simple library for handling time format
conversion. It overcomes the limitations of the POSIX time handling
@@ -226,7 +241,8 @@ Description: Time format conversion library (development files)
Package: plplot-driver-xwin
Architecture: any
Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Conflicts: plplot12-driver-xwin
@@ -247,7 +263,9 @@ Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: libplplot14, ${misc:Depends}, ${shlibs:Depends}
+Depends: libplplot14,
+ ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: plplot12-driver-wxwidgets
Replaces: plplot12-driver-wxwidgets
Description: Scientific plotting library (wxWidgets driver)
@@ -265,7 +283,10 @@ Package: plplot-tcl
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: iwidgets4, plplot-driver-xwin, ${misc:Depends}, ${shlibs:Depends}
+Depends: iwidgets4,
+ plplot-driver-xwin,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Tcl/Tk support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@ -280,7 +301,9 @@ Description: Tcl/Tk support for PLplot, a plotting library
Package: plplot-tcl-bin
Architecture: any
-Depends: plplot-tcl, ${misc:Depends}, ${shlibs:Depends}
+Depends: plplot-tcl,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Tcl/Tk tools for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@ -296,7 +319,9 @@ Description: Tcl/Tk tools for PLplot, a plotting library
Package: plplot-tcl-dev
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: libplplot14 (= ${binary:Version}), plplot-tcl, ${misc:Depends}
+Depends: libplplot14 (= ${binary:Version}),
+ plplot-tcl,
+ ${misc:Depends}
Breaks: plplot-tcl (<= 5.2.0.cvs.20030224-1)
Description: Tcl/Tk development support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
@@ -315,7 +340,8 @@ Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: plplot12-driver-cairo
Replaces: plplot12-driver-cairo
Description: Scientific plotting library (Cairo driver)
@@ -336,7 +362,9 @@ Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: libplplot14, ${misc:Depends}, ${shlibs:Depends}
+Depends: libplplot14,
+ ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: plplot12-driver-qt
Replaces: plplot12-driver-qt
Description: Scientific plotting library (qt driver)
@@ -398,7 +426,8 @@ Package: plplot-doc
Architecture: all
Section: doc
Suggests: libplplot-dev
-Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Depends: dpkg (>= 1.15.4) | install-info,
+ ${misc:Depends}
Description: Documentation for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@ -435,7 +464,10 @@ Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: libplplot14, lua5.1, ${misc:Depends}, ${shlibs:Depends}
+Depends: libplplot14,
+ lua5.1,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Scientific plotting library (Lua bindings)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
diff --git a/debian/libcsiro0.install b/debian/libcsiro0.install
index d51a68a..f2d6c76 100644
--- a/debian/libcsiro0.install
+++ b/debian/libcsiro0.install
@@ -1,2 +1 @@
usr/lib/*/libcsiro*.so.*
-
diff --git a/debian/libplplot-ada1-dev.install b/debian/libplplot-ada1-dev.install
index c72220e..8b67866 100644
--- a/debian/libplplot-ada1-dev.install
+++ b/debian/libplplot-ada1-dev.install
@@ -1,3 +1,3 @@
usr/lib/*/ada
-usr/share/ada
usr/lib/*/libplplotada*.so
+usr/share/ada
diff --git a/debian/libplplot-d.install b/debian/libplplot-d.install
index d32c8ae..2c92c38 100644
--- a/debian/libplplot-d.install
+++ b/debian/libplplot-d.install
@@ -1,2 +1 @@
usr/lib/*/libplplotdmdd.a
-
diff --git a/debian/libplplot-dev.examples b/debian/libplplot-dev.examples
index 94121a4..86d67c3 100644
--- a/debian/libplplot-dev.examples
+++ b/debian/libplplot-dev.examples
@@ -1,2 +1,2 @@
-examples/c/*
examples/c++/*
+examples/c/*
diff --git a/debian/libplplot-dev.install b/debian/libplplot-dev.install
index 72876d8..8178218 100644
--- a/debian/libplplot-dev.install
+++ b/debian/libplplot-dev.install
@@ -15,13 +15,13 @@ usr/include/plplot/qt.h
usr/include/plplot/wxPLplot_nanosec.h
usr/include/plplot/wxPLplotstream.h
usr/include/plplot/wxPLplotwindow.h
+usr/lib/*/fortran
usr/lib/*/libcsirocsa.so
usr/lib/*/libcsironn.so
usr/lib/*/libplf95demolib.a
-usr/lib/*/libplplotcxx.so
usr/lib/*/libplplot.so
+usr/lib/*/libplplotcxx.so
usr/lib/*/libplplotf95.so
usr/lib/*/libplplotqt.so
usr/lib/*/libplplotwxwidgets.so
-usr/lib/*/fortran
usr/lib/*/pkgconfig
diff --git a/debian/libplplot-lua.install b/debian/libplplot-lua.install
index 2c57a78..0e45a6a 100644
--- a/debian/libplplot-lua.install
+++ b/debian/libplplot-lua.install
@@ -1,2 +1 @@
usr/lib/*/lua/5.1/plplot/*.so
-
diff --git a/debian/libplplot-ocaml.install b/debian/libplplot-ocaml.install
index 2e1909d..a03343c 100644
--- a/debian/libplplot-ocaml.install
+++ b/debian/libplplot-ocaml.install
@@ -1,5 +1,5 @@
-usr/lib/ocaml/stublibs/*.so
-usr/lib/ocaml/plplot/META
usr/lib/ocaml/plplot/*.a
usr/lib/ocaml/plplot/*.cm*
usr/lib/ocaml/plplot/*.ml*
+usr/lib/ocaml/plplot/META
+usr/lib/ocaml/stublibs/*.so
diff --git a/debian/libplplot14.install b/debian/libplplot14.install
index 616afa7..41ecbc3 100644
--- a/debian/libplplot14.install
+++ b/debian/libplplot14.install
@@ -8,5 +8,3 @@ usr/share/plplot*/*.fnt
usr/share/plplot*/*.pal
usr/share/plplot*/*.shp
usr/share/plplot*/*.shx
-
-
diff --git a/debian/libqsastime-dev.install b/debian/libqsastime-dev.install
index 8560cef..73ace5a 100644
--- a/debian/libqsastime-dev.install
+++ b/debian/libqsastime-dev.install
@@ -1,2 +1,2 @@
-usr/lib/*/libqsastime*.so
usr/include/plplot/qsas*.h
+usr/lib/*/libqsastime*.so
diff --git a/debian/octave-plplot.install b/debian/octave-plplot.install
index f15bebf..a70ec1b 100644
--- a/debian/octave-plplot.install
+++ b/debian/octave-plplot.install
@@ -1,3 +1,3 @@
-usr/share/plplot_octave
-usr/share/octave/site/m/PLplot
usr/lib/*/octave
+usr/share/octave/site/m/PLplot
+usr/share/plplot_octave
diff --git a/debian/plplot-doc.docs b/debian/plplot-doc.docs
index 3337318..85dbd9d 100644
--- a/debian/plplot-doc.docs
+++ b/debian/plplot-doc.docs
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/info
debian/tmp/usr/share/doc/plplot/html
+debian/tmp/usr/share/info
diff --git a/debian/plplot-driver-qt.install b/debian/plplot-driver-qt.install
index ec24532..2183b1d 100644
--- a/debian/plplot-driver-qt.install
+++ b/debian/plplot-driver-qt.install
@@ -1,2 +1,2 @@
-usr/lib/*/plplot*/drivers/qt.*
usr/lib/*/libplplotqt.so.*
+usr/lib/*/plplot*/drivers/qt.*
diff --git a/debian/plplot-driver-wxwidgets.install b/debian/plplot-driver-wxwidgets.install
index 934299e..baea48c 100644
--- a/debian/plplot-driver-wxwidgets.install
+++ b/debian/plplot-driver-wxwidgets.install
@@ -1,4 +1,2 @@
-usr/lib/*/plplot*/drivers/wxwidgets.*
usr/lib/*/libplplotwxwidgets.so.*
-
-
+usr/lib/*/plplot*/drivers/wxwidgets.*
diff --git a/debian/plplot-driver-xwin.install b/debian/plplot-driver-xwin.install
index 0465217..b420bd2 100644
--- a/debian/plplot-driver-xwin.install
+++ b/debian/plplot-driver-xwin.install
@@ -1,3 +1 @@
usr/lib/*/plplot*/drivers/xwin.*
-
-
diff --git a/debian/plplot-tcl-dev.install b/debian/plplot-tcl-dev.install
index 9bbd178..20cbe9d 100644
--- a/debian/plplot-tcl-dev.install
+++ b/debian/plplot-tcl-dev.install
@@ -1,5 +1,5 @@
-usr/lib/*/libplplottcltk*.so
-usr/lib/*/libtclmatrix.so
usr/include/plplot/pltcl.h
usr/include/plplot/pltk.h
usr/include/plplot/tclMatrix.h
+usr/lib/*/libplplottcltk*.so
+usr/lib/*/libtclmatrix.so
diff --git a/debian/plplot-tcl.install b/debian/plplot-tcl.install
index e0bf1cf..a043e34 100644
--- a/debian/plplot-tcl.install
+++ b/debian/plplot-tcl.install
@@ -1,7 +1,7 @@
usr/lib/*/lib*tcl*.so.*
+usr/lib/*/plplot*/drivers/*tk*
usr/lib/*/plplot/bin/plserver
usr/share/man/man1/plserver.1
usr/share/man/man1/pltcl.1
usr/share/plplot*/pkgIndex.tcl
usr/share/plplot*/tcl
-usr/lib/*/plplot*/drivers/*tk*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git
More information about the debian-science-commits
mailing list