From: <and...@us...> - 2011-08-03 20:36:55
|
Revision: 11847 http://plplot.svn.sourceforge.net/plplot/?rev=11847&view=rev Author: andrewross Date: 2011-08-03 20:36:48 +0000 (Wed, 03 Aug 2011) Log Message: ----------- Add in Debian package of the ocaml bindings. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control.in branches/v5_9_8_debian/debian/rules Added Paths: ----------- branches/v5_9_8_debian/debian/libplplot9-ocaml.files.in Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-03 14:40:25 UTC (rev 11846) +++ branches/v5_9_8_debian/debian/changelog 2011-08-03 20:36:48 UTC (rev 11847) @@ -5,6 +5,8 @@ * debian/rules: + update to reflect changs in upstream ChangeLog file name. + Tidy up some old comments. + * debian/rules, debian/control.in, debian/libplplot9-ocaml.files.in: + Add new libplplot9-ocaml package which includes the ocaml bindings. -- Andrew Ross <and...@us...> Tue, 02 Aug 2011 15:41:38 +0100 Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-08-03 14:40:25 UTC (rev 11846) +++ branches/v5_9_8_debian/debian/control.in 2011-08-03 20:36:48 UTC (rev 11847) @@ -11,7 +11,9 @@ quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, python-all-dev (>= 2.6.6-3~), python-numpy (>= 1:1.4.1-4~), ttf-freefont, default-jdk, - fastjar, swig, gnat [!sh4], libqt4-dev, python-sip-dev + fastjar, swig, gnat [!sh4], libqt4-dev, python-sip-dev, + ocaml-nox, camlidl, ocaml-findlib, libcairo-ocaml-dev, + liblablgtk2-ocaml-dev Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex, ghostscript Build-Conflicts: libplplot5, octave3.0-headers @@ -318,3 +320,18 @@ 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: libplplot9-ocaml +Architecture: any +Section: libs +Depends: libplplot9, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends} +Description: Scientific plotting library (ocaml 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 + (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 OCaml bindings for PLplot. Added: branches/v5_9_8_debian/debian/libplplot9-ocaml.files.in =================================================================== --- branches/v5_9_8_debian/debian/libplplot9-ocaml.files.in (rev 0) +++ branches/v5_9_8_debian/debian/libplplot9-ocaml.files.in 2011-08-03 20:36:48 UTC (rev 11847) @@ -0,0 +1,10 @@ +usr/lib/ocaml/@OCamlABI@/stublibs/*.so +usr/lib/ocaml/@OCamlABI@/plplot/META +usr/lib/ocaml/@OCamlABI@/plplot/*.a +usr/lib/ocaml/@OCamlABI@/plplot/*.cm* +usr/lib/ocaml/@OCamlABI@/plplot/*.ml* +usr/lib/ocaml/@OCamlABI@/plcairo/META +usr/lib/ocaml/@OCamlABI@/plcairo/*.a +usr/lib/ocaml/@OCamlABI@/plcairo/*.cm* +usr/lib/ocaml/@OCamlABI@/plcairo/*.ml* + Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-08-03 14:40:25 UTC (rev 11846) +++ branches/v5_9_8_debian/debian/rules 2011-08-03 20:36:48 UTC (rev 11847) @@ -30,6 +30,9 @@ 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 armel - gnat not available on armel at the moment. @@ -56,7 +59,7 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON -DENABLE_ocaml=OFF \ + -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON -DENABLE_ocaml=ON \ -DPLD_jpeg=ON -DPLD_png=ON -DPLD_gif=ON \ -DTCL_TCLSH=/usr/bin/tclsh8.5 \ $(ADA_OPTIONS) $(JAVA_OPTIONS) @@ -64,6 +67,8 @@ BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) +ocamlinit: + for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done control: ifeq ($(BUILD_ADA),no) @@ -73,7 +78,7 @@ endif config: config-stamp -config-stamp: control +config-stamp: control ocamlinit mkdir $(BUILD_DIR) (cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ @@ -213,7 +218,7 @@ -l $(debbase)/$(libpkg)/usr/lib:$(debbase)/plplot-tcl/usr/lib octave-depends --package=octave-plplot dh_installdeb -a - dh_gencontrol -a + dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)" dh_md5sums -a dh_builddeb -a @@ -222,4 +227,4 @@ binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary config \ - patch unpatch control + patch unpatch control ocamlinit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-08-03 20:38:17
|
Revision: 11848 http://plplot.svn.sourceforge.net/plplot/?rev=11848&view=rev Author: andrewross Date: 2011-08-03 20:38:11 +0000 (Wed, 03 Aug 2011) Log Message: ----------- Change package name for ocaml Debian bindings. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control.in Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-03 20:36:48 UTC (rev 11847) +++ branches/v5_9_8_debian/debian/changelog 2011-08-03 20:38:11 UTC (rev 11848) @@ -5,8 +5,8 @@ * debian/rules: + update to reflect changs in upstream ChangeLog file name. + Tidy up some old comments. - * debian/rules, debian/control.in, debian/libplplot9-ocaml.files.in: - Add new libplplot9-ocaml package which includes the ocaml bindings. + * debian/rules, debian/control.in, debian/libplplot-ocaml.files.in: + Add new libplplot-ocaml package which includes the ocaml bindings. -- Andrew Ross <and...@us...> Tue, 02 Aug 2011 15:41:38 +0100 Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-08-03 20:36:48 UTC (rev 11847) +++ branches/v5_9_8_debian/debian/control.in 2011-08-03 20:38:11 UTC (rev 11848) @@ -321,7 +321,7 @@ C++ bindings to allow use of the PLplot API in qt applications. -Package: libplplot9-ocaml +Package: libplplot-ocaml Architecture: any Section: libs Depends: libplplot9, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-08-04 08:23:49
|
Revision: 11850 http://plplot.svn.sourceforge.net/plplot/?rev=11850&view=rev Author: andrewross Date: 2011-08-04 08:23:43 +0000 (Thu, 04 Aug 2011) Log Message: ----------- Fix up ocaml package. Add in new packages for lua and d language bindings. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control.in branches/v5_9_8_debian/debian/rules Added Paths: ----------- branches/v5_9_8_debian/debian/libplplot-d.files branches/v5_9_8_debian/debian/libplplot-lua.files branches/v5_9_8_debian/debian/libplplot-ocaml.files.in Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-03 23:11:30 UTC (rev 11849) +++ branches/v5_9_8_debian/debian/changelog 2011-08-04 08:23:43 UTC (rev 11850) @@ -7,6 +7,10 @@ + Tidy up some old comments. * debian/rules, debian/control.in, debian/libplplot-ocaml.files.in: Add new libplplot-ocaml package which includes the ocaml bindings. + * debian/rules, debian/control.in, debian/libplplot-lua.files.in: + Add new libplplot-lua package which includes the lua bindings. + * debian/rules, debian/control.in, debian/libplplot-d.files.in: + Add new libplplot-d package which includes the D language bindings. -- Andrew Ross <and...@us...> Tue, 02 Aug 2011 15:41:38 +0100 Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-08-03 23:11:30 UTC (rev 11849) +++ branches/v5_9_8_debian/debian/control.in 2011-08-04 08:23:43 UTC (rev 11850) @@ -13,7 +13,7 @@ python-numpy (>= 1:1.4.1-4~), ttf-freefont, default-jdk, fastjar, swig, gnat [!sh4], libqt4-dev, python-sip-dev, ocaml-nox, camlidl, ocaml-findlib, libcairo-ocaml-dev, - liblablgtk2-ocaml-dev + liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex, ghostscript Build-Conflicts: libplplot5, octave3.0-headers @@ -46,10 +46,11 @@ Package: libplplot-dev Architecture: any Section: libdevel -Recommends: pkg-config +Recommends: pkg-config, libplplot-c++9c2 (= ${binary:Version}), + libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):], + libplplot-ocaml, libplplot-lua, libplplot-d Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, - libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), - libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):], + libltdl3-dev ${misc:Depends} Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich @@ -64,7 +65,9 @@ Fortran and Ada with PLplot. Examples of programs for these languages are also included. For development in Tcl/Tk, Python, Octave, and Java install the plplot-tcl, python-plplot, octave-plplot and libplplot9-java packages, - respectively. + respectively. This package also includes the ocaml, lua and D examples. To use + a particular language you will also need to install the libplplot-xxx package + for that language. Package: libplplot-c++9c2 Architecture: any @@ -283,8 +286,7 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This package contains the Ada bindings for PLplot. The ada bindings are - currently under development and should be considered experimental. + This package contains the Ada bindings for PLplot. :] Package: plplot-doc Architecture: all @@ -335,3 +337,35 @@ virtually all aspects of plotting are configurable. . This package provides the OCaml bindings for PLplot. + + +Package: libplplot-lua +Architecture: any +Section: libs +Depends: libplplot9, ${shlibs:Depends}, ${misc: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 + (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 lua bindings for PLplot. + + +Package: libplplot-d +Architecture: any +Section: libs +Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} +Description: Scientific plotting library (D language 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 + (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 D language bindings for PLplot. Added: branches/v5_9_8_debian/debian/libplplot-d.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot-d.files (rev 0) +++ branches/v5_9_8_debian/debian/libplplot-d.files 2011-08-04 08:23:43 UTC (rev 11850) @@ -0,0 +1,2 @@ +usr/lib/libplplotdmdd.a + Added: branches/v5_9_8_debian/debian/libplplot-lua.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot-lua.files (rev 0) +++ branches/v5_9_8_debian/debian/libplplot-lua.files 2011-08-04 08:23:43 UTC (rev 11850) @@ -0,0 +1,2 @@ +usr/lib/lua/5.1/plplot/*.so + Added: branches/v5_9_8_debian/debian/libplplot-ocaml.files.in =================================================================== --- branches/v5_9_8_debian/debian/libplplot-ocaml.files.in (rev 0) +++ branches/v5_9_8_debian/debian/libplplot-ocaml.files.in 2011-08-04 08:23:43 UTC (rev 11850) @@ -0,0 +1,10 @@ +usr/lib/ocaml/@OCamlABI@/stublibs/*.so +usr/lib/ocaml/@OCamlABI@/plplot/META +usr/lib/ocaml/@OCamlABI@/plplot/*.a +usr/lib/ocaml/@OCamlABI@/plplot/*.cm* +usr/lib/ocaml/@OCamlABI@/plplot/*.ml* +usr/lib/ocaml/@OCamlABI@/plcairo/META +usr/lib/ocaml/@OCamlABI@/plcairo/*.a +usr/lib/ocaml/@OCamlABI@/plcairo/*.cm* +usr/lib/ocaml/@OCamlABI@/plcairo/*.ml* + Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-08-03 23:11:30 UTC (rev 11849) +++ branches/v5_9_8_debian/debian/rules 2011-08-04 08:23:43 UTC (rev 11850) @@ -59,7 +59,7 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON -DENABLE_ocaml=ON \ + -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) @@ -144,12 +144,12 @@ for i in libplplot-dev plplot-tcl plplot-tcl-dev \ plplot9-driver-gd plplot9-driver-xwin octave-plplot \ python-plplot libplplot-c++9c2 plplot9-driver-wxwidgets \ - plplot9-driver-qt \ - plplot9-driver-cairo libplplot-fortran9 ; do \ + plplot9-driver-qt libplplot9-java \ + plplot9-driver-cairo libplplot-fortran9 \ + libplplot-ocaml libplplot-lua libplplot-d ; do \ ln -s $(libpkg) $(debdoc)/$$i ; \ done - ln -s $(libpkg) $(debdoc)/libplplot9-java mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar ( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-08-04 11:53:53
|
Revision: 11854 http://plplot.svn.sourceforge.net/plplot/?rev=11854&view=rev Author: andrewross Date: 2011-08-04 11:53:47 +0000 (Thu, 04 Aug 2011) Log Message: ----------- Further cleanups to remove lintian errors and update standards version. Update Debian NEWS file. Modified Paths: -------------- branches/v5_9_8_debian/debian/NEWS branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control.in Modified: branches/v5_9_8_debian/debian/NEWS =================================================================== --- branches/v5_9_8_debian/debian/NEWS 2011-08-04 09:07:44 UTC (rev 11853) +++ branches/v5_9_8_debian/debian/NEWS 2011-08-04 11:53:47 UTC (rev 11854) @@ -1,3 +1,11 @@ +plplot (5.9.8-1) unstable; urgency=low + + New libplplot-ocaml, libplplot-lua and libplplot-d packages have been + introduced. These contain the PLplot bindings for the ocaml, lua and D + languages respectively. + + -- Andrew Ross <and...@us...> Tue, 02 Aug 2011 15:41:38 +0100 + plplot (5.9.6-1) unstable; urgency=low The plplot-bin package has been dropped since all the utilities in contained Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-04 09:07:44 UTC (rev 11853) +++ branches/v5_9_8_debian/debian/changelog 2011-08-04 11:53:47 UTC (rev 11854) @@ -11,6 +11,11 @@ Add new libplplot-lua package which includes the lua bindings. * debian/rules, debian/control.in, debian/libplplot-d.files.in: Add new libplplot-d package which includes the D language bindings. + * debian/control.in: remove dependency of libplplot9-java on default-jre + as per policy. Java libraries do not need to depend on a java runtime. + Fixes lintian warning. + * debian/control.in: Bump standards version to 3.9.2. + * debian/NEWS: update NEWS file for 5.9.8. -- Andrew Ross <and...@us...> Tue, 02 Aug 2011 15:41:38 +0100 @@ -20,7 +25,7 @@ * debian/rules: remove -DHAVE_PTHREADS=ON option as it is on by default. Option name is also likely to change in future releases. * debian/control.in, debian/rules, debian/python-plplot.files: change from - using dh_pycentral to dh_python2 (closes: #616942). + using dh_pycentral to dh_python2 (closes: #616942). Also fixes lintian warning. * debian/control.in: minor tweaks to package descriptions. -- Andrew Ross <and...@us...> Wed, 16 Mar 2011 11:10:59 +0000 Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-08-04 09:07:44 UTC (rev 11853) +++ branches/v5_9_8_debian/debian/control.in 2011-08-04 11:53:47 UTC (rev 11854) @@ -2,7 +2,7 @@ Section: math Priority: optional Maintainer: Andrew Ross <and...@us...> -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.2-headers, @@ -105,7 +105,7 @@ Package: libplplot9-java Architecture: any Section: java -Depends: default-jre, ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc: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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-08-11 10:23:42
|
Revision: 11870 http://plplot.svn.sourceforge.net/plplot/?rev=11870&view=rev Author: andrewross Date: 2011-08-11 09:41:08 +0000 (Thu, 11 Aug 2011) Log Message: ----------- Change from using ctest to using make test_noninteractive for performing tests. Should allow parallel builds to be much faster. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/rules Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-11 09:35:00 UTC (rev 11869) +++ branches/v5_9_8_debian/debian/changelog 2011-08-11 09:41:08 UTC (rev 11870) @@ -5,6 +5,8 @@ * debian/rules: + update to reflect changs in upstream ChangeLog file name. + Tidy up some old comments. + + Change from calling ctest to using "make test_noninteractive" + to run the tests. This should allow parallel builds. * debian/rules, debian/control.in, debian/libplplot-ocaml.files.in: Add new libplplot-ocaml package which includes the ocaml bindings. * debian/rules, debian/control.in, debian/libplplot-lua.files.in: Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-08-11 09:35:00 UTC (rev 11869) +++ branches/v5_9_8_debian/debian/rules 2011-08-11 09:41:08 UTC (rev 11870) @@ -90,7 +90,7 @@ build-arch-stamp: patch config-stamp dh_testdir ( cd $(BUILD_DIR) ; $(MAKE) ) - -( cd $(BUILD_DIR) ; ctest -VV ) + -( cd $(BUILD_DIR) ; $(MAKE) test_noninteractive ) touch build-arch-stamp build-indep: build-indep-stamp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-08-12 11:47:38
|
Revision: 11876 http://plplot.svn.sourceforge.net/plplot/?rev=11876&view=rev Author: andrewross Date: 2011-08-12 11:47:32 +0000 (Fri, 12 Aug 2011) Log Message: ----------- Various further changes to debian packages to fix some of the issues identified by lintian and by Alan's testing. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control.in branches/v5_9_8_debian/debian/libplplot-d.files branches/v5_9_8_debian/debian/libplplot-lua.files branches/v5_9_8_debian/debian/libplplot-ocaml.files.in branches/v5_9_8_debian/debian/patches/series branches/v5_9_8_debian/debian/rules Added Paths: ----------- branches/v5_9_8_debian/debian/patches/08_oct_perms.diff branches/v5_9_8_debian/debian/patches/09_qt_nodisplay.diff branches/v5_9_8_debian/debian/patches/10_fix_test_scripts.diff Removed Paths: ------------- branches/v5_9_8_debian/debian/pycompat Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-12 09:42:17 UTC (rev 11875) +++ branches/v5_9_8_debian/debian/changelog 2011-08-12 11:47:32 UTC (rev 11876) @@ -3,25 +3,37 @@ * New upstream release. * Rebuild against gfortran-4.6 (closes: #635739). * debian/rules: - + update to reflect changs in upstream ChangeLog file name. + + Update to reflect changs in upstream ChangeLog file name. + Tidy up some old comments. + Change from calling ctest to using "make test_noninteractive" to run the tests. Also include .NOTPARALLEL target to prevent the rules makefile being parallelised. Instead pass -j options to the plplot make files. This allows parallel builds to work correctly. + + Fix a temporary permissions problem with test script in the 5.9.8 + tarball. * debian/rules, debian/control.in, debian/libplplot-ocaml.files.in: Add new libplplot-ocaml package which includes the ocaml bindings. * debian/rules, debian/control.in, debian/libplplot-lua.files.in: Add new libplplot-lua package which includes the lua bindings. * debian/rules, debian/control.in, debian/libplplot-d.files.in: Add new libplplot-d package which includes the D language bindings. - * debian/control.in: remove dependency of libplplot9-java on default-jre - as per policy. Java libraries do not need to depend on a java runtime. - Fixes lintian warning. + * debian/control.in: + + Remove dependency of libplplot9-java on default-jre as per policy. + Java libraries do not need to depend on a java runtime. Fixes + lintian warning. + + Tidy up section / priority headers for the packages. * debian/control.in: Bump standards version to 3.9.2. * debian/NEWS: update NEWS file for 5.9.8. + * debain/patches/series, debian/patches/08_oct_perms.diff, + debian/patches/09_qt_nodisplay.diff, debian/patches/10_fix_test_scripts.diff: + + Add new patch to turn off execute permissions for plplot_octave.oct + (fixes lintian error). Add patch from upstream to enable + non-interactive qt devices to work even if DISPLAY is not set + (prevents error when running tests on a buildd / using pbuilder). Add new + upstream patch to remove spurious chmod commands from test scripts. This + ensures the installed examples will work as expected. - -- Andrew Ross <and...@us...> Tue, 02 Aug 2011 15:41:38 +0100 + -- Andrew Ross <and...@us...> Fri, 12 Aug 2011 10:23:38 +0100 plplot (5.9.7-1) UNRELEASED; urgency=low Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-08-12 09:42:17 UTC (rev 11875) +++ branches/v5_9_8_debian/debian/control.in 2011-08-12 11:47:32 UTC (rev 11876) @@ -50,8 +50,7 @@ libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):], libplplot-ocaml, libplplot-lua, libplplot-d Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, - libltdl3-dev - ${misc:Depends} + libltdl3-dev, ${misc:Depends} Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -220,6 +219,7 @@ Package: plplot9-driver-cairo Architecture: any Section: libs +Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: plplot9-driver-psttf Replaces: plplot9-driver-psttf @@ -239,6 +239,7 @@ Package: python-plplot Architecture: any Section: python +Priority: extra Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} Provides: ${python:Provides} @@ -257,6 +258,7 @@ Package: octave-plplot Architecture: any +Section: math Priority: extra Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}, ${misc:Depends} @@ -288,9 +290,11 @@ . This package contains the Ada bindings for PLplot. :] + Package: plplot-doc Architecture: all Section: doc +Priority: extra Suggests: libplplot-dev Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends} Description: Documentation for PLplot, a plotting library @@ -309,6 +313,7 @@ Package: plplot9-driver-qt Architecture: any Section: libs +Priority: extra Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (qt driver) PLplot is relatively small, portable, freely distributable, and is rich @@ -325,7 +330,8 @@ Package: libplplot-ocaml Architecture: any -Section: libs +Section: ocaml +Priority: extra Depends: libplplot9, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (ocaml bindings) PLplot is relatively small, portable, freely distributable, and is rich @@ -342,6 +348,7 @@ Package: libplplot-lua Architecture: any Section: libs +Priority: extra Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (lua bindings) PLplot is relatively small, portable, freely distributable, and is rich @@ -358,6 +365,7 @@ Package: libplplot-d Architecture: any Section: libs +Priority: extra Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (D language bindings) PLplot is relatively small, portable, freely distributable, and is rich Modified: branches/v5_9_8_debian/debian/libplplot-d.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot-d.files 2011-08-12 09:42:17 UTC (rev 11875) +++ branches/v5_9_8_debian/debian/libplplot-d.files 2011-08-12 11:47:32 UTC (rev 11876) @@ -1,2 +1,3 @@ usr/lib/libplplotdmdd.a +usr/share/doc/libplplot-d Modified: branches/v5_9_8_debian/debian/libplplot-lua.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot-lua.files 2011-08-12 09:42:17 UTC (rev 11875) +++ branches/v5_9_8_debian/debian/libplplot-lua.files 2011-08-12 11:47:32 UTC (rev 11876) @@ -1,2 +1,3 @@ usr/lib/lua/5.1/plplot/*.so +usr/share/doc/libplplot-lua Modified: branches/v5_9_8_debian/debian/libplplot-ocaml.files.in =================================================================== --- branches/v5_9_8_debian/debian/libplplot-ocaml.files.in 2011-08-12 09:42:17 UTC (rev 11875) +++ branches/v5_9_8_debian/debian/libplplot-ocaml.files.in 2011-08-12 11:47:32 UTC (rev 11876) @@ -7,4 +7,4 @@ usr/lib/ocaml/@OCamlABI@/plcairo/*.a usr/lib/ocaml/@OCamlABI@/plcairo/*.cm* usr/lib/ocaml/@OCamlABI@/plcairo/*.ml* - +usr/share/doc/libplplot-ocaml Added: branches/v5_9_8_debian/debian/patches/08_oct_perms.diff =================================================================== --- branches/v5_9_8_debian/debian/patches/08_oct_perms.diff (rev 0) +++ branches/v5_9_8_debian/debian/patches/08_oct_perms.diff 2011-08-12 11:47:32 UTC (rev 11876) @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_oct_perms.diff by Andrew Ross <and...@us...> +## +## DP: Correctly set permissions for plplot_octave.oct + +@DPATCH@ + +--- plplot-5.9.8.orig/bindings/octave/CMakeLists.txt 2011-08-12 09:11:40.000000000 +0100 ++++ plplot-5.9.8/bindings/octave/CMakeLists.txt.bak 2011-08-12 09:11:32.000000000 +0100 +@@ -314,11 +314,8 @@ + set(PERM_MODULES + OWNER_READ + OWNER_WRITE +- OWNER_EXECUTE + GROUP_READ +- GROUP_EXECUTE + WORLD_READ +- WORLD_EXECUTE + ) + + install(TARGETS plplot_octave Property changes on: branches/v5_9_8_debian/debian/patches/08_oct_perms.diff ___________________________________________________________________ Added: svn:executable + * Added: branches/v5_9_8_debian/debian/patches/09_qt_nodisplay.diff =================================================================== --- branches/v5_9_8_debian/debian/patches/09_qt_nodisplay.diff (rev 0) +++ branches/v5_9_8_debian/debian/patches/09_qt_nodisplay.diff 2011-08-12 11:47:32 UTC (rev 11876) @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_qt_nodisplay.diff by Andrew Ross <and...@us...> +## +## DP: Upstream patch so all non-interactive Qt drivers still work if DISPLAY is not set + +@DPATCH@ + +--- plplot-5.9.8.orig/drivers/qt.cpp 2011-08-12 09:11:40.000000000 +0100 ++++ plplot-5.9.8/drivers/qt.cpp 2011-08-12 09:11:32.000000000 +0100 +@@ -96,6 +96,11 @@ + argv[1] = new char[1]; + snprintf( argv[0], 10, "qt_driver" ); + argv[1][0] = '\0'; ++#ifdef Q_WS_X11 ++ // On X11 if DISPLAY is not set then cannot open GUI. This allows non-interactive devices to still work in this case. ++ if (getenv("DISPLAY") == NULL) ++ isGUI = false; ++#endif + new QApplication( argc, argv, isGUI ); + res = true; + } Property changes on: branches/v5_9_8_debian/debian/patches/09_qt_nodisplay.diff ___________________________________________________________________ Added: svn:executable + * Added: branches/v5_9_8_debian/debian/patches/10_fix_test_scripts.diff =================================================================== --- branches/v5_9_8_debian/debian/patches/10_fix_test_scripts.diff (rev 0) +++ branches/v5_9_8_debian/debian/patches/10_fix_test_scripts.diff 2011-08-12 11:47:32 UTC (rev 11876) @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_fix_test_scripts.diff by Andrew Ross <and...@us...> +## +## DP: Patch from upstream to remove superfluous chmod from test scripts so installed tests work ok. + +@DPATCH@ + +--- plplot-5.9.8.orig/plplot_test/plplot-test.sh.cmake 2011-08-02 15:26:37.000000000 +0100 ++++ plplot-5.9.8/plplot_test/plplot-test.sh.cmake.new 2011-08-12 10:19:20.000000000 +0100 +@@ -233,9 +233,6 @@ + echo "Testing interactive octave examples for device $device" + script="$scripts_dir"/test_octave_interactive.sh + fi +- if [ "@WIN32@" != "1" ] ; then +- chmod +x "$script" +- fi + @SH_EXECUTABLE@ "$script" || status=1 + + exit $status +@@ -405,9 +402,6 @@ + for i in $FRONT_END ; do + echo "Testing front-end $i" + script="$scripts_dir"/test_$i.sh +- if [ "@WIN32@" != "1" ] ; then +- chmod +x "$script" +- fi + @SH_EXECUTABLE@ "$script" || status=1 + done + Property changes on: branches/v5_9_8_debian/debian/patches/10_fix_test_scripts.diff ___________________________________________________________________ Added: svn:executable + * Modified: branches/v5_9_8_debian/debian/patches/series =================================================================== --- branches/v5_9_8_debian/debian/patches/series 2011-08-12 09:42:17 UTC (rev 11875) +++ branches/v5_9_8_debian/debian/patches/series 2011-08-12 11:47:32 UTC (rev 11876) @@ -1,3 +1,6 @@ 02_unset-python-path.diff #04_use-mkoctfile.diff #07_octave_prune_examples.diff +08_oct_perms.diff +09_qt_nodisplay.diff +10_fix_test_scripts.diff Deleted: branches/v5_9_8_debian/debian/pycompat =================================================================== --- branches/v5_9_8_debian/debian/pycompat 2011-08-12 09:42:17 UTC (rev 11875) +++ branches/v5_9_8_debian/debian/pycompat 2011-08-12 11:47:32 UTC (rev 11876) @@ -1 +0,0 @@ -2 Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-08-12 09:42:17 UTC (rev 11875) +++ branches/v5_9_8_debian/debian/rules 2011-08-12 11:47:32 UTC (rev 11876) @@ -79,6 +79,8 @@ config: config-stamp config-stamp: control ocamlinit + # Temporary fix for perms problem in 5.9.8 + chmod a+x $(SRC_DIR)/plplot_test/test_d.sh.in mkdir $(BUILD_DIR) (cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ @@ -112,9 +114,14 @@ install-arch: install-arch-stamp install-python dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \ --no-package=python-plplot \ - --no-package=libplplot9-java --no-package=libplplot-ada + --no-package=libplplot9-java --no-package=libplplot-ada \ + --no-package=libplplot-ocaml --no-package=libplplot-lua \ + --no-package=libplplot-d dh_movefiles --package=python-plplot dh_movefiles --package=libplplot9-java + dh_movefiles --package=libplplot-ocaml + dh_movefiles --package=libplplot-lua + dh_movefiles --package=libplplot-d ifeq ($(BUILD_ADA),yes) dh_movefiles --package=libplplot-ada dh_movefiles --package=libplplot-dev usr/share/ada This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-08-22 18:27:15
|
Revision: 11890 http://plplot.svn.sourceforge.net/plplot/?rev=11890&view=rev Author: andrewross Date: 2011-08-22 18:27:09 +0000 (Mon, 22 Aug 2011) Log Message: ----------- Change ocaml install location to /usr/lib/ocaml rather than /usr/lib/ocaml/3.11.2 as per current Debian practice. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/libplplot-ocaml.files.in branches/v5_9_8_debian/debian/patches/series branches/v5_9_8_debian/debian/rules Added Paths: ----------- branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-22 18:09:33 UTC (rev 11889) +++ branches/v5_9_8_debian/debian/changelog 2011-08-22 18:27:09 UTC (rev 11890) @@ -26,15 +26,19 @@ * debian/NEWS: update NEWS file for 5.9.8. * debian/patches/series, debian/patches/08_oct_perms.diff, debian/patches/09_qt_nodisplay.diff, - debian/patches/10_fix_test_scripts.diff: + debian/patches/10_fix_test_scripts.diff, + debian/patches/11_ocaml_library_location.diff: + Add new patch to turn off execute permissions for plplot_octave.oct - (fixes lintian error). Add patch from upstream to enable - non-interactive qt devices to work even if DISPLAY is not set - (prevents error when running tests on a buildd / using pbuilder). Add new - upstream patch to remove spurious chmod commands from test scripts. This - ensures the installed examples will work as expected. + (fixes lintian error). + + Add patch from upstream to enable non-interactive qt devices to work + even if DISPLAY is not set (prevents error when running tests on a + buildd / using pbuilder). + + Add new upstream patch to remove spurious chmod commands from test + scripts. This ensures the installed examples will work as expected. + + Add new upstream patch to change the install location for ocaml + libraries to remove the ocaml version (as per Debian ocaml practice). - -- Andrew Ross <and...@us...> Fri, 12 Aug 2011 10:23:38 +0100 + -- Andrew Ross <and...@us...> Mon, 22 Aug 2011 19:20:38 +0100 plplot (5.9.7-1) UNRELEASED; urgency=low Modified: branches/v5_9_8_debian/debian/libplplot-ocaml.files.in =================================================================== --- branches/v5_9_8_debian/debian/libplplot-ocaml.files.in 2011-08-22 18:09:33 UTC (rev 11889) +++ branches/v5_9_8_debian/debian/libplplot-ocaml.files.in 2011-08-22 18:27:09 UTC (rev 11890) @@ -1,10 +1,10 @@ -usr/lib/ocaml/@OCamlABI@/stublibs/*.so -usr/lib/ocaml/@OCamlABI@/plplot/META -usr/lib/ocaml/@OCamlABI@/plplot/*.a -usr/lib/ocaml/@OCamlABI@/plplot/*.cm* -usr/lib/ocaml/@OCamlABI@/plplot/*.ml* -usr/lib/ocaml/@OCamlABI@/plcairo/META -usr/lib/ocaml/@OCamlABI@/plcairo/*.a -usr/lib/ocaml/@OCamlABI@/plcairo/*.cm* -usr/lib/ocaml/@OCamlABI@/plcairo/*.ml* +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/plcairo/META +usr/lib/ocaml/plcairo/*.a +usr/lib/ocaml/plcairo/*.cm* +usr/lib/ocaml/plcairo/*.ml* usr/share/doc/libplplot-ocaml Added: branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff =================================================================== --- branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff (rev 0) +++ branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff 2011-08-22 18:27:09 UTC (rev 11890) @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_ocaml_install_location.diff by Andrew Ross <and...@us...> +## +## DP: Patch from upstream to remove ocaml version from ocaml library install path as per ocaml policy. + +@DPATCH@ + +--- plplot-5.9.8.orig/cmake/modules/ocaml.cmake 2011-08-02 15:26:05.000000000 +0100 ++++ plplot-5.9.8/cmake/modules/ocaml.cmake 2011-08-22 19:02:34.000000000 +0100 +@@ -122,7 +122,7 @@ + + # Installation follows the Debian ocaml policy for want of a better + # standard. +- set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ocaml/${OCAML_VERSION} ++ set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ocaml + CACHE PATH "install location for ocaml files" + ) + +--- plplot-5.9.8.orig/doc/docbook/src/ocaml.xml 2011-08-02 15:26:17.000000000 +0100 ++++ plplot-5.9.8/doc/docbook/src/ocaml.xml 2011-08-22 19:07:54.000000000 +@@ -209,8 +209,8 @@ + look for PLplot: + </para> + <programlisting> +- export OCAMLPATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml/$OCAML_VERSION:$OCAMLPATH +- export LD_LIBRARY_PATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml/$OCAML_VERSION/stublibs:$LD_LIBRARY_PATH ++ export OCAMLPATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml:$OCAMLPATH ++ export LD_LIBRARY_PATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml/stublibs:$LD_LIBRARY_PATH + </programlisting> + </sect2> + <sect2 id="ocaml_command_line_sample_project_core"> Property changes on: branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff ___________________________________________________________________ Added: svn:executable + * Modified: branches/v5_9_8_debian/debian/patches/series =================================================================== --- branches/v5_9_8_debian/debian/patches/series 2011-08-22 18:09:33 UTC (rev 11889) +++ branches/v5_9_8_debian/debian/patches/series 2011-08-22 18:27:09 UTC (rev 11890) @@ -4,3 +4,4 @@ 08_oct_perms.diff 09_qt_nodisplay.diff 10_fix_test_scripts.diff +11_ocaml_install_location.diff Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-08-22 18:09:33 UTC (rev 11889) +++ branches/v5_9_8_debian/debian/rules 2011-08-22 18:27:09 UTC (rev 11890) @@ -67,9 +67,6 @@ BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) -ocamlinit: - for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done - control: ifeq ($(BUILD_ADA),no) slice -o UNDEF+ADA:debian/control debian/control.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-08-22 18:38:23
|
Revision: 11891 http://plplot.svn.sourceforge.net/plplot/?rev=11891&view=rev Author: andrewross Date: 2011-08-22 18:38:17 +0000 (Mon, 22 Aug 2011) Log Message: ----------- Update ocaml patch to also remove the execute bits from the stublibs. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-22 18:27:09 UTC (rev 11890) +++ branches/v5_9_8_debian/debian/changelog 2011-08-22 18:38:17 UTC (rev 11891) @@ -36,7 +36,8 @@ + Add new upstream patch to remove spurious chmod commands from test scripts. This ensures the installed examples will work as expected. + Add new upstream patch to change the install location for ocaml - libraries to remove the ocaml version (as per Debian ocaml practice). + libraries to remove the ocaml version (as per Debian ocaml practice) + and to remove the execute permissions for the stublibs. -- Andrew Ross <and...@us...> Mon, 22 Aug 2011 19:20:38 +0100 Modified: branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff =================================================================== --- branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff 2011-08-22 18:27:09 UTC (rev 11890) +++ branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff 2011-08-22 18:38:17 UTC (rev 11891) @@ -1,7 +1,9 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 11_ocaml_install_location.diff by Andrew Ross <and...@us...> ## -## DP: Patch from upstream to remove ocaml version from ocaml library install path as per ocaml policy. +## DP: Patch from upstream to remove ocaml version from ocaml library +## DP: install path and remove executable bit for stublibs s per ocaml +## DP: policy. @DPATCH@ @@ -29,3 +31,38 @@ </programlisting> </sect2> <sect2 id="ocaml_command_line_sample_project_core"> +--- plplot-5.9.8.orig/bindings/ocaml/plcairo/CMakeLists.txt 2011-08-02 15:26:14.000000000 ++++ plplot-5.9.8/bindings/ocaml/plcairo/CMakeLists.txt 2011-08-20 20:23:44.000000000 +0100 +@@ -251,7 +251,13 @@ + ) + + # Shared library stubs go in stublibs +- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/dllplcairo_stubs.so ++ # Use default permissions (rw-r--r--) for FILES signature because ++ # those are the permissions used by install(TARGETS... (which ++ # we are trying to emulate here because that signature not ++ # available to us because this shared object was ++ # created by a custom command). ++ install( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/dllplcairo_stubs.so + DESTINATION ${OCAML_INSTALL_DIR}/stublibs + ) + +--- plplot-5.9.8.orig/bindings/ocaml/CMakeLists.txt 2011-08-02 15:26:14.000000000 ++++ plplot-5.9.8/bindings/ocaml/CMakeLists.txt 2011-08-20 20:23:44.000000000 +0100 +@@ -331,8 +331,14 @@ + DESTINATION ${OCAML_INSTALL_DIR}/plplot + ) + +- # Shared library stubs go in stublibs +- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/dllplplot_stubs.so ++ # Shared library stubs go in stublibs. ++ # Use default permissions (rw-r--r--) for FILES signature because ++ # those are the permissions used by install(TARGETS... (which ++ # we are trying to emulate here because that signature not ++ # available to us because this shared object was ++ # created by a custom command). ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/dllplplot_stubs.so + DESTINATION ${OCAML_INSTALL_DIR}/stublibs + ) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-08-22 18:42:26
|
Revision: 11892 http://plplot.svn.sourceforge.net/plplot/?rev=11892&view=rev Author: andrewross Date: 2011-08-22 18:42:19 +0000 (Mon, 22 Aug 2011) Log Message: ----------- Fix up ocaml package rules now libplplot-ocaml.files is no longer preprocessed. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/rules Added Paths: ----------- branches/v5_9_8_debian/debian/libplplot-ocaml.files Removed Paths: ------------- branches/v5_9_8_debian/debian/libplplot-ocaml.files.in Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-22 18:38:17 UTC (rev 11891) +++ branches/v5_9_8_debian/debian/changelog 2011-08-22 18:42:19 UTC (rev 11892) @@ -11,11 +11,11 @@ plplot make files. This allows parallel builds to work correctly. + Fix a temporary permissions problem with test script in the 5.9.8 tarball. - * debian/rules, debian/control.in, debian/libplplot-ocaml.files.in: + * debian/rules, debian/control.in, debian/libplplot-ocaml.files: Add new libplplot-ocaml package which includes the ocaml bindings. - * debian/rules, debian/control.in, debian/libplplot-lua.files.in: + * debian/rules, debian/control.in, debian/libplplot-lua.files: Add new libplplot-lua package which includes the lua bindings. - * debian/rules, debian/control.in, debian/libplplot-d.files.in: + * debian/rules, debian/control.in, debian/libplplot-d.files: Add new libplplot-d package which includes the D language bindings. * debian/control.in: + Remove dependency of libplplot9-java on default-jre as per policy. Copied: branches/v5_9_8_debian/debian/libplplot-ocaml.files (from rev 11890, branches/v5_9_8_debian/debian/libplplot-ocaml.files.in) =================================================================== --- branches/v5_9_8_debian/debian/libplplot-ocaml.files (rev 0) +++ branches/v5_9_8_debian/debian/libplplot-ocaml.files 2011-08-22 18:42:19 UTC (rev 11892) @@ -0,0 +1,10 @@ +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/plcairo/META +usr/lib/ocaml/plcairo/*.a +usr/lib/ocaml/plcairo/*.cm* +usr/lib/ocaml/plcairo/*.ml* +usr/share/doc/libplplot-ocaml Deleted: branches/v5_9_8_debian/debian/libplplot-ocaml.files.in =================================================================== --- branches/v5_9_8_debian/debian/libplplot-ocaml.files.in 2011-08-22 18:38:17 UTC (rev 11891) +++ branches/v5_9_8_debian/debian/libplplot-ocaml.files.in 2011-08-22 18:42:19 UTC (rev 11892) @@ -1,10 +0,0 @@ -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/plcairo/META -usr/lib/ocaml/plcairo/*.a -usr/lib/ocaml/plcairo/*.cm* -usr/lib/ocaml/plcairo/*.ml* -usr/share/doc/libplplot-ocaml Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-08-22 18:38:17 UTC (rev 11891) +++ branches/v5_9_8_debian/debian/rules 2011-08-22 18:42:19 UTC (rev 11892) @@ -75,7 +75,7 @@ endif config: config-stamp -config-stamp: control ocamlinit +config-stamp: control # Temporary fix for perms problem in 5.9.8 chmod a+x $(SRC_DIR)/plplot_test/test_d.sh.in mkdir $(BUILD_DIR) @@ -231,7 +231,7 @@ binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary config \ - patch unpatch control ocamlinit + patch unpatch control .NOTPARALLEL: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-08-24 09:16:04
|
Revision: 11897 http://plplot.svn.sourceforge.net/plplot/?rev=11897&view=rev Author: andrewross Date: 2011-08-24 09:15:57 +0000 (Wed, 24 Aug 2011) Log Message: ----------- Fix remaining issues with python and octave packages. Create a new package containing the python qt bindings. Fix a couple of other minor issues. Packages are now free of any lintian errors and mostly free of any warnings. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control branches/v5_9_8_debian/debian/control.in branches/v5_9_8_debian/debian/copyright branches/v5_9_8_debian/debian/plplot9-driver-qt.files branches/v5_9_8_debian/debian/rules Added Paths: ----------- branches/v5_9_8_debian/debian/python-plplot-qt.files Removed Paths: ------------- branches/v5_9_8_debian/debian/libplplot9-ocaml.files.in Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-23 13:43:20 UTC (rev 11896) +++ branches/v5_9_8_debian/debian/changelog 2011-08-24 09:15:57 UTC (rev 11897) @@ -1,6 +1,8 @@ plplot (5.9.8-1) unstable; urgency=low * New upstream release. + * debian/control.in: Bump standards version to 3.9.2. + * debian/NEWS: update NEWS file for 5.9.8. * Rebuild against gfortran-4.6 (closes: #635739). * debian/rules: + Update to reflect changs in upstream ChangeLog file name. @@ -11,23 +13,28 @@ plplot make files. This allows parallel builds to work correctly. + Fix a temporary permissions problem with test script in the 5.9.8 tarball. + + Fix dependency generation for octave package. + + Fix python build so that the installed example Makefiles are + properly configured. * debian/rules, debian/control.in, debian/libplplot-ocaml.files: - Add new libplplot-ocaml package which includes the ocaml bindings. + Add new libplplot-ocaml package which includes the OCaml bindings. * debian/rules, debian/control.in, debian/libplplot-lua.files: Add new libplplot-lua package which includes the lua bindings. * debian/rules, debian/control.in, debian/libplplot-d.files: Add new libplplot-d package which includes the D language bindings. + * debian/rules, debian/control.in, debian/python-plplot-qt.files: + Add new python-plplot-qt package which includes the python bindings to + alllow use of the plplot API in qt applications. * debian/control.in: + Remove dependency of libplplot9-java on default-jre as per policy. Java libraries do not need to depend on a java runtime. Fixes lintian warning. + Tidy up section / priority headers for the packages. - * debian/control.in: Bump standards version to 3.9.2. - * debian/NEWS: update NEWS file for 5.9.8. * debian/patches/series, debian/patches/08_oct_perms.diff, debian/patches/09_qt_nodisplay.diff, debian/patches/10_fix_test_scripts.diff, - debian/patches/11_ocaml_library_location.diff: + debian/patches/11_ocaml_library_location.diff, + debian/patches/12_octave_rpath.diff: + Add new patch to turn off execute permissions for plplot_octave.oct (fixes lintian error). + Add patch from upstream to enable non-interactive qt devices to work @@ -35,11 +42,15 @@ buildd / using pbuilder). + Add new upstream patch to remove spurious chmod commands from test scripts. This ensures the installed examples will work as expected. - + Add new upstream patch to change the install location for ocaml - libraries to remove the ocaml version (as per Debian ocaml practice) + + Add new upstream patch to change the install location for OCaml + libraries to remove the OCaml version (as per Debian OCaml practice) and to remove the execute permissions for the stublibs. + + Add new patch to include rpath information for octave libraries (as + mkoctfile does) to ensure they are found correctly. + * debian/copyright: Make explicit that the license is LGPL-2 (fixes + lintian warning). - -- Andrew Ross <and...@us...> Mon, 22 Aug 2011 19:20:38 +0100 + -- Andrew Ross <and...@us...> Wed, 24 Aug 2011 09:22:38 +0100 plplot (5.9.7-1) UNRELEASED; urgency=low @@ -212,7 +223,7 @@ large number of warnings. Also fixes automatic_replot support. (closes: #522423) - * debian/rules: Disable ocaml support to prevent ocaml bindings + * debian/rules: Disable OCaml support to prevent OCaml bindings being build if ocamlc is installed. [ Rafael Laboissiere ] Modified: branches/v5_9_8_debian/debian/control =================================================================== --- branches/v5_9_8_debian/debian/control 2011-08-23 13:43:20 UTC (rev 11896) +++ branches/v5_9_8_debian/debian/control 2011-08-24 09:15:57 UTC (rev 11897) @@ -11,7 +11,8 @@ quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, python-all-dev (>= 2.6.6-3~), python-numpy (>= 1:1.4.1-4~), ttf-freefont, default-jdk, - fastjar, swig, gnat [!sh4], libqt4-dev, python-sip-dev, + fastjar, swig, gnat [!sh4], libqt4-dev, python-sip-dev, + python-qt4, python-qt4-dev, ocaml-nox, camlidl, ocaml-findlib, libcairo-ocaml-dev, liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, @@ -256,6 +257,26 @@ scientific plotting library into Python applications. Examples are also provided. +Package: python-plplot-qt +Architecture: any +Section: python +Priority: extra +Depends: libplplot9 (= ${binary:Version}), python-plplot-qt (= ${binary:Version}), + plplot9-driver-qt (= ${binary:Version}), + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} +Provides: ${python:Provides} +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 + (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 python bindings to allow use of the PLplot API in + qt applications. + Package: octave-plplot Architecture: any Section: math Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-08-23 13:43:20 UTC (rev 11896) +++ branches/v5_9_8_debian/debian/control.in 2011-08-24 09:15:57 UTC (rev 11897) @@ -11,7 +11,8 @@ quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, python-all-dev (>= 2.6.6-3~), python-numpy (>= 1:1.4.1-4~), ttf-freefont, default-jdk, - fastjar, swig, gnat [!sh4], libqt4-dev, python-sip-dev, + fastjar, swig, gnat [!sh4], libqt4-dev, python-sip-dev, + python-qt4, python-qt4-dev, ocaml-nox, camlidl, ocaml-findlib, libcairo-ocaml-dev, liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, @@ -256,6 +257,26 @@ scientific plotting library into Python applications. Examples are also provided. +Package: python-plplot-qt +Architecture: any +Section: python +Priority: extra +Depends: libplplot9 (= ${binary:Version}), python-plplot-qt (= ${binary:Version}), + plplot9-driver-qt (= ${binary:Version}), + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} +Provides: ${python:Provides} +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 + (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 python bindings to allow use of the PLplot API in + qt applications. + Package: octave-plplot Architecture: any Section: math Modified: branches/v5_9_8_debian/debian/copyright =================================================================== --- branches/v5_9_8_debian/debian/copyright 2011-08-23 13:43:20 UTC (rev 11896) +++ branches/v5_9_8_debian/debian/copyright 2011-08-24 09:15:57 UTC (rev 11897) @@ -35,7 +35,7 @@ The text of this license is given in the file COPYING.LIB in the distribution directory. [In Debian systems, see the file -/usr/share/common-licenses/LGPL.] Exceptions are noted below. +/usr/share/common-licenses/LGPL-2.] Exceptions are noted below. The intent behind distributing PLplot under the LGPL is to ensure that it continues to evolve in a positive way, while remaining freely Deleted: branches/v5_9_8_debian/debian/libplplot9-ocaml.files.in =================================================================== --- branches/v5_9_8_debian/debian/libplplot9-ocaml.files.in 2011-08-23 13:43:20 UTC (rev 11896) +++ branches/v5_9_8_debian/debian/libplplot9-ocaml.files.in 2011-08-24 09:15:57 UTC (rev 11897) @@ -1,10 +0,0 @@ -usr/lib/ocaml/@OCamlABI@/stublibs/*.so -usr/lib/ocaml/@OCamlABI@/plplot/META -usr/lib/ocaml/@OCamlABI@/plplot/*.a -usr/lib/ocaml/@OCamlABI@/plplot/*.cm* -usr/lib/ocaml/@OCamlABI@/plplot/*.ml* -usr/lib/ocaml/@OCamlABI@/plcairo/META -usr/lib/ocaml/@OCamlABI@/plcairo/*.a -usr/lib/ocaml/@OCamlABI@/plcairo/*.cm* -usr/lib/ocaml/@OCamlABI@/plcairo/*.ml* - Modified: branches/v5_9_8_debian/debian/plplot9-driver-qt.files =================================================================== --- branches/v5_9_8_debian/debian/plplot9-driver-qt.files 2011-08-23 13:43:20 UTC (rev 11896) +++ branches/v5_9_8_debian/debian/plplot9-driver-qt.files 2011-08-24 09:15:57 UTC (rev 11897) @@ -1,3 +1,4 @@ usr/lib/plplot*/driversd/qt.* usr/lib/libplplotqtd.so.* usr/share/doc/plplot9-driver-qt +usr/lib/python*/plplot_pyqt4.so Added: branches/v5_9_8_debian/debian/python-plplot-qt.files =================================================================== --- branches/v5_9_8_debian/debian/python-plplot-qt.files (rev 0) +++ branches/v5_9_8_debian/debian/python-plplot-qt.files 2011-08-24 09:15:57 UTC (rev 11897) @@ -0,0 +1,2 @@ +usr/lib/python*/plplot_pyqt4.so +usr/share/doc/python-plplot-qt Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-08-23 13:43:20 UTC (rev 11896) +++ branches/v5_9_8_debian/debian/rules 2011-08-24 09:15:57 UTC (rev 11897) @@ -25,6 +25,7 @@ debdoc := $(debshr)/doc debinfo := $(debshr)/info debex := $(debshr)/plplot$(version)/examples +octver := $(shell octave-config -v) JAVA_HOME = /usr/lib/jvm/default-java @@ -82,14 +83,14 @@ (cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ JAVA_HOME=$(JAVA_HOME) \ - cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=OFF ) + cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) ) touch config-stamp build-arch: build-arch-stamp build-arch-stamp: patch config-stamp dh_testdir ( cd $(BUILD_DIR) ; $(MAKE) ) - -( cd $(BUILD_DIR) ; $(MAKE) test_noninteractive ) + -( cd $(BUILD_DIR) ; unset DISPLAY ; $(MAKE) test_noninteractive ) touch build-arch-stamp build-indep: build-indep-stamp @@ -110,10 +111,11 @@ 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 --no-package=python-plplot-qt \ --no-package=libplplot9-java --no-package=libplplot-ada \ --no-package=libplplot-ocaml --no-package=libplplot-lua \ --no-package=libplplot-d + dh_movefiles --package=python-plplot-qt dh_movefiles --package=python-plplot dh_movefiles --package=libplplot9-java dh_movefiles --package=libplplot-ocaml @@ -131,6 +133,10 @@ dh_testdir dh_testroot + # Strip bindings/octave/plplot_octave.oct as this is missed by + # dh_strip. + strip $(BUILD_DIR)/bindings/octave/plplot_octave.oct + ( cd $(BUILD_DIR) ; \ $(MAKE) DESTDIR=$(debtmp) install ) @@ -147,6 +153,7 @@ for i in libplplot-dev plplot-tcl plplot-tcl-dev \ plplot9-driver-gd plplot9-driver-xwin octave-plplot \ + python-plplot-qt \ python-plplot libplplot-c++9c2 plplot9-driver-wxwidgets \ plplot9-driver-qt libplplot9-java \ plplot9-driver-cairo libplplot-fortran9 \ @@ -175,14 +182,12 @@ touch install-indep-stamp install-python: $(PYVERS:%=install-python%) - ( cd $(BUILD_DIR)/examples/python ; $(MAKE) DESTDIR=$(debtmp) install ) - mv $(debex)/python $(debdoc)/$(libpkg)/examples touch $@ install-python%: build-arch-stamp ( cd $(BUILD_DIR) ; \ - cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/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 ; do \ + cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/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) ; \ @@ -212,14 +217,15 @@ dh_installdocs --package=$(libpkg) --package=libcsiro0 dh_installchangelogs --package=$(libpkg) --package=libcsiro0 - dh_python2 --package=python-plplot + dh_python2 --package=python-plplot-qt --package=python-plplot dh_numpy dh_strip -a dh_compress -a -Xexamples/ dh_fixperms -a dh_makeshlibs -V -a - dh_shlibdeps -a -L $(libpkg) \ - -l $(debbase)/$(libpkg)/usr/lib:$(debbase)/plplot-tcl/usr/lib + dh_shlibdeps -a --no-package=octave-plplot -L $(libpkg) \ + -l $(debbase)/$(libpkg)/usr/lib:$(debbase)/plplot-tcl/usr/lib + dpkg-shlibdeps -Tdebian/octave-plplot.substvars -S$(debbase)/$(libpkg)/usr/lib/*.so* -S/usr/lib/$(octver)/*.so* $(debbase)/octave-plplot/$(OCTDIR)/plplot_octave.oct octave-depends --package=octave-plplot dh_installdeb -a dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-02 07:04:19
|
Revision: 11901 http://plplot.svn.sourceforge.net/plplot/?rev=11901&view=rev Author: andrewross Date: 2011-09-02 07:04:12 +0000 (Fri, 02 Sep 2011) Log Message: ----------- Upgrade debian packages names to reflect soname version change from 9 to 11 for C library and for 9 to 10 for C++ library. Modified Paths: -------------- branches/v5_9_8_debian/debian/NEWS branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control branches/v5_9_8_debian/debian/control.in branches/v5_9_8_debian/debian/libplplot-dev.files branches/v5_9_8_debian/debian/libplplot-fortran9.files branches/v5_9_8_debian/debian/octave-plplot.files branches/v5_9_8_debian/debian/plplot-tcl-dev.files branches/v5_9_8_debian/debian/python-plplot.files branches/v5_9_8_debian/debian/rules Added Paths: ----------- branches/v5_9_8_debian/debian/libplplot-c++10.files branches/v5_9_8_debian/debian/libplplot-java.files branches/v5_9_8_debian/debian/libplplot11.README.Debian branches/v5_9_8_debian/debian/libplplot11.files branches/v5_9_8_debian/debian/libqsastime-dev.files branches/v5_9_8_debian/debian/libqsastime0.files branches/v5_9_8_debian/debian/plplot11-driver-cairo.files branches/v5_9_8_debian/debian/plplot11-driver-gd.files branches/v5_9_8_debian/debian/plplot11-driver-qt.files branches/v5_9_8_debian/debian/plplot11-driver-wxwidgets.files branches/v5_9_8_debian/debian/plplot11-driver-xwin.files Removed Paths: ------------- branches/v5_9_8_debian/debian/libplplot-c++9.files branches/v5_9_8_debian/debian/libplplot-c++9c2.files branches/v5_9_8_debian/debian/libplplot9-java.files branches/v5_9_8_debian/debian/libplplot9.README.Debian branches/v5_9_8_debian/debian/libplplot9.files branches/v5_9_8_debian/debian/plplot9-driver-cairo.files branches/v5_9_8_debian/debian/plplot9-driver-gd.files branches/v5_9_8_debian/debian/plplot9-driver-qt.files branches/v5_9_8_debian/debian/plplot9-driver-wxwidgets.files branches/v5_9_8_debian/debian/plplot9-driver-xwin.files Modified: branches/v5_9_8_debian/debian/NEWS =================================================================== --- branches/v5_9_8_debian/debian/NEWS 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/NEWS 2011-09-02 07:04:12 UTC (rev 11901) @@ -2,8 +2,11 @@ New libplplot-ocaml, libplplot-lua and libplplot-d packages have been introduced. These contain the PLplot bindings for the ocaml, lua and D - languages respectively. + languages respectively. + New python-plplot-qt package has been introduced which allows the PLplot + API to be used in Qt applications from python using pyqt4. + -- Andrew Ross <and...@us...> Tue, 02 Aug 2011 15:41:38 +0100 plplot (5.9.6-1) unstable; urgency=low Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/changelog 2011-09-02 07:04:12 UTC (rev 11901) @@ -3,6 +3,8 @@ * New upstream release. * debian/control.in: Bump standards version to 3.9.2. * debian/NEWS: update NEWS file for 5.9.8. + * debian/control.in, debian/rules, debian/*.files: + Rename packages to reflect bump in SONAME version. * Rebuild against gfortran-4.6 (closes: #635739). * debian/rules: + Update to reflect changes in upstream ChangeLog file name. @@ -26,7 +28,7 @@ Add new python-plplot-qt package which includes the python bindings to allow use of the plplot API in qt applications. * debian/control.in: - + Remove dependency of libplplot9-java on default-jre as per policy. + + Remove dependency of libplplot-java on default-jre as per policy. Java libraries do not need to depend on a java runtime. Fixes lintian warning. + Tidy up section / priority headers for the packages. @@ -46,6 +48,12 @@ and to remove the execute permissions for the stublibs. * debian/copyright: Make explicit that the license is LGPL-2 (fixes lintian warning). + * debian/control.in, debian/rules, debian/libqsastime0.files, + debian/libqsastime-dev.file: + Split libqsastime off into separate library and devel packages. + * debian/libplplot-dev.files, debian/libplplot-fortran9.files: + Move fortran .h and .mod files to the libplplot-dev package as these + are required for compiling fortran with plplot and not for runtime. -- Andrew Ross <and...@us...> Wed, 24 Aug 2011 09:22:38 +0100 @@ -1143,7 +1151,7 @@ - debian/rules - debian/libplplot9.README.Debian (new) - debian/libplplot9.files (new) - * In order to avoid backward incompatibilities withe the release of + * In order to avoid backward incompatibilities with the release of libplplot9, the driver module packages have now versioned names: - plplot9-driver-gd - plplot9-driver-xwin Modified: branches/v5_9_8_debian/debian/control =================================================================== --- branches/v5_9_8_debian/debian/control 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/control 2011-09-02 07:04:12 UTC (rev 11901) @@ -23,13 +23,13 @@ Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian Vcs-Browser: http://plplot.svn.sourceforge.net/viewvc/plplot/trunk/debian/ -Package: libplplot9 +Package: libplplot11 Architecture: any Section: libs -Conflicts: libplplot5, plplot (<< 5) +Conflicts: libplplot9 Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: plplot9-driver-xwin, plplot9-driver-gd, - plplot9-driver-cairo, plplot9-driver-wxwidgets, plplot-tcl +Suggests: plplot11-driver-xwin, plplot11-driver-gd, + plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot11-tcl Replaces: plplot-bin (<< 5.9.6-1) Breaks: plplot-bin (<<5.9.6-1) Description: Scientific plotting library @@ -47,11 +47,12 @@ Package: libplplot-dev Architecture: any Section: libdevel -Recommends: pkg-config, libplplot-c++9c2 (= ${binary:Version}), +Recommends: pkg-config, libplplot-c++10 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version}), libplplot-ada (= ${binary:Version}), libplplot-ocaml, libplplot-lua, libplplot-d -Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, +Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, ${misc:Depends} +Conflicts: libplplot-fortran9 (<< 5.9.8-1) Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -64,16 +65,16 @@ This package contains all that is needed for doing development in C, C++, Fortran and Ada with PLplot. Examples of programs for these languages are also included. For development in Tcl/Tk, Python, Octave, and Java install - the plplot-tcl, python-plplot, octave-plplot and libplplot9-java packages, + the plplot-tcl, python-plplot, octave-plplot and libplplot-java packages, respectively. This package also includes the OCaml, lua and D examples. To use a particular language you will also need to install the libplplot-xxx package for that language. -Package: libplplot-c++9c2 +Package: libplplot-c++10 Architecture: any Section: libs -Conflicts: libplplot5, libplplot-c++9 -Replaces: libplplot-c++9 +Conflicts: libplplot5, libplplot-c++9, libplplot-c++9c2 +Replaces: libplplot-c++9c2 Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (C++ binding) PLplot is relatively small, portable, freely distributable, and is rich @@ -102,9 +103,11 @@ This package contains the Fortran 77 and Fortran 95 bindings for PLplot. -Package: libplplot9-java +Package: libplplot-java Architecture: any Section: java +Breaks: libplplot9-java +Replaces: libplplot9-java Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (Java bindings) PLplot is relatively small, portable, freely distributable, and is rich @@ -120,7 +123,7 @@ Package: libcsiro0 Architecture: any Section: libs -Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303) +Conflicts: libplplot9 (<< 5.3.0.cvs.20040303) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (CSIRO libraries) This package contains two libraries developed by Pavel Sakov, from the @@ -132,10 +135,43 @@ The source code for these libraries are part of the plplot source package. -Package: plplot9-driver-xwin +Package: libqsastime0 Architecture: any Section: libs +Conflicts: libplplot9 Depends: ${shlibs:Depends}, ${misc: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 + routines by allow high precision time variables over a large range + of ranges of dates and by correctly handling leap seconds. It was + designed with the needs of scientific data plotting in mind. This + package provides the runtime library. + . + The source code for this library is part of the plplot source + package. + +Package: libqsastime-dev +Architecture: any +Section: libdevel +Conflicts: libplplot-dev (<< 5.9.8-1) +Depends: ${shlibs:Depends}, ${misc: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 + routines by allow high precision time variables over a large range + of ranges of dates and by correctly handling leap seconds. It was + designed with the needs of scientific data plotting in mind. This + package provides the necessary files to do development with + libqsastime. + . + The source code for this library is part of the plplot source + package. + +Package: plplot11-driver-xwin +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: plplot-lib, plplot (<< 5) Description: Scientific plotting library (X11 driver) PLplot is relatively small, portable, freely distributable, and is rich @@ -148,10 +184,10 @@ . This package provides the X11 driver module for PLplot. -Package: plplot9-driver-wxwidgets +Package: plplot11-driver-wxwidgets Architecture: any Section: libs -Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends} 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 @@ -166,7 +202,7 @@ Package: plplot-tcl Architecture: any Priority: extra -Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends} +Depends: plplot11-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 enough to satisfy most users. It has a wide range of plot types including @@ -183,7 +219,7 @@ Package: plplot-tcl-dev Architecture: any Priority: extra -Depends: libplplot9 (= ${binary:Version}), plplot-tcl, ${misc:Depends} +Depends: libplplot11 (= ${binary:Version}), plplot-tcl, ${misc:Depends} Conflicts: 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 @@ -197,7 +233,7 @@ This package contains the necessary files to do development in Tcl/Tk with PLplot: header files, shared libraries links, and examples. -Package: plplot9-driver-gd +Package: plplot11-driver-gd Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -217,13 +253,11 @@ dropped in a future release. The cairo and qt drivers offer newer, and better alternatives. -Package: plplot9-driver-cairo +Package: plplot11-driver-cairo Architecture: any Section: libs Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: plplot9-driver-psttf -Replaces: plplot9-driver-psttf 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 @@ -241,7 +275,7 @@ Architecture: any Section: python Priority: extra -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, +Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} Provides: ${python:Provides} Description: Python support for PLplot, a plotting library @@ -261,8 +295,8 @@ Architecture: any Section: python Priority: extra -Depends: libplplot9 (= ${binary:Version}), python-plplot-qt (= ${binary:Version}), - plplot9-driver-qt (= ${binary:Version}), +Depends: libplplot11 (= ${binary:Version}), python-plplot-qt (= ${binary:Version}), + plplot11-driver-qt (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} Provides: ${python:Provides} Description: Scientific plotting library (python qt GUI) @@ -281,7 +315,7 @@ Architecture: any Section: math Priority: extra -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}, +Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}, ${misc:Depends} Description: Octave support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich @@ -299,7 +333,7 @@ Package: libplplot-ada Architecture: any Priority: extra -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Ada 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 @@ -331,11 +365,11 @@ PLplot documentation. It also contains the man pages for the API functions. -Package: plplot9-driver-qt +Package: plplot11-driver-qt Architecture: any Section: libs Priority: extra -Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ${shlibs:Depends}, ${misc: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 @@ -353,7 +387,7 @@ Architecture: any Section: ocaml Priority: extra -Depends: libplplot9, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (OCaml 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 @@ -370,7 +404,7 @@ Architecture: any Section: libs Priority: extra -Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ${shlibs:Depends}, ${misc: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 @@ -387,7 +421,7 @@ Architecture: any Section: libs Priority: extra -Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (D language 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 Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/control.in 2011-09-02 07:04:12 UTC (rev 11901) @@ -23,13 +23,13 @@ Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian Vcs-Browser: http://plplot.svn.sourceforge.net/viewvc/plplot/trunk/debian/ -Package: libplplot9 +Package: libplplot11 Architecture: any Section: libs -Conflicts: libplplot5, plplot (<< 5) +Conflicts: libplplot9 Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: plplot9-driver-xwin, plplot9-driver-gd, - plplot9-driver-cairo, plplot9-driver-wxwidgets, plplot-tcl +Suggests: plplot11-driver-xwin, plplot11-driver-gd, + plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot11-tcl Replaces: plplot-bin (<< 5.9.6-1) Breaks: plplot-bin (<<5.9.6-1) Description: Scientific plotting library @@ -47,11 +47,12 @@ Package: libplplot-dev Architecture: any Section: libdevel -Recommends: pkg-config, libplplot-c++9c2 (= ${binary:Version}), +Recommends: pkg-config, libplplot-c++10 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):], libplplot-ocaml, libplplot-lua, libplplot-d -Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, +Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, ${misc:Depends} +Conflicts: libplplot-fortran9 (<< 5.9.8-1) Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -64,16 +65,16 @@ This package contains all that is needed for doing development in C, C++, Fortran and Ada with PLplot. Examples of programs for these languages are also included. For development in Tcl/Tk, Python, Octave, and Java install - the plplot-tcl, python-plplot, octave-plplot and libplplot9-java packages, + the plplot-tcl, python-plplot, octave-plplot and libplplot-java packages, respectively. This package also includes the OCaml, lua and D examples. To use a particular language you will also need to install the libplplot-xxx package for that language. -Package: libplplot-c++9c2 +Package: libplplot-c++10 Architecture: any Section: libs -Conflicts: libplplot5, libplplot-c++9 -Replaces: libplplot-c++9 +Conflicts: libplplot5, libplplot-c++9, libplplot-c++9c2 +Replaces: libplplot-c++9c2 Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (C++ binding) PLplot is relatively small, portable, freely distributable, and is rich @@ -102,9 +103,11 @@ This package contains the Fortran 77 and Fortran 95 bindings for PLplot. -Package: libplplot9-java +Package: libplplot-java Architecture: any Section: java +Breaks: libplplot9-java +Replaces: libplplot9-java Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (Java bindings) PLplot is relatively small, portable, freely distributable, and is rich @@ -120,7 +123,7 @@ Package: libcsiro0 Architecture: any Section: libs -Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303) +Conflicts: libplplot9 (<< 5.3.0.cvs.20040303) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (CSIRO libraries) This package contains two libraries developed by Pavel Sakov, from the @@ -132,10 +135,43 @@ The source code for these libraries are part of the plplot source package. -Package: plplot9-driver-xwin +Package: libqsastime0 Architecture: any Section: libs +Conflicts: libplplot9 Depends: ${shlibs:Depends}, ${misc: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 + routines by allow high precision time variables over a large range + of ranges of dates and by correctly handling leap seconds. It was + designed with the needs of scientific data plotting in mind. This + package provides the runtime library. + . + The source code for this library is part of the plplot source + package. + +Package: libqsastime-dev +Architecture: any +Section: libdevel +Conflicts: libplplot-dev (<< 5.9.8-1) +Depends: ${shlibs:Depends}, ${misc: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 + routines by allow high precision time variables over a large range + of ranges of dates and by correctly handling leap seconds. It was + designed with the needs of scientific data plotting in mind. This + package provides the necessary files to do development with + libqsastime. + . + The source code for this library is part of the plplot source + package. + +Package: plplot11-driver-xwin +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: plplot-lib, plplot (<< 5) Description: Scientific plotting library (X11 driver) PLplot is relatively small, portable, freely distributable, and is rich @@ -148,10 +184,10 @@ . This package provides the X11 driver module for PLplot. -Package: plplot9-driver-wxwidgets +Package: plplot11-driver-wxwidgets Architecture: any Section: libs -Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends} 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 @@ -166,7 +202,7 @@ Package: plplot-tcl Architecture: any Priority: extra -Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends} +Depends: plplot11-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 enough to satisfy most users. It has a wide range of plot types including @@ -183,7 +219,7 @@ Package: plplot-tcl-dev Architecture: any Priority: extra -Depends: libplplot9 (= ${binary:Version}), plplot-tcl, ${misc:Depends} +Depends: libplplot11 (= ${binary:Version}), plplot-tcl, ${misc:Depends} Conflicts: 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 @@ -197,7 +233,7 @@ This package contains the necessary files to do development in Tcl/Tk with PLplot: header files, shared libraries links, and examples. -Package: plplot9-driver-gd +Package: plplot11-driver-gd Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -217,13 +253,11 @@ dropped in a future release. The cairo and qt drivers offer newer, and better alternatives. -Package: plplot9-driver-cairo +Package: plplot11-driver-cairo Architecture: any Section: libs Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: plplot9-driver-psttf -Replaces: plplot9-driver-psttf 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 @@ -241,7 +275,7 @@ Architecture: any Section: python Priority: extra -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, +Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} Provides: ${python:Provides} Description: Python support for PLplot, a plotting library @@ -261,8 +295,8 @@ Architecture: any Section: python Priority: extra -Depends: libplplot9 (= ${binary:Version}), python-plplot-qt (= ${binary:Version}), - plplot9-driver-qt (= ${binary:Version}), +Depends: libplplot11 (= ${binary:Version}), python-plplot-qt (= ${binary:Version}), + plplot11-driver-qt (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} Provides: ${python:Provides} Description: Scientific plotting library (python qt GUI) @@ -281,7 +315,7 @@ Architecture: any Section: math Priority: extra -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}, +Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}, ${misc:Depends} Description: Octave support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich @@ -299,7 +333,7 @@ [ADA:Package: libplplot-ada Architecture: any Priority: extra -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Ada 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 @@ -331,11 +365,11 @@ PLplot documentation. It also contains the man pages for the API functions. -Package: plplot9-driver-qt +Package: plplot11-driver-qt Architecture: any Section: libs Priority: extra -Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ${shlibs:Depends}, ${misc: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 @@ -353,7 +387,7 @@ Architecture: any Section: ocaml Priority: extra -Depends: libplplot9, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (OCaml 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 @@ -370,7 +404,7 @@ Architecture: any Section: libs Priority: extra -Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ${shlibs:Depends}, ${misc: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 @@ -387,7 +421,7 @@ Architecture: any Section: libs Priority: extra -Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (D language 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 Copied: branches/v5_9_8_debian/debian/libplplot-c++10.files (from rev 11897, branches/v5_9_8_debian/debian/libplplot-c++9c2.files) =================================================================== --- branches/v5_9_8_debian/debian/libplplot-c++10.files (rev 0) +++ branches/v5_9_8_debian/debian/libplplot-c++10.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1,2 @@ +usr/lib/libplplotcxxd.so.* +usr/share/doc/libplplot-c++10 Deleted: branches/v5_9_8_debian/debian/libplplot-c++9.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot-c++9.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/libplplot-c++9.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,2 +0,0 @@ -usr/lib/libplplotcxxd.so.* -usr/share/doc/libplplot-c++9 Deleted: branches/v5_9_8_debian/debian/libplplot-c++9c2.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot-c++9c2.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/libplplot-c++9c2.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,2 +0,0 @@ -usr/lib/libplplotcxxd.so.* -usr/share/doc/libplplot-c++9c2 Modified: branches/v5_9_8_debian/debian/libplplot-dev.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot-dev.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/libplplot-dev.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -2,7 +2,8 @@ usr/lib/lib*.a usr/lib/lib*.la usr/lib/lib*.so +usr/lib/fortran usr/lib/pkgconfig -usr/share/doc/libplplot9/examples -usr/share/doc/libplplot9/README.pkg-config +usr/share/doc/libplplot11/examples +usr/share/doc/libplplot11/README.pkg-config usr/share/doc/libplplot-dev Modified: branches/v5_9_8_debian/debian/libplplot-fortran9.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot-fortran9.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/libplplot-fortran9.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,3 +1,2 @@ usr/lib/libplplotf*.so.* -usr/lib/fortran usr/share/doc/libplplot-fortran9 Copied: branches/v5_9_8_debian/debian/libplplot-java.files (from rev 11897, branches/v5_9_8_debian/debian/libplplot9-java.files) =================================================================== --- branches/v5_9_8_debian/debian/libplplot-java.files (rev 0) +++ branches/v5_9_8_debian/debian/libplplot-java.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1,4 @@ +usr/lib/jni +usr/share/java +usr/share/doc/libplplot11/examples/java +usr/share/doc/libplplot-java Copied: branches/v5_9_8_debian/debian/libplplot11.README.Debian (from rev 11897, branches/v5_9_8_debian/debian/libplplot9.README.Debian) =================================================================== --- branches/v5_9_8_debian/debian/libplplot11.README.Debian (rev 0) +++ branches/v5_9_8_debian/debian/libplplot11.README.Debian 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1,100 @@ +plplot for Debian +----------------- + +1. INTRODUCTION & ORIGIN + + These are the debianized packages for PLplot, a scientific plotting + library. They were put together by Rafael Laboissiere. The porting + to the new CMake build system was done by Andrew Ross. + + +2. PACKAGES + + The original PLplot distribution was broken down in several Debian + packages: + + * libplplot11: Contains the shared C libraries, as well as the + data files and the driver modules that do not depend on other + libraries. + + * libplplot-dev: Headers and static libraries for developing programs + using the PLplot API, as well as many examples in C, C++, and + Fortran77. + + * plplot-doc: HTML, PS and PDF formats of the PLplot manual. + + * plplot11-driver-xwin: Provides the xwin driver module. + + * plplot11-driver-gd: Provides the GD driver module, which allows + direct generation of PNG and JPEG files. + + * plplot11-driver-cairo: Provides the cairo driver module. This uses + the cairo library to produce higher quality text using truetype + fonts. It produces postscript, pdf, svg, png, mem and X output. + This replaces the plplot9-driver-psttf package in previous + releases. The cairo driver provides similar results for postscript + and more functionality. + + * plplot11-driver-wxwidgets: Provides the WXWidgets driver module. + + * plplot11-driver-qt: Provides the qt driver module. + + * libplplot-c++10: Contains the library for using the C++ PLplot + classes. + + * libplplot-fortran9: Contains the F77 and F90 bindings for + the PLplot functions. + + * libplplot-java: Contains the bindings for using the PLplot + functions from java. + + * libplplot-ada: Contains the Ada bindings for the PLplot functions. + + * libplplot-ocaml: Contains the OCaml bindings for the PLplot functions. + + * libplplot-lua: Contains the lua bindings for the PLplot functions. + + * libplplot-d: Contains the d language bindings for the PLplot functions. + + * plplot-tcl: Modules allowing binding of the PLplot functions + for Tcl/Tk. Contains also the Tk driver module and some interactive + programs + + * plplot-tcl-dev: Development files for the Tcl/Tk biondings. + + * python-plplot: Glue library with bindings for Python. + + * python-plplot-qt: Bindings to use the plplot API in Qt applications + from python with pyqt4. + + * octave-plplot: Glue library with bindings for Octave 3.2. In order + to use this package, issue the command "toggle_plplot_use" at the + Octave 3.2 prompt. This will have the effect of replacing the + traditional Gnuplot interface by a PLplot based one. + + * libcsiro0: libcsirocsa and libcsironn libraries from Pavel Sakov + at CSIRO which are used by PLplot. + + * libqsastime0, libqsastime-dev: library and development packages for + the qsastime library for handling time format conversions. This is + use by PLplot. + + +3. DOCUMENTATION + + Further documentation for PLplot can be found in the plplot-doc + package. The entry point is /usr/share/doc/plplot-doc. + + +4. DEMOS & EXAMPLES + + A lot of examples were included in the libplplot-dev, plplot-tcl, + python-plplot, and octave-plplot packages. They can be found under + /usr/share/doc/libplplot11/examples/. Makefiles are available along the + sources. + + For development of C programs with the PLplot library, there is a + pkg-config support included in the libplplot-dev package. For details, + see /usr/share/doc/libplplot-dev/README.pkg-config. + + -- Rafael Laboissiere <ra...@de...>, Tue Mar 4 17:05:31 2003 Copied: branches/v5_9_8_debian/debian/libplplot11.files (from rev 11897, branches/v5_9_8_debian/debian/libplplot9.files) =================================================================== --- branches/v5_9_8_debian/debian/libplplot11.files (rev 0) +++ branches/v5_9_8_debian/debian/libplplot11.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1,7 @@ +usr/lib +usr/share/plplot*/*.map +usr/share/plplot*/*.fnt +usr/share/plplot*/*.pal +usr/share/doc/libplplot11 + + Deleted: branches/v5_9_8_debian/debian/libplplot9-java.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot9-java.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/libplplot9-java.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,4 +0,0 @@ -usr/lib/jni -usr/share/java -usr/share/doc/libplplot9/examples/java -usr/share/doc/libplplot9-java Deleted: branches/v5_9_8_debian/debian/libplplot9.README.Debian =================================================================== --- branches/v5_9_8_debian/debian/libplplot9.README.Debian 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/libplplot9.README.Debian 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,83 +0,0 @@ -plplot for Debian ------------------ - -1. INTRODUCTION & ORIGIN - - These are the debianized packages for PLplot, a scientific plotting - library. They were put together by Rafael Laboissiere. The porting - to the new CMake build system was done by Andrew Ross. - - -2. PACKAGES - - The original PLplot distribution was broken down in several Debian - packages: - - * libplplot9: Contains the shared C libraries, as well as the - data files and the driver modules that do not depend on other - libraries. - - * libplplot-dev: Headers and static libraries for developing programs - using the PLplot API, as well as many examples in C, C++, and - Fortran77. - - * plplot-doc: HTML, PS and PDF formats of the PLplot manual. - - * plplot9-driver-xwin: Provides the xwin driver module. - - * plplot9-driver-gd: Provides the GD driver module, which allows - direct generation of PNG and JPEG files. - - * plplot9-driver-cairo: Provides the cairo driver module. This uses - the cairo library to produce higher quality text using truetype - fonts. It produces postscript, pdf, svg, png, mem and X output. - This replaces the plplot9-driver-psttf package in previous - releases. The cairo driver provides similar results for postscript - and more functionality. - - * plplot9-driver-wxwidgets: Provides the WXWidgets driver module. - - * libplplot-c++9c2: Contains the library for using the C++ PLplot - classes. - - * libplplot-fortran9: Contains the F77 and F90 bindings for - the PLplot functions. - - * libplplot9-java: Contains the bindings for using the PLplot - functions from java. This package is currently empty on arm due - to problems with java-gcj-compat-dev on this platform. - - * libplplot9-ada: Contains the Ada bindings for the PLplot functions. - - * plplot-tcl: Modules allowing binding of the PLplot functions - for Tcl/Tk. Contains also the Tk driver module and some interactive - programs - - * plplot-tcl-dev: Development files for the Tcl/Tk biondings. - - * python-plplot: Glue library with bindings for Python. - - * octave-plplot: Glue library with bindings for Octave 2.9. In order - to use this package, issue the command "toggle_plplot_use" at the - Octave 2.9 prompt. This will have the effect of replacing the - traditional Gnuplot interface by a PLplot based one. - - -3. DOCUMENTATION - - Further documentation for PLplot can be found in the plplot-doc - package. The entry point is /usr/share/doc/plplot-doc. - - -4. DEMOS & EXAMPLES - - A lot of examples were included in the libplplot-dev, plplot-tcl, - python-plplot, and octave-plplot packages. They can be found under - /usr/share/doc/libplplot9/examples/. Makefiles are available along the - sources. - - For development of C programs with the PLplot library, there is a - pkg-config support included in the libplplot-dev package. For details, - see /usr/share/doc/libplplot-dev/README.pkg-config. - - -- Rafael Laboissiere <ra...@de...>, Tue Mar 4 17:05:31 2003 Deleted: branches/v5_9_8_debian/debian/libplplot9.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot9.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/libplplot9.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,7 +0,0 @@ -usr/lib -usr/share/plplot*/*.map -usr/share/plplot*/*.fnt -usr/share/plplot*/*.pal -usr/share/doc/libplplot9 - - Added: branches/v5_9_8_debian/debian/libqsastime-dev.files =================================================================== --- branches/v5_9_8_debian/debian/libqsastime-dev.files (rev 0) +++ branches/v5_9_8_debian/debian/libqsastime-dev.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1,2 @@ +usr/lib/libqsastime*.so +usr/include/plplot/qsas*.h Property changes on: branches/v5_9_8_debian/debian/libqsastime-dev.files ___________________________________________________________________ Added: svn:eol-style + native Added: branches/v5_9_8_debian/debian/libqsastime0.files =================================================================== --- branches/v5_9_8_debian/debian/libqsastime0.files (rev 0) +++ branches/v5_9_8_debian/debian/libqsastime0.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1 @@ +/usr/lib/libqsastime*.so.* Property changes on: branches/v5_9_8_debian/debian/libqsastime0.files ___________________________________________________________________ Added: svn:eol-style + native Modified: branches/v5_9_8_debian/debian/octave-plplot.files =================================================================== --- branches/v5_9_8_debian/debian/octave-plplot.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/octave-plplot.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,6 +1,6 @@ usr/share/plplot_octave usr/share/octave/site/m/PLplot usr/lib/octave -usr/share/doc/libplplot9/*.octave -usr/share/doc/libplplot9/examples/*octave* +usr/share/doc/libplplot11/*.octave +usr/share/doc/libplplot11/examples/*octave* usr/share/doc/octave-plplot Modified: branches/v5_9_8_debian/debian/plplot-tcl-dev.files =================================================================== --- branches/v5_9_8_debian/debian/plplot-tcl-dev.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/plplot-tcl-dev.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -3,5 +3,5 @@ usr/include/plplot/pltk.h usr/include/plplot/tclMatrix.h usr/share/doc/plplot-tcl-dev -usr/share/doc/libplplot9/examples/*tcl* -usr/share/doc/libplplot9/examples/tk +usr/share/doc/libplplot11/examples/*tcl* +usr/share/doc/libplplot11/examples/tk Copied: branches/v5_9_8_debian/debian/plplot11-driver-cairo.files (from rev 11897, branches/v5_9_8_debian/debian/plplot9-driver-cairo.files) =================================================================== --- branches/v5_9_8_debian/debian/plplot11-driver-cairo.files (rev 0) +++ branches/v5_9_8_debian/debian/plplot11-driver-cairo.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1,2 @@ +usr/lib/plplot*/driversd/cairo.* +usr/share/doc/plplot11-driver-cairo Copied: branches/v5_9_8_debian/debian/plplot11-driver-gd.files (from rev 11897, branches/v5_9_8_debian/debian/plplot9-driver-gd.files) =================================================================== --- branches/v5_9_8_debian/debian/plplot11-driver-gd.files (rev 0) +++ branches/v5_9_8_debian/debian/plplot11-driver-gd.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1,4 @@ +usr/lib/plplot*/driversd/gd.* +usr/share/doc/plplot11-driver-gd + + Copied: branches/v5_9_8_debian/debian/plplot11-driver-qt.files (from rev 11897, branches/v5_9_8_debian/debian/plplot9-driver-qt.files) =================================================================== --- branches/v5_9_8_debian/debian/plplot11-driver-qt.files (rev 0) +++ branches/v5_9_8_debian/debian/plplot11-driver-qt.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1,4 @@ +usr/lib/plplot*/driversd/qt.* +usr/lib/libplplotqtd.so.* +usr/share/doc/plplot11-driver-qt +usr/lib/python*/plplot_pyqt4.so Copied: branches/v5_9_8_debian/debian/plplot11-driver-wxwidgets.files (from rev 11897, branches/v5_9_8_debian/debian/plplot9-driver-wxwidgets.files) =================================================================== --- branches/v5_9_8_debian/debian/plplot11-driver-wxwidgets.files (rev 0) +++ branches/v5_9_8_debian/debian/plplot11-driver-wxwidgets.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1,5 @@ +usr/lib/plplot*/driversd/wxwidgets.* +usr/lib/libplplotwxwidgetsd.so.* +usr/share/doc/plplot11-driver-wxwidgets + + Copied: branches/v5_9_8_debian/debian/plplot11-driver-xwin.files (from rev 11897, branches/v5_9_8_debian/debian/plplot9-driver-xwin.files) =================================================================== --- branches/v5_9_8_debian/debian/plplot11-driver-xwin.files (rev 0) +++ branches/v5_9_8_debian/debian/plplot11-driver-xwin.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -0,0 +1,4 @@ +usr/lib/plplot*/driversd/xwin.* +usr/share/doc/plplot11-driver-xwin + + Deleted: branches/v5_9_8_debian/debian/plplot9-driver-cairo.files =================================================================== --- branches/v5_9_8_debian/debian/plplot9-driver-cairo.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/plplot9-driver-cairo.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,2 +0,0 @@ -usr/lib/plplot*/driversd/cairo.* -usr/share/doc/plplot9-driver-cairo Deleted: branches/v5_9_8_debian/debian/plplot9-driver-gd.files =================================================================== --- branches/v5_9_8_debian/debian/plplot9-driver-gd.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/plplot9-driver-gd.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,4 +0,0 @@ -usr/lib/plplot*/driversd/gd.* -usr/share/doc/plplot9-driver-gd - - Deleted: branches/v5_9_8_debian/debian/plplot9-driver-qt.files =================================================================== --- branches/v5_9_8_debian/debian/plplot9-driver-qt.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/plplot9-driver-qt.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,4 +0,0 @@ -usr/lib/plplot*/driversd/qt.* -usr/lib/libplplotqtd.so.* -usr/share/doc/plplot9-driver-qt -usr/lib/python*/plplot_pyqt4.so Deleted: branches/v5_9_8_debian/debian/plplot9-driver-wxwidgets.files =================================================================== --- branches/v5_9_8_debian/debian/plplot9-driver-wxwidgets.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/plplot9-driver-wxwidgets.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,5 +0,0 @@ -usr/lib/plplot*/driversd/wxwidgets.* -usr/lib/libplplotwxwidgetsd.so.* -usr/share/doc/plplot9-driver-wxwidgets - - Deleted: branches/v5_9_8_debian/debian/plplot9-driver-xwin.files =================================================================== --- branches/v5_9_8_debian/debian/plplot9-driver-xwin.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/plplot9-driver-xwin.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,4 +0,0 @@ -usr/lib/plplot*/driversd/xwin.* -usr/share/doc/plplot9-driver-xwin - - Modified: branches/v5_9_8_debian/debian/python-plplot.files =================================================================== --- branches/v5_9_8_debian/debian/python-plplot.files 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/python-plplot.files 2011-09-02 07:04:12 UTC (rev 11901) @@ -1,3 +1,3 @@ usr/lib/python* -usr/share/doc/libplplot9/examples/*python* +usr/share/doc/libplplot11/examples/*python* usr/share/doc/python-plplot Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-08-26 22:02:48 UTC (rev 11900) +++ branches/v5_9_8_debian/debian/rules 2011-09-02 07:04:12 UTC (rev 11901) @@ -15,7 +15,7 @@ include /usr/share/quilt/quilt.make version := $(shell perl debian/get-upstream-version.pl < cmake/modules/plplot_version.cmake) -libpkg := libplplot9 +libpkg := libplplot11 docpkg := plplot-doc debbase := $(shell pwd)/debian debtmp := $(debbase)/tmp @@ -57,13 +57,14 @@ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar -CONFIGURE_OPTIONS = -DBUILD_TEST=ON \ +CONFIGURE_OPTIONS = -DBUILD_TEST=OFF \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -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) + $(ADA_OPTIONS) $(JAVA_OPTIONS) \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) @@ -90,7 +91,7 @@ build-arch-stamp: patch config-stamp dh_testdir ( cd $(BUILD_DIR) ; $(MAKE) ) - -( cd $(BUILD_DIR) ; unset DISPLAY ; $(MAKE) test_noninteractive ) + -( cd $(BUILD_DIR) ; unset DISPLAY ; echo $(MAKE) test_noninteractive ) touch build-arch-stamp build-indep: build-indep-stamp @@ -112,12 +113,12 @@ 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=libplplot9-java --no-package=libplplot-ada \ + --no-package=libplplot-java --no-package=libplplot-ada \ --no-package=libplplot-ocaml --no-package=libplplot-lua \ --no-package=libplplot-d dh_movefiles --package=python-plplot-qt dh_movefiles --package=python-plplot - dh_movefiles --package=libplplot9-java + dh_movefiles --package=libplplot-java dh_movefiles --package=libplplot-ocaml dh_movefiles --package=libplplot-lua dh_movefiles --package=libplplot-d @@ -152,14 +153,15 @@ rm -f $(debtmp)/usr/bin/plplot-config for i in libplplot-dev plplot-tcl plplot-tcl-dev \ - plplot9-driver-gd plplot9-driver-xwin octave-plplot \ + plplot11-driver-gd plplot11-driver-xwin octave-plplot \ python-plplot-qt \ - python-plplot libplplot-c++9c2 plplot9-driver-wxwidgets \ - plplot9-driver-qt libplplot9-java \ - plplot9-driver-cairo libplplot-fortran9 \ + python-plplot libplplot-c++10 plplot11-driver-wxwidgets \ + plplot11-driver-qt libplplot-java \ + plplot11-driver-cairo libplplot-fortran9 \ 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 ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-02 09:00:54
|
Revision: 11903 http://plplot.svn.sourceforge.net/plplot/?rev=11903&view=rev Author: andrewross Date: 2011-09-02 09:00:47 +0000 (Fri, 02 Sep 2011) Log Message: ----------- Fix up dependencies for drivers in debian packages. Modified Paths: -------------- branches/v5_9_8_debian/debian/control branches/v5_9_8_debian/debian/control.in Modified: branches/v5_9_8_debian/debian/control =================================================================== --- branches/v5_9_8_debian/debian/control 2011-09-02 08:41:58 UTC (rev 11902) +++ branches/v5_9_8_debian/debian/control 2011-09-02 09:00:47 UTC (rev 11903) @@ -106,7 +106,7 @@ Package: libplplot-java Architecture: any Section: java -Breaks: libplplot9-java +Conflicts: libplplot9-java Replaces: libplplot9-java Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (Java bindings) @@ -172,7 +172,8 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: plplot-lib, plplot (<< 5) +Conflicts: plplot9-driver-xwin +Replaces: plplot9-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 @@ -188,6 +189,8 @@ Architecture: any Section: libs Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends} +Conflicts: plplot9-driver-wxwidgets +Replaces: plplot9-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 @@ -237,6 +240,8 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: plplot9-driver-gd +Replaces: plplot9-driver-gd Recommends: ttf-freefont Description: Scientific plotting library (GD driver) PLplot is relatively small, portable, freely distributable, and is rich @@ -258,6 +263,8 @@ Section: libs Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: plplot9-driver-cairo +Replaces: plplot9-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 Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-09-02 08:41:58 UTC (rev 11902) +++ branches/v5_9_8_debian/debian/control.in 2011-09-02 09:00:47 UTC (rev 11903) @@ -106,7 +106,7 @@ Package: libplplot-java Architecture: any Section: java -Breaks: libplplot9-java +Conflicts: libplplot9-java Replaces: libplplot9-java Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (Java bindings) @@ -172,7 +172,8 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: plplot-lib, plplot (<< 5) +Conflicts: plplot9-driver-xwin +Replaces: plplot9-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 @@ -188,6 +189,8 @@ Architecture: any Section: libs Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends} +Conflicts: plplot9-driver-wxwidgets +Replaces: plplot9-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 @@ -237,6 +240,8 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: plplot9-driver-gd +Replaces: plplot9-driver-gd Recommends: ttf-freefont Description: Scientific plotting library (GD driver) PLplot is relatively small, portable, freely distributable, and is rich @@ -258,6 +263,8 @@ Section: libs Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: plplot9-driver-cairo +Replaces: plplot9-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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-02 09:01:35
|
Revision: 11904 http://plplot.svn.sourceforge.net/plplot/?rev=11904&view=rev Author: andrewross Date: 2011-09-02 09:01:29 +0000 (Fri, 02 Sep 2011) Log Message: ----------- Update Debian copyright statement and change rules so this gets included with libqsastime0 package. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/copyright branches/v5_9_8_debian/debian/rules Added Paths: ----------- branches/v5_9_8_debian/debian/README.Debian Removed Paths: ------------- branches/v5_9_8_debian/debian/libplplot11.README.Debian Copied: branches/v5_9_8_debian/debian/README.Debian (from rev 11901, branches/v5_9_8_debian/debian/libplplot11.README.Debian) =================================================================== --- branches/v5_9_8_debian/debian/README.Debian (rev 0) +++ branches/v5_9_8_debian/debian/README.Debian 2011-09-02 09:01:29 UTC (rev 11904) @@ -0,0 +1,101 @@ +plplot for Debian +----------------- + +1. INTRODUCTION & ORIGIN + + These are the debianized packages for PLplot, a scientific plotting + library. They were put together by Rafael Laboissiere. The porting + to the new CMake build system and current maintenance is done by + Andrew Ross. + + +2. PACKAGES + + The original PLplot distribution was broken down in several Debian + packages: + + * libplplot11: Contains the shared C libraries, as well as the + data files and the driver modules that do not depend on other + libraries. + + * libplplot-dev: Headers and static libraries for developing programs + using the PLplot API, as well as many examples in C, C++, and + Fortran77. + + * plplot-doc: HTML, PS and PDF formats of the PLplot manual. + + * plplot11-driver-xwin: Provides the xwin driver module. + + * plplot11-driver-gd: Provides the GD driver module, which allows + direct generation of PNG and JPEG files. + + * plplot11-driver-cairo: Provides the cairo driver module. This uses + the cairo library to produce higher quality text using truetype + fonts. It produces postscript, pdf, svg, png, mem and X output. + This replaces the plplot9-driver-psttf package in previous + releases. The cairo driver provides similar results for postscript + and more functionality. + + * plplot11-driver-wxwidgets: Provides the WXWidgets driver module. + + * plplot11-driver-qt: Provides the qt driver module. + + * libplplot-c++10: Contains the library for using the C++ PLplot + classes. + + * libplplot-fortran9: Contains the F77 and F90 bindings for + the PLplot functions. + + * libplplot-java: Contains the bindings for using the PLplot + functions from java. + + * libplplot-ada: Contains the Ada bindings for the PLplot functions. + + * libplplot-ocaml: Contains the OCaml bindings for the PLplot functions. + + * libplplot-lua: Contains the lua bindings for the PLplot functions. + + * libplplot-d: Contains the d language bindings for the PLplot functions. + + * plplot-tcl: Modules allowing binding of the PLplot functions + for Tcl/Tk. Contains also the Tk driver module and some interactive + programs + + * plplot-tcl-dev: Development files for the Tcl/Tk biondings. + + * python-plplot: Glue library with bindings for Python. + + * python-plplot-qt: Bindings to use the plplot API in Qt applications + from python with pyqt4. + + * octave-plplot: Glue library with bindings for Octave 3.2. In order + to use this package, issue the command "toggle_plplot_use" at the + Octave 3.2 prompt. This will have the effect of replacing the + traditional Gnuplot interface by a PLplot based one. + + * libcsiro0: libcsirocsa and libcsironn libraries from Pavel Sakov + at CSIRO which are used by PLplot. + + * libqsastime0, libqsastime-dev: library and development packages for + the qsastime library for handling time format conversions. This is + used by PLplot. + + +3. DOCUMENTATION + + Further documentation for PLplot can be found in the plplot-doc + package. The entry point is /usr/share/doc/plplot-doc. + + +4. DEMOS & EXAMPLES + + A lot of examples were included in the libplplot-dev, plplot-tcl, + python-plplot, and octave-plplot packages. They can be found under + /usr/share/doc/libplplot11/examples/. Makefiles are available along the + sources. + + For development of C programs with the PLplot library, there is a + pkg-config support included in the libplplot-dev package. For details, + see /usr/share/doc/libplplot-dev/README.pkg-config. + + -- Rafael Laboissiere <ra...@de...>, Tue Mar 4 17:05:31 2003 Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-09-02 09:00:47 UTC (rev 11903) +++ branches/v5_9_8_debian/debian/changelog 2011-09-02 09:01:29 UTC (rev 11904) @@ -47,7 +47,7 @@ libraries to remove the OCaml version (as per Debian OCaml practice) and to remove the execute permissions for the stublibs. * debian/copyright: Make explicit that the license is LGPL-2 (fixes - lintian warning). + lintian warning). Update consistent with upstream copyright file. * debian/control.in, debian/rules, debian/libqsastime0.files, debian/libqsastime-dev.file: Split libqsastime off into separate library and devel packages. Modified: branches/v5_9_8_debian/debian/copyright =================================================================== --- branches/v5_9_8_debian/debian/copyright 2011-09-02 09:00:47 UTC (rev 11903) +++ branches/v5_9_8_debian/debian/copyright 2011-09-02 09:01:29 UTC (rev 11904) @@ -1,14 +1,10 @@ This package was debianized by Rafael Laboissiere ra...@de... on -Sun Feb 16 18:44:55 CET 2003 +Sun Feb 16 18:44:55 CET 2003. It is currently maintained by Andrew Ross +an...@us.... -It was downloaded from: +The source was obtained from the plplot subversion repository at +sourceforge.net http://sourceforge.net/projects/plplot/ . - http://sourceforge.net/project/showfiles.php?group_id=2915 - -Several files were backported from the CVS sources available at: - - http://sourceforge.net/cvs/?group_id=2915 - Below is the copyright notice that comes with the source distribution (reference to the location of LGPL text in the Debian system was added): @@ -30,8 +26,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free Software - Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + License along with this library; if not, write to the Free + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. The text of this license is given in the file COPYING.LIB in the distribution directory. [In Debian systems, see the file @@ -54,6 +50,10 @@ Additional Copyrights --------------------- +The octave front end which links to the PLplot library (but not vice versa), +and which is otherwise independent of PLplot is copyright under the GPL +license (see COPYING). + The startup code used in argument handling (utils/plrender.c and src/plargs.c) is partially derived from "xterm.c" of the X11R5 distribution, and its copyright is reproduced here: @@ -64,13 +64,13 @@ All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -86,7 +86,8 @@ DocBook documentation for the PLplot Library Copyright (C) 1994 Geoffrey Furnish and Maurice LeBrun -Copyright (C) 1999, 2000, 2001, 2003 Alan W. Irwin and Rafael Laboissiere, +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Alan W. Irwin +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Rafael Laboissiere Copyright (C) 2003 Joao Cardoso License terms: @@ -124,7 +125,7 @@ Any file that is explicitly marked as "public domain" is free from any -restriction on distribution. +restriction on distribution. Any file that has a explicit copyright notice may be distributed under the terms of both the LGPL and whatever stated conditions accompany the Deleted: branches/v5_9_8_debian/debian/libplplot11.README.Debian =================================================================== --- branches/v5_9_8_debian/debian/libplplot11.README.Debian 2011-09-02 09:00:47 UTC (rev 11903) +++ branches/v5_9_8_debian/debian/libplplot11.README.Debian 2011-09-02 09:01:29 UTC (rev 11904) @@ -1,100 +0,0 @@ -plplot for Debian ------------------ - -1. INTRODUCTION & ORIGIN - - These are the debianized packages for PLplot, a scientific plotting - library. They were put together by Rafael Laboissiere. The porting - to the new CMake build system was done by Andrew Ross. - - -2. PACKAGES - - The original PLplot distribution was broken down in several Debian - packages: - - * libplplot11: Contains the shared C libraries, as well as the - data files and the driver modules that do not depend on other - libraries. - - * libplplot-dev: Headers and static libraries for developing programs - using the PLplot API, as well as many examples in C, C++, and - Fortran77. - - * plplot-doc: HTML, PS and PDF formats of the PLplot manual. - - * plplot11-driver-xwin: Provides the xwin driver module. - - * plplot11-driver-gd: Provides the GD driver module, which allows - direct generation of PNG and JPEG files. - - * plplot11-driver-cairo: Provides the cairo driver module. This uses - the cairo library to produce higher quality text using truetype - fonts. It produces postscript, pdf, svg, png, mem and X output. - This replaces the plplot9-driver-psttf package in previous - releases. The cairo driver provides similar results for postscript - and more functionality. - - * plplot11-driver-wxwidgets: Provides the WXWidgets driver module. - - * plplot11-driver-qt: Provides the qt driver module. - - * libplplot-c++10: Contains the library for using the C++ PLplot - classes. - - * libplplot-fortran9: Contains the F77 and F90 bindings for - the PLplot functions. - - * libplplot-java: Contains the bindings for using the PLplot - functions from java. - - * libplplot-ada: Contains the Ada bindings for the PLplot functions. - - * libplplot-ocaml: Contains the OCaml bindings for the PLplot functions. - - * libplplot-lua: Contains the lua bindings for the PLplot functions. - - * libplplot-d: Contains the d language bindings for the PLplot functions. - - * plplot-tcl: Modules allowing binding of the PLplot functions - for Tcl/Tk. Contains also the Tk driver module and some interactive - programs - - * plplot-tcl-dev: Development files for the Tcl/Tk biondings. - - * python-plplot: Glue library with bindings for Python. - - * python-plplot-qt: Bindings to use the plplot API in Qt applications - from python with pyqt4. - - * octave-plplot: Glue library with bindings for Octave 3.2. In order - to use this package, issue the command "toggle_plplot_use" at the - Octave 3.2 prompt. This will have the effect of replacing the - traditional Gnuplot interface by a PLplot based one. - - * libcsiro0: libcsirocsa and libcsironn libraries from Pavel Sakov - at CSIRO which are used by PLplot. - - * libqsastime0, libqsastime-dev: library and development packages for - the qsastime library for handling time format conversions. This is - use by PLplot. - - -3. DOCUMENTATION - - Further documentation for PLplot can be found in the plplot-doc - package. The entry point is /usr/share/doc/plplot-doc. - - -4. DEMOS & EXAMPLES - - A lot of examples were included in the libplplot-dev, plplot-tcl, - python-plplot, and octave-plplot packages. They can be found under - /usr/share/doc/libplplot11/examples/. Makefiles are available along the - sources. - - For development of C programs with the PLplot library, there is a - pkg-config support included in the libplplot-dev package. For details, - see /usr/share/doc/libplplot-dev/README.pkg-config. - - -- Rafael Laboissiere <ra...@de...>, Tue Mar 4 17:05:31 2003 Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-09-02 09:00:47 UTC (rev 11903) +++ branches/v5_9_8_debian/debian/rules 2011-09-02 09:01:29 UTC (rev 11904) @@ -216,8 +216,8 @@ dh_testroot -a dh_installdirs -a - dh_installdocs --package=$(libpkg) --package=libcsiro0 - dh_installchangelogs --package=$(libpkg) --package=libcsiro0 + 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 dh_numpy This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-02 12:23:58
|
Revision: 11906 http://plplot.svn.sourceforge.net/plplot/?rev=11906&view=rev Author: andrewross Date: 2011-09-02 12:23:52 +0000 (Fri, 02 Sep 2011) Log Message: ----------- Fix address in copyright file and ensure copyright file is included in libqsastime-dev package. Modified Paths: -------------- branches/v5_9_8_debian/debian/copyright branches/v5_9_8_debian/debian/libqsastime-dev.files Modified: branches/v5_9_8_debian/debian/copyright =================================================================== --- branches/v5_9_8_debian/debian/copyright 2011-09-02 12:11:33 UTC (rev 11905) +++ branches/v5_9_8_debian/debian/copyright 2011-09-02 12:23:52 UTC (rev 11906) @@ -26,8 +26,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + License along with this library; if not, write to the Free Software + Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA The text of this license is given in the file COPYING.LIB in the distribution directory. [In Debian systems, see the file Modified: branches/v5_9_8_debian/debian/libqsastime-dev.files =================================================================== --- branches/v5_9_8_debian/debian/libqsastime-dev.files 2011-09-02 12:11:33 UTC (rev 11905) +++ branches/v5_9_8_debian/debian/libqsastime-dev.files 2011-09-02 12:23:52 UTC (rev 11906) @@ -1,2 +1,3 @@ usr/lib/libqsastime*.so usr/include/plplot/qsas*.h +usr/share/doc/libqsastime-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-02 20:12:43
|
Revision: 11907 http://plplot.svn.sourceforge.net/plplot/?rev=11907&view=rev Author: andrewross Date: 2011-09-02 20:12:36 +0000 (Fri, 02 Sep 2011) Log Message: ----------- Add -fvisibility=hidden and -Wl,--as-needed flags to reduce unneeded function exports and linkages. Fix up a number of minor lintian issues. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control branches/v5_9_8_debian/debian/control.in branches/v5_9_8_debian/debian/rules Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-09-02 12:23:52 UTC (rev 11906) +++ branches/v5_9_8_debian/debian/changelog 2011-09-02 20:12:36 UTC (rev 11907) @@ -54,8 +54,14 @@ * debian/libplplot-dev.files, debian/libplplot-fortran9.files: Move fortran .h and .mod files to the libplplot-dev package as these are required for compiling fortran with plplot and not for runtime. + * debian/plplot-tcl-dev.lintian-overrides: Add lintian override for + informational warning about interpreter path not being absolute. + * debian/rules: Add -fvisibility=hidden to CFLAGS and -Wl,--as-needed + to LD_FLAGS to only export required symbols and prevent linking in + unnecessary libraries. Reduces the dependency requirements, + particularly for the drivers. - -- Andrew Ross <and...@us...> Wed, 24 Aug 2011 09:22:38 +0100 + -- Andrew Ross <and...@us...> Fri, 2 Sep 2011 20:35:33 +0100 plplot (5.9.7-1) UNRELEASED; urgency=low Modified: branches/v5_9_8_debian/debian/control =================================================================== --- branches/v5_9_8_debian/debian/control 2011-09-02 12:23:52 UTC (rev 11906) +++ branches/v5_9_8_debian/debian/control 2011-09-02 20:12:36 UTC (rev 11907) @@ -50,9 +50,10 @@ Recommends: pkg-config, libplplot-c++10 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version}), libplplot-ada (= ${binary:Version}), libplplot-ocaml, libplplot-lua, libplplot-d +Suggests: plplot-doc Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, ${misc:Depends} -Conflicts: libplplot-fortran9 (<< 5.9.8-1) +Breaks: libplplot-fortran9 (<< 5.9.8-1) Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -62,10 +63,9 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This package contains all that is needed for doing development in C, C++, Fortran and Ada with PLplot. Examples of programs for these languages are also included. For development in Tcl/Tk, Python, Octave, and Java install - the plplot-tcl, python-plplot, octave-plplot and libplplot-java packages, + the plplot-tcl-dev, python-plplot, octave-plplot and libplplot-java packages, respectively. This package also includes the OCaml, lua and D examples. To use a particular language you will also need to install the libplplot-xxx package for that language. @@ -123,7 +123,6 @@ Package: libcsiro0 Architecture: any Section: libs -Conflicts: libplplot9 (<< 5.3.0.cvs.20040303) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (CSIRO libraries) This package contains two libraries developed by Pavel Sakov, from the @@ -154,9 +153,9 @@ Package: libqsastime-dev Architecture: any Section: libdevel -Conflicts: libplplot-dev (<< 5.9.8-1) -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Time format conversion library +Breaks: libplplot-dev (<< 5.9.8-1) +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 conversion. It overcomes the limitations of the POSIX time handling routines by allow high precision time variables over a large range @@ -223,7 +222,7 @@ Architecture: any Priority: extra Depends: libplplot11 (= ${binary:Version}), plplot-tcl, ${misc:Depends} -Conflicts: plplot-tcl (<= 5.2.0.cvs.20030224-1) +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 enough to satisfy most users. It has a wide range of plot types including @@ -302,7 +301,7 @@ Architecture: any Section: python Priority: extra -Depends: libplplot11 (= ${binary:Version}), python-plplot-qt (= ${binary:Version}), +Depends: libplplot11 (= ${binary:Version}), python-plplot (= ${binary:Version}), plplot11-driver-qt (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} Provides: ${python:Provides} @@ -315,12 +314,11 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This package provides python bindings to allow use of the PLplot API in + This package provides Python bindings to allow use of the PLplot API in qt applications. Package: octave-plplot Architecture: any -Section: math Priority: extra Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}, ${misc:Depends} Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-09-02 12:23:52 UTC (rev 11906) +++ branches/v5_9_8_debian/debian/control.in 2011-09-02 20:12:36 UTC (rev 11907) @@ -50,9 +50,10 @@ Recommends: pkg-config, libplplot-c++10 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):], libplplot-ocaml, libplplot-lua, libplplot-d +Suggests: plplot-doc Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, ${misc:Depends} -Conflicts: libplplot-fortran9 (<< 5.9.8-1) +Breaks: libplplot-fortran9 (<< 5.9.8-1) Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -62,10 +63,9 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This package contains all that is needed for doing development in C, C++, Fortran and Ada with PLplot. Examples of programs for these languages are also included. For development in Tcl/Tk, Python, Octave, and Java install - the plplot-tcl, python-plplot, octave-plplot and libplplot-java packages, + the plplot-tcl-dev, python-plplot, octave-plplot and libplplot-java packages, respectively. This package also includes the OCaml, lua and D examples. To use a particular language you will also need to install the libplplot-xxx package for that language. @@ -123,7 +123,6 @@ Package: libcsiro0 Architecture: any Section: libs -Conflicts: libplplot9 (<< 5.3.0.cvs.20040303) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (CSIRO libraries) This package contains two libraries developed by Pavel Sakov, from the @@ -154,9 +153,9 @@ Package: libqsastime-dev Architecture: any Section: libdevel -Conflicts: libplplot-dev (<< 5.9.8-1) -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Time format conversion library +Breaks: libplplot-dev (<< 5.9.8-1) +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 conversion. It overcomes the limitations of the POSIX time handling routines by allow high precision time variables over a large range @@ -223,7 +222,7 @@ Architecture: any Priority: extra Depends: libplplot11 (= ${binary:Version}), plplot-tcl, ${misc:Depends} -Conflicts: plplot-tcl (<= 5.2.0.cvs.20030224-1) +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 enough to satisfy most users. It has a wide range of plot types including @@ -302,7 +301,7 @@ Architecture: any Section: python Priority: extra -Depends: libplplot11 (= ${binary:Version}), python-plplot-qt (= ${binary:Version}), +Depends: libplplot11 (= ${binary:Version}), python-plplot (= ${binary:Version}), plplot11-driver-qt (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} Provides: ${python:Provides} @@ -315,12 +314,11 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This package provides python bindings to allow use of the PLplot API in + This package provides Python bindings to allow use of the PLplot API in qt applications. Package: octave-plplot Architecture: any -Section: math Priority: extra Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}, ${misc:Depends} Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-09-02 12:23:52 UTC (rev 11906) +++ branches/v5_9_8_debian/debian/rules 2011-09-02 20:12:36 UTC (rev 11907) @@ -27,6 +27,15 @@ debex := $(debshr)/plplot$(version)/examples octver := $(shell octave-config -v) +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) +CFLAGS += -fvisibility=hidden +#Don't add -fvisibility=hidden to CXXFLAGS for now as this breaks the octave bindings. +#CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) +#CXXFLAGS += -fvisibility=hidden +LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) +LDFLAGS += -Wl,--as-needed + + JAVA_HOME = /usr/lib/jvm/default-java PYVERS = $(shell pyversions -vr) @@ -57,14 +66,13 @@ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar -CONFIGURE_OPTIONS = -DBUILD_TEST=OFF \ +CONFIGURE_OPTIONS = -DBUILD_TEST=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -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) \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" + $(ADA_OPTIONS) $(JAVA_OPTIONS) BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) @@ -91,7 +99,7 @@ build-arch-stamp: patch config-stamp dh_testdir ( cd $(BUILD_DIR) ; $(MAKE) ) - -( cd $(BUILD_DIR) ; unset DISPLAY ; echo $(MAKE) test_noninteractive ) + -( cd $(BUILD_DIR) ; unset DISPLAY ; $(MAKE) test_noninteractive ) touch build-arch-stamp build-indep: build-indep-stamp @@ -136,7 +144,7 @@ # Strip bindings/octave/plplot_octave.oct as this is missed by # dh_strip. - strip $(BUILD_DIR)/bindings/octave/plplot_octave.oct + strip --strip-unneeded --remove-section=.comment $(BUILD_DIR)/bindings/octave/plplot_octave.oct ( cd $(BUILD_DIR) ; \ $(MAKE) DESTDIR=$(debtmp) install ) @@ -207,6 +215,7 @@ dh_compress -i --exclude=.pdf dh_fixperms -i dh_installdeb -i + dh_lintian -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i @@ -230,6 +239,7 @@ dpkg-shlibdeps -Tdebian/octave-plplot.substvars -S$(debbase)/$(libpkg)/usr/lib/*.so* -S/usr/lib/$(octver)/*.so* $(debbase)/octave-plplot/$(OCTDIR)/plplot_octave.oct octave-depends --package=octave-plplot dh_installdeb -a + dh_lintian -a dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)" dh_md5sums -a dh_builddeb -a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-06 13:09:10
|
Revision: 11911 http://plplot.svn.sourceforge.net/plplot/?rev=11911&view=rev Author: andrewross Date: 2011-09-06 13:09:04 +0000 (Tue, 06 Sep 2011) Log Message: ----------- Temporary fix from upstream to prevent qt driver crashing on exit with Qt-4.7.3. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/patches/series Added Paths: ----------- branches/v5_9_8_debian/debian/patches/12_qt_unload_fix.diff Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-09-06 10:32:30 UTC (rev 11910) +++ branches/v5_9_8_debian/debian/changelog 2011-09-06 13:09:04 UTC (rev 11911) @@ -36,6 +36,7 @@ debian/patches/09_qt_nodisplay.diff, debian/patches/10_fix_test_scripts.diff, debian/patches/11_ocaml_library_location.diff, + debian/patches/12_qt_unload_fix.diff + Add new patch to turn off execute permissions for plplot_octave.oct (fixes lintian error). + Add patch from upstream to enable non-interactive qt devices to work @@ -46,6 +47,8 @@ + Add new upstream patch to change the install location for OCaml libraries to remove the OCaml version (as per Debian OCaml practice) and to remove the execute permissions for the stublibs. + + Add temporary workaround from upstream to prevent crash on exit with + the qt driver and Qt-4.7.3. * debian/copyright: Make explicit that the license is LGPL-2 (fixes lintian warning). Update consistent with upstream copyright file. * debian/control.in, debian/rules, debian/libqsastime0.files, Added: branches/v5_9_8_debian/debian/patches/12_qt_unload_fix.diff =================================================================== --- branches/v5_9_8_debian/debian/patches/12_qt_unload_fix.diff (rev 0) +++ branches/v5_9_8_debian/debian/patches/12_qt_unload_fix.diff 2011-09-06 13:09:04 UTC (rev 11911) @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_qt_unload_fix.diff by Andrew Ross <and...@us...> +## +## DP: Prevent unloading of qt driver which leads to a segfault on exit +## DP: with Qt 4.7.3. + +@DPATCH@ + +--- plplot-5.9.8-orig/src/plcore.c 2011-09-05 10:21:54.000000000 +0100 ++++ plplot-5.9.8/src/plcore.c 2011-09-05 10:21:37.000000000 +0100 +@@ -3272,6 +3272,10 @@ + driver->drvnam, drvspec ); + + driver->dlhand = lt_dlopenext( drvspec ); ++ ++ if (strcmp(driver->drvnam,"qt") == 0) { ++ lt_dlmakeresident(driver->dlhand); ++ } + } + + // If it still isn't loaded, then we're doomed. Property changes on: branches/v5_9_8_debian/debian/patches/12_qt_unload_fix.diff ___________________________________________________________________ Added: svn:executable + * Modified: branches/v5_9_8_debian/debian/patches/series =================================================================== --- branches/v5_9_8_debian/debian/patches/series 2011-09-06 10:32:30 UTC (rev 11910) +++ branches/v5_9_8_debian/debian/patches/series 2011-09-06 13:09:04 UTC (rev 11911) @@ -5,3 +5,4 @@ 09_qt_nodisplay.diff 10_fix_test_scripts.diff 11_ocaml_install_location.diff +12_qt_unload_fix.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-06 13:09:36
|
Revision: 11912 http://plplot.svn.sourceforge.net/plplot/?rev=11912&view=rev Author: andrewross Date: 2011-09-06 13:09:26 +0000 (Tue, 06 Sep 2011) Log Message: ----------- Couple of minor tweaks to Debian packaging. Modified Paths: -------------- branches/v5_9_8_debian/debian/control.in branches/v5_9_8_debian/debian/rules Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-09-06 13:09:04 UTC (rev 11911) +++ branches/v5_9_8_debian/debian/control.in 2011-09-06 13:09:26 UTC (rev 11912) @@ -409,7 +409,7 @@ Architecture: any Section: libs Priority: extra -Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends} +Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends}, lua5.1 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 Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-09-06 13:09:04 UTC (rev 11911) +++ branches/v5_9_8_debian/debian/rules 2011-09-06 13:09:26 UTC (rev 11912) @@ -30,7 +30,7 @@ CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS += -fvisibility=hidden #Don't add -fvisibility=hidden to CXXFLAGS for now as this breaks the octave bindings. -#CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) +CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) #CXXFLAGS += -fvisibility=hidden LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) LDFLAGS += -Wl,--as-needed This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-14 08:48:28
|
Revision: 11923 http://plplot.svn.sourceforge.net/plplot/?rev=11923&view=rev Author: andrewross Date: 2011-09-14 08:48:17 +0000 (Wed, 14 Sep 2011) Log Message: ----------- Change Debian package priority as recommended by policy. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control.in Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-09-13 13:13:05 UTC (rev 11922) +++ branches/v5_9_8_debian/debian/changelog 2011-09-14 08:48:17 UTC (rev 11923) @@ -1,3 +1,9 @@ +plplot (5.9.8-2) unstable; urgency=low + + * debian/control.in: Change package priority to optional as per policy. + + -- Andrew Ross <and...@us...> Wed, 14 Sep 2011 09:46:45 +0100 + plplot (5.9.8-1) unstable; urgency=low * New upstream release. Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-09-13 13:13:05 UTC (rev 11922) +++ branches/v5_9_8_debian/debian/control.in 2011-09-14 08:48:17 UTC (rev 11923) @@ -203,7 +203,6 @@ Package: plplot-tcl Architecture: any -Priority: extra Depends: plplot11-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 @@ -220,7 +219,6 @@ Package: plplot-tcl-dev Architecture: any -Priority: extra Depends: libplplot11 (= ${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 @@ -260,7 +258,6 @@ Package: plplot11-driver-cairo Architecture: any Section: libs -Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: plplot9-driver-cairo Replaces: plplot9-driver-cairo @@ -280,7 +277,6 @@ Package: python-plplot Architecture: any Section: python -Priority: extra Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} Provides: ${python:Provides} @@ -300,7 +296,6 @@ Package: python-plplot-qt Architecture: any Section: python -Priority: extra Depends: libplplot11 (= ${binary:Version}), python-plplot (= ${binary:Version}), plplot11-driver-qt (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} @@ -319,7 +314,6 @@ Package: octave-plplot Architecture: any -Priority: extra Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}, ${misc:Depends} Description: Octave support for PLplot, a plotting library @@ -337,7 +331,6 @@ [ADA:Package: libplplot-ada Architecture: any -Priority: extra Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Ada support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich @@ -354,7 +347,6 @@ Package: plplot-doc Architecture: all Section: doc -Priority: extra Suggests: libplplot-dev Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends} Description: Documentation for PLplot, a plotting library @@ -373,7 +365,6 @@ Package: plplot11-driver-qt Architecture: any Section: libs -Priority: extra Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (qt driver) PLplot is relatively small, portable, freely distributable, and is rich @@ -391,7 +382,6 @@ Package: libplplot-ocaml Architecture: any Section: ocaml -Priority: extra Depends: libplplot11, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (OCaml bindings) PLplot is relatively small, portable, freely distributable, and is rich @@ -408,7 +398,6 @@ Package: libplplot-lua Architecture: any Section: libs -Priority: extra Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends}, lua5.1 Description: Scientific plotting library (lua bindings) PLplot is relatively small, portable, freely distributable, and is rich @@ -425,7 +414,6 @@ Package: libplplot-d Architecture: any Section: libs -Priority: extra Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (D language bindings) PLplot is relatively small, portable, freely distributable, and is rich This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-15 08:54:25
|
Revision: 11926 http://plplot.svn.sourceforge.net/plplot/?rev=11926&view=rev Author: andrewross Date: 2011-09-15 08:54:18 +0000 (Thu, 15 Sep 2011) Log Message: ----------- Minor tweaks to Debian packages, and add missing file. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control.in Added Paths: ----------- branches/v5_9_8_debian/debian/plplot-tcl-dev.lintian-overrides Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-09-15 01:17:51 UTC (rev 11925) +++ branches/v5_9_8_debian/debian/changelog 2011-09-15 08:54:18 UTC (rev 11926) @@ -1,8 +1,11 @@ plplot (5.9.8-2) unstable; urgency=low - * debian/control.in: Change package priority to optional as per policy. + * debian/control.in: + + Change package priority to optional as per policy. + + Add libplplot-dev dependency on libqsastime-dev. + * debian/plplot-tcl-dev.lintian-overrides: Fix lintian overrides. - -- Andrew Ross <and...@us...> Wed, 14 Sep 2011 09:46:45 +0100 + -- Andrew Ross <and...@us...> Thu, 15 Sep 2011 09:50:43 +0100 plplot (5.9.8-1) unstable; urgency=low Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-09-15 01:17:51 UTC (rev 11925) +++ branches/v5_9_8_debian/debian/control.in 2011-09-15 08:54:18 UTC (rev 11926) @@ -52,7 +52,7 @@ libplplot-ocaml, libplplot-lua, libplplot-d Suggests: plplot-doc Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, - libltdl3-dev, ${misc:Depends} + libltdl3-dev, libqsastime-dev, ${misc:Depends} Breaks: libplplot-fortran9 (<< 5.9.8-1) Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich Added: branches/v5_9_8_debian/debian/plplot-tcl-dev.lintian-overrides =================================================================== --- branches/v5_9_8_debian/debian/plplot-tcl-dev.lintian-overrides (rev 0) +++ branches/v5_9_8_debian/debian/plplot-tcl-dev.lintian-overrides 2011-09-15 08:54:18 UTC (rev 11926) @@ -0,0 +1,7 @@ +# The .in files are templates for the example scripts which are configured +# 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/libplplot11/examples/tk/tk01.in #!@xtk01_LOCATION@ +plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot11/examples/tk/tk02.in #!@xtk02_LOCATION@ +plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot11/examples/tk/tk04.in #!@xtk04_LOCATION@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-19 19:41:06
|
Revision: 11929 http://plplot.svn.sourceforge.net/plplot/?rev=11929&view=rev Author: andrewross Date: 2011-09-19 19:41:00 +0000 (Mon, 19 Sep 2011) Log Message: ----------- Fix bug in description of Debian libplplot-dev package. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control.in Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-09-16 18:01:56 UTC (rev 11928) +++ branches/v5_9_8_debian/debian/changelog 2011-09-19 19:41:00 UTC (rev 11929) @@ -3,9 +3,10 @@ * debian/control.in: + Change package priority to optional as per policy. + Add libplplot-dev dependency on libqsastime-dev. + + Fix description for libplplot-dev package (closes: #642122). * debian/plplot-tcl-dev.lintian-overrides: Fix lintian overrides. - -- Andrew Ross <and...@us...> Thu, 15 Sep 2011 09:50:43 +0100 + -- Andrew Ross <and...@us...> Mon, 19 Sep 2011 20:38:55 +0100 plplot (5.9.8-1) unstable; urgency=low Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-09-16 18:01:56 UTC (rev 11928) +++ branches/v5_9_8_debian/debian/control.in 2011-09-19 19:41:00 UTC (rev 11929) @@ -63,6 +63,7 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . + This package contains all that is needed for doing development in C, C++, Fortran and Ada with PLplot. Examples of programs for these languages are also included. For development in Tcl/Tk, Python, Octave, and Java install the plplot-tcl-dev, python-plplot, octave-plplot and libplplot-java packages, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-09-30 14:51:17
|
Revision: 11937 http://plplot.svn.sourceforge.net/plplot/?rev=11937&view=rev Author: andrewross Date: 2011-09-30 14:51:11 +0000 (Fri, 30 Sep 2011) Log Message: ----------- Update debian libplplot-dev package dependencies to revert to old behaviour of always pulling in the C++, fortran and ada bindings. Closes an outstanding Debian bug. Modified Paths: -------------- branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control branches/v5_9_8_debian/debian/control.in Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-09-25 16:40:30 UTC (rev 11936) +++ branches/v5_9_8_debian/debian/changelog 2011-09-30 14:51:11 UTC (rev 11937) @@ -1,3 +1,13 @@ +plplot (5.9.8-3) unstable; urgency=low + + * debian/control.in: + + Add back in dependencies (rather than recommends) on the C++, + fortran and ada libraries. This does pull in extra libraries if you + only wish to develop with one language, but reverts to the old + behaviour (closes: #642715). + + -- Andrew Ross <and...@us...> Fri, 30 Sep 2011 15:42:04 +0100 + plplot (5.9.8-2) unstable; urgency=low * debian/control.in: Modified: branches/v5_9_8_debian/debian/control =================================================================== --- branches/v5_9_8_debian/debian/control 2011-09-25 16:40:30 UTC (rev 11936) +++ branches/v5_9_8_debian/debian/control 2011-09-30 14:51:11 UTC (rev 11937) @@ -47,12 +47,12 @@ Package: libplplot-dev Architecture: any Section: libdevel -Recommends: pkg-config, libplplot-c++10 (= ${binary:Version}), - libplplot-fortran9 (= ${binary:Version}), libplplot-ada (= ${binary:Version}), - libplplot-ocaml, libplplot-lua, libplplot-d +Recommends: pkg-config, libplplot-ocaml, libplplot-lua, libplplot-d Suggests: plplot-doc Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, - libltdl3-dev, libqsastime-dev, ${misc:Depends} + libltdl3-dev, libqsastime-dev, ${misc:Depends}, + libplplot-c++10 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version}) + , libplplot-ada (= ${binary:Version}) Breaks: libplplot-fortran9 (<< 5.9.8-1) Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich @@ -68,7 +68,7 @@ also included. For development in Tcl/Tk, Python, Octave, and Java install the plplot-tcl-dev, python-plplot, octave-plplot and libplplot-java packages, respectively. This package also includes the OCaml, lua and D examples. To use - a particular language you will also need to install the libplplot-xxx package + one of these languages you will also need to install the libplplot-xxx package for that language. Package: libplplot-c++10 Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-09-25 16:40:30 UTC (rev 11936) +++ branches/v5_9_8_debian/debian/control.in 2011-09-30 14:51:11 UTC (rev 11937) @@ -47,12 +47,12 @@ Package: libplplot-dev Architecture: any Section: libdevel -Recommends: pkg-config, libplplot-c++10 (= ${binary:Version}), - libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):], - libplplot-ocaml, libplplot-lua, libplplot-d +Recommends: pkg-config, libplplot-ocaml, libplplot-lua, libplplot-d Suggests: plplot-doc Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, - libltdl3-dev, libqsastime-dev, ${misc:Depends} + libltdl3-dev, libqsastime-dev, ${misc:Depends}, + libplplot-c++10 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version}) + [ADA:, libplplot-ada (= ${binary:Version}):] Breaks: libplplot-fortran9 (<< 5.9.8-1) Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich @@ -68,7 +68,7 @@ also included. For development in Tcl/Tk, Python, Octave, and Java install the plplot-tcl-dev, python-plplot, octave-plplot and libplplot-java packages, respectively. This package also includes the OCaml, lua and D examples. To use - a particular language you will also need to install the libplplot-xxx package + one of these languages you will also need to install the libplplot-xxx package for that language. Package: libplplot-c++10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-10-10 19:26:33
|
Revision: 11948 http://plplot.svn.sourceforge.net/plplot/?rev=11948&view=rev Author: andrewross Date: 2011-10-10 19:26:27 +0000 (Mon, 10 Oct 2011) Log Message: ----------- Updates to Debian Ada packages to fix some outstanding bugs. Modified Paths: -------------- branches/v5_9_8_debian/debian/README.Debian branches/v5_9_8_debian/debian/changelog branches/v5_9_8_debian/debian/control.in branches/v5_9_8_debian/debian/rules Added Paths: ----------- branches/v5_9_8_debian/debian/libplplot-ada0-dev.files branches/v5_9_8_debian/debian/libplplot-ada0.files Removed Paths: ------------- branches/v5_9_8_debian/debian/libplplot-ada.files Modified: branches/v5_9_8_debian/debian/README.Debian =================================================================== --- branches/v5_9_8_debian/debian/README.Debian 2011-10-10 14:36:09 UTC (rev 11947) +++ branches/v5_9_8_debian/debian/README.Debian 2011-10-10 19:26:27 UTC (rev 11948) @@ -49,8 +49,12 @@ * libplplot-java: Contains the bindings for using the PLplot functions from java. - * libplplot-ada: Contains the Ada bindings for the PLplot functions. + * libplplot-ada0: Contains the runtiem Ada bindings library for the + PLplot functions. + * libplplot-ada0-dev: Development files for the Ada bindings for + the PLplot functions. + * libplplot-ocaml: Contains the OCaml bindings for the PLplot functions. * libplplot-lua: Contains the lua bindings for the PLplot functions. Modified: branches/v5_9_8_debian/debian/changelog =================================================================== --- branches/v5_9_8_debian/debian/changelog 2011-10-10 14:36:09 UTC (rev 11947) +++ branches/v5_9_8_debian/debian/changelog 2011-10-10 19:26:27 UTC (rev 11948) @@ -1,12 +1,22 @@ plplot (5.9.8-3) unstable; urgency=low * debian/control.in: - + Add back in dependencies (rather than recommends) on the C++, - fortran and ada libraries. This does pull in extra libraries if you + + Add back in dependencies (rather than recommends) on the C++ + and fortran libraries. This does pull in extra libraries if you only wish to develop with one language, but reverts to the old behaviour (closes: #642715). + * debian/control.in, debian/libplplot-ada0.files, + debian/libplplot-ada0-dev.files, debian/libplplot-dev, debian/rules, + debian/README.Debian: + + Split off ada development files from libplplot-dev package into new + libplplot-ada0-dev package. Move .ali files from libplplot-ada into + libplplot-ada0-dev package as per Debian Ada policy. Add explicit + dependency on ada-compiler, gnat and gnat-4.6 as per policy. + (closes: #644105, #644110, #644112) + + Rename libplplot-ada package to libplplot-ada0 so it includes the + library soversion as per Debian Ada policy. - -- Andrew Ross <and...@us...> Fri, 30 Sep 2011 15:42:04 +0100 + -- Andrew Ross <and...@us...> Mon, 10 Oct 2011 08:55:58 +0100 plplot (5.9.8-2) unstable; urgency=low Modified: branches/v5_9_8_debian/debian/control.in =================================================================== --- branches/v5_9_8_debian/debian/control.in 2011-10-10 14:36:09 UTC (rev 11947) +++ branches/v5_9_8_debian/debian/control.in 2011-10-10 19:26:27 UTC (rev 11948) @@ -52,7 +52,6 @@ Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, libqsastime-dev, ${misc:Depends}, libplplot-c++10 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version}) - [ADA:, libplplot-ada (= ${binary:Version}):] Breaks: libplplot-fortran9 (<< 5.9.8-1) Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich @@ -63,8 +62,8 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This package contains all that is needed for doing development in C, C++, - Fortran and Ada with PLplot. Examples of programs for these languages are + This package contains all that is needed for doing development in C, C++ + and Fortran with PLplot. Examples of programs for these languages are also included. For development in Tcl/Tk, Python, Octave, and Java install the plplot-tcl-dev, python-plplot, octave-plplot and libplplot-java packages, respectively. This package also includes the OCaml, lua and D examples. To use @@ -330,9 +329,11 @@ almost drop-in replacement for the traditional Gnuplot graphical interface in Octave. Examples are also provided. -[ADA:Package: libplplot-ada +[ADA:Package: libplplot-ada0 Architecture: any Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Breaks: libplplot-ada (<< 5.9.8-2) +Replaces: libplplot-ada (<< 5.9.8-2) Description: Ada 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 @@ -342,9 +343,31 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This package contains the Ada bindings for PLplot. + This package contains the runtime Ada bindings library for PLplot. :] +[ADA:Package: libplplot-ada0-dev +Architecture: any +Section: libdevel +Suggests: plplot-doc +Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, + libltdl3-dev, libqsastime-dev, ada-compiler, gnat, gnat-4.6, ${misc:Depends}, + libplplot-ada0 (= ${binary:Version}) +Recommends: libplplot-dev +Breaks: libplplot-ada (<< 5.9.8-2), libplplot-dev (<< 5.9.8-2) +Description: Scientific plotting library (development files) + 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 all that is needed for doing PLplot development in + Ada. +:] + Package: plplot-doc Architecture: all Section: doc Deleted: branches/v5_9_8_debian/debian/libplplot-ada.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot-ada.files 2011-10-10 14:36:09 UTC (rev 11947) +++ branches/v5_9_8_debian/debian/libplplot-ada.files 2011-10-10 19:26:27 UTC (rev 11948) @@ -1,3 +0,0 @@ -usr/lib/libplplotada*.so.* -usr/lib/ada -usr/share/doc/libplplot-ada Added: branches/v5_9_8_debian/debian/libplplot-ada0-dev.files =================================================================== --- branches/v5_9_8_debian/debian/libplplot-ada0-dev.files (rev 0) +++ branches/v5_9_8_debian/debian/libplplot-ada0-dev.files 2011-10-10 19:26:27 UTC (rev 11948) @@ -0,0 +1,5 @@ +usr/lib/ada +usr/share/ada +usr/lib/libplplotada*.so +usr/share/doc/libplplot11/examples/ada +usr/share/doc/libplplot-ada0-dev Copied: branches/v5_9_8_debian/debian/libplplot-ada0.files (from rev 11944, branches/v5_9_8_debian/debian/libplplot-ada.files) =================================================================== --- branches/v5_9_8_debian/debian/libplplot-ada0.files (rev 0) +++ branches/v5_9_8_debian/debian/libplplot-ada0.files 2011-10-10 19:26:27 UTC (rev 11948) @@ -0,0 +1,2 @@ +usr/lib/libplplotada*.so.* +usr/share/doc/libplplot-ada0 Modified: branches/v5_9_8_debian/debian/rules =================================================================== --- branches/v5_9_8_debian/debian/rules 2011-10-10 14:36:09 UTC (rev 11947) +++ branches/v5_9_8_debian/debian/rules 2011-10-10 19:26:27 UTC (rev 11948) @@ -121,9 +121,9 @@ 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-ada \ + --no-package=libplplot-java --no-package=libplplot-ada0 \ --no-package=libplplot-ocaml --no-package=libplplot-lua \ - --no-package=libplplot-d + --no-package=libplplot-d --no-package=libplplot-ada0-dev dh_movefiles --package=python-plplot-qt dh_movefiles --package=python-plplot dh_movefiles --package=libplplot-java @@ -131,11 +131,10 @@ dh_movefiles --package=libplplot-lua dh_movefiles --package=libplplot-d ifeq ($(BUILD_ADA),yes) - dh_movefiles --package=libplplot-ada - dh_movefiles --package=libplplot-dev usr/share/ada -else + dh_movefiles --package=libplplot-ada0 + dh_movefiles --package=libplplot-ada0-dev +endif dh_movefiles --package=libplplot-dev -endif dh_movefiles --package=$(libpkg) install-arch-stamp: build-arch-stamp @@ -175,7 +174,8 @@ ( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar ) ifeq ($(BUILD_ADA),yes) - ln -s $(libpkg) $(debdoc)/libplplot-ada + ln -s $(libpkg) $(debdoc)/libplplot-ada0 + ln -s $(libpkg) $(debdoc)/libplplot-ada0-dev endif touch install-arch-stamp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |