From: <and...@us...> - 2007-12-03 10:59:11
|
Revision: 8055 http://plplot.svn.sourceforge.net/plplot/?rev=8055&view=rev Author: andrewross Date: 2007-12-03 02:59:16 -0800 (Mon, 03 Dec 2007) Log Message: ----------- Add -VV option to ctest call in debian/rules. This will make debugging output from the build daemons easier when tests fail. Modified Paths: -------------- trunk/debian/changelog trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-03 10:38:12 UTC (rev 8054) +++ trunk/debian/changelog 2007-12-03 10:59:16 UTC (rev 8055) @@ -1,3 +1,10 @@ +plplot (5.8.0-2) UNRELEASED; urgency=low + + * debian/rules: add -VV option to ctest. Will make it easier to debug + any failed tests for auto-built packages. + + -- Andrew Ross <and...@us...> Mon, 03 Dec 2007 10:57:54 +0000 + plplot (5.8.0-1) unstable; urgency=low * New upstream release. Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-12-03 10:38:12 UTC (rev 8054) +++ trunk/debian/rules 2007-12-03 10:59:16 UTC (rev 8055) @@ -59,7 +59,7 @@ #( cd bindings/octave ; \ # $(MAKE) CC="gcc -D__builtin_va_list=void" plplot_octave.oct ) ( cd $(BUILD_DIR) ; $(MAKE) ) - -( cd $(BUILD_DIR) ; ITCL_LIBRARY=/usr/lib/itcl3.2 ctest ) + -( cd $(BUILD_DIR) ; ITCL_LIBRARY=/usr/lib/itcl3.2 ctest -VV) touch build-stamp clean: unpatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-12-03 12:43:17
|
Revision: 8056 http://plplot.svn.sourceforge.net/plplot/?rev=8056&view=rev Author: andrewross Date: 2007-12-03 04:43:20 -0800 (Mon, 03 Dec 2007) Log Message: ----------- Add patch to ensure that the test for plplot running in the build tree works even when the path involves symlinks. This may fix problems with ctest on some auto-builders. Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/00list Added Paths: ----------- trunk/debian/patches/06_build_dir_use_physical_path.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-03 10:59:16 UTC (rev 8055) +++ trunk/debian/changelog 2007-12-03 12:43:20 UTC (rev 8056) @@ -2,6 +2,9 @@ * debian/rules: add -VV option to ctest. Will make it easier to debug any failed tests for auto-built packages. + * debian/patches/06_build_dir_use_physical_path.dpatch: Ensure that plplot + correctly identifies when run in the build tree, even if the path + involves symlinks. -- Andrew Ross <and...@us...> Mon, 03 Dec 2007 10:57:54 +0000 Modified: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2007-12-03 10:59:16 UTC (rev 8055) +++ trunk/debian/patches/00list 2007-12-03 12:43:20 UTC (rev 8056) @@ -2,3 +2,4 @@ 02_unset-python-path 04_use-mkoctfile 05_octave_documentation +06_build_dir_use_physical_path Added: trunk/debian/patches/06_build_dir_use_physical_path.dpatch =================================================================== --- trunk/debian/patches/06_build_dir_use_physical_path.dpatch (rev 0) +++ trunk/debian/patches/06_build_dir_use_physical_path.dpatch 2007-12-03 12:43:20 UTC (rev 8056) @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_build_dir_use_physical_path.dpatch by Andrew Ross <and...@us...urceforge.n +et> +## +## DP: Use physical path (resolve symlinks) when checking whether in build +## DP: directory. (This patch was taken from the upstream SVN repository.) + +@DPATCH@ + +--- plplot-5.8.0.orig/src/plcore.c ++++ plplot-5.8.0/src/plcore.c +@@ -2110,6 +2110,7 @@ + + if (inited == 0) { + char currdir[256]; ++ char builddir[256]; + + /* AM: getcwd has a somewhat strange status on Windows, its proper + name is _getcwd, this is a problem in the case of DLLs, like with +@@ -2121,8 +2122,22 @@ + + if (getcwd(currdir, 256) == NULL) { + pldebug("plInBuildTree():", "Not enough buffer space"); +- } else if (strncmp(BUILD_DIR, currdir, strlen(BUILD_DIR)) == 0) +- inBuildTree = 1; ++ } else { ++ /* The chdir / getcwd call is to ensure we get the physical ++ * path without any symlinks */ ++ /* Ignore error in chdir - build tree may not exist */ ++ if (chdir(BUILD_DIR) == 0) { ++ if (getcwd(builddir, 256) == NULL) { ++ pldebug("plInBuildTree():", "Not enough buffer space"); ++ } ++ else { ++ if (strncmp(builddir, currdir, strlen(builddir)) == 0) { ++ inBuildTree = 1; ++ } ++ } ++ chdir(currdir); ++ } ++ } + inited = 1; + } + return inBuildTree; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-12-05 11:47:19
|
Revision: 8066 http://plplot.svn.sourceforge.net/plplot/?rev=8066&view=rev Author: rlaboiss Date: 2007-12-05 03:47:20 -0800 (Wed, 05 Dec 2007) Log Message: ----------- * debian/control: + Dropped the Homepage pseudo-header from the extended descriptions + Bumped Standards-Version to 3.7.3 Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-04 10:48:49 UTC (rev 8065) +++ trunk/debian/changelog 2007-12-05 11:47:20 UTC (rev 8066) @@ -1,3 +1,12 @@ +plplot (5.8.0-3) UNRELEASED; urgency=low + + [ Rafael Laboissiere ] + * debian/control: + + Dropped the Homepage pseudo-header from the extended description + + Bumped Standards-Version to 3.7.3 + + -- Rafael Laboissiere <ra...@de...> Wed, 05 Dec 2007 12:46:40 +0100 + plplot (5.8.0-2) unstable; urgency=low * debian/rules: add -VV option to ctest. Will make it easier to debug @@ -3,5 +12,5 @@ any failed tests for auto-built packages. * debian/patches/06_build_dir_use_physical_path.dpatch: Ensure that plplot - correctly identifies when run in the build tree, even if the path + correctly identifies when run in the build tree, even if the path involves symlinks. Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-12-04 10:48:49 UTC (rev 8065) +++ trunk/debian/control 2007-12-05 11:47:20 UTC (rev 8066) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Andrew Ross <and...@us...> Uploaders: Rafael Laboissiere <ra...@de...> -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave2.9-headers, @@ -41,8 +41,6 @@ . This package contains the PLplot libraries for C and Fortran77, as well as the necessary data files. - . - Homepage: http://www.plplot.org Package: libplplot-dev Architecture: any @@ -56,8 +54,6 @@ programs for these languages are also included. For development in Tcl/Tk, Python, and Octave, install the plplot-tcl, python-plplot, and octave-plplot packages, respectively. - . - Homepage: http://www.plplot.org Package: libplplot-c++9c2 Architecture: any @@ -68,8 +64,6 @@ Description: Scientific plotting library This package contains the C++ binding for PLplot, a scientific plotting library. - . - Homepage: http://www.plplot.org Package: libplplot-fortran9 Architecture: any @@ -78,8 +72,6 @@ Description: Scientific plotting library This package contains the Fortran 77 and Fortran 95 bindings for PLplot, a scientific plotting library. - . - Homepage: http://www.plplot.org Package: libplplot9-java Architecture: any @@ -105,8 +97,6 @@ . The source code for these libraries are part of the plplot source package. - . - Homepage: http://www.plplot.org Package: plplot-bin Architecture: any @@ -120,8 +110,6 @@ * pltek - review a Tektronix vector file * plm2gif - converts PLplot metafiles to GIF files * plpr - converts PLplot metafile to something the printer will understand - . - Homepage: http://www.plplot.org Package: plplot9-driver-xwin Architecture: any @@ -131,8 +119,6 @@ Description: Scientific plotting library (X11 driver) This package provides the X11 driver module for PLplot, a scientific plotting library. - . - Homepage: http://www.plplot.org Package: plplot9-driver-gnome2 Architecture: any @@ -144,8 +130,6 @@ This package provides the Gnome Canvas Widget driver module for PLplot, a scientific plotting library. This package replaces the (now deprecated) plplot9-driver-gnome package. - . - Homepage: http://www.plplot.org Package: plplot9-driver-wxwidgets Architecture: any @@ -154,8 +138,6 @@ Description: Scientific plotting library (wxWidgets driver) This package provides the wxWidgets driver module for PLplot, a scientific plotting library. - . - Homepage: http://www.plplot.org Package: plplot-tcl Architecture: any @@ -167,8 +149,6 @@ some programs for interactive use of PLplot (plserver and pltcl). Also included is the utility program plrender to render PLplot metafiles. - . - Homepage: http://www.plplot.org Package: plplot-tcl-dev Architecture: any @@ -179,8 +159,6 @@ This package contains the necessary files to do development in Tcl/Tk with PLplot, a scientific plotting library: header files, shared libraries links, and examples. - . - Homepage: http://www.plplot.org Package: plplot9-driver-gd Architecture: any @@ -191,8 +169,6 @@ This package provides the GD driver module for PLplot, a scientific plotting library. It allows the generation of PNG and JPEG files directly from PLplot programs. - . - Homepage: http://www.plplot.org Package: plplot9-driver-cairo Architecture: any @@ -205,8 +181,6 @@ scientific plotting library. It is based on the Cairo 2D graphics library with supportting multiple output devices (X-Window, PDF, PostScript, and PNG). - . - Homepage: http://www.plplot.org Package: python-plplot Architecture: any @@ -219,8 +193,6 @@ This package contains the library plmodule.so for gluing the PLplot scientific plotting library into Python applications. Examples are also provided. - . - Homepage: http://www.plplot.org Package: octave-plplot Architecture: any @@ -230,8 +202,6 @@ This package contains the Octave bindings for PLplot, a scientific plotting library. It provides an almost drop-in replacement for the traditional Gnuplot graphical interface in Octave. Examples are also provided. - . - Homepage: http://www.plplot.org Package: plplot-doc Architecture: all @@ -241,6 +211,4 @@ This package contains the HTML, PDF, PostScript and info forms of the PLplot documentation. It also contains the man pages for the API functions. - . - Homepage: http://www.plplot.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-12-10 21:04:17
|
Revision: 8079 http://plplot.svn.sourceforge.net/plplot/?rev=8079&view=rev Author: andrewross Date: 2007-12-10 13:04:20 -0800 (Mon, 10 Dec 2007) Log Message: ----------- Update debian rules so documentation is only built for architecture independent package builds. Modified Paths: -------------- trunk/debian/changelog trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-10 20:22:24 UTC (rev 8078) +++ trunk/debian/changelog 2007-12-10 21:04:20 UTC (rev 8079) @@ -1,3 +1,10 @@ +plplot (5.8.0-4) UNRELEASED; urgency=low + + * debian/rules: rewrite the rules so the documentation is only built for + binary-indep targets. This save significant time for the autobuilders. + + -- Andrew Ross <and...@us...> Mon, 10 Dec 2007 20:33:28 +0000 + plplot (5.8.0-3) unstable; urgency=low [ Rafael Laboissiere ] Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-12-10 20:22:24 UTC (rev 8078) +++ trunk/debian/rules 2007-12-10 21:04:20 UTC (rev 8079) @@ -30,7 +30,7 @@ PYVERS = $(shell pyversions -vr) CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ - -DBUILD_DOC=ON -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \ @@ -49,8 +49,8 @@ cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=OFF ) touch config-stamp -build: build-stamp -build-stamp: patch config-stamp +build-arch: build-arch-stamp +build-arch-stamp: patch config-stamp dh_testdir # The hack below is to go around a bug in matwrap that was # preventing the Octave binding to compile with g++ 4.0 @@ -60,45 +60,49 @@ # $(MAKE) CC="gcc -D__builtin_va_list=void" plplot_octave.oct ) ( cd $(BUILD_DIR) ; $(MAKE) ) -( cd $(BUILD_DIR) ; ITCL_LIBRARY=/usr/lib/itcl3.2 ctest -VV) - touch build-stamp + touch build-arch-stamp +build-indep: build-indep-stamp +build-indep-stamp: patch + dh_testdir + ( cd $(BUILD_DIR) ; cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DBUILD_DOC=ON ; \ + cd doc ; $(MAKE) ) + touch build-indep-stamp + clean: unpatch dh_testdir dh_testroot - rm -f build-stamp install-stamp config-stamp \ - patch-stamp debian/files install-python* + rm -f build-arch-stamp build-indep-stamp install-arch-stamp install-indep-stamp \ + config-stamp patch-stamp debian/files install-python* rm -rf $(BUILD_DIR) rm -rf $(debbase)/$(libpkg) dh_clean -install: install-stamp install-python +install-arch: install-arch-stamp install-python dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \ --no-package=plplot-bin --no-package=python-plplot - dh_movefiles -i dh_movefiles --package=python-plplot dh_movefiles --package=libplplot-dev dh_movefiles --package=plplot-bin dh_movefiles --package=$(libpkg) -install-stamp: build-stamp +install-arch-stamp: build-arch-stamp dh_testdir dh_testroot ( cd $(BUILD_DIR) ; \ $(MAKE) DESTDIR=$(debtmp) install ) - rm -f $(debtmp)/usr/bin/plplot-config - ( cd $(debdoc)/plplot ; \ rm -f COPYING.LIB *.dvi ; \ mv ChangeLog changelog ) mv $(debdoc)/plplot $(debdoc)/$(libpkg) - mkdir -p $(debdoc)/$(docpkg) - (cd $(debdoc)/$(libpkg) ; mv html *.pdf *.ps.gz $(debdoc)/$(docpkg)) + install -d $(debex)/perl install --mode=644 examples/perl/x* examples/perl/README* \ $(debex)/perl mv $(debex) $(debdoc)/$(libpkg) + 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 \ @@ -112,14 +116,25 @@ mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar ( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar ) - touch install-stamp + touch install-arch-stamp +install-indep: install-indep-stamp + dh_movefiles -i + +install-indep-stamp: build-indep-stamp + ( cd $(BUILD_DIR)/doc ; \ + $(MAKE) DESTDIR=$(debtmp) install ) + + mkdir -p $(debdoc)/$(docpkg) + (cd $(debdoc)/plplot ; mv html *.pdf *.ps.gz $(debdoc)/$(docpkg)) + 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-stamp +install-python%: build-arch-stamp ( cd $(BUILD_DIR) ; \ cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DENABLE_pygcw=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/lib/python$*/site-packages/numpy/core/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/lib/python$*/site-packages/numpy/core/include/numpy ; \ for d in gnome2/python python ; do \ @@ -131,7 +146,7 @@ touch $@ # Build architecture-independent files here. -binary-indep: build install +binary-indep: build-indep install-indep dh_testdir -i dh_testroot -i dh_installdirs -i @@ -144,7 +159,7 @@ dh_md5sums -i dh_builddeb -i -binary-arch: build install +binary-arch: build-arch install-arch dh_testdir -a dh_testroot -a dh_installdirs -a @@ -168,6 +183,6 @@ source diff: @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false -binary: binary-indep binary-arch +binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary config \ patch unpatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-12-13 09:29:49
|
Revision: 8095 http://plplot.svn.sourceforge.net/plplot/?rev=8095&view=rev Author: andrewross Date: 2007-12-13 01:29:53 -0800 (Thu, 13 Dec 2007) Log Message: ----------- Add patch from SVN to fix C++ includes for the examples. Enables building with gcc 4.3. Closes #456040. Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/00list Added Paths: ----------- trunk/debian/patches/08_fix_cxx_includes.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-13 09:28:06 UTC (rev 8094) +++ trunk/debian/changelog 2007-12-13 09:29:53 UTC (rev 8095) @@ -1,3 +1,11 @@ +plplot (5.8.0-5) UNRELEASED; urgency=low + + * debian/patches/08_fix_cxx_includes: Add patch to fix the include files for + the c++ examples. This patch should ensure the examples build with gcc 4.3. + (closes: #456040) + + -- Andrew Ross <and...@us...> Thu, 13 Dec 2007 09:24:51 +0000 + plplot (5.8.0-4) unstable; urgency=low * debian/rules: rewrite the rules so the documentation is only built for Modified: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2007-12-13 09:28:06 UTC (rev 8094) +++ trunk/debian/patches/00list 2007-12-13 09:29:53 UTC (rev 8095) @@ -4,3 +4,4 @@ 05_octave_documentation 06_build_dir_use_physical_path 07_octave_prune_examples +08_fix_cxx_includes Added: trunk/debian/patches/08_fix_cxx_includes.dpatch =================================================================== --- trunk/debian/patches/08_fix_cxx_includes.dpatch (rev 0) +++ trunk/debian/patches/08_fix_cxx_includes.dpatch 2007-12-13 09:29:53 UTC (rev 8095) @@ -0,0 +1,37 @@ +! /bin/sh /usr/share/dpatch/dpatch-run +## 08_fix_cxx_includes.dpatch by Andrew Ross <and...@us...urceforge.n +et> +## +## DP: Add in missing include files for C++ examples to fix compile errors +## DP: with gcc 4.3. (This patch was taken from the upstream SVN repository.) + +@DPATCH@ + +--- examples/c++/plc++demos.h (revision 8091) ++++ examples/c++/plc++demos.h (working copy) +@@ -8,7 +8,14 @@ + + /* common includes */ + #include "plstream.h" ++ ++/* plplot actually includes the C versions of these 2, but ++ * add here for completeness */ ++#include <cstdio> ++#include <cstdlib> ++ + #include <iostream> ++#include <cstring> + #include <cmath> + + /* common defines */ +--- examples/c++/x21.cc (revision 8092) ++++ examples/c++/x21.cc (working copy) +@@ -27,7 +27,7 @@ + //---------------------------------------------------------------------------// + + #include "plc++demos.h" +-#include <time.h> ++#include <ctime> + + #if !defined(HAVE_ISNAN) + #define isnan(x) ((x) != (x)) Property changes on: trunk/debian/patches/08_fix_cxx_includes.dpatch ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-12-13 15:32:19
|
Revision: 8099 http://plplot.svn.sourceforge.net/plplot/?rev=8099&view=rev Author: andrewross Date: 2007-12-13 07:32:16 -0800 (Thu, 13 Dec 2007) Log Message: ----------- Change debian build dependencies so the packages need just for documentation are only included for architecture independent builds. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-13 13:03:40 UTC (rev 8098) +++ trunk/debian/changelog 2007-12-13 15:32:16 UTC (rev 8099) @@ -1,10 +1,13 @@ plplot (5.8.0-5) UNRELEASED; urgency=low - * debian/patches/08_fix_cxx_includes: Add patch to fix the include files for - the c++ examples. This patch should ensure the examples build with gcc 4.3. + * debian/patches/08_fix_cxx_includes: Add patch to fix the include files for + the c++ examples. This patch should ensure the examples build with gcc 4.3. (closes: #456040) + * debian/control: Add Build-Depends-Indep section for those packages + only used in building the documentation. Reduces package dependecies + for autobuilders. - -- Andrew Ross <and...@us...> Thu, 13 Dec 2007 09:24:51 +0000 + -- Andrew Ross <and...@us...> Thu, 13 Dec 2007 15:09:00 +0000 plplot (5.8.0-4) unstable; urgency=low Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-12-13 13:03:40 UTC (rev 8098) +++ trunk/debian/control 2007-12-13 15:32:16 UTC (rev 8099) @@ -14,9 +14,9 @@ [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k], python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), - python-numpy, ttf-freefont, - docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, - opensp, jadetex, java-gcj-compat-dev, fastjar, swig + python-numpy, ttf-freefont, java-gcj-compat-dev, fastjar, swig +Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, + docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers XS-Python-Version: all Homepage: http://www.plplot.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-12-14 11:15:49
|
Revision: 8101 http://plplot.svn.sourceforge.net/plplot/?rev=8101&view=rev Author: rlaboiss Date: 2007-12-14 03:15:45 -0800 (Fri, 14 Dec 2007) Log Message: ----------- Build-depends on libqhull-dev >= 2003.1-8 Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-14 11:11:58 UTC (rev 8100) +++ trunk/debian/changelog 2007-12-14 11:15:45 UTC (rev 8101) @@ -1,14 +1,20 @@ -plplot (5.8.0-5) unstable; urgency=low +plplot (5.8.0-5) UNRELEASED; urgency=low + [ Andrew Ross ] * debian/patches/08_fix_cxx_includes: Add patch to fix the include files for the c++ examples. This patch should ensure the examples build with gcc 4.3. (closes: #456040) - * debian/control: Add Build-Depends-Indep section for those packages + * debian/control: Add Build-Depends-Indep section for those packages only used in building the documentation. Reduces package dependencies for autobuilders. - - -- Andrew Ross <and...@us...> Thu, 13 Dec 2007 15:09:00 +0000 + [ Rafael Laboissiere ] + * debian/control: Tighten build-dependency on libqhull-dev to version + equal or greater 2003.1-8 because versions previous to that one were + terribly broken. + + -- Rafael Laboissiere <ra...@de...> Fri, 14 Dec 2007 12:12:21 +0100 + plplot (5.8.0-4) unstable; urgency=low * debian/rules: rewrite the rules so the documentation is only built for Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-12-14 11:11:58 UTC (rev 8100) +++ trunk/debian/control 2007-12-14 11:15:45 UTC (rev 8101) @@ -9,13 +9,13 @@ libxi-dev, gfortran, itk3-dev, octave2.9-headers, libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, - m4, libqhull-dev, libxml-parser-perl, libxml-dom-perl, + m4, libqhull-dev (<= 2003.1-8), libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, dpatch, atlas3-base-dev [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k], python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy, ttf-freefont, java-gcj-compat-dev, fastjar, swig -Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, +Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers XS-Python-Version: all This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-12-18 13:47:33
|
Revision: 8110 http://plplot.svn.sourceforge.net/plplot/?rev=8110&view=rev Author: andrewross Date: 2007-12-18 05:47:33 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Disable building of java bindings on arm - current java-gcj-compat-dev is not building. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/libplplot9.README.Debian trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-17 22:24:56 UTC (rev 8109) +++ trunk/debian/changelog 2007-12-18 13:47:33 UTC (rev 8110) @@ -1,3 +1,11 @@ +plplot (5.8.0-6) UNRELEASED; urgency=low + + * debian/rules, debian/control, debian/libplplot9.README.debian: Disable java + on arm platform. Currently java-gcj-compat-dev is out of date on that + architecture. Instead the libplplot9-java package will be empty on arm. + + -- Andrew Ross <andrew@localhost> Tue, 18 Dec 2007 13:07:38 +0000 + plplot (5.8.0-5) unstable; urgency=low [ Andrew Ross ] Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-12-17 22:24:56 UTC (rev 8109) +++ trunk/debian/control 2007-12-18 13:47:33 UTC (rev 8110) @@ -14,7 +14,7 @@ [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k], python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), - python-numpy, ttf-freefont, java-gcj-compat-dev, fastjar, swig + python-numpy, ttf-freefont, java-gcj-compat-dev [!arm] , fastjar, swig Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers @@ -76,7 +76,7 @@ Package: libplplot9-java Architecture: any Section: libs -Depends: java-gcj-compat, ${shlibs:Depends} +Depends: java-gcj-compat [!arm] , ${shlibs:Depends} Description: Scientific plotting library This packages contains the Java bindings for PLplot, a scientific plotting library. Modified: trunk/debian/libplplot9.README.Debian =================================================================== --- trunk/debian/libplplot9.README.Debian 2007-12-17 22:24:56 UTC (rev 8109) +++ trunk/debian/libplplot9.README.Debian 2007-12-18 13:47:33 UTC (rev 8110) @@ -48,7 +48,8 @@ the PLplot functions. * libplplot9-java: Contains the bindings for using the PLplot - functions from java. + functions from java. This package is currently empty on arm due + to problems with java-gcj-compat-dev on this platform. * plplot-tcl: Modules allowing binding of the PLplot functions for Tcl/Tk. Contains also the Tk driver module and some interactive Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-12-17 22:24:56 UTC (rev 8109) +++ trunk/debian/rules 2007-12-18 13:47:33 UTC (rev 8110) @@ -29,13 +29,21 @@ JAVA_HOME = /usr/lib/jvm/java-gcj PYVERS = $(shell pyversions -vr) +# Disable java build on arm - problems with java-gcj-compat-dev at the moment +ifeq ($(DEB_BUILD_ARCH),arm) CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ + -DOCTAVE_OCT_DIR=$(OCTDIR) \ + -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_java=OFF +else +CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ + -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ -DUSE_RPATH=OFF -DPLD_psttf=OFF +endif BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) @@ -113,8 +121,10 @@ ln -s $(libpkg) $(debdoc)/$$i ; \ done +ifneq ($(DEB_BUILD_ARCH),arm) mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar ( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar ) +endif touch install-arch-stamp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-12-23 22:39:15
|
Revision: 8111 http://plplot.svn.sourceforge.net/plplot/?rev=8111&view=rev Author: rlaboiss Date: 2007-12-23 14:39:20 -0800 (Sun, 23 Dec 2007) Log Message: ----------- Force build-dependency on python-numpy to be >=1.0.4-4, because the previous version had the include files installed in the wrong directory Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-18 13:47:33 UTC (rev 8110) +++ trunk/debian/changelog 2007-12-23 22:39:20 UTC (rev 8111) @@ -1,11 +1,17 @@ plplot (5.8.0-6) UNRELEASED; urgency=low - * debian/rules, debian/control, debian/libplplot9.README.debian: Disable java - on arm platform. Currently java-gcj-compat-dev is out of date on that - architecture. Instead the libplplot9-java package will be empty on arm. + [ Andrew Ross ] + * debian/rules, debian/control, debian/libplplot9.README.debian: Disable java + on arm platform. Currently java-gcj-compat-dev is out of date on that + architecture. Instead the libplplot9-java package will be empty on arm. - -- Andrew Ross <andrew@localhost> Tue, 18 Dec 2007 13:07:38 +0000 + [ Rafael Laboissiere ] + * debian/control: Force build-dependency on python-numpy to be >=1.0.4-4, + because the previous version had the include files installed in the + wrong directory + -- Rafael Laboissiere <ra...@de...> Sun, 23 Dec 2007 23:36:42 +0100 + plplot (5.8.0-5) unstable; urgency=low [ Andrew Ross ] Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-12-18 13:47:33 UTC (rev 8110) +++ trunk/debian/control 2007-12-23 22:39:20 UTC (rev 8111) @@ -14,7 +14,8 @@ [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k], python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), - python-numpy, ttf-freefont, java-gcj-compat-dev [!arm] , fastjar, swig + python-numpy (>= 1.0.4-4), ttf-freefont, java-gcj-compat-dev [!arm], + fastjar, swig Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-12-23 22:47:18
|
Revision: 8112 http://plplot.svn.sourceforge.net/plplot/?rev=8112&view=rev Author: rlaboiss Date: 2007-12-23 14:46:50 -0800 (Sun, 23 Dec 2007) Log Message: ----------- Build-depends on octave3.0-headers instead of octave2.9-headers Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-23 22:39:20 UTC (rev 8111) +++ trunk/debian/changelog 2007-12-23 22:46:50 UTC (rev 8112) @@ -6,9 +6,11 @@ architecture. Instead the libplplot9-java package will be empty on arm. [ Rafael Laboissiere ] - * debian/control: Force build-dependency on python-numpy to be >=1.0.4-4, - because the previous version had the include files installed in the - wrong directory + * debian/control: + + Force build-dependency on python-numpy to be >=1.0.4-4, because the + previous version had the include files installed in the wrong + directory + + Build-depends on octave3.0-headers instead of octave2.9-headers -- Rafael Laboissiere <ra...@de...> Sun, 23 Dec 2007 23:36:42 +0100 Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-12-23 22:39:20 UTC (rev 8111) +++ trunk/debian/control 2007-12-23 22:46:50 UTC (rev 8112) @@ -6,7 +6,7 @@ Standards-Version: 3.7.3 Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, - libxi-dev, gfortran, itk3-dev, octave2.9-headers, + libxi-dev, gfortran, itk3-dev, octave3.0-headers, libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-12-23 23:07:13
|
Revision: 8113 http://plplot.svn.sourceforge.net/plplot/?rev=8113&view=rev Author: rlaboiss Date: 2007-12-23 15:07:17 -0800 (Sun, 23 Dec 2007) Log Message: ----------- Adapted dpatch for also accepting Octave 3.0 Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/01_check-for-octave2.9.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-23 22:46:50 UTC (rev 8112) +++ trunk/debian/changelog 2007-12-23 23:07:17 UTC (rev 8113) @@ -11,8 +11,10 @@ previous version had the include files installed in the wrong directory + Build-depends on octave3.0-headers instead of octave2.9-headers + * debian/patches/01_check-for-octave2.9.dpatch: Adapted for also + accepting Octave 3.0 - -- Rafael Laboissiere <ra...@de...> Sun, 23 Dec 2007 23:36:42 +0100 + -- Rafael Laboissiere <ra...@de...> Mon, 24 Dec 2007 00:06:08 +0100 plplot (5.8.0-5) unstable; urgency=low Modified: trunk/debian/patches/01_check-for-octave2.9.dpatch =================================================================== --- trunk/debian/patches/01_check-for-octave2.9.dpatch 2007-12-23 22:46:50 UTC (rev 8112) +++ trunk/debian/patches/01_check-for-octave2.9.dpatch 2007-12-23 23:07:17 UTC (rev 8113) @@ -1,7 +1,7 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 01_check-for-octave2.9.dpatch by Rafael Laboissiere <ra...@de...> ## -## DP: Abort toggle_plplot_use if not using Octave 2.9 +## DP: Abort toggle_plplot_use if not using Octave 2.9 or newer @DPATCH@ @@ -11,9 +11,9 @@ 1; -+## Abort if not using Octave 2.9 -+if (split (version , '.') (1, 1) != '2' || split (version , '.') (2, 1) != '9') -+ error ("This version of octave-plplot only works with Octave 2.9\n"); ++## Abort if not using Octave 2.9 or newer ++if ! ((split (version , '.') (1, 1) == '2' && split (version , '.') (1, 2) == '9') || split (version , '.') (1, 1) > '2' ) ++ error ("This version of octave-plplot only works with Octave 2.9 or newer\n"); +endif + if ! exist ("use_plplot_state") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-12-24 11:46:14
|
Revision: 8114 http://plplot.svn.sourceforge.net/plplot/?rev=8114&view=rev Author: rlaboiss Date: 2007-12-24 03:46:19 -0800 (Mon, 24 Dec 2007) Log Message: ----------- Adjusted path of numpy include files, which are now in /usr/include/numpy Modified Paths: -------------- trunk/debian/changelog trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-12-23 23:07:17 UTC (rev 8113) +++ trunk/debian/changelog 2007-12-24 11:46:19 UTC (rev 8114) @@ -13,6 +13,8 @@ + Build-depends on octave3.0-headers instead of octave2.9-headers * debian/patches/01_check-for-octave2.9.dpatch: Adapted for also accepting Octave 3.0 + * debian/rules: Adjusted path of numpy include files, which are now in + /usr/include/numpy -- Rafael Laboissiere <ra...@de...> Mon, 24 Dec 2007 00:06:08 +0100 Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-12-23 23:07:17 UTC (rev 8113) +++ trunk/debian/rules 2007-12-24 11:46:19 UTC (rev 8114) @@ -146,7 +146,7 @@ install-python%: build-arch-stamp ( cd $(BUILD_DIR) ; \ - cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DENABLE_pygcw=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/lib/python$*/site-packages/numpy/core/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/lib/python$*/site-packages/numpy/core/include/numpy ; \ + cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DENABLE_pygcw=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" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \ for d in gnome2/python python ; do \ ( cd bindings/$$d; \ $(MAKE) clean ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-01-18 12:24:07
|
Revision: 8148 http://plplot.svn.sourceforge.net/plplot/?rev=8148&view=rev Author: rlaboiss Date: 2008-01-18 04:24:11 -0800 (Fri, 18 Jan 2008) Log Message: ----------- * debian/changelog: Preparation for release 5.8.0-7 * debian/control: Fixed capitalization of GNOME (Lintian warning) Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-01-18 10:03:02 UTC (rev 8147) +++ trunk/debian/changelog 2008-01-18 12:24:11 UTC (rev 8148) @@ -1,3 +1,10 @@ +plplot (5.8.0-7) UNRELEASED; urgency=low + + [ Rafael Laboissiere ] + * debian/control: Fixed capitalization of GNOME (Lintian warning) + + -- Rafael Laboissiere <ra...@de...> Fri, 18 Jan 2008 13:16:38 +0100 + plplot (5.8.0-6) unstable; urgency=low [ Andrew Ross ] Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2008-01-18 10:03:02 UTC (rev 8147) +++ trunk/debian/control 2008-01-18 12:24:11 UTC (rev 8148) @@ -125,8 +125,8 @@ Depends: libplplot9, ${shlibs:Depends} Conflicts: plplot9-driver-gnome Replaces: plplot9-driver-gnome -Description: Scientific plotting library (Gnome Canvas Widget driver) - This package provides the Gnome Canvas Widget driver module for PLplot, a +Description: Scientific plotting library (GNOME Canvas Widget driver) + This package provides the GNOME Canvas Widget driver module for PLplot, a scientific plotting library. This package replaces the (now deprecated) plplot9-driver-gnome package. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-01-18 12:28:08
|
Revision: 8149 http://plplot.svn.sourceforge.net/plplot/?rev=8149&view=rev Author: rlaboiss Date: 2008-01-18 04:28:13 -0800 (Fri, 18 Jan 2008) Log Message: ----------- Added patch for fixing EC encoding problems Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/00list Added Paths: ----------- trunk/debian/patches/09_pdftex-EC-encoding.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-01-18 12:24:11 UTC (rev 8148) +++ trunk/debian/changelog 2008-01-18 12:28:13 UTC (rev 8149) @@ -2,8 +2,12 @@ [ Rafael Laboissiere ] * debian/control: Fixed capitalization of GNOME (Lintian warning) + * debian/patches/09_pdftex-EC-encoding.dpatch: Added patch for getting + included the correct ec.enc file for the EC encoding, such that + ligatures like "ff" and "fi" display correctly in the PDF form of the + documentation (closes: #461343) - -- Rafael Laboissiere <ra...@de...> Fri, 18 Jan 2008 13:16:38 +0100 + -- Rafael Laboissiere <ra...@de...> Fri, 18 Jan 2008 13:26:34 +0100 plplot (5.8.0-6) unstable; urgency=low Modified: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2008-01-18 12:24:11 UTC (rev 8148) +++ trunk/debian/patches/00list 2008-01-18 12:28:13 UTC (rev 8149) @@ -5,3 +5,4 @@ 06_build_dir_use_physical_path 07_octave_prune_examples 08_fix_cxx_includes +09_pdftex-EC-encoding Added: trunk/debian/patches/09_pdftex-EC-encoding.dpatch =================================================================== --- trunk/debian/patches/09_pdftex-EC-encoding.dpatch (rev 0) +++ trunk/debian/patches/09_pdftex-EC-encoding.dpatch 2008-01-18 12:28:13 UTC (rev 8149) @@ -0,0 +1,69 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_pdftex-EC-encoding by Rafael Laboissiere <ra...@de...> +## +## DP: Use ec.enc file instead of EC.enc, which does not exist in Debian + +@DPATCH@ + +--- plplot-5.8.0.orig/doc/docbook/src/pdftex.map ++++ plplot-5.8.0/doc/docbook/src/pdftex.map +@@ -1,31 +1,31 @@ +-cmr10 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb ++cmr10 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb + cmmi10 <cmmi10.pfb + cmsy10 <cmsy10.pfb + cmsy9 <cmsy9.pfb +-ectt0800 "ECEncoding ReEncodeFont"<EC.enc <cmtt8.pfb +-ecit0900 "0.9 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb +-ecit1000 "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb +-tcrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb +-ecrm0600 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb +-ectt0900 "ECEncoding ReEncodeFont"<EC.enc <cmtt9.pfb +-ecti1000 "ECEncoding ReEncodeFont"<EC.enc <cmti10.pfb +-ecbx1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb +-ecrb1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb +-ecrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb +-ecti0800 "ECEncoding ReEncodeFont"<EC.enc <cmti8.pfb +-tcrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb +-ecrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb +-ecrm0900 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb +-ecsx1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb +-ecss1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb +-ecsx1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecss1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecsx1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecss1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecsx1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecss1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecsx2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb +-ecss2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb +-ecsx2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb +-ecss2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb +-ectt1095 "1.095 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmtt10.pfb ++ectt0800 "ecEncoding ReEncodeFont"<ec.enc <cmtt8.pfb ++ecit0900 "0.9 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb ++ecit1000 "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb ++tcrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb ++ecrm0600 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb ++ectt0900 "ecEncoding ReEncodeFont"<ec.enc <cmtt9.pfb ++ecti1000 "ecEncoding ReEncodeFont"<ec.enc <cmti10.pfb ++ecbx1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb ++ecrb1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb ++ecrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb ++ecti0800 "ecEncoding ReEncodeFont"<ec.enc <cmti8.pfb ++tcrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb ++ecrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb ++ecrm0900 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb ++ecsx1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb ++ecss1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb ++ecsx1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecss1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecsx1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecss1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecsx1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecss1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecsx2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb ++ecss2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb ++ecsx2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb ++ecss2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb ++ectt1095 "1.095 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmtt10.pfb Property changes on: trunk/debian/patches/09_pdftex-EC-encoding.dpatch ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-02-12 18:33:23
|
Revision: 8242 http://plplot.svn.sourceforge.net/plplot/?rev=8242&view=rev Author: andrewross Date: 2008-02-12 10:33:22 -0800 (Tue, 12 Feb 2008) Log Message: ----------- Update debian files for 5.9.0 release. Remove debian patches now included in the main source. Enable ada bindings and create new libplplot-ada package for them. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/libplplot-dev.files trunk/debian/libplplot9.README.Debian trunk/debian/patches/00list trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-02-12 03:16:19 UTC (rev 8241) +++ trunk/debian/changelog 2008-02-12 18:33:22 UTC (rev 8242) @@ -1,3 +1,21 @@ +plplot (5.9.0-1) UNRELEASED; urgency=low + + * New upstream release + * debian/patches/00list: Remove patches + 05_octave_documentation.dpatch + 06_build_dir_use_physical_path.dpatch + 08_fix_cxx_includes.dpatch + as they are now included upstream + * debian/rules, debian/control, debian/libplplot-ada.files, + debian/liplplot-dev.files: + Add new package libplplot-ada to contain the Ada bindings. Include + examples and source in with the libplplot-dev package (following + Ada policy). + * debian/libplplot9.README.Debian: Update to include new ada + bindings package. + + -- Andrew Ross <and...@us...> Tue, 12 Feb 2008 16:33:45 +0000 + plplot (5.8.0-7) UNRELEASED; urgency=low [ Rafael Laboissiere ] Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2008-02-12 03:16:19 UTC (rev 8241) +++ trunk/debian/control 2008-02-12 18:33:22 UTC (rev 8242) @@ -15,7 +15,7 @@ python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, java-gcj-compat-dev [!arm], - fastjar, swig + fastjar, swig, gnat Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers @@ -202,6 +202,14 @@ library. It provides an almost drop-in replacement for the traditional Gnuplot graphical interface in Octave. Examples are also provided. +Package: libplplot-ada +Architecture: any +Priority: extra +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends} +Description: Ada support for PLplot, a plotting library + This package contains the Ada bindings for PLplot, a scientific plotting + library. + Package: plplot-doc Architecture: all Section: doc Modified: trunk/debian/libplplot-dev.files =================================================================== --- trunk/debian/libplplot-dev.files 2008-02-12 03:16:19 UTC (rev 8241) +++ trunk/debian/libplplot-dev.files 2008-02-12 18:33:22 UTC (rev 8242) @@ -6,3 +6,4 @@ usr/share/doc/libplplot9/examples usr/share/doc/libplplot9/README.pkg-config usr/share/doc/libplplot-dev +usr/share/ada Modified: trunk/debian/libplplot9.README.Debian =================================================================== --- trunk/debian/libplplot9.README.Debian 2008-02-12 03:16:19 UTC (rev 8241) +++ trunk/debian/libplplot9.README.Debian 2008-02-12 18:33:22 UTC (rev 8242) @@ -44,13 +44,15 @@ * libplplot-c++9c2: Contains the library for using the C++ PLplot classes. - * libplplot-fortran9: Contains the F77 and F90 binding for + * 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 Modified: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2008-02-12 03:16:19 UTC (rev 8241) +++ trunk/debian/patches/00list 2008-02-12 18:33:22 UTC (rev 8242) @@ -1,8 +1,8 @@ 01_check-for-octave2.9 02_unset-python-path 04_use-mkoctfile -05_octave_documentation -06_build_dir_use_physical_path +#05_octave_documentation +#06_build_dir_use_physical_path 07_octave_prune_examples -08_fix_cxx_includes +#08_fix_cxx_includes 09_pdftex-EC-encoding Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-02-12 03:16:19 UTC (rev 8241) +++ trunk/debian/rules 2008-02-12 18:33:22 UTC (rev 8242) @@ -34,7 +34,8 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_java=OFF + -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_java=OFF \ + -DENABLE_ada=ON else CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ @@ -42,7 +43,8 @@ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF -DPLD_psttf=OFF + -DUSE_RPATH=OFF -DPLD_psttf=OFF \ + -DENABLE_ada=ON endif BUILD_DIR = $(debbase)/build_tmp @@ -117,7 +119,7 @@ python-plplot plplot-bin libplplot-c++9c2 \ plplot9-driver-gnome2 plplot9-driver-wxwidgets \ plplot9-driver-cairo libplplot-fortran9 \ - libplplot9-java; do \ + libplplot9-java libplplot-ada; do \ ln -s $(libpkg) $(debdoc)/$$i ; \ done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-02-24 10:16:35
|
Revision: 8246 http://plplot.svn.sourceforge.net/plplot/?rev=8246&view=rev Author: rlaboiss Date: 2008-02-24 02:16:39 -0800 (Sun, 24 Feb 2008) Log Message: ----------- Force build-dependency on octave3.0 >= 3.0.0-2, ensuring the transition from g77 to gfortran Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-02-24 10:13:49 UTC (rev 8245) +++ trunk/debian/changelog 2008-02-24 10:16:39 UTC (rev 8246) @@ -16,7 +16,10 @@ bindings package. [ Rafael Laboissiere ] - * debian/control: Fixed capitalization of GNOME (Lintian warning) + * debian/control: + + Fixed capitalization of GNOME (Lintian warning) + + Force build-dependency on octave3.0 >= 3.0.0-2, ensuring the + transition from g77 to gfortran * debian/patches/09_pdftex-EC-encoding.dpatch: Added patch for getting included the correct ec.enc file for the EC encoding, such that ligatures like "ff" and "fi" display correctly in the PDF form of the Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2008-02-24 10:13:49 UTC (rev 8245) +++ trunk/debian/control 2008-02-24 10:16:39 UTC (rev 8246) @@ -6,12 +6,11 @@ Standards-Version: 3.7.3 Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, - libxi-dev, gfortran, itk3-dev, octave3.0-headers, + libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, - libltdl3-dev, pkg-config, dpatch, atlas3-base-dev - [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k], + libltdl3-dev, pkg-config, dpatch, python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, java-gcj-compat-dev [!arm], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-02-24 11:47:37
|
Revision: 8249 http://plplot.svn.sourceforge.net/plplot/?rev=8249&view=rev Author: rlaboiss Date: 2008-02-24 03:47:42 -0800 (Sun, 24 Feb 2008) Log Message: ----------- Added dpatch 10_print-usage-octave-3.0 Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/00list Added Paths: ----------- trunk/debian/patches/10_print-usage-octave-3.0.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-02-24 10:26:32 UTC (rev 8248) +++ trunk/debian/changelog 2008-02-24 11:47:42 UTC (rev 8249) @@ -22,12 +22,14 @@ transition from g77 to gfortran. Also, drop the unnecessary build-dependencies on blas, atlas, and lapack, since they are pulled in by octave3.0. - * debian/patches/09_pdftex-EC-encoding.dpatch: Added patch for getting - included the correct ec.enc file for the EC encoding, such that - ligatures like "ff" and "fi" display correctly in the PDF form of the - documentation (closes: #461343) + * Add dpatches: + + 09_pdftex-EC-encoding: Include the correct ec.enc file for the EC + encoding, such that ligatures like "ff" and "fi" display correctly + in the PDF form of the documentation (closes: #461343) + + 10_print-usage-octave-3.0: Use the appropriate call to print_usage + in wrap_octave.pl when building against octave3.0 - -- Andrew Ross <and...@us...> Tue, 12 Feb 2008 16:33:45 +0000 + -- Rafael Laboissiere <ra...@de...> Sun, 24 Feb 2008 12:43:28 +0100 plplot (5.8.0-6) unstable; urgency=low Modified: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2008-02-24 10:26:32 UTC (rev 8248) +++ trunk/debian/patches/00list 2008-02-24 11:47:42 UTC (rev 8249) @@ -3,3 +3,4 @@ 04_use-mkoctfile 07_octave_prune_examples 09_pdftex-EC-encoding +10_print-usage-octave-3.0 Added: trunk/debian/patches/10_print-usage-octave-3.0.dpatch =================================================================== --- trunk/debian/patches/10_print-usage-octave-3.0.dpatch (rev 0) +++ trunk/debian/patches/10_print-usage-octave-3.0.dpatch 2008-02-24 11:47:42 UTC (rev 8249) @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_print-usage-octave-3.0.dpatch by Rafael Laboissiere <ra...@de...> +## +## DP: Use correct call to print_usage in wrap_octave.pl when compiling +## DP: against octave3.0 + +@DPATCH@ + +--- plplot-5.9.0.orig/bindings/octave/matwrap/wrap_octave.pl ++++ plplot-5.9.0/bindings/octave/matwrap/wrap_octave.pl +@@ -10,7 +10,7 @@ + # Copyright (c) 1997 Gary R. Holt. This is distributed under the terms of the + # perl artistic license (http://language.perl.com/misc/Artistic.html). + # +-# Modifications 2007 Andrew Ross ++# Modifications 2007 Andrew Ross + # This version contains three local fixes for plplot + # 1) Change _dim function to allow a zero length array (required by plstyl) + # 2) Alter string to std::string for compatibility with gcc3.2 and later +@@ -18,6 +18,9 @@ + # from v2.1 to v2.9. This requires a file octave_version.pl which defines + # the variable octave_version. + # ++# Modifications 2008 Rafael Laboissiere ++# Change 3) above is adapted for Octave v3.0 ++ + + package octave; # Everything should be in this package. + +@@ -158,7 +161,7 @@ + # Permissible not to specify output args + # if there is only one. + @ver = split(/\./,$octave_version); +- if ($ver[0] >= 2 && $ver[1] >= 9) { ++ if ($ver[0] >= 3 || ($ver[0] >= 2 && $ver[1] >= 9)) { + $retstr .= (")\n" . + " {\n" . + " print_usage();\n" . # Give an error. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-02-24 14:08:03
|
Revision: 8250 http://plplot.svn.sourceforge.net/plplot/?rev=8250&view=rev Author: rlaboiss Date: 2008-02-24 06:08:07 -0800 (Sun, 24 Feb 2008) Log Message: ----------- Adjust dpatch 04_use-mkoctfile for installing plplot_octave.oct with the appropriate execution permissions Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/04_use-mkoctfile.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-02-24 11:47:42 UTC (rev 8249) +++ trunk/debian/changelog 2008-02-24 14:08:07 UTC (rev 8250) @@ -28,6 +28,10 @@ in the PDF form of the documentation (closes: #461343) + 10_print-usage-octave-3.0: Use the appropriate call to print_usage in wrap_octave.pl when building against octave3.0 + * debian/patches/04_use-mkoctfile.dpatch: Adjust for installing + plplot_octave.oct with the appropriate execution permissions, + otherwise dpkg-shlibdeps does not work correctly for the octave-plplot + package -- Rafael Laboissiere <ra...@de...> Sun, 24 Feb 2008 12:43:28 +0100 Modified: trunk/debian/patches/04_use-mkoctfile.dpatch =================================================================== --- trunk/debian/patches/04_use-mkoctfile.dpatch 2008-02-24 11:47:42 UTC (rev 8249) +++ trunk/debian/patches/04_use-mkoctfile.dpatch 2008-02-24 14:08:07 UTC (rev 8250) @@ -7,7 +7,7 @@ --- plplot-5.8.0~RC1.orig/bindings/octave/CMakeLists.txt +++ plplot-5.8.0~RC1/bindings/octave/CMakeLists.txt -@@ -128,66 +128,24 @@ +@@ -133,64 +133,34 @@ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h ) @@ -54,15 +54,17 @@ - ) -endif(USE_RPATH) - --# Have to be specific about permissions for some reason (probably oct suffix). --set(PERM_MODULES --OWNER_READ --OWNER_WRITE --OWNER_EXECUTE --GROUP_READ --GROUP_EXECUTE --WORLD_READ --WORLD_EXECUTE + # Have to be specific about permissions for some reason (probably oct suffix). + set(PERM_MODULES + OWNER_READ + OWNER_WRITE + OWNER_EXECUTE + GROUP_READ + GROUP_EXECUTE + WORLD_READ + WORLD_EXECUTE + ) + +add_custom_command( +OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct +DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc @@ -75,8 +77,8 @@ +add_custom_target( +plplot_octave_oct_file ALL +DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct - ) - ++) ++ install( -TARGETS -plplot_octave @@ -84,11 +86,9 @@ +FILES +${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct DESTINATION ${OCTAVE_OCT_DIR} --PERMISSIONS ${PERM_MODULES} + PERMISSIONS ${PERM_MODULES} ) - - # Build and install plplot_stub.m -@@ -233,23 +191,4 @@ +@@ -238,23 +208,4 @@ DESTINATION ${PLPLOT_OCTAVE_DIR} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-03-05 19:53:15
|
Revision: 8256 http://plplot.svn.sourceforge.net/plplot/?rev=8256&view=rev Author: andrewross Date: 2008-03-05 11:53:10 -0800 (Wed, 05 Mar 2008) Log Message: ----------- Disable ada support in debian packges for arm architecture. gnat is not available on arm. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-03-03 07:55:29 UTC (rev 8255) +++ trunk/debian/changelog 2008-03-05 19:53:10 UTC (rev 8256) @@ -1,3 +1,11 @@ +plplot (5.9.0-2) unstable; urgency=low + + * debian/control, debian/rules: Disable ada support for arm. The + gnat compiler is not available on the arm architecture. The + libplplot-ada package will be empty on this architecture. + + -- Andrew Ross <and...@us...> Wed, 05 Mar 2008 19:49:02 +0000 + plplot (5.9.0-1) unstable; urgency=low [ Andrew Ross ] Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2008-03-03 07:55:29 UTC (rev 8255) +++ trunk/debian/control 2008-03-05 19:53:10 UTC (rev 8256) @@ -14,7 +14,7 @@ python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, java-gcj-compat-dev [!arm], - fastjar, swig, gnat + fastjar, swig, gnat [!arm] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-03-03 07:55:29 UTC (rev 8255) +++ trunk/debian/rules 2008-03-05 19:53:10 UTC (rev 8256) @@ -29,13 +29,14 @@ JAVA_HOME = /usr/lib/jvm/java-gcj PYVERS = $(shell pyversions -vr) -# Disable java build on arm - problems with java-gcj-compat-dev at the moment +# Disable java and ada build on arm - problems with java-gcj-compat-dev +# at the moment. Also gnat not available on arm. ifeq ($(DEB_BUILD_ARCH),arm) CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_java=OFF \ - -DENABLE_ada=ON + -DENABLE_ada=OFF else CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-22 18:50:42
|
Revision: 8313 http://plplot.svn.sourceforge.net/plplot/?rev=8313&view=rev Author: rlaboiss Date: 2008-03-22 11:50:46 -0700 (Sat, 22 Mar 2008) Log Message: ----------- Add patch for fixing minus signs in manpage Modified Paths: -------------- trunk/debian/changelog Added Paths: ----------- trunk/debian/patches/11_minus-sign-manpage.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-03-22 16:23:58 UTC (rev 8312) +++ trunk/debian/changelog 2008-03-22 18:50:46 UTC (rev 8313) @@ -1,11 +1,16 @@ -plplot (5.9.0-2) unstable; urgency=low +plplot (5.9.0-2) UNRELEASED; urgency=low - * debian/control, debian/rules: Disable ada support for arm. The + [ Andrew Ross ] + * debian/control, debian/rules: Disable ada support for arm. The gnat compiler is not available on the arm architecture. The libplplot-ada package will be empty on this architecture. - -- Andrew Ross <and...@us...> Wed, 05 Mar 2008 19:49:02 +0000 + [ Rafael Laboissiere ] + * debian/patches/11_minus-sign-manpage.dpatch: Escape "-" signs that + mean the "minus" character in plserver man page + -- Rafael Laboissiere <ra...@de...> Sun, 16 Mar 2008 23:37:46 +0100 + plplot (5.9.0-1) unstable; urgency=low [ Andrew Ross ] Added: trunk/debian/patches/11_minus-sign-manpage.dpatch =================================================================== --- trunk/debian/patches/11_minus-sign-manpage.dpatch (rev 0) +++ trunk/debian/patches/11_minus-sign-manpage.dpatch 2008-03-22 18:50:46 UTC (rev 8313) @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_minus-sign-manpage.dpatch by Rafael Laboissiere <ra...@de...> +## +## DP: Escape "-" signs that mean the "minus" character + +@DPATCH@ + +--- plplot-5.9.0.orig/doc/plserver.1 ++++ plplot-5.9.0/doc/plserver.1 +@@ -14,10 +14,10 @@ + is just a front-end to the pltkMain() function. Structured along the + preferred lines for extended wish'es. It typically runs as a child + process from the PLplot TK driver to render output. Can use either TK +-send or Tcl-DP RPC for communication, depending on how it is invoked. ++send or Tcl\-DP RPC for communication, depending on how it is invoked. + .PP + Note that plserver can be used the same way as wish or dpwish, as it +-contains the functionality of each of these (except the -notk Tcl-DP ++contains the functionality of each of these (except the \-notk Tcl-DP + command-line option is not supported). + .SH "SEE ALSO" + See /usr/share/doc/plplot/plplot.ps.gz for more details. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-22 18:54:37
|
Revision: 8315 http://plplot.svn.sourceforge.net/plplot/?rev=8315&view=rev Author: rlaboiss Date: 2008-03-22 11:54:41 -0700 (Sat, 22 Mar 2008) Log Message: ----------- Set doc-base section to Science/Mathematics Modified Paths: -------------- trunk/debian/changelog trunk/debian/plplot-doc.doc-base Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-03-22 18:53:55 UTC (rev 8314) +++ trunk/debian/changelog 2008-03-22 18:54:41 UTC (rev 8315) @@ -8,6 +8,7 @@ [ Rafael Laboissiere ] * debian/patches/11_minus-sign-manpage.dpatch: Escape "-" signs that mean the "minus" character in plserver man page + * debian/plplot-doc.doc-base: Set section to Science/Mathematics -- Rafael Laboissiere <ra...@de...> Sun, 16 Mar 2008 23:37:46 +0100 Modified: trunk/debian/plplot-doc.doc-base =================================================================== --- trunk/debian/plplot-doc.doc-base 2008-03-22 18:53:55 UTC (rev 8314) +++ trunk/debian/plplot-doc.doc-base 2008-03-22 18:54:41 UTC (rev 8315) @@ -7,7 +7,7 @@ almost all aspects of the plot are configurable. This manual contains an extensive presentation of the PLplot concepts and the documentation of the API functions. -Section: Apps/Math +Section: Science/Mathematics Format: HTML Index: /usr/share/doc/plplot-doc/html/index.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-22 19:17:13
|
Revision: 8317 http://plplot.svn.sourceforge.net/plplot/?rev=8317&view=rev Author: rlaboiss Date: 2008-03-22 12:17:19 -0700 (Sat, 22 Mar 2008) Log Message: ----------- Do not build ADA binding on mipsel Modified Paths: -------------- trunk/debian/control trunk/debian/rules Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2008-03-22 19:04:35 UTC (rev 8316) +++ trunk/debian/control 2008-03-22 19:17:19 UTC (rev 8317) @@ -14,7 +14,7 @@ python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, java-gcj-compat-dev [!arm], - fastjar, swig, gnat [!arm] + fastjar, swig, gnat [!arm !mipsel] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers @@ -207,7 +207,7 @@ Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends} Description: Ada support for PLplot, a plotting library This package contains the Ada bindings for PLplot, a scientific plotting - library. + library. Package: plplot-doc Architecture: all Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-03-22 19:04:35 UTC (rev 8316) +++ trunk/debian/rules 2008-03-22 19:17:19 UTC (rev 8317) @@ -29,24 +29,30 @@ JAVA_HOME = /usr/lib/jvm/java-gcj PYVERS = $(shell pyversions -vr) -# Disable java and ada build on arm - problems with java-gcj-compat-dev -# at the moment. Also gnat not available on arm. +# Disable java and ada build on arm - problems with java-gcj-compat-dev +# at the moment. Also gnat not available on arm and mipsel. ifeq ($(DEB_BUILD_ARCH),arm) -CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ - -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ - -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_java=OFF \ - -DENABLE_ada=OFF +ADA_OPTIONS = -DENABLE_ada=OFF +JAVA_OPTIONS = -DENABLE_java=OFF +else ifeq ($(DEB_BUILD_ARCH),mipsel) +ADA_OPTIONS = -DENABLE_ada=OFF +JAVA_OPTIONS = \ + -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ + -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ + -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar else +ADA_OPTIONS = -DENABLE_ada=ON +JAVA_OPTIONS = \ + -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ + -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ + -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar +endif + CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ - -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ - -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ -DUSE_RPATH=OFF -DPLD_psttf=OFF \ - -DENABLE_ada=ON -endif + $(ADA_OPTIONS) $(JAVA_OPTIONS) BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) @@ -74,7 +80,7 @@ touch build-arch-stamp build-indep: build-indep-stamp -build-indep-stamp: patch +build-indep-stamp: patch dh_testdir ( cd $(BUILD_DIR) ; cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DBUILD_DOC=ON ; \ cd doc ; $(MAKE) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-23 15:19:23
|
Revision: 8320 http://plplot.svn.sourceforge.net/plplot/?rev=8320&view=rev Author: rlaboiss Date: 2008-03-23 08:19:29 -0700 (Sun, 23 Mar 2008) Log Message: ----------- Build-depend on g++-4.1 on arm, otherwise mkoctfile fails on this architecture Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-03-23 11:10:05 UTC (rev 8319) +++ trunk/debian/changelog 2008-03-23 15:19:29 UTC (rev 8320) @@ -1,3 +1,10 @@ +plplot (5.9.0-3) UNRELEASED; urgency=low + + * debian/control: Build-depend on g++-4.1 on arm, otherwise mkoctfile + fails on this architecture + + -- Rafael Laboissiere <ra...@de...> Sun, 23 Mar 2008 16:19:02 +0100 + plplot (5.9.0-2) unstable; urgency=low [ Andrew Ross ] Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2008-03-23 11:10:05 UTC (rev 8319) +++ trunk/debian/control 2008-03-23 15:19:29 UTC (rev 8320) @@ -4,7 +4,7 @@ Maintainer: Andrew Ross <and...@us...> Uploaders: Rafael Laboissiere <ra...@de...> Standards-Version: 3.7.3 -Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), +Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm], tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-23 21:24:03
|
Revision: 8322 http://plplot.svn.sourceforge.net/plplot/?rev=8322&view=rev Author: rlaboiss Date: 2008-03-23 14:24:06 -0700 (Sun, 23 Mar 2008) Log Message: ----------- Set variable DEB_BUID_ARCH using dpkg-architecture Modified Paths: -------------- trunk/debian/changelog trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-03-23 19:57:51 UTC (rev 8321) +++ trunk/debian/changelog 2008-03-23 21:24:06 UTC (rev 8322) @@ -2,8 +2,9 @@ * debian/control: Build-depend on g++-4.1 on arm, otherwise mkoctfile fails on this architecture + * debian/rules: Set variable DEB_BUID_ARCH using dpkg-architecture - -- Rafael Laboissiere <ra...@de...> Sun, 23 Mar 2008 16:19:02 +0100 + -- Rafael Laboissiere <ra...@de...> Sun, 23 Mar 2008 22:18:14 +0100 plplot (5.9.0-2) unstable; urgency=low Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-03-23 19:57:51 UTC (rev 8321) +++ trunk/debian/rules 2008-03-23 21:24:06 UTC (rev 8322) @@ -29,6 +29,9 @@ JAVA_HOME = /usr/lib/jvm/java-gcj PYVERS = $(shell pyversions -vr) + +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + # Disable java and ada build on arm - problems with java-gcj-compat-dev # at the moment. Also gnat not available on arm and mipsel. ifeq ($(DEB_BUILD_ARCH),arm) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-24 09:57:35
|
Revision: 8328 http://plplot.svn.sourceforge.net/plplot/?rev=8328&view=rev Author: rlaboiss Date: 2008-03-24 02:57:42 -0700 (Mon, 24 Mar 2008) Log Message: ----------- * debian/control: Build-depend on gnat-4.1 on alpha and mipsel, since gnat-4.3, the default ADA compiler, has issues on those architectures * debian/rules: Do not issue commands related to the libplplot9-java and libplplot-ada packages on arm Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/libplplot-dev.files trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-03-24 01:37:35 UTC (rev 8327) +++ trunk/debian/changelog 2008-03-24 09:57:42 UTC (rev 8328) @@ -1,3 +1,12 @@ +plplot (5.9.0-4) UNRELEASED; urgency=low + + * debian/control: Build-depend on gnat-4.1 on alpha and mipsel, since + gnat-4.3, the default ADA compiler, has issues on those architectures + * debian/rules: Do not issue commands related to the libplplot9-java and + libplplot-ada packages on arm + + -- Rafael Laboissiere <ra...@de...> Mon, 24 Mar 2008 10:57:11 +0100 + plplot (5.9.0-3) unstable; urgency=low * debian/control: Build-depend on g++-4.1 on arm, otherwise mkoctfile Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2008-03-24 01:37:35 UTC (rev 8327) +++ trunk/debian/control 2008-03-24 09:57:42 UTC (rev 8328) @@ -14,7 +14,7 @@ python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, java-gcj-compat-dev [!arm], - fastjar, swig, gnat [!arm !mipsel] + fastjar, swig, gnat [!alpha !arm !mipsel], gnat-4.1 [alpha mipsel] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers Modified: trunk/debian/libplplot-dev.files =================================================================== --- trunk/debian/libplplot-dev.files 2008-03-24 01:37:35 UTC (rev 8327) +++ trunk/debian/libplplot-dev.files 2008-03-24 09:57:42 UTC (rev 8328) @@ -6,4 +6,3 @@ usr/share/doc/libplplot9/examples usr/share/doc/libplplot9/README.pkg-config usr/share/doc/libplplot-dev -usr/share/ada Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-03-24 01:37:35 UTC (rev 8327) +++ trunk/debian/rules 2008-03-24 09:57:42 UTC (rev 8328) @@ -33,16 +33,10 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) # Disable java and ada build on arm - problems with java-gcj-compat-dev -# at the moment. Also gnat not available on arm and mipsel. +# at the moment. Also gnat not available on arm. ifeq ($(DEB_BUILD_ARCH),arm) ADA_OPTIONS = -DENABLE_ada=OFF JAVA_OPTIONS = -DENABLE_java=OFF -else ifeq ($(DEB_BUILD_ARCH),mipsel) -ADA_OPTIONS = -DENABLE_ada=OFF -JAVA_OPTIONS = \ - -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ - -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ - -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar else ADA_OPTIONS = -DENABLE_ada=ON JAVA_OPTIONS = \ @@ -100,11 +94,16 @@ install-arch: install-arch-stamp install-python dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \ - --no-package=plplot-bin --no-package=python-plplot + --no-package=plplot-bin --no-package=python-plplot \ + --no-package=libplplot-ada dh_movefiles --package=python-plplot dh_movefiles --package=libplplot-dev dh_movefiles --package=plplot-bin dh_movefiles --package=$(libpkg) +ifneq ($(DEB_BUILD_ARCH),arm) + dh_movefiles --package=libplplot-ada + dh_movefiles --package=libplplot-dev usr/share/ada +endif install-arch-stamp: build-arch-stamp dh_testdir @@ -128,12 +127,14 @@ plplot9-driver-gd plplot9-driver-xwin octave-plplot \ python-plplot plplot-bin libplplot-c++9c2 \ plplot9-driver-gnome2 plplot9-driver-wxwidgets \ - plplot9-driver-cairo libplplot-fortran9 \ - libplplot9-java libplplot-ada; do \ + plplot9-driver-cairo libplplot-fortran9 ; do \ ln -s $(libpkg) $(debdoc)/$$i ; \ done ifneq ($(DEB_BUILD_ARCH),arm) + for i in libplplot9-java libplplot-ada ; do \ + ln -s $(libpkg) $(debdoc)/$$i ; \ + done mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar ( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar ) endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |