[plplot] 01/03: Simplify debian files
Ole Streicher
olebole at moszumanska.debian.org
Wed Jul 12 08:19:40 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 ae19d0607e908634df8a56600ef8ecc8fa5a2867
Author: Ole Streicher <olebole at debian.org>
Date: Fri Jul 7 20:31:43 2017 +0200
Simplify debian files
This consists of three parts that are interdependent and therefore
needed to be done within one commit:
* simplify build procedure in d/rules
* use standard dh_auto_install instead of dh_files to install the files
* Update the shared lib package names to reflect SONAME changes
---
debian/clean | 1 +
debian/control | 107 ++++----
debian/{libcsiro0.files => libcsiro0.install} | 0
debian/libplplot-ada1-dev.files | 5 -
debian/libplplot-ada1-dev.install | 3 +
...libplplot-ada1.files => libplplot-ada1.install} | 1 -
debian/libplplot-c++11.files | 2 -
debian/{libplplot-d.files => libplplot-d.install} | 1 -
debian/libplplot-dev.examples | 2 +
debian/libplplot-dev.files | 9 -
debian/libplplot-dev.install | 27 ++
debian/libplplot-fortran10.files | 2 -
debian/libplplot-java.examples | 1 +
debian/libplplot-java.files | 4 -
debian/libplplot-java.install | 2 +
debian/libplplot-lua.examples | 1 +
.../{libplplot-lua.files => libplplot-lua.install} | 1 -
debian/libplplot-ocaml.examples | 1 +
...bplplot-ocaml.files => libplplot-ocaml.install} | 1 -
debian/libplplot12.files | 9 -
debian/libplplot14.install | 12 +
debian/libplplotcxx13.install | 1 +
debian/libplplotf95-13.examples | 1 +
debian/libplplotf95-13.install | 1 +
...overrides => libplplotf95-13.lintian-overrides} | 0
...bqsastime-dev.files => libqsastime-dev.install} | 1 -
.../{libqsastime0.files => libqsastime0.install} | 0
debian/octave-plplot.files | 6 -
debian/octave-plplot.install | 3 +
debian/patches/Add-Tcl-multiarch.patch | 13 -
debian/plplot-doc.docs | 2 +
debian/plplot-doc.files | 4 -
debian/plplot-doc.manpages | 1 +
debian/plplot-driver-cairo.install | 1 +
debian/plplot-driver-qt.install | 2 +
debian/plplot-driver-wxwidgets.install | 4 +
debian/plplot-driver-xwin.install | 3 +
debian/plplot-tcl-bin.files | 2 -
debian/plplot-tcl-bin.install | 1 +
debian/plplot-tcl-dev.examples | 2 +
debian/plplot-tcl-dev.files | 7 -
debian/plplot-tcl-dev.install | 5 +
debian/{plplot-tcl.files => plplot-tcl.install} | 5 +-
debian/plplot12-driver-cairo.files | 2 -
debian/plplot12-driver-qt.files | 4 -
debian/plplot12-driver-wxwidgets.files | 5 -
debian/plplot12-driver-xwin.files | 4 -
...on-plplot-qt.files => python-plplot-qt.install} | 1 -
debian/python-plplot.examples | 1 +
debian/python-plplot.files | 3 -
debian/python-plplot.install | 3 +
debian/rules | 293 ++-------------------
52 files changed, 157 insertions(+), 416 deletions(-)
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..ad4d998
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+bindings/python/plplot.pyc
diff --git a/debian/control b/debian/control
index 0464421..0e71095 100644
--- a/debian/control
+++ b/debian/control
@@ -50,12 +50,11 @@ Build-Depends-Indep: dblatex,
lmodern,
texlive-xetex,
xmlto
-X-Python-Version: >=2.4
Homepage: http://www.plplot.org
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/plplot.git
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/plplot.git
-Package: libplplot12
+Package: libplplot14
Architecture: any
Section: libs
Conflicts: libplplot11
@@ -63,11 +62,11 @@ Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: plplot-tcl,
- plplot12-driver-cairo,
- plplot12-driver-gd,
- plplot12-driver-qt,
- plplot12-driver-wxwidgets,
- plplot12-driver-xwin
+ plplot-driver-cairo,
+ plplot-driver-gd,
+ plplot-driver-qt,
+ plplot-driver-wxwidgets,
+ plplot-driver-xwin
Replaces: plplot-bin (<< 5.9.6-1)
Breaks: plplot-bin (<<5.9.6-1)
Description: Scientific plotting library
@@ -91,13 +90,13 @@ Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: libfreetype6-dev,
libltdl3-dev,
- libplplot-c++11 (= ${binary:Version}),
- libplplot-fortran10 (= ${binary:Version}),
- libplplot12 (= ${binary:Version}),
+ libplplotcxx13 (= ${binary:Version}),
+ libplplotf95-13 (= ${binary:Version}),
+ libplplot14 (= ${binary:Version}),
libqhull-dev,
libqsastime-dev,
- plplot12-driver-qt (= ${binary:Version}),
- plplot12-driver-wxwidgets (= ${binary:Version}),
+ plplot-driver-qt (= ${binary:Version}),
+ plplot-driver-wxwidgets (= ${binary:Version}),
${misc:Depends}
Breaks: libplplot-fortran9 (<< 5.9.8-1)
Description: Scientific plotting library (development files)
@@ -114,10 +113,10 @@ Description: Scientific plotting library (development files)
also included. For development in Tcl/Tk, Python and Java
install the plplot-tcl-dev, python-plplot
and libplplot-java packages, respectively. This package also includes the
- OCaml and lua examples. To use one of these languages you will also
+ OCaml and Lua examples. To use one of these languages you will also
need to install the libplplot-xxx package for that language.
-Package: libplplot-c++11
+Package: libplplotcxx13
Architecture: any
Section: libs
Conflicts: libplplot-c++10, libplplot-c++9, libplplot-c++9c2, libplplot5
@@ -135,7 +134,7 @@ Description: Scientific plotting library (C++ binding)
.
This package contains the C++ binding for PLplot.
-Package: libplplot-fortran10
+Package: libplplotf95-13
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
@@ -224,14 +223,14 @@ Description: Time format conversion library (development files)
The source code for this library is part of the plplot source
package.
-Package: plplot12-driver-xwin
+Package: plplot-driver-xwin
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Conflicts: plplot9-driver-xwin
-Replaces: plplot9-driver-xwin
+Conflicts: plplot12-driver-xwin
+Replaces: plplot12-driver-xwin
Description: Scientific plotting library (X11 driver)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@ -243,14 +242,14 @@ Description: Scientific plotting library (X11 driver)
.
This package provides the X11 driver module for PLplot.
-Package: plplot12-driver-wxwidgets
+Package: plplot-driver-wxwidgets
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: libplplot12, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: plplot9-driver-wxwidgets
-Replaces: plplot9-driver-wxwidgets
+Depends: libplplot14, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: plplot12-driver-wxwidgets
+Replaces: plplot12-driver-wxwidgets
Description: Scientific plotting library (wxWidgets driver)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@ -266,7 +265,7 @@ Package: plplot-tcl
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: iwidgets4, plplot12-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
@@ -298,7 +297,7 @@ Package: plplot-tcl-dev
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: libplplot12 (= ${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
@@ -312,14 +311,14 @@ Description: Tcl/Tk development support for PLplot, a plotting library
This package contains the necessary files to do development in Tcl/Tk
with PLplot: header files, shared libraries links, and examples.
-Package: plplot12-driver-cairo
+Package: plplot-driver-cairo
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: plplot9-driver-cairo
-Replaces: plplot9-driver-cairo
+Conflicts: plplot12-driver-cairo
+Replaces: plplot12-driver-cairo
Description: Scientific plotting library (Cairo driver)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@ -333,10 +332,30 @@ Description: Scientific plotting library (Cairo driver)
on the Cairo 2D graphics library with supporting multiple output devices
(X-Window, PDF, PostScript, and PNG).
+Package: plplot-driver-qt
+Architecture: any
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: libplplot14, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: plplot12-driver-qt
+Replaces: plplot12-driver-qt
+Description: Scientific plotting library (qt driver)
+ PLplot is relatively small, portable, freely distributable, and is rich
+ enough to satisfy most users. It has a wide range of plot types including
+ line (linear, log), contour, 3D, fill, and almost 1000 characters
+ (including Greek and mathematical) in its extended font set. The package
+ is designed to make it easy to quickly get graphical output; only a
+ handful of function calls is typically required. For more advanced use,
+ virtually all aspects of plotting are configurable.
+ .
+ This package provides the qt driver module for PLplot. It also provides
+ C++ bindings to allow use of the PLplot API in qt applications.
+
Package: python-plplot
Architecture: any
Section: python
-Depends: libplplot12 (= ${binary:Version}),
+Depends: libplplot14 (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
@@ -357,14 +376,14 @@ Description: Python support for PLplot, a plotting library
Package: python-plplot-qt
Architecture: any
Section: python
-Depends: libplplot12 (= ${binary:Version}),
- plplot12-driver-qt (= ${binary:Version}),
+Depends: libplplot14 (= ${binary:Version}),
+ plplot-driver-qt (= ${binary:Version}),
python-plplot (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Provides: ${python:Provides}
-Description: Scientific plotting library (python qt GUI)
+Description: Scientific plotting library (Python Qt GUI)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
line (linear, log), contour, 3D, fill, and almost 1000 characters
@@ -394,28 +413,10 @@ Description: Documentation for PLplot, a plotting library
PLplot documentation. It also contains the man pages for the API
functions.
-Package: plplot12-driver-qt
-Architecture: any
-Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Depends: libplplot12, ${misc:Depends}, ${shlibs:Depends}
-Description: Scientific plotting library (qt driver)
- PLplot is relatively small, portable, freely distributable, and is rich
- enough to satisfy most users. It has a wide range of plot types including
- line (linear, log), contour, 3D, fill, and almost 1000 characters
- (including Greek and mathematical) in its extended font set. The package
- is designed to make it easy to quickly get graphical output; only a
- handful of function calls is typically required. For more advanced use,
- virtually all aspects of plotting are configurable.
- .
- This package provides the qt driver module for PLplot. It also provides
- C++ bindings to allow use of the PLplot API in qt applications.
-
Package: libplplot-ocaml
Architecture: any
Section: ocaml
-Depends: libplplot12,
+Depends: libplplot14,
ocaml-base-nox-${F:OCamlABI},
${misc:Depends},
${shlibs:Depends}
@@ -435,8 +436,8 @@ Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: libplplot12, lua5.1, ${misc:Depends}, ${shlibs:Depends}
-Description: Scientific plotting library (lua bindings)
+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
line (linear, log), contour, 3D, fill, and almost 1000 characters
@@ -445,4 +446,4 @@ Description: Scientific plotting library (lua bindings)
handful of function calls is typically required. For more advanced use,
virtually all aspects of plotting are configurable.
.
- This package provides the lua bindings for PLplot.
+ This package provides the Lua bindings for PLplot.
diff --git a/debian/libcsiro0.files b/debian/libcsiro0.install
similarity index 100%
rename from debian/libcsiro0.files
rename to debian/libcsiro0.install
diff --git a/debian/libplplot-ada1-dev.files b/debian/libplplot-ada1-dev.files
deleted file mode 100644
index 4be650d..0000000
--- a/debian/libplplot-ada1-dev.files
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/ada
-usr/share/ada
-usr/lib/*/libplplotada*.so
-usr/share/doc/libplplot12/examples/ada
-usr/share/doc/libplplot-ada1-dev
diff --git a/debian/libplplot-ada1-dev.install b/debian/libplplot-ada1-dev.install
new file mode 100644
index 0000000..c72220e
--- /dev/null
+++ b/debian/libplplot-ada1-dev.install
@@ -0,0 +1,3 @@
+usr/lib/*/ada
+usr/share/ada
+usr/lib/*/libplplotada*.so
diff --git a/debian/libplplot-ada1.files b/debian/libplplot-ada1.install
similarity index 50%
rename from debian/libplplot-ada1.files
rename to debian/libplplot-ada1.install
index c9ea45d..f014c6d 100644
--- a/debian/libplplot-ada1.files
+++ b/debian/libplplot-ada1.install
@@ -1,2 +1 @@
usr/lib/*/libplplotada*.so.*
-usr/share/doc/libplplot-ada1
diff --git a/debian/libplplot-c++11.files b/debian/libplplot-c++11.files
deleted file mode 100644
index b40afa1..0000000
--- a/debian/libplplot-c++11.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libplplotcxxd.so.*
-usr/share/doc/libplplot-c++11
diff --git a/debian/libplplot-d.files b/debian/libplplot-d.install
similarity index 50%
rename from debian/libplplot-d.files
rename to debian/libplplot-d.install
index 99cc82e..d32c8ae 100644
--- a/debian/libplplot-d.files
+++ b/debian/libplplot-d.install
@@ -1,3 +1,2 @@
usr/lib/*/libplplotdmdd.a
-usr/share/doc/libplplot-d
diff --git a/debian/libplplot-dev.examples b/debian/libplplot-dev.examples
new file mode 100644
index 0000000..94121a4
--- /dev/null
+++ b/debian/libplplot-dev.examples
@@ -0,0 +1,2 @@
+examples/c/*
+examples/c++/*
diff --git a/debian/libplplot-dev.files b/debian/libplplot-dev.files
deleted file mode 100644
index 7351139..0000000
--- a/debian/libplplot-dev.files
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/include
-usr/lib/*/lib*.a
-usr/lib/*/lib*.la
-usr/lib/*/lib*.so
-usr/lib/*/fortran
-usr/lib/*/pkgconfig
-usr/share/doc/libplplot12/examples
-usr/share/doc/libplplot12/README.pkg-config
-usr/share/doc/libplplot-dev
diff --git a/debian/libplplot-dev.install b/debian/libplplot-dev.install
new file mode 100644
index 0000000..72876d8
--- /dev/null
+++ b/debian/libplplot-dev.install
@@ -0,0 +1,27 @@
+usr/include/plplot/disptab.h
+usr/include/plplot/drivers.h
+usr/include/plplot/pdf.h
+usr/include/plplot/plConfig.h
+usr/include/plplot/plDevs.h
+usr/include/plplot/pldebug.h
+usr/include/plplot/pldll.h
+usr/include/plplot/plevent.h
+usr/include/plplot/plplot.h
+usr/include/plplot/plplotP.h
+usr/include/plplot/plstream.h
+usr/include/plplot/plstrm.h
+usr/include/plplot/plxwd.h
+usr/include/plplot/qt.h
+usr/include/plplot/wxPLplot_nanosec.h
+usr/include/plplot/wxPLplotstream.h
+usr/include/plplot/wxPLplotwindow.h
+usr/lib/*/libcsirocsa.so
+usr/lib/*/libcsironn.so
+usr/lib/*/libplf95demolib.a
+usr/lib/*/libplplotcxx.so
+usr/lib/*/libplplot.so
+usr/lib/*/libplplotf95.so
+usr/lib/*/libplplotqt.so
+usr/lib/*/libplplotwxwidgets.so
+usr/lib/*/fortran
+usr/lib/*/pkgconfig
diff --git a/debian/libplplot-fortran10.files b/debian/libplplot-fortran10.files
deleted file mode 100644
index 7e7a114..0000000
--- a/debian/libplplot-fortran10.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libplplotf*.so.*
-usr/share/doc/libplplot-fortran10
diff --git a/debian/libplplot-java.examples b/debian/libplplot-java.examples
new file mode 100644
index 0000000..4c097d6
--- /dev/null
+++ b/debian/libplplot-java.examples
@@ -0,0 +1 @@
+examples/java/*
diff --git a/debian/libplplot-java.files b/debian/libplplot-java.files
deleted file mode 100644
index 6b85144..0000000
--- a/debian/libplplot-java.files
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/jni
-usr/share/java
-usr/share/doc/libplplot12/examples/java
-usr/share/doc/libplplot-java
diff --git a/debian/libplplot-java.install b/debian/libplplot-java.install
new file mode 100644
index 0000000..a178b4f
--- /dev/null
+++ b/debian/libplplot-java.install
@@ -0,0 +1,2 @@
+usr/lib/*/jni
+usr/share/java
diff --git a/debian/libplplot-lua.examples b/debian/libplplot-lua.examples
new file mode 100644
index 0000000..35c5dc5
--- /dev/null
+++ b/debian/libplplot-lua.examples
@@ -0,0 +1 @@
+examples/lua/*
diff --git a/debian/libplplot-lua.files b/debian/libplplot-lua.install
similarity index 52%
rename from debian/libplplot-lua.files
rename to debian/libplplot-lua.install
index f6dbe62..2c57a78 100644
--- a/debian/libplplot-lua.files
+++ b/debian/libplplot-lua.install
@@ -1,3 +1,2 @@
usr/lib/*/lua/5.1/plplot/*.so
-usr/share/doc/libplplot-lua
diff --git a/debian/libplplot-ocaml.examples b/debian/libplplot-ocaml.examples
new file mode 100644
index 0000000..1338c16
--- /dev/null
+++ b/debian/libplplot-ocaml.examples
@@ -0,0 +1 @@
+examples/ocaml/*
diff --git a/debian/libplplot-ocaml.files b/debian/libplplot-ocaml.install
similarity index 81%
rename from debian/libplplot-ocaml.files
rename to debian/libplplot-ocaml.install
index 1ad6f9a..2e1909d 100644
--- a/debian/libplplot-ocaml.files
+++ b/debian/libplplot-ocaml.install
@@ -3,4 +3,3 @@ usr/lib/ocaml/plplot/META
usr/lib/ocaml/plplot/*.a
usr/lib/ocaml/plplot/*.cm*
usr/lib/ocaml/plplot/*.ml*
-usr/share/doc/libplplot-ocaml
diff --git a/debian/libplplot12.files b/debian/libplplot12.files
deleted file mode 100644
index 2a69b58..0000000
--- a/debian/libplplot12.files
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/lib
-usr/share/plplot*/*.map
-usr/share/plplot*/*.fnt
-usr/share/plplot*/*.pal
-usr/share/plplot*/*.shp
-usr/share/plplot*/*.shx
-usr/share/doc/libplplot12
-
-
diff --git a/debian/libplplot14.install b/debian/libplplot14.install
new file mode 100644
index 0000000..616afa7
--- /dev/null
+++ b/debian/libplplot14.install
@@ -0,0 +1,12 @@
+usr/lib/*/libplplot.so.*
+usr/lib/*/plplot5.*/drivers/mem.*
+usr/lib/*/plplot5.*/drivers/null.*
+usr/lib/*/plplot5.*/drivers/ps.*
+usr/lib/*/plplot5.*/drivers/svg.*
+usr/lib/*/plplot5.*/drivers/xfig.*
+usr/share/plplot*/*.fnt
+usr/share/plplot*/*.pal
+usr/share/plplot*/*.shp
+usr/share/plplot*/*.shx
+
+
diff --git a/debian/libplplotcxx13.install b/debian/libplplotcxx13.install
new file mode 100644
index 0000000..b44fd14
--- /dev/null
+++ b/debian/libplplotcxx13.install
@@ -0,0 +1 @@
+usr/lib/*/libplplotcxx.so.*
diff --git a/debian/libplplotf95-13.examples b/debian/libplplotf95-13.examples
new file mode 100644
index 0000000..f5e9b08
--- /dev/null
+++ b/debian/libplplotf95-13.examples
@@ -0,0 +1 @@
+examples/f95/*
diff --git a/debian/libplplotf95-13.install b/debian/libplplotf95-13.install
new file mode 100644
index 0000000..faa851f
--- /dev/null
+++ b/debian/libplplotf95-13.install
@@ -0,0 +1 @@
+usr/lib/*/libplplotf*.so.*
diff --git a/debian/libplplot-fortran10.lintian-overrides b/debian/libplplotf95-13.lintian-overrides
similarity index 100%
rename from debian/libplplot-fortran10.lintian-overrides
rename to debian/libplplotf95-13.lintian-overrides
diff --git a/debian/libqsastime-dev.files b/debian/libqsastime-dev.install
similarity index 63%
rename from debian/libqsastime-dev.files
rename to debian/libqsastime-dev.install
index 38b6ce2..8560cef 100644
--- a/debian/libqsastime-dev.files
+++ b/debian/libqsastime-dev.install
@@ -1,3 +1,2 @@
usr/lib/*/libqsastime*.so
usr/include/plplot/qsas*.h
-usr/share/doc/libqsastime-dev
diff --git a/debian/libqsastime0.files b/debian/libqsastime0.install
similarity index 100%
rename from debian/libqsastime0.files
rename to debian/libqsastime0.install
diff --git a/debian/octave-plplot.files b/debian/octave-plplot.files
deleted file mode 100644
index a746719..0000000
--- a/debian/octave-plplot.files
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/share/plplot_octave
-usr/share/octave/site/m/PLplot
-usr/lib/*/octave
-usr/share/doc/libplplot12/*.octave
-usr/share/doc/libplplot12/examples/*octave*
-usr/share/doc/octave-plplot
diff --git a/debian/octave-plplot.install b/debian/octave-plplot.install
new file mode 100644
index 0000000..f15bebf
--- /dev/null
+++ b/debian/octave-plplot.install
@@ -0,0 +1,3 @@
+usr/share/plplot_octave
+usr/share/octave/site/m/PLplot
+usr/lib/*/octave
diff --git a/debian/patches/Add-Tcl-multiarch.patch b/debian/patches/Add-Tcl-multiarch.patch
index f34cbea..8e509b5 100644
--- a/debian/patches/Add-Tcl-multiarch.patch
+++ b/debian/patches/Add-Tcl-multiarch.patch
@@ -9,19 +9,6 @@ Change the location of tcl binaries to make the packages multiarch compliant.
src/plctrl.c | 9 +++++++++
3 files changed, 13 insertions(+), 1 deletion(-)
-diff --git a/bindings/tk/CMakeLists.txt b/bindings/tk/CMakeLists.txt
-index 8285aa2..399d8af 100644
---- a/bindings/tk/CMakeLists.txt
-+++ b/bindings/tk/CMakeLists.txt
-@@ -55,7 +55,7 @@ if(ENABLE_tkX)
-
- install(TARGETS plserver
- EXPORT export_plplot
-- DESTINATION ${BIN_DIR}
-+ DESTINATION ${LIBEXEC_DIR}
- )
- endif(ENABLE_tkX)
-
diff --git a/plplot_config.h.in b/plplot_config.h.in
index 78fafdd..90ec6b9 100644
--- a/plplot_config.h.in
diff --git a/debian/plplot-doc.docs b/debian/plplot-doc.docs
new file mode 100644
index 0000000..3337318
--- /dev/null
+++ b/debian/plplot-doc.docs
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/info
+debian/tmp/usr/share/doc/plplot/html
diff --git a/debian/plplot-doc.files b/debian/plplot-doc.files
deleted file mode 100644
index dd0d1d6..0000000
--- a/debian/plplot-doc.files
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/doc/plplot-doc
-usr/share/man/man3
-usr/share/info
-
diff --git a/debian/plplot-doc.manpages b/debian/plplot-doc.manpages
new file mode 100644
index 0000000..64a2504
--- /dev/null
+++ b/debian/plplot-doc.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man3/*.3*
diff --git a/debian/plplot-driver-cairo.install b/debian/plplot-driver-cairo.install
new file mode 100644
index 0000000..d8cb6c6
--- /dev/null
+++ b/debian/plplot-driver-cairo.install
@@ -0,0 +1 @@
+usr/lib/*/plplot*/drivers/cairo.*
diff --git a/debian/plplot-driver-qt.install b/debian/plplot-driver-qt.install
new file mode 100644
index 0000000..ec24532
--- /dev/null
+++ b/debian/plplot-driver-qt.install
@@ -0,0 +1,2 @@
+usr/lib/*/plplot*/drivers/qt.*
+usr/lib/*/libplplotqt.so.*
diff --git a/debian/plplot-driver-wxwidgets.install b/debian/plplot-driver-wxwidgets.install
new file mode 100644
index 0000000..934299e
--- /dev/null
+++ b/debian/plplot-driver-wxwidgets.install
@@ -0,0 +1,4 @@
+usr/lib/*/plplot*/drivers/wxwidgets.*
+usr/lib/*/libplplotwxwidgets.so.*
+
+
diff --git a/debian/plplot-driver-xwin.install b/debian/plplot-driver-xwin.install
new file mode 100644
index 0000000..0465217
--- /dev/null
+++ b/debian/plplot-driver-xwin.install
@@ -0,0 +1,3 @@
+usr/lib/*/plplot*/drivers/xwin.*
+
+
diff --git a/debian/plplot-tcl-bin.files b/debian/plplot-tcl-bin.files
deleted file mode 100644
index f836f40..0000000
--- a/debian/plplot-tcl-bin.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/pltcl
-usr/share/doc/plplot-tcl-bin
diff --git a/debian/plplot-tcl-bin.install b/debian/plplot-tcl-bin.install
new file mode 100644
index 0000000..b75642c
--- /dev/null
+++ b/debian/plplot-tcl-bin.install
@@ -0,0 +1 @@
+usr/bin/pltcl
diff --git a/debian/plplot-tcl-dev.examples b/debian/plplot-tcl-dev.examples
new file mode 100644
index 0000000..13b4dea
--- /dev/null
+++ b/debian/plplot-tcl-dev.examples
@@ -0,0 +1,2 @@
+examples/tcl/*
+examples/tk/*
diff --git a/debian/plplot-tcl-dev.files b/debian/plplot-tcl-dev.files
deleted file mode 100644
index f1ba233..0000000
--- a/debian/plplot-tcl-dev.files
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/*/lib*tcl*
-usr/include/plplot/pltcl.h
-usr/include/plplot/pltk.h
-usr/include/plplot/tclMatrix.h
-usr/share/doc/plplot-tcl-dev
-usr/share/doc/libplplot12/examples/*tcl*
-usr/share/doc/libplplot12/examples/tk
diff --git a/debian/plplot-tcl-dev.install b/debian/plplot-tcl-dev.install
new file mode 100644
index 0000000..9bbd178
--- /dev/null
+++ b/debian/plplot-tcl-dev.install
@@ -0,0 +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
diff --git a/debian/plplot-tcl.files b/debian/plplot-tcl.install
similarity index 60%
rename from debian/plplot-tcl.files
rename to debian/plplot-tcl.install
index 4ba594e..e0bf1cf 100644
--- a/debian/plplot-tcl.files
+++ b/debian/plplot-tcl.install
@@ -1,8 +1,7 @@
usr/lib/*/lib*tcl*.so.*
-usr/lib/*/plplot*/bin/plserver
+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*/driversd/*tk*
-usr/share/doc/plplot-tcl
+usr/lib/*/plplot*/drivers/*tk*
diff --git a/debian/plplot12-driver-cairo.files b/debian/plplot12-driver-cairo.files
deleted file mode 100644
index 1792e31..0000000
--- a/debian/plplot12-driver-cairo.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/plplot*/driversd/cairo.*
-usr/share/doc/plplot12-driver-cairo
diff --git a/debian/plplot12-driver-qt.files b/debian/plplot12-driver-qt.files
deleted file mode 100644
index c88aa7d..0000000
--- a/debian/plplot12-driver-qt.files
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/plplot*/driversd/qt.*
-usr/lib/*/libplplotqtd.so.*
-usr/share/doc/plplot12-driver-qt
-usr/lib/python*/plplot_pyqt4.so
diff --git a/debian/plplot12-driver-wxwidgets.files b/debian/plplot12-driver-wxwidgets.files
deleted file mode 100644
index 2483a20..0000000
--- a/debian/plplot12-driver-wxwidgets.files
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/plplot*/driversd/wxwidgets.*
-usr/lib/*/libplplotwxwidgetsd.so.*
-usr/share/doc/plplot12-driver-wxwidgets
-
-
diff --git a/debian/plplot12-driver-xwin.files b/debian/plplot12-driver-xwin.files
deleted file mode 100644
index a13cdf0..0000000
--- a/debian/plplot12-driver-xwin.files
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/plplot*/driversd/xwin.*
-usr/share/doc/plplot12-driver-xwin
-
-
diff --git a/debian/python-plplot-qt.files b/debian/python-plplot-qt.install
similarity index 59%
rename from debian/python-plplot-qt.files
rename to debian/python-plplot-qt.install
index 7a3361f..e80c025 100644
--- a/debian/python-plplot-qt.files
+++ b/debian/python-plplot-qt.install
@@ -1,2 +1 @@
usr/lib/python*/dist-packages/plplot_pyqt4.so
-usr/share/doc/python-plplot-qt
diff --git a/debian/python-plplot.examples b/debian/python-plplot.examples
new file mode 100644
index 0000000..0f9a780
--- /dev/null
+++ b/debian/python-plplot.examples
@@ -0,0 +1 @@
+examples/python/*
diff --git a/debian/python-plplot.files b/debian/python-plplot.files
deleted file mode 100644
index 65a2cd6..0000000
--- a/debian/python-plplot.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/python*
-usr/share/doc/libplplot12/examples/*python*
-usr/share/doc/python-plplot
diff --git a/debian/python-plplot.install b/debian/python-plplot.install
new file mode 100644
index 0000000..eff2dd1
--- /dev/null
+++ b/debian/python-plplot.install
@@ -0,0 +1,3 @@
+usr/lib/python*/dist-packages/*.py
+usr/lib/python*/dist-packages/_plplotc*.so
+usr/lib/python*/dist-packages/plplot_widget*.so
diff --git a/debian/rules b/debian/rules
index b9d4e0e..61a3476 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,287 +1,34 @@
#!/usr/bin/make -f
# -*- gmake -*-
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independant
-# package.
-# Modified by Rafael Laboissiere <rafael at debian.org> on 1998/06/12
-# for the plplot package
-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Update build-depedencies in debian/control with "debian/rules control"
-# after changing one of these.
-BUILD_ADA = no
-BUILD_D = no
-BUILD_OCT = no
-
-# Default slice, don't change. Will be extended as necessary based on
-# the above.
-SLICES=UNDEF
-
-ifeq ($(BUILD_OCT),yes)
- # Paths for Octave
- MDIR = $(shell octave-config --print LOCALAPIFCNFILEDIR)
- OCTDIR = $(shell octave-config --print LOCALAPIOCTFILEDIR)
- octver := $(shell octave-config -v)
- SLICES := $(SLICES)+OCT
-endif
-
-ifeq ($(BUILD_D),yes)
- SLICES := $(SLICES)+D
-endif
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-version := $(shell perl debian/get-upstream-version.pl < cmake/modules/plplot_version.cmake)
-libpkg := libplplot12
-docpkg := plplot-doc
-debbase := $(shell pwd)/debian
-debtmp := $(debbase)/tmp
-debusr := $(debtmp)/usr
-deblib := $(debusr)/lib/$(DEB_HOST_MULTIARCH)
-debshr := $(debusr)/share
-debdoc := $(debshr)/doc
-debinfo := $(debshr)/info
-debex := $(debshr)/plplot$(version)/examples
-
-# Note cmake ignores CPPFLAGS so add them to CFLAGS and CXXFLAGS as a work around
-CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) \
- $(shell mkoctfile -p INCFLAGS)
-CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-CFLAGS += -fvisibility=hidden
-#Don't add -fvisibility=hidden to CXXFLAGS for now as this breaks the octave bindings.
-CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+# Note cmake ignores CPPFLAGS so add them to CFLAGS and CXXFLAGS as a
+# work around
+CPPFLAGS += $(shell mkoctfile -p INCFLAGS)
+CFLAGS += $(CPPFLAGS) -fvisibility=hidden
+# Don't add -fvisibility=hidden to CXXFLAGS for now as this breaks the
+# octave bindings.
+CXXFLAGS += $(CPPFLAGS)
#CXXFLAGS += -fvisibility=hidden
-FFLAGS = $(shell dpkg-buildflags --get FFLAGS)
FFLAGS += -fvisibility=hidden
-LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
LDFLAGS += -Wl,--as-needed
-CMAKE = xvfb-run cmake
-
-JAVA_HOME = /usr/lib/jvm/default-java
-
-PYVERS = $(shell pyversions -vr)
-
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-# Disable Ada build on sh4 - gnat not available at the moment.
-
-ifeq ($(BUILD_ADA),yes)
-ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:sh4:))
-BUILD_ADA = no
-endif
-endif
-
-# Configure options
-
-ifeq ($(BUILD_ADA),yes)
-ADA_OPTIONS = -DENABLE_ada=ON
-SLICES := $(SLICES)+ADA
-endif
-
-JAVA_OPTIONS = \
- -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \
- -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \
- -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \
- -DJAVACFLAGS="-source 1.5 -target 1.5"
-
-CONFIGURE_OPTIONS = -DBUILD_TEST=ON \
- -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
- -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON \
- -DTCL_TCLSH=/usr/bin/tclsh8.5 \
- $(ADA_OPTIONS) $(JAVA_OPTIONS)
-
-ifeq ($(with_oct),yes)
- CONFIGURE_OPTIONS += -DOCTAVE_OCT_DIR=$(OCTDIR)
-endif
-
-BUILD_DIR = $(debbase)/build_tmp
-SRC_DIR = $(shell pwd)
-
-control:
- slice -o $(SLICES):debian/control debian/control.in
-
-config: config-stamp
-config-stamp: control
- mkdir -p $(BUILD_DIR)
- ( cd $(BUILD_DIR) ; \
- PKG_CONFIG_ENV=" " FC=gfortran \
- JAVA_HOME=$(JAVA_HOME) DC=$(DC) \
- CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
- LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- $(CMAKE) $(SRC_DIR) $(CONFIGURE_OPTIONS) )
- touch config-stamp
-
-build-arch: build-arch-stamp
-build-arch-stamp: config-stamp
- dh_testdir
- ( cd $(BUILD_DIR) ; $(MAKE) )
- -( cd $(BUILD_DIR) ; unset DISPLAY ; $(MAKE) test_noninteractive )
- touch build-arch-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp: config-stamp
- dh_testdir
- ( cd $(BUILD_DIR) ; $(CMAKE) $(SRC_DIR) $(CONFIGURE_OPTIONS) -DBUILD_DOC=ON ; \
- cd doc ; $(MAKE) )
- touch build-indep-stamp
+CONFIGURE_OPTIONS = -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON \
+ -DBUILD_TEST=ON -DBUILD_DOC=ON \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp install-arch-stamp install-indep-stamp \
- config-stamp debian/files install-python*
- rm -rf $(BUILD_DIR)
- rm -rf $(debbase)/$(libpkg)
- dh_clean
+%:
+ dh $@ -Scmake --with python2
-install-arch: install-arch-stamp install-python
- dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \
- --no-package=python-plplot --no-package=python-plplot-qt \
- --no-package=libplplot-java --no-package=libplplot-ada1 \
- --no-package=libplplot-ocaml --no-package=libplplot-lua \
- --no-package=libplplot-d --no-package=libplplot-ada1-dev
- dh_movefiles --package=python-plplot-qt
- dh_movefiles --package=python-plplot
- dh_movefiles --package=libplplot-java
- dh_movefiles --package=libplplot-ocaml
- dh_movefiles --package=libplplot-lua
- dh_movefiles --package=libplplot-d
-ifeq ($(BUILD_ADA),yes)
- dh_movefiles --package=libplplot-ada1
- dh_movefiles --package=libplplot-ada1-dev
-endif
- dh_movefiles --package=libplplot-dev
- dh_movefiles --package=$(libpkg)
+override_dh_auto_configure:
+ xvfb-run dh_auto_configure -- $(CONFIGURE_OPTIONS)
-install-arch-stamp: build-arch-stamp
- dh_testdir
- dh_testroot
-
-ifeq ($(with_oct),yes)
- #Strip bindings/octave/plplot_octave.oct as this is missed by.
- # dh_strip.
- strip --strip-unneeded --remove-section=.comment $(BUILD_DIR)/bindings/octave/plplot_octave.oct
-endif
-
- ( cd $(BUILD_DIR) ; \
- $(MAKE) DESTDIR=$(debtmp) install )
-
- ( cd $(debdoc)/plplot ; \
- rm -f COPYING.LIB ; \
- mv ChangeLog.release changelog )
- mv $(debdoc)/plplot $(debdoc)/$(libpkg)
-
- install -d $(debex)/perl
- install --mode=644 examples/perl/x* examples/perl/README* \
- $(debex)/perl
- mv $(debex) $(debdoc)/$(libpkg)
-
- for i in libplplot-dev plplot-tcl plplot-tcl-bin plplot-tcl-dev \
- plplot12-driver-xwin octave-plplot python-plplot-qt \
- $(if $(filter yes,$(with_oct)),octave-plplot) \
- python-plplot libplplot-c++11 plplot12-driver-wxwidgets \
- plplot12-driver-qt libplplot-java \
- plplot12-driver-cairo libplplot-fortran10 \
- libplplot-ocaml libplplot-lua libplplot-d ; do \
- ln -s $(libpkg) $(debdoc)/$$i ; \
- done
- ln -s libqsastime0 $(debdoc)/libqsastime-dev
-
- mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar
- ( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar )
-
-ifeq ($(BUILD_ADA),yes)
- ln -s $(libpkg) $(debdoc)/libplplot-ada1
- ln -s $(libpkg) $(debdoc)/libplplot-ada1-dev
-endif
-
- touch install-arch-stamp
-
-install-indep: install-indep-stamp
- dh_movefiles -i
-
-install-indep-stamp: build-indep-stamp
- ( cd $(BUILD_DIR)/doc ; \
- $(MAKE) DESTDIR=$(debtmp) install )
-
- mkdir -p $(debdoc)/$(docpkg)
- (cd $(debdoc)/plplot ; rm -f html/plplotdoc-html.proc ; mv html *.pdf $(debdoc)/$(docpkg))
- touch install-indep-stamp
-
-install-python: $(PYVERS:%=install-python%)
- touch $@
-
-install-python%: build-arch-stamp
- ( cd $(BUILD_DIR) ; \
- $(CMAKE) $(SRC_DIR) $(CONFIGURE_OPTIONS) -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=`python-config --configdir`/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy;/usr/lib/pyshared/python$*/numpy/core/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \
- for d in python qt_gui/pyqt4 ; do \
- ( cd bindings/$$d; \
- $(MAKE) clean ; \
- $(MAKE) ; \
- $(MAKE) DESTDIR=$(debtmp) install ) ; \
- done )
- touch $@
-
-# Build architecture-independent files here.
-binary-indep: build-indep install-indep
- dh_testdir -i
- dh_testroot -i
- dh_installdirs -i
- dh_installdocs --package=$(docpkg)
- dh_installchangelogs --package=$(docpkg)
- dh_compress -i --exclude=.pdf
- dh_fixperms -i
- dh_installdeb -i
- dh_lintian -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build-arch install-arch
- dh_testdir -a
- dh_testroot -a
- dh_installdirs -a
-
- dh_installdocs --package=$(libpkg) --package=libcsiro0 --package=libqsastime0
- dh_installchangelogs --package=$(libpkg) --package=libcsiro0 --package=libqsastime0
-
- dh_python2 --package=python-plplot-qt --package=python-plplot
+override_dh_auto_install:
+ dh_auto_install
+ mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/plplot/bin
+ mv debian/tmp/usr/bin/plserver debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/plplot/bin/plserver
dh_numpy
- dh_strip -a
- dh_compress -a -Xexamples/
- dh_fixperms -a
- dh_makeshlibs -V -a
- dh_shlibdeps -a --no-package=octave-plplot -L $(libpkg) \
- -l $(debbase)/$(libpkg)/usr/lib/$(DEB_HOST_MULTIARCH):$(debbase)/plplot-tcl/usr/lib/$(DEB_HOST_MULTIARCH)
-ifeq ($(with_oct),yes)
- dpkg-shlibdeps -Tdebian/octave-plplot.substvars -S$(debbase)/$(libpkg)/usr/lib/*.so* -S/usr/lib/$(octver)/*.so* $(debbase)/octave-plplot/$(OCTDIR)/plplot_octave.oct
-endif
- dh_installdeb -a
-
- # Replace tk copied files with symlinks
- (cd $(debbase)/plplot-tcl-dev/usr/share/doc/${libpkg}/examples/tk ; for file in x??.tcl plgrid.tcl ; do rm -f $${file} ; ln -s ../tcl/$${file} . ; done)
-
- dh_lintian -a
- dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-arch binary-indep
-
-get-orig-source:
- uscan --force-download
-
-.PHONY: build clean binary-indep binary-arch binary config \
- control
-
-.NOTPARALLEL:
+override_dh_auto_test:
+ true
--
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