Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12576] trunk/debian
|
From: <and...@us...> - 2013-10-03 21:51:27
|
Revision: 12576
http://sourceforge.net/p/plplot/code/12576
Author: andrewross
Date: 2013-10-03 21:51:23 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
Next round of updates to the Debian packages. Should be (nearly) there now.
Modified Paths:
--------------
trunk/debian/changelog
trunk/debian/control
trunk/debian/control.in
trunk/debian/libcsiro0.files
trunk/debian/libplplot-ada1-dev.files
trunk/debian/libplplot-ada1.files
trunk/debian/libplplot-c++11.files
trunk/debian/libplplot-d.files
trunk/debian/libplplot-dev.files
trunk/debian/libplplot-fortran10.files
trunk/debian/libplplot-java.files
trunk/debian/libplplot-lua.files
trunk/debian/libqsastime-dev.files
trunk/debian/libqsastime0.files
trunk/debian/patches/series
trunk/debian/plplot-tcl-dev.files
trunk/debian/plplot-tcl-dev.lintian-overrides
trunk/debian/plplot-tcl.files
trunk/debian/plplot12-driver-cairo.files
trunk/debian/plplot12-driver-qt.files
trunk/debian/plplot12-driver-wxwidgets.files
trunk/debian/plplot12-driver-xwin.files
trunk/debian/rules
Added Paths:
-----------
trunk/debian/libplplot-ada1.lintian-overrides
trunk/debian/libplplot-fortran10.lintian-overrides
trunk/debian/libplplot-ocaml.lintian-overrides
trunk/debian/patches/fix-python-exec-bit.diff
trunk/debian/plplot-tcl-bin.files
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/changelog 2013-10-03 21:51:23 UTC (rev 12576)
@@ -3,19 +3,36 @@
* New upstream release
* debian/patches/series: Remove backported patches no longer need with
current release and update remaining patches.
- * debian/control.in: Update dependencies for new documentation build system and to
- include shapelib (needed for new map support).
+ * debian/control.in: Update dependencies for new documentation build system
+ and to include shapelib (needed for new map support).
* debian/control.in, debian/rules, debian/*.files:
Rename packages to reflect bump in SONAME version.
* debian/control.in: Drop support for f77 bindings (deprecated upstream
and replaced by the better f95 bindings).
- * debian/libplplot12.files: Ensure shape file versions of the maps are installed.
+ * debian/libplplot12.files: Ensure shape file versions of the maps are
+ installed.
* debian/control.in, debian/rule: Drop the gd driver support and the
- plplot11-driver-gd package. No longer supported upstream and superceded by cairo
- and qt drivers.
- * debian/patches/series, debian/patches/fix-d-examples.diff: Fix from upstream for
- D example 20 so it compiles with latest gdc.
- * debian/rules: Fix command line options for python-config to prevent an error.
+ plplot11-driver-gd package. No longer supported upstream and superceded
+ by cairo and qt drivers.
+ * debian/patches/series, debian/patches/fix-d-examples.diff: Fix from
+ upstream for D example 20 so it compiles with latest gdc.
+ * debian/rules: Fix command line options for python-config to prevent an
+ error.
+ * debian/control.in, debian/rules, debian/*.files: Update package to be
+ multiarch compatible. (Fixes some lintian warnings).
+ * debian/rules: Force compatibility with java 5 (default on some platforms).
+ Fixes lintian warning.
+ * debian/patches/series, debian/patches/fix_python_exec_bit.diff: Fix
+ incorrect executable bit on python script. Fixes lintian warning.
+ * debian/libplplot-ada1.lintian-overrides,
+ debian/libplplot-fortran10.lintian-overrides,
+ libplplot-ocaml.lintian-overrides: Suppress hardening warnings for ada,
+ fortran and ocaml compiled code since they are not relevant.
+ * debian/control.in, debian/plplot-tcl-bin.files, debian/plplot-tcl.files,
+ debian/patches/series, debian/patches/add-tcl-multiarch.diff: Move
+ pltcl to a new plplot-tcl-bin package and move plserver to a location in
+ the library path (executable by the library not the user). Required to make
+ the tcl packages multiarch compliant.
-- Andrew Ross <and...@us...> Tue, 01 Oct 2013 12:44:20 +0100
@@ -182,7 +199,6 @@
* debian/rules, debian/control.in, debian/python-plplot-qt.files:
Add new python-plplot-qt package which includes the python bindings to
allow use of the plplot API in qt applications.
- -- Andrew Ross <and...@us...> Mon, 30 Sep 2013 09:47:30 +0100
* debian/control.in:
+ Remove dependency of libplplot-java on default-jre as per policy.
Java libraries do not need to depend on a java runtime. Fixes
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/control 2013-10-03 21:51:23 UTC (rev 12576)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Andrew Ross <and...@us...>
Standards-Version: 3.9.4
-Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
+Build-Depends: cmake (>= 2.6.3), debhelper (>= 9),
tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
libxi-dev, gfortran, itk3-dev, liboctave-dev,
m4, libqhull-dev (>= 2003.1-8),
@@ -26,6 +26,8 @@
Architecture: any
Section: libs
Conflicts: libplplot11
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: plplot12-driver-xwin, plplot12-driver-gd,
plplot12-driver-cairo, plplot12-driver-qt, plplot12-driver-wxwidgets, plplot-tcl
@@ -48,6 +50,8 @@
Section: libdevel
Recommends: pkg-config, cmake, libplplot-ocaml, libplplot-lua, libplplot-d
Suggests: plplot-doc
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
libltdl3-dev, libqsastime-dev, ${misc:Depends},
libplplot-c++11 (= ${binary:Version}), libplplot-fortran10 (= ${binary:Version})
@@ -73,6 +77,8 @@
Architecture: any
Section: libs
Conflicts: libplplot5, libplplot-c++9, libplplot-c++9c2, libplplot-c++10
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (C++ binding)
PLplot is relatively small, portable, freely distributable, and is rich
@@ -88,6 +94,8 @@
Package: libplplot-fortran10
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends} , ${misc:Depends}
Description: Scientific plotting library (fortran bindings)
PLplot is relatively small, portable, freely distributable, and is rich
@@ -122,6 +130,8 @@
Package: libcsiro0
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (CSIRO libraries)
This package contains two libraries developed by Pavel Sakov, from the
@@ -137,6 +147,8 @@
Architecture: any
Section: libs
Conflicts: libplplot9
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Time format conversion library
The qsastime library is a simple library for handling time format
@@ -153,6 +165,8 @@
Architecture: any
Section: libdevel
Breaks: libplplot-dev (<< 5.9.8-1)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libqsastime0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Time format conversion library (development files)
The qsastime library is a simple library for handling time format
@@ -170,6 +184,8 @@
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Conflicts: plplot9-driver-xwin
Replaces: plplot9-driver-xwin
Description: Scientific plotting library (X11 driver)
@@ -186,6 +202,8 @@
Package: plplot12-driver-wxwidgets
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}
Conflicts: plplot9-driver-wxwidgets
Replaces: plplot9-driver-wxwidgets
@@ -202,6 +220,8 @@
Package: plplot-tcl
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: plplot12-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends}
Description: Tcl/Tk support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
@@ -213,11 +233,27 @@
virtually all aspects of plotting are configurable.
.
This package contains the Tcl/Tk support for PLplot: shared libraries,
- Tcl modules, the Tk driver, and some programs for interactive use of
- PLplot (plserver and pltcl).
+ Tcl modules and the Tk driver.
+Package: plplot-tcl-bin
+Architecture: any
+Depends: plplot-tcl, ${shlibs:Depends}, ${misc: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
+ 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 contains the pltcl program for interactive use of the Tcl/Tk
+ support for PLplot.
+
Package: plplot-tcl-dev
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12 (= ${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
@@ -235,6 +271,8 @@
Package: plplot12-driver-cairo
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: plplot9-driver-cairo
Replaces: plplot9-driver-cairo
@@ -291,6 +329,8 @@
Package: octave-plplot
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12 (= ${binary:Version}), octave (>= 3.6.1), ${shlibs:Depends},
${misc:Depends}
Description: Octave support for PLplot, a plotting library
@@ -308,6 +348,8 @@
Package: libplplot-ada1
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Breaks: libplplot-ada (<< 5.9.8-2)
Replaces: libplplot-ada (<< 5.9.8-2)
@@ -327,6 +369,8 @@
Architecture: any
Section: libdevel
Suggests: plplot-doc
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
libltdl3-dev, libqsastime-dev, gnat, gnat-4.6, ${misc:Depends},
libplplot-ada1 (= ${binary:Version})
@@ -366,6 +410,8 @@
Package: plplot12-driver-qt
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (qt driver)
PLplot is relatively small, portable, freely distributable, and is rich
@@ -399,6 +445,8 @@
Package: libplplot-lua
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}, lua5.1
Description: Scientific plotting library (lua bindings)
PLplot is relatively small, portable, freely distributable, and is rich
@@ -415,6 +463,8 @@
Package: libplplot-d
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (D language bindings)
PLplot is relatively small, portable, freely distributable, and is rich
Modified: trunk/debian/control.in
===================================================================
--- trunk/debian/control.in 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/control.in 2013-10-03 21:51:23 UTC (rev 12576)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Andrew Ross <and...@us...>
Standards-Version: 3.9.4
-Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
+Build-Depends: cmake (>= 2.6.3), debhelper (>= 9),
tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
libxi-dev, gfortran, itk3-dev, liboctave-dev,
m4, libqhull-dev (>= 2003.1-8),
@@ -26,6 +26,8 @@
Architecture: any
Section: libs
Conflicts: libplplot11
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: plplot12-driver-xwin, plplot12-driver-gd,
plplot12-driver-cairo, plplot12-driver-qt, plplot12-driver-wxwidgets, plplot-tcl
@@ -48,6 +50,8 @@
Section: libdevel
Recommends: pkg-config, cmake, libplplot-ocaml, libplplot-lua, libplplot-d
Suggests: plplot-doc
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
libltdl3-dev, libqsastime-dev, ${misc:Depends},
libplplot-c++11 (= ${binary:Version}), libplplot-fortran10 (= ${binary:Version})
@@ -73,6 +77,8 @@
Architecture: any
Section: libs
Conflicts: libplplot5, libplplot-c++9, libplplot-c++9c2, libplplot-c++10
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (C++ binding)
PLplot is relatively small, portable, freely distributable, and is rich
@@ -88,6 +94,8 @@
Package: libplplot-fortran10
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends} , ${misc:Depends}
Description: Scientific plotting library (fortran bindings)
PLplot is relatively small, portable, freely distributable, and is rich
@@ -122,6 +130,8 @@
Package: libcsiro0
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (CSIRO libraries)
This package contains two libraries developed by Pavel Sakov, from the
@@ -137,6 +147,8 @@
Architecture: any
Section: libs
Conflicts: libplplot9
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Time format conversion library
The qsastime library is a simple library for handling time format
@@ -153,6 +165,8 @@
Architecture: any
Section: libdevel
Breaks: libplplot-dev (<< 5.9.8-1)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libqsastime0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Time format conversion library (development files)
The qsastime library is a simple library for handling time format
@@ -170,6 +184,8 @@
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Conflicts: plplot9-driver-xwin
Replaces: plplot9-driver-xwin
Description: Scientific plotting library (X11 driver)
@@ -186,6 +202,8 @@
Package: plplot12-driver-wxwidgets
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}
Conflicts: plplot9-driver-wxwidgets
Replaces: plplot9-driver-wxwidgets
@@ -202,6 +220,8 @@
Package: plplot-tcl
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: plplot12-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends}
Description: Tcl/Tk support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
@@ -213,11 +233,27 @@
virtually all aspects of plotting are configurable.
.
This package contains the Tcl/Tk support for PLplot: shared libraries,
- Tcl modules, the Tk driver, and some programs for interactive use of
- PLplot (plserver and pltcl).
+ Tcl modules and the Tk driver.
+Package: plplot-tcl-bin
+Architecture: any
+Depends: plplot-tcl, ${shlibs:Depends}, ${misc: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
+ 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 contains the pltcl program for interactive use of the Tcl/Tk
+ support for PLplot.
+
Package: plplot-tcl-dev
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12 (= ${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
@@ -235,6 +271,8 @@
Package: plplot12-driver-cairo
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: plplot9-driver-cairo
Replaces: plplot9-driver-cairo
@@ -291,6 +329,8 @@
Package: octave-plplot
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12 (= ${binary:Version}), octave (>= 3.6.1), ${shlibs:Depends},
${misc:Depends}
Description: Octave support for PLplot, a plotting library
@@ -308,6 +348,8 @@
[ADA:Package: libplplot-ada1
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Breaks: libplplot-ada (<< 5.9.8-2)
Replaces: libplplot-ada (<< 5.9.8-2)
@@ -327,6 +369,8 @@
Architecture: any
Section: libdevel
Suggests: plplot-doc
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
libltdl3-dev, libqsastime-dev, gnat, gnat-4.6, ${misc:Depends},
libplplot-ada1 (= ${binary:Version})
@@ -366,6 +410,8 @@
Package: plplot12-driver-qt
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (qt driver)
PLplot is relatively small, portable, freely distributable, and is rich
@@ -399,6 +445,8 @@
Package: libplplot-lua
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}, lua5.1
Description: Scientific plotting library (lua bindings)
PLplot is relatively small, portable, freely distributable, and is rich
@@ -415,6 +463,8 @@
Package: libplplot-d
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (D language bindings)
PLplot is relatively small, portable, freely distributable, and is rich
Modified: trunk/debian/libcsiro0.files
===================================================================
--- trunk/debian/libcsiro0.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libcsiro0.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,2 +1,2 @@
-usr/lib/libcsiro*.so.*
+usr/lib/*/libcsiro*.so.*
Modified: trunk/debian/libplplot-ada1-dev.files
===================================================================
--- trunk/debian/libplplot-ada1-dev.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libplplot-ada1-dev.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,5 +1,5 @@
-usr/lib/ada
+usr/lib/*/ada
usr/share/ada
-usr/lib/libplplotada*.so
+usr/lib/*/libplplotada*.so
usr/share/doc/libplplot12/examples/ada
usr/share/doc/libplplot-ada1-dev
Modified: trunk/debian/libplplot-ada1.files
===================================================================
--- trunk/debian/libplplot-ada1.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libplplot-ada1.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,2 +1,2 @@
-usr/lib/libplplotada*.so.*
+usr/lib/*/libplplotada*.so.*
usr/share/doc/libplplot-ada1
Added: trunk/debian/libplplot-ada1.lintian-overrides
===================================================================
--- trunk/debian/libplplot-ada1.lintian-overrides (rev 0)
+++ trunk/debian/libplplot-ada1.lintian-overrides 2013-10-03 21:51:23 UTC (rev 12576)
@@ -0,0 +1 @@
+libplplot-ada1 binary: hardening-no-fortify-functions usr/lib/*/libplplotadad.so.1.0.0
Property changes on: trunk/debian/libplplot-ada1.lintian-overrides
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/debian/libplplot-c++11.files
===================================================================
--- trunk/debian/libplplot-c++11.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libplplot-c++11.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,2 +1,2 @@
-usr/lib/libplplotcxxd.so.*
+usr/lib/*/libplplotcxxd.so.*
usr/share/doc/libplplot-c++11
Modified: trunk/debian/libplplot-d.files
===================================================================
--- trunk/debian/libplplot-d.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libplplot-d.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,3 +1,3 @@
-usr/lib/libplplotdmdd.a
+usr/lib/*/libplplotdmdd.a
usr/share/doc/libplplot-d
Modified: trunk/debian/libplplot-dev.files
===================================================================
--- trunk/debian/libplplot-dev.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libplplot-dev.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,9 +1,9 @@
usr/include
-usr/lib/lib*.a
-usr/lib/lib*.la
-usr/lib/lib*.so
-usr/lib/fortran
-usr/lib/pkgconfig
+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
Modified: trunk/debian/libplplot-fortran10.files
===================================================================
--- trunk/debian/libplplot-fortran10.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libplplot-fortran10.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,2 +1,2 @@
-usr/lib/libplplotf*.so.*
+usr/lib/*/libplplotf*.so.*
usr/share/doc/libplplot-fortran10
Added: trunk/debian/libplplot-fortran10.lintian-overrides
===================================================================
--- trunk/debian/libplplot-fortran10.lintian-overrides (rev 0)
+++ trunk/debian/libplplot-fortran10.lintian-overrides 2013-10-03 21:51:23 UTC (rev 12576)
@@ -0,0 +1 @@
+libplplot-fortran10 binary: hardening-no-fortify-functions usr/lib/*/libplplotf95d.so.10.0.0
Property changes on: trunk/debian/libplplot-fortran10.lintian-overrides
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/debian/libplplot-java.files
===================================================================
--- trunk/debian/libplplot-java.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libplplot-java.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,4 +1,4 @@
-usr/lib/jni
+usr/lib/*/jni
usr/share/java
usr/share/doc/libplplot12/examples/java
usr/share/doc/libplplot-java
Modified: trunk/debian/libplplot-lua.files
===================================================================
--- trunk/debian/libplplot-lua.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libplplot-lua.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,3 +1,3 @@
-usr/lib/lua/5.1/plplot/*.so
+usr/lib/*/lua/5.1/plplot/*.so
usr/share/doc/libplplot-lua
Added: trunk/debian/libplplot-ocaml.lintian-overrides
===================================================================
--- trunk/debian/libplplot-ocaml.lintian-overrides (rev 0)
+++ trunk/debian/libplplot-ocaml.lintian-overrides 2013-10-03 21:51:23 UTC (rev 12576)
@@ -0,0 +1,3 @@
+libplplot-ocaml binary: hardening-no-relro usr/lib/ocaml/stublibs/dllplcairo_stubs.so
+libplplot-ocaml binary: hardening-no-relro usr/lib/ocaml/stublibs/dllplplot_stubs.so
+libplplot-ocaml binary: hardening-no-fortify-functions usr/lib/ocaml/stublibs/dllplplot_stubs.so
Property changes on: trunk/debian/libplplot-ocaml.lintian-overrides
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/debian/libqsastime-dev.files
===================================================================
--- trunk/debian/libqsastime-dev.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libqsastime-dev.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,3 +1,3 @@
-usr/lib/libqsastime*.so
+usr/lib/*/libqsastime*.so
usr/include/plplot/qsas*.h
usr/share/doc/libqsastime-dev
Modified: trunk/debian/libqsastime0.files
===================================================================
--- trunk/debian/libqsastime0.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/libqsastime0.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1 +1 @@
-/usr/lib/libqsastime*.so.*
+usr/lib/*/libqsastime*.so.*
Added: trunk/debian/patches/fix-python-exec-bit.diff
===================================================================
--- trunk/debian/patches/fix-python-exec-bit.diff (rev 0)
+++ trunk/debian/patches/fix-python-exec-bit.diff 2013-10-03 21:51:23 UTC (rev 12576)
@@ -0,0 +1,23 @@
+Description: Fix incorrect executable bit on python script
+Author: Andrew Ross <and...@us...>
+Origin: upstream
+Index: plplot-5.9.10/examples/python/CMakeLists.txt
+===================================================================
+--- plplot-5.9.10.orig/examples/python/CMakeLists.txt 2013-10-01 13:10:53.000000000 +0100
++++ plplot-5.9.10/examples/python/CMakeLists.txt 2013-10-03 09:21:13.601454559 +0100
+@@ -79,7 +79,6 @@
+ xw17.py
+ xw31.py
+ plplot_logo.py
+- plplot_py_demos.py
+ test_circle.py
+ test_axis_precision.py
+ test_symbol_clip.py
+@@ -142,6 +141,7 @@
+ set(
+ python_DATA
+ ${python_DATA}
++ plplot_py_demos.py
+ README.pythondemos
+ README.rendering_tests
+ README.logo
Property changes on: trunk/debian/patches/fix-python-exec-bit.diff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/patches/series 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,12 +1,8 @@
-fix-d-examples.diff
02_unset-python-path.diff
#04_use-mkoctfile.diff
-#07_octave_prune_examples.diff
-#08_nn_link_lib.diff
-#replace-deprecated-split.diff
proper-path-handling.diff
-#fix-boolean-operators.diff
-#fix-cmake-ada-support.diff
fix-lua-includes.diff
-#fix-cmake-d-support.diff
-#java-pltr2-fix.diff
+fix-d-examples.diff
+fix-python-exec-bit.diff
+add-tcl-multiarch.diff
+support-javac-options.diff
Added: trunk/debian/plplot-tcl-bin.files
===================================================================
--- trunk/debian/plplot-tcl-bin.files (rev 0)
+++ trunk/debian/plplot-tcl-bin.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -0,0 +1,2 @@
+usr/bin/pltcl
+usr/share/doc/plplot-tcl-bin
Property changes on: trunk/debian/plplot-tcl-bin.files
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/debian/plplot-tcl-dev.files
===================================================================
--- trunk/debian/plplot-tcl-dev.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/plplot-tcl-dev.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,4 +1,4 @@
-usr/lib/lib*tcl*
+usr/lib/*/lib*tcl*
usr/include/plplot/pltcl.h
usr/include/plplot/pltk.h
usr/include/plplot/tclMatrix.h
Modified: trunk/debian/plplot-tcl-dev.lintian-overrides
===================================================================
--- trunk/debian/plplot-tcl-dev.lintian-overrides 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/plplot-tcl-dev.lintian-overrides 2013-10-03 21:51:23 UTC (rev 12576)
@@ -2,6 +2,6 @@
# by CMake and so the interpreter is replaced before the script is
# acutally run.
-plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot21/examples/tk/tk01.in #!@xtk01_LOCATION@
-plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot21/examples/tk/tk02.in #!@xtk02_LOCATION@
-plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot21/examples/tk/tk04.in #!@xtk04_LOCATION@
+plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot12/examples/tk/tk01.in #!@xtk01_LOCATION@
+plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot12/examples/tk/tk02.in #!@xtk02_LOCATION@
+plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot12/examples/tk/tk04.in #!@xtk04_LOCATION@
Modified: trunk/debian/plplot-tcl.files
===================================================================
--- trunk/debian/plplot-tcl.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/plplot-tcl.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,9 +1,8 @@
-usr/lib/lib*tcl*.so.*
-usr/bin/plserver
-usr/bin/pltcl
+usr/lib/*/lib*tcl*.so.*
+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/lib/*/plplot*/driversd/*tk*
usr/share/doc/plplot-tcl
Modified: trunk/debian/plplot12-driver-cairo.files
===================================================================
--- trunk/debian/plplot12-driver-cairo.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/plplot12-driver-cairo.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,2 +1,2 @@
-usr/lib/plplot*/driversd/cairo.*
+usr/lib/*/plplot*/driversd/cairo.*
usr/share/doc/plplot12-driver-cairo
Modified: trunk/debian/plplot12-driver-qt.files
===================================================================
--- trunk/debian/plplot12-driver-qt.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/plplot12-driver-qt.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,4 +1,4 @@
-usr/lib/plplot*/driversd/qt.*
-usr/lib/libplplotqtd.so.*
+usr/lib/*/plplot*/driversd/qt.*
+usr/lib/*/libplplotqtd.so.*
usr/share/doc/plplot12-driver-qt
usr/lib/python*/plplot_pyqt4.so
Modified: trunk/debian/plplot12-driver-wxwidgets.files
===================================================================
--- trunk/debian/plplot12-driver-wxwidgets.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/plplot12-driver-wxwidgets.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,5 +1,5 @@
-usr/lib/plplot*/driversd/wxwidgets.*
-usr/lib/libplplotwxwidgetsd.so.*
+usr/lib/*/plplot*/driversd/wxwidgets.*
+usr/lib/*/libplplotwxwidgetsd.so.*
usr/share/doc/plplot12-driver-wxwidgets
Modified: trunk/debian/plplot12-driver-xwin.files
===================================================================
--- trunk/debian/plplot12-driver-xwin.files 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/plplot12-driver-xwin.files 2013-10-03 21:51:23 UTC (rev 12576)
@@ -1,4 +1,4 @@
-usr/lib/plplot*/driversd/xwin.*
+usr/lib/*/plplot*/driversd/xwin.*
usr/share/doc/plplot12-driver-xwin
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2013-10-03 21:19:46 UTC (rev 12575)
+++ trunk/debian/rules 2013-10-03 21:51:23 UTC (rev 12576)
@@ -15,13 +15,15 @@
MDIR = $(shell octave-config --print LOCALAPIFCNFILEDIR)
OCTDIR = $(shell octave-config --print LOCALAPIOCTFILEDIR)
+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
+deblib := $(debusr)/lib/$(DEB_HOST_MULTIARCH)
debshr := $(debusr)/share
debdoc := $(debshr)/doc
debinfo := $(debshr)/info
@@ -69,13 +71,13 @@
JAVA_OPTIONS = \
-DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \
-DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \
- -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar
+ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar
CONFIGURE_OPTIONS = -DBUILD_TEST=ON \
-DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-DOCTAVE_OCT_DIR=$(OCTDIR) \
-DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON \
- -DPLD_jpeg=ON -DPLD_png=ON -DPLD_gif=ON \
-DTCL_TCLSH=/usr/bin/tclsh8.5 \
$(ADA_OPTIONS) $(JAVA_OPTIONS)
@@ -163,12 +165,12 @@
$(debex)/perl
mv $(debex) $(debdoc)/$(libpkg)
- for i in libplplot-dev plplot-tcl plplot-tcl-dev \
+ for i in libplplot-dev plplot-tcl plplot-tcl-bin plplot-tcl-dev \
plplot12-driver-xwin octave-plplot \
python-plplot-qt \
python-plplot libplplot-c++11 plplot12-driver-wxwidgets \
plplot12-driver-qt libplplot-java \
- plplot12-driver-cairo libplplot-fortran10 \
+ plplot12-driver-cairo libplplot-fortran10 \
libplplot-ocaml libplplot-lua libplplot-d ; do \
ln -s $(libpkg) $(debdoc)/$$i ; \
done
@@ -192,7 +194,7 @@
$(MAKE) DESTDIR=$(debtmp) install )
mkdir -p $(debdoc)/$(docpkg)
- (cd $(debdoc)/plplot ; mv html *.pdf *.ps.gz $(debdoc)/$(docpkg))
+ (cd $(debdoc)/plplot ; rm -f html/plplotdoc-html.proc ; mv html *.pdf *.ps.gz $(debdoc)/$(docpkg))
touch install-indep-stamp
install-python: $(PYVERS:%=install-python%)
@@ -239,7 +241,7 @@
dh_fixperms -a
dh_makeshlibs -V -a
dh_shlibdeps -a --no-package=octave-plplot -L $(libpkg) \
- -l $(debbase)/$(libpkg)/usr/lib:$(debbase)/plplot-tcl/usr/lib
+ -l $(debbase)/$(libpkg)/usr/lib/$(DEB_HOST_MULTIARCH):$(debbase)/plplot-tcl/usr/lib/$(DEB_HOST_MULTIARCH)
dpkg-shlibdeps -Tdebian/octave-plplot.substvars -S$(debbase)/$(libpkg)/usr/lib/*.so* -S/usr/lib/$(octver)/*.so* $(debbase)/octave-plplot/$(OCTDIR)/plplot_octave.oct
dh_installdeb -a
dh_lintian -a
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
