From: <and...@us...> - 2007-05-31 21:23:00
|
Revision: 7701 http://plplot.svn.sourceforge.net/plplot/?rev=7701&view=rev Author: andrewross Date: 2007-05-31 14:23:01 -0700 (Thu, 31 May 2007) Log Message: ----------- Initial commit of changes to debian packages to use CBS. Note that python packages are currently disabled. Please test. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/libplplot-dev.files trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-05-31 21:19:09 UTC (rev 7700) +++ trunk/debian/changelog 2007-05-31 21:23:01 UTC (rev 7701) @@ -1,3 +1,9 @@ +plplot (5.7.4.svn.20070523-1) unstable; urgency=low + + * Initial port of debian packaging files to use new cmake build system + + -- Andrew Ross <and...@us...> Wed, 23 May 2007 13:35:43 +0100 + plplot (5.6.1-9) unstable; urgency=low * debian/control: Applied patch from Tomas Pospisek tomake list in Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-05-31 21:19:09 UTC (rev 7700) +++ trunk/debian/control 2007-05-31 21:23:01 UTC (rev 7701) @@ -3,12 +3,13 @@ Priority: optional Maintainer: Rafael Laboissiere <ra...@de...> Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 5.0.37.2), tcl8.4-dev, tk8.4-dev, itcl3-dev, - libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, - octave2.1-headers (>= 2.1.65), libgd2-noxpm-dev | libgd2-xpm-dev, - libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, m4, +Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.37.2), + tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, + libxi-dev, gfortran, itk3-dev, octave2.1-headers (>= 2.1.65), + libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, + libgnomeprintui2.2-dev, libgnomeui-dev, liblasi-dev, m4, libqhull-dev, libxml-parser-perl, libxml-dom-perl, matwrap, - autotools-dev, libltdl3-dev, pkg-config, dpatch, atlas3-base-dev + libltdl3-dev, pkg-config, dpatch, atlas3-base-dev [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k], python-gtk2-dev, liblasi-dev (>= 1.0.5-2), libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), Modified: trunk/debian/libplplot-dev.files =================================================================== --- trunk/debian/libplplot-dev.files 2007-05-31 21:19:09 UTC (rev 7700) +++ trunk/debian/libplplot-dev.files 2007-05-31 21:23:01 UTC (rev 7701) @@ -1,5 +1,3 @@ -usr/bin/plplot_libtool -usr/share/man/man1/plplot_libtool.1 usr/include usr/lib/lib*.a usr/lib/lib*.la Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-05-31 21:19:09 UTC (rev 7700) +++ trunk/debian/rules 2007-05-31 21:23:01 UTC (rev 7701) @@ -27,26 +27,18 @@ debex := $(debshr)/plplot$(version)/examples PYVERS = $(shell pyversions -vr) -CONFIGURE_OPTIONS = \ - --prefix=/usr --mandir=/usr/share/man \ - --infodir=/usr/share/info --with-pkg-config \ - --without-rpath --with-prebuiltdoc \ - --with-pthreads --with-ltdlsystem \ - --disable-linuxvga --enable-psttf \ - --enable-f95 --enable-psttfc \ - --disable-java +CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ + -DBUILD_DOC=ON -DCMAKE_INSTALL_PREFIX=/usr -autotools: autotools-stamp -autotools-stamp: - -rm -f config.sub config.guess - ln -s /usr/share/misc/config.sub config.sub - ln -s /usr/share/misc/config.guess config.guess - touch autotools-stamp +BUILD_DIR = debian/build_tmp +SRC_DIR = $(shell pwd) config: config-stamp -config-stamp: autotools-stamp +config-stamp: + mkdir $(BUILD_DIR) + (cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ - ./configure $(CONFIGURE_OPTIONS) --disable-python + cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=OFF ) touch config-stamp build: build-stamp @@ -54,31 +46,28 @@ 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 - ( cd lib ; $(MAKE) ) - ( cd src ; $(MAKE) ) - ( cd bindings/octave ; \ - $(MAKE) CC="gcc -D__builtin_va_list=void" plplot_octave.oct ) - $(MAKE) - $(MAKE) check + #( cd lib ; $(MAKE) ) + #( cd src ; $(MAKE) ) + #( cd bindings/octave ; \ + # $(MAKE) CC="gcc -D__builtin_va_list=void" plplot_octave.oct ) + ( cd $(BUILD_DIR) ; $(MAKE) ; ctest ) touch build-stamp clean: unpatch dh_testdir dh_testroot - rm -f build-stamp install-stamp config-stamp autotools-stamp \ + rm -f build-stamp install-stamp config-stamp \ patch-stamp debian/files - -$(MAKE) -k distclean - rm -f config.sub config.guess - find . -name config.log -o -name config.status | xargs rm -f - rm -f Makefile install-python* + rm -rf $(BUILD_DIR) rm -rf $(debbase)/$(libpkg) dh_clean -install: install-stamp install-python +#install: install-stamp install-python +install: install-stamp 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=python-plplot dh_movefiles --package=libplplot-dev dh_movefiles --package=plplot-bin dh_movefiles --package=$(libpkg) @@ -87,7 +76,8 @@ dh_testdir dh_testroot - $(MAKE) DESTDIR=$(debtmp) OCTAVE_OCT_DIR=$(OCTDIR) install + ( cd $(BUILD_DIR) ; \ + $(MAKE) DESTDIR=$(debtmp) OCTAVE_OCT_DIR=$(OCTDIR) install ) rm -f $(debtmp)/usr/bin/plplot-config @@ -113,18 +103,19 @@ touch install-stamp install-python: $(PYVERS:%=install-python%) - ( cd examples/python ; $(MAKE) DESTDIR=$(debtmp) install ) + ( cd $(BUILD_DIR)/examples/python ; $(MAKE) DESTDIR=$(debtmp) install ) mv $(debex)/python $(debdoc)/$(libpkg)/examples touch $@ install-python%: build-stamp - PYTHON=python$* ./configure $(CONFIGURE_OPTIONS) - for d in gnome2/python python ; do \ - ( cd bindings/$$d; \ + ( cd $(BUILD_DIR) ; \ + PYTHON=python$* cmake $(BUILD_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON ; \ + for d in gnome2/python python ; do \ + ( cd bindings/$$d; \ $(MAKE) clean ; \ $(MAKE) ; \ $(MAKE) DESTDIR=$(debtmp) install ) ; \ - done + done ) touch $@ # Build architecture-independent files here. @@ -149,8 +140,8 @@ dh_installdocs --package=$(libpkg) --package=libcsiro0 dh_installchangelogs --package=$(libpkg) --package=libcsiro0 - dh_pycentral --package=python-plplot - dh_python --package=python-plplot +# dh_pycentral --package=python-plplot +# dh_python --package=python-plplot dh_strip -a dh_compress -a -Xexamples/ dh_fixperms -a @@ -167,5 +158,5 @@ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary config autotools \ +.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-06-19 08:04:58
|
Revision: 7723 http://plplot.svn.sourceforge.net/plplot/?rev=7723&view=rev Author: andrewross Date: 2007-06-19 01:04:59 -0700 (Tue, 19 Jun 2007) Log Message: ----------- Debian packages: - Fix python package to work with cmake build system. - Re-enable libplplot9-java package. This is now built with jikes / kaffe. - Update dependency information. Include dependencies required to build documentation from source. - Update README.Debian file to include current packages. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/libplplot9.README.Debian trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-06-19 07:06:46 UTC (rev 7722) +++ trunk/debian/changelog 2007-06-19 08:04:59 UTC (rev 7723) @@ -1,3 +1,16 @@ +plplot (5.7.4.svn.20070523-2) unstable; urgency=low + + * debian/control, debian/rules: Fix python packages to work with + cmake build system. + * debian/control, debian/rules: Re-enable the libplplot9-java package. + Now uses jikes / kaffe to build. + * debian/control: Tidy up dependencies and include dependencies for + building documentation from source. + * debian/libplplot9.README.Debian: Update list to describe current + packages. + + -- Andrew Ross <and...@us...> Tue, 19 Jun 2007 08:35:59 +0100 + plplot (5.7.4.svn.20070523-1) unstable; urgency=low * Initial port of debian packaging files to use new cmake build system Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-06-19 07:06:46 UTC (rev 7722) +++ trunk/debian/control 2007-06-19 08:04:59 UTC (rev 7723) @@ -3,17 +3,19 @@ Priority: optional Maintainer: Rafael Laboissiere <ra...@de...> Standards-Version: 3.7.2 -Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.37.2), +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.1-headers (>= 2.1.65), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, - libgnomeprintui2.2-dev, libgnomeui-dev, liblasi-dev, m4, - libqhull-dev, libxml-parser-perl, libxml-dom-perl, matwrap, + libgnomeprintui2.2-dev, libgnomeui-dev, liblasi-dev (>= 1.0.6), + m4, libqhull-dev, 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, liblasi-dev (>= 1.0.5-2), libwxgtk2.6-dev, - python-gnome2-dev, python-all-dev (>= 2.3.5-11), - python-central (>= 0.5), python-numeric (>= 24.2-3), ttf-freefont + python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, + python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), + python-numeric (>= 24.2-3), ttf-freefont, + docbook-xml, docbook, docbook-dsssl, docbook-xsl, jadetex, + jikes-kaffe, fastjar Build-Conflicts: libplplot5 XS-Python-Version: all @@ -23,7 +25,7 @@ Conflicts: libplplot5, plplot (<< 5) Depends: ${shlibs:Depends} Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd, - plplot-tcl + plplot-driver-psttf, plplot-driver-wxwidgets, plplot-tcl Description: Scientific 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 @@ -75,6 +77,16 @@ . Homepage: http://www.plplot.org +Package: libplplot9-java +Architecture: any +Section: libs +Depends: java-runtime, ${shlibs:Depends} +Description: Scientific plotting library + This packages contains the Java bindings for PLplot, a scientific + plotting library. + . + Homepage: http://www.plplot.org + Package: libcsiro0 Architecture: any Section: libs @@ -195,6 +207,7 @@ Section: python Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}, ${python:Depends}, python-numeric +Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python support for PLplot, a plotting library This package contains the library plmodule.so for gluing the PLplot Modified: trunk/debian/libplplot9.README.Debian =================================================================== --- trunk/debian/libplplot9.README.Debian 2007-06-19 07:06:46 UTC (rev 7722) +++ trunk/debian/libplplot9.README.Debian 2007-06-19 08:04:59 UTC (rev 7723) @@ -4,9 +4,10 @@ 1. INTRODUCTION & ORIGIN These are the debianized packages for PLplot, a scientific plotting - library. They were put together by Rafael Laboissiere. + library. They were put together by Rafael Laboissiere. The porting + to the new CMake build system was done by Andrew Ross. - The packages were built directly from the CVS sources and are considered + The packages were built directly from the SVN sources and are considered experimental. @@ -15,32 +16,47 @@ The original PLplot distribution was broken down in several Debian packages: - * libplplot9: Contains the shared libraries for C, C++ and Fortran77, - as well as the data files and the driver modules that do not depend - on other libraries. Some miscellaneous utilities that used to be in - the plplot-bin package in the past have been moved into libplplot9. + * 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 and PDF formats of the PLplot manual. + * plplot-bin: Contains various utilities associated with PLplot. + * 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-gnome: Provides the Gnome canvas driver module. This - is highly experimental. + * plplot9-driver-gnome2: Provides the Gnome canvas driver module. + * plplot9-driver-psttf: Provides the psttf driver module. This uses + liblasi0 to produce postscript with higher quality text using + truetype fonts. + + * 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 binding for + the PLplot functions. + + * libplplot9-java: Contains the bindings for using the PLplot + functions from java. + * 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 2.2. + * python-plplot: Glue library with bindings for Python. * octave-plplot: Glue library with bindings for Octave 2.1. In order to use this package, issue the command "use_plplot" at the Octave @@ -51,7 +67,7 @@ 3. DOCUMENTATION Further documentation for PLplot can be found in the plplot-doc - package. The entry point is + package. The entry point is /usr/share/doc/plplot-doc. 4. DEMOS & EXAMPLES Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-06-19 07:06:46 UTC (rev 7722) +++ trunk/debian/rules 2007-06-19 08:04:59 UTC (rev 7723) @@ -37,7 +37,8 @@ config-stamp: mkdir $(BUILD_DIR) (cd $(BUILD_DIR) ; \ - PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ + PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ + JAVA_HOME=/usr/lib/kaffe \ cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=OFF ) touch config-stamp @@ -95,10 +96,14 @@ plplot9-driver-gd plplot9-driver-xwin octave-plplot \ python-plplot plplot-bin libplplot-c++9c2 \ plplot9-driver-gnome2 plplot9-driver-wxwidgets \ - plplot9-driver-psttf libplplot-fortran9 ; do \ + plplot9-driver-psttf libplplot-fortran9 \ + libplplot9-java; 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 ) + touch install-stamp install-python: $(PYVERS:%=install-python%) @@ -140,7 +145,6 @@ dh_installchangelogs --package=$(libpkg) --package=libcsiro0 dh_pycentral --package=python-plplot - dh_python --package=python-plplot dh_strip -a dh_compress -a -Xexamples/ dh_fixperms -a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-08-15 09:54:21
|
Revision: 7800 http://plplot.svn.sourceforge.net/plplot/?rev=7800&view=rev Author: andrewross Date: 2007-08-15 02:54:24 -0700 (Wed, 15 Aug 2007) Log Message: ----------- Update Debian package scripts to build python packages using numpy. Add more checks to try to ensure corect java compilers / interpreters are used. Update maintainer information to refer to Andrew Ross rather than Rafael. Disable running ctest - it fails for psttf driver because of the lasi / pango bug for my current Ubuntu system. This causes the whole build to fail. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-08-15 09:45:16 UTC (rev 7799) +++ trunk/debian/changelog 2007-08-15 09:54:24 UTC (rev 7800) @@ -1,3 +1,11 @@ +plplot (5.7.4-1) unstable; urgency=low + + * New upstream release. + * debian/control, debian/rules: Fix python settings to work with + numpy rather than Numeric. + + -- Andrew Ross <and...@us...> Tue, 14 Aug 2007 15:32:07 +0100 + plplot (5.7.4.svn.20070523-2) unstable; urgency=low * debian/control, debian/rules: Fix python packages to work with Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-08-15 09:45:16 UTC (rev 7799) +++ trunk/debian/control 2007-08-15 09:54:24 UTC (rev 7800) @@ -1,7 +1,7 @@ Source: plplot Section: math Priority: optional -Maintainer: Rafael Laboissiere <ra...@de...> +Maintainer: Andrew Ross <and...@us...> Standards-Version: 3.7.2 Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, @@ -13,9 +13,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-numeric (>= 24.2-3), ttf-freefont, - docbook-xml, docbook, docbook-dsssl, docbook-xsl, jadetex, - jikes-kaffe, fastjar + python-numpy, ttf-freefont, + docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, + opensp, jadetex, jikes-kaffe, kaffe-dev, fastjar Build-Conflicts: libplplot5 XS-Python-Version: all @@ -206,7 +206,7 @@ Architecture: any Section: python Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}, - ${python:Depends}, python-numeric + ${python:Depends}, python-numpy Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python support for PLplot, a plotting library Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-08-15 09:45:16 UTC (rev 7799) +++ trunk/debian/rules 2007-08-15 09:54:24 UTC (rev 7800) @@ -26,9 +26,14 @@ debinfo := $(debshr)/info debex := $(debshr)/plplot$(version)/examples +JAVA_HOME = /usr/lib/kaffe + PYVERS = $(shell pyversions -vr) CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ - -DBUILD_DOC=ON -DCMAKE_INSTALL_PREFIX=/usr + -DBUILD_DOC=ON -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 BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) @@ -38,7 +43,7 @@ mkdir $(BUILD_DIR) (cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ - JAVA_HOME=/usr/lib/kaffe \ + JAVA_HOME=$(JAVA_HOME) \ cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=OFF ) touch config-stamp @@ -51,7 +56,8 @@ #( cd src ; $(MAKE) ) #( cd bindings/octave ; \ # $(MAKE) CC="gcc -D__builtin_va_list=void" plplot_octave.oct ) - ( cd $(BUILD_DIR) ; $(MAKE) ; ctest ) + #( cd $(BUILD_DIR) ; $(MAKE) ; ctest ) + ( cd $(BUILD_DIR) ; $(MAKE) ) touch build-stamp clean: unpatch @@ -113,7 +119,7 @@ install-python%: build-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$* -DNUMERIC_INCLUDE_PATH=/usr/include/python$*/Numeric ; \ + 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 \ ( 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...> - 2007-10-18 13:54:54
|
Revision: 7941 http://plplot.svn.sourceforge.net/plplot/?rev=7941&view=rev Author: rlaboiss Date: 2007-10-18 06:54:57 -0700 (Thu, 18 Oct 2007) Log Message: ----------- * debian/control: Replaced the deprecated variable ${Source-Version} by ${binary:Version} (Note that ${source:Version} will not work because the packages are Arch:any Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-18 13:51:11 UTC (rev 7940) +++ trunk/debian/changelog 2007-10-18 13:54:57 UTC (rev 7941) @@ -1,9 +1,14 @@ plplot (5.7.4-1) UNRELEASED; urgency=low + [ Andrew Ross ] * New upstream release. * debian/control, debian/rules: Fix python settings to work with numpy rather than Numeric. + [ Rafael Laboissiere ] + * debian/control: Replaced the deprecated variable ${Source-Version} by + ${binary:Version} + -- Andrew Ross <and...@us...> Tue, 14 Aug 2007 15:32:07 +0100 plplot (5.7.4.svn.20070523-2) unstable; urgency=low Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-10-18 13:51:11 UTC (rev 7940) +++ trunk/debian/control 2007-10-18 13:54:57 UTC (rev 7941) @@ -3,19 +3,19 @@ Priority: optional Maintainer: Andrew Ross <and...@us...> Standards-Version: 3.7.2 -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.1-headers (>= 2.1.65), - libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, - libgnomeprintui2.2-dev, libgnomeui-dev, liblasi-dev (>= 1.0.6), - m4, libqhull-dev, libxml-parser-perl, libxml-dom-perl, +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.1-headers (>= 2.1.65), + libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, + libgnomeprintui2.2-dev, libgnomeui-dev, liblasi-dev (>= 1.0.6), + m4, libqhull-dev, 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, + 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, jikes-kaffe, kaffe-dev, fastjar + opensp, jadetex, jikes-kaffe, kaffe-dev, fastjar, swig Build-Conflicts: libplplot5 XS-Python-Version: all @@ -44,8 +44,8 @@ Architecture: any Section: libdevel Recommends: pkg-config -Depends: libplplot9 (= ${Source-Version}), libqhull-dev, libfreetype6-dev, - libltdl3-dev, libplplot-c++9c2 (= ${Source-Version}), plplot9-driver-gnome2 +Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, + libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2 Description: Scientific plotting library (development files) This package contains all that is needed for doing development in C, C++, and Fortran with PLplot, a scientific plotting library. Examples of @@ -82,7 +82,7 @@ Section: libs Depends: java-runtime, ${shlibs:Depends} Description: Scientific plotting library - This packages contains the Java bindings for PLplot, a scientific + This packages contains the Java bindings for PLplot, a scientific plotting library. . Homepage: http://www.plplot.org @@ -106,7 +106,7 @@ Package: plplot-bin Architecture: any -Section: +Section: math Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5) Depends: ${shlibs:Depends} Description: Scientific plotting library (utilities) @@ -181,7 +181,7 @@ Package: plplot-tcl-dev Architecture: any Priority: extra -Depends: libplplot9 (= ${Source-Version}), plplot-tcl +Depends: libplplot9 (= ${binary:Version}), plplot-tcl Conflicts: plplot-tcl (<= 5.2.0.cvs.20030224-1) Description: Tcl/Tk development support for PLplot, a plotting library This package contains the necessary files to do development in Tcl/Tk @@ -205,7 +205,7 @@ Package: python-plplot Architecture: any Section: python -Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}, +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, python-numpy Provides: ${python:Provides} XB-Python-Version: ${python:Versions} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-18 13:58:44
|
Revision: 7943 http://plplot.svn.sourceforge.net/plplot/?rev=7943&view=rev Author: rlaboiss Date: 2007-10-18 06:58:48 -0700 (Thu, 18 Oct 2007) Log Message: ----------- * debian/rules: Do not set the RPATH when building shared libraries, complying with the Debian Policy Modified Paths: -------------- trunk/debian/changelog trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-18 13:56:32 UTC (rev 7942) +++ trunk/debian/changelog 2007-10-18 13:58:48 UTC (rev 7943) @@ -8,6 +8,8 @@ [ Rafael Laboissiere ] * debian/control: Replaced the deprecated variable ${Source-Version} by ${binary:Version} + * debian/rules: Do not set the RPATH when building shared libraries, + complying with the Debian Policy -- Andrew Ross <and...@us...> Tue, 14 Aug 2007 15:32:07 +0100 Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-18 13:56:32 UTC (rev 7942) +++ trunk/debian/rules 2007-10-18 13:58:48 UTC (rev 7943) @@ -33,13 +33,14 @@ -DBUILD_DOC=ON -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 + -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \ + -DUSE_RPATH=OFF BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) config: config-stamp -config-stamp: +config-stamp: mkdir $(BUILD_DIR) (cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-18 14:02:45
|
Revision: 7944 http://plplot.svn.sourceforge.net/plplot/?rev=7944&view=rev Author: rlaboiss Date: 2007-10-18 07:02:48 -0700 (Thu, 18 Oct 2007) Log Message: ----------- * debian/rules: Remove tclIndex and x*.tcl files in clean rule (this should be done upstream) Modified Paths: -------------- trunk/debian/changelog trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-18 13:58:48 UTC (rev 7943) +++ trunk/debian/changelog 2007-10-18 14:02:48 UTC (rev 7944) @@ -8,8 +8,11 @@ [ Rafael Laboissiere ] * debian/control: Replaced the deprecated variable ${Source-Version} by ${binary:Version} - * debian/rules: Do not set the RPATH when building shared libraries, - complying with the Debian Policy + * debian/rules: + + Do not set the RPATH when building shared libraries, complying with + the Debian Policy + + Remove tclIndex and x*.tcl files in clean rule (this should be done + upstream) -- Andrew Ross <and...@us...> Tue, 14 Aug 2007 15:32:07 +0100 Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-18 13:58:48 UTC (rev 7943) +++ trunk/debian/rules 2007-10-18 14:02:48 UTC (rev 7944) @@ -68,6 +68,8 @@ patch-stamp debian/files rm -rf $(BUILD_DIR) rm -rf $(debbase)/$(libpkg) + # FIXME: this should be fixed upstream! + rm -f bindings/tk/tclIndex examples/tk/x*.tcl examples/tk/tclIndex dh_clean install: install-stamp install-python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-20 10:25:41
|
Revision: 7950 http://plplot.svn.sourceforge.net/plplot/?rev=7950&view=rev Author: rlaboiss Date: 2007-10-20 03:25:45 -0700 (Sat, 20 Oct 2007) Log Message: ----------- Added dpatches Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/00list Added Paths: ----------- trunk/debian/patches/03_clean-source-tree.dpatch trunk/debian/patches/04_python-scripts-perms.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-20 10:22:24 UTC (rev 7949) +++ trunk/debian/changelog 2007-10-20 10:25:45 UTC (rev 7950) @@ -13,6 +13,10 @@ the Debian Policy + Remove tclIndex and x*.tcl files in clean rule (this should be done upstream) + * Added dpatches (taken from the SVN upstream repository): + + 03_clean-source-tree: Prevent Tcl/Tk files from been left in the + source tree after "make clean" + + 04_python-scripts-perms: Fix permission for Python scripts -- Andrew Ross <and...@us...> Tue, 14 Aug 2007 15:32:07 +0100 Modified: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2007-10-20 10:22:24 UTC (rev 7949) +++ trunk/debian/patches/00list 2007-10-20 10:25:45 UTC (rev 7950) @@ -1,2 +1,4 @@ 01_check-for-octave2.1 02_unset-python-path +03_clean-source-tree +04_python-scripts-perms Added: trunk/debian/patches/03_clean-source-tree.dpatch =================================================================== --- trunk/debian/patches/03_clean-source-tree.dpatch (rev 0) +++ trunk/debian/patches/03_clean-source-tree.dpatch 2007-10-20 10:25:45 UTC (rev 7950) @@ -0,0 +1,140 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_clean-source-tree.dpatch by Rafael Laboissiere <ra...@de...> +## +## DP: This patch is taken from the upstream SVN repository and relates +## DP: to the following change: +## DP: +## DP: Tidy up build for tcl and tk examples. Ensures that tclIndex is created +## DP: in the binary tree and no files are created in the source tree. Also +## DP: make tclIndex a command output so it is only recreated when needed and +## DP: is deleted by "make clean". + +@DPATCH@ + +--- plplot-5.7.4.orig/examples/tcl/CMakeLists.txt ++++ plplot-5.7.4/examples/tcl/CMakeLists.txt +@@ -60,14 +60,10 @@ + install(FILES ${tcl_FILES} DESTINATION ${DATA_DIR}/examples/tcl) + install(PROGRAMS ${tcl_SCRIPTS} DESTINATION ${DATA_DIR}/examples/tcl) + +-set(tclIndex_DEPENDS ${tcl_FILES} ${tcl_SCRIPTS}) +-set(tclIndex_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +-if(BUILD_TEST AND +-NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}" +-) +- # equivalent to install commands but at "make" time rather than +- # "make install" time, to the build tree if different than the source +- # tree. ++# Copy file and scripts to the binary directory if different to the ++# source directory. Needed for ctest, but also so the tclIndex file ++# is generated in the binary tree not the source tree. ++if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + set(tclIndex_WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + set(tclIndex_DEPENDS) + foreach(file ${tcl_SCRIPTS} ${tcl_FILES}) +@@ -84,11 +80,13 @@ + ) + endforeach(file ${tcl_SCRIPTS} ${tcl_FILES}) + add_custom_target(tcl_examples ALL DEPENDS ${tclIndex_DEPENDS}) +-endif(BUILD_TEST AND +-NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}" +-) ++else(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") ++ set(tclIndex_DEPENDS ${tcl_FILES} ${tcl_SCRIPTS}) ++ set(tclIndex_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ++endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + +-add_custom_target(tclIndex_examples_tcl ALL ++add_custom_command( ++OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex + COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS} + DEPENDS ${tclIndex_DEPENDS} + WORKING_DIRECTORY ${tclIndex_WORKING_DIRECTORY} +@@ -98,3 +96,7 @@ + FILES ${tclIndex_WORKING_DIRECTORY}/tclIndex + DESTINATION ${DATA_DIR}/examples/tcl + ) ++ ++add_custom_target(tclIndex_examples_tcl ALL ++ DEPENDS ${tclIndex_DEPENDS} ${CMAKE_CURRENT_BINARY_DIR}/tclIndex ++) +--- plplot-5.7.4.orig/examples/tk/CMakeLists.txt ++++ plplot-5.7.4/examples/tk/CMakeLists.txt +@@ -18,7 +18,9 @@ + # along with PLplot; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +-set(tk_FILES ++set(tk_FILES) ++ ++set(tk_SRC_FILES + README.tkdemos + runAllDemos.tcl + runExtendedDemos.tcl +@@ -48,28 +50,45 @@ + "22" + ) + ++# Copy files to the binary directory (if different) for generating tclIndex ++# This ensures no files are created in the source tree. ++if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") ++foreach(_file ${tk_SRC_FILES}) ++ add_custom_command( ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file} ++ COMMAND ${CMAKE_COMMAND} ++ -E copy ++ ${CMAKE_CURRENT_SOURCE_DIR}/${_file} ++ ${CMAKE_CURRENT_BINARY_DIR}/${_file} ++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_file} ++ ) ++ set(tk_FILES ${tk_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${_file}) ++endforeach(_file ${tk_SRC_FILES}) ++endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") ++ + foreach(STRING_INDEX ${tk_STRING_INDICES}) + set(_file x${STRING_INDEX}.tcl) + add_custom_command( +- OUTPUT ${_file} ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file} + COMMAND ${CMAKE_COMMAND} + -E copy + ${CMAKE_SOURCE_DIR}/examples/tcl/${_file} +- ${CMAKE_CURRENT_SOURCE_DIR}/${_file} ++ ${CMAKE_CURRENT_BINARY_DIR}/${_file} + DEPENDS ${CMAKE_SOURCE_DIR}/examples/tcl/${_file} + ) +- set(tk_FILES ${tk_FILES} ${_file}) ++ set(tk_FILES ${tk_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${_file}) + endforeach(STRING_INDEX ${tk_STRING_INDICES}) + + install(FILES ${tk_FILES} DESTINATION ${DATA_DIR}/examples/tk) + +-add_custom_target(tclIndex_examples_tk ALL ++add_custom_command( ++OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex + COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS} + DEPENDS ${tk_FILES} +-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + +-install(FILES tclIndex DESTINATION ${DATA_DIR}/examples/tk) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tclIndex DESTINATION ${DATA_DIR}/examples/tk) + + set(tk_SCRIPTS + tk01 +@@ -89,6 +108,7 @@ + install(FILES ${tk_SRC} DESTINATION ${DATA_DIR}/examples/tk) + + set(CC ${CMAKE_C_COMPILER}) ++ + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.examples.in + ${CMAKE_CURRENT_BINARY_DIR}/Makefile.examples +@@ -99,3 +119,6 @@ + RENAME Makefile + ) + ++add_custom_target(tclIndex_examples_tk ALL ++ DEPENDS ${tk_FILES} ${CMAKE_CURRENT_BINARY_DIR}/tclIndex ++) Property changes on: trunk/debian/patches/03_clean-source-tree.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/debian/patches/04_python-scripts-perms.dpatch =================================================================== --- trunk/debian/patches/04_python-scripts-perms.dpatch (rev 0) +++ trunk/debian/patches/04_python-scripts-perms.dpatch 2007-10-20 10:25:45 UTC (rev 7950) @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_python-scripts-perms.dpatch by Rafael Laboissiere <ra...@de...> +## +## DP: This patch is taken from the upstream SVN repository and relates +## DP: to the following change: +## DP: +## DP: plplot.py, plplotc.py and plplotcanvas.py are not scripts which should +## DP: be executed and therefore they do not need the executable permission +## DP: bit set. + +@DPATCH@ + +--- plplot-5.7.4.orig/bindings/python/CMakeLists.txt ++++ plplot-5.7.4/bindings/python/CMakeLists.txt +@@ -95,7 +95,6 @@ + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot.py ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py + DESTINATION ${PYTHON_INSTDIR} +-PERMISSIONS ${PERM_SCRIPTS} + ) + + endif(ENABLE_python) +--- plplot-5.7.4.orig/bindings/gnome2/python/CMakeLists.txt ++++ plplot-5.7.4/bindings/gnome2/python/CMakeLists.txt +@@ -184,7 +184,6 @@ + install( + FILES plplotcanvas.py + DESTINATION ${PYTHON_INSTDIR} +-PERMISSIONS ${PERM_SCRIPTS} + ) + + endif(ENABLE_pygcw) Property changes on: trunk/debian/patches/04_python-scripts-perms.dpatch ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-20 10:29:12
|
Revision: 7951 http://plplot.svn.sourceforge.net/plplot/?rev=7951&view=rev Author: rlaboiss Date: 2007-10-20 03:29:16 -0700 (Sat, 20 Oct 2007) Log Message: ----------- Dropped the removal of Tcl/Tk files, since this is fixed by 03_clean-source-tree.dpatch Modified Paths: -------------- trunk/debian/changelog trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-20 10:25:45 UTC (rev 7950) +++ trunk/debian/changelog 2007-10-20 10:29:16 UTC (rev 7951) @@ -11,8 +11,6 @@ * debian/rules: + Do not set the RPATH when building shared libraries, complying with the Debian Policy - + Remove tclIndex and x*.tcl files in clean rule (this should be done - upstream) * Added dpatches (taken from the SVN upstream repository): + 03_clean-source-tree: Prevent Tcl/Tk files from been left in the source tree after "make clean" Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-20 10:25:45 UTC (rev 7950) +++ trunk/debian/rules 2007-10-20 10:29:16 UTC (rev 7951) @@ -68,8 +68,6 @@ patch-stamp debian/files rm -rf $(BUILD_DIR) rm -rf $(debbase)/$(libpkg) - # FIXME: this should be fixed upstream! - rm -f bindings/tk/tclIndex examples/tk/x*.tcl examples/tk/tclIndex dh_clean install: install-stamp install-python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-20 10:52:49
|
Revision: 7952 http://plplot.svn.sourceforge.net/plplot/?rev=7952&view=rev Author: rlaboiss Date: 2007-10-20 03:52:52 -0700 (Sat, 20 Oct 2007) Log Message: ----------- Added Homepage, XS-Vcs-Svn, and XS-Vcs-Browser fields Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-20 10:29:16 UTC (rev 7951) +++ trunk/debian/changelog 2007-10-20 10:52:52 UTC (rev 7952) @@ -6,8 +6,10 @@ numpy rather than Numeric. [ Rafael Laboissiere ] - * debian/control: Replaced the deprecated variable ${Source-Version} by - ${binary:Version} + * debian/control: + + Replaced the deprecated variable ${Source-Version} by + ${binary:Version} + + Added Homepage, XS-Vcs-Svn, and XS-Vcs-Browser fields * debian/rules: + Do not set the RPATH when building shared libraries, complying with the Debian Policy Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-10-20 10:29:16 UTC (rev 7951) +++ trunk/debian/control 2007-10-20 10:52:52 UTC (rev 7952) @@ -18,6 +18,9 @@ opensp, jadetex, jikes-kaffe, kaffe-dev, fastjar, swig Build-Conflicts: libplplot5 XS-Python-Version: all +Homepage: http://www.plplot.org +XS-Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian +XS-Vcs-Browser: http://plplot.svn.sourceforge.net/viewvc/plplot/trunk/debian/ Package: libplplot9 Architecture: any This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-21 11:37:15
|
Revision: 7953 http://plplot.svn.sourceforge.net/plplot/?rev=7953&view=rev Author: rlaboiss Date: 2007-10-21 04:37:18 -0700 (Sun, 21 Oct 2007) Log Message: ----------- Introduced past changes done by the Debian QA team. Note that 51_remove-no-force-mem.dpatch is not need in the new cmake base building. Modified Paths: -------------- trunk/debian/changelog trunk/debian/watch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-20 10:52:52 UTC (rev 7952) +++ trunk/debian/changelog 2007-10-21 11:37:18 UTC (rev 7953) @@ -39,6 +39,31 @@ -- Andrew Ross <and...@us...> Wed, 23 May 2007 13:35:43 +0100 +plplot (5.6.1-12) unstable; urgency=low + + * QA upload. + * Fix missing section on the plplot-bin package, causing build failures on + some (!) architectures. + + -- Steve Langasek <vo...@de...> Wed, 03 Oct 2007 11:32:21 -0700 + +plplot (5.6.1-11) unstable; urgency=low + + * QA upload. + * debian/patches/51_remove-no-force-mem.dpatch: Remove `-fno-force-mem', + which is a no-op with GCC 4.1+, and unsupported with GCC 4.3. + Closes: #415278. + * debian/watch: Update upstream URL. + + -- Matej Vela <ve...@de...> Sun, 15 Apr 2007 21:57:03 +0200 + +plplot (5.6.1-10) unstable; urgency=low + + * Orphaning the package + * debian/control: Changed the maintainer to the Debian QA Group + + -- Rafael Laboissiere <ra...@de...> Sat, 4 Nov 2006 10:19:34 +0100 + plplot (5.6.1-9) unstable; urgency=low * debian/control: Applied patch from Tomas Pospisek tomake list in Modified: trunk/debian/watch =================================================================== --- trunk/debian/watch 2007-10-20 10:52:52 UTC (rev 7952) +++ trunk/debian/watch 2007-10-21 11:37:18 UTC (rev 7953) @@ -1,4 +1,2 @@ version=3 -http://sourceforge.net/project/showfiles.php?group_id=2915 \ - http://prdownloads.sourceforge.net/plplot/plplot-([\d\.]+).tar.gz\?download - +http://sf.net/plplot/plplot-(.*)\.tar\.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-25 21:07:47
|
Revision: 7972 http://plplot.svn.sourceforge.net/plplot/?rev=7972&view=rev Author: rlaboiss Date: 2007-10-25 14:07:42 -0700 (Thu, 25 Oct 2007) Log Message: ----------- Dropped patches (applied upstream) Modified Paths: -------------- trunk/debian/changelog Removed Paths: ------------- trunk/debian/patches/03_clean-source-tree.dpatch trunk/debian/patches/04_python-scripts-perms.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-25 21:03:36 UTC (rev 7971) +++ trunk/debian/changelog 2007-10-25 21:07:42 UTC (rev 7972) @@ -14,10 +14,6 @@ * debian/rules: + Do not set the RPATH when building shared libraries, complying with the Debian Policy - * Added dpatches (taken from the SVN upstream repository): - + 03_clean-source-tree: Prevent Tcl/Tk files from been left in the - source tree after "make clean" - + 04_python-scripts-perms: Fix permission for Python scripts -- Andrew Ross <and...@us...> Tue, 14 Aug 2007 15:32:07 +0100 Deleted: trunk/debian/patches/03_clean-source-tree.dpatch =================================================================== --- trunk/debian/patches/03_clean-source-tree.dpatch 2007-10-25 21:03:36 UTC (rev 7971) +++ trunk/debian/patches/03_clean-source-tree.dpatch 2007-10-25 21:07:42 UTC (rev 7972) @@ -1,140 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_clean-source-tree.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: This patch is taken from the upstream SVN repository and relates -## DP: to the following change: -## DP: -## DP: Tidy up build for tcl and tk examples. Ensures that tclIndex is created -## DP: in the binary tree and no files are created in the source tree. Also -## DP: make tclIndex a command output so it is only recreated when needed and -## DP: is deleted by "make clean". - -@DPATCH@ - ---- plplot-5.7.4.orig/examples/tcl/CMakeLists.txt -+++ plplot-5.7.4/examples/tcl/CMakeLists.txt -@@ -60,14 +60,10 @@ - install(FILES ${tcl_FILES} DESTINATION ${DATA_DIR}/examples/tcl) - install(PROGRAMS ${tcl_SCRIPTS} DESTINATION ${DATA_DIR}/examples/tcl) - --set(tclIndex_DEPENDS ${tcl_FILES} ${tcl_SCRIPTS}) --set(tclIndex_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) --if(BUILD_TEST AND --NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}" --) -- # equivalent to install commands but at "make" time rather than -- # "make install" time, to the build tree if different than the source -- # tree. -+# Copy file and scripts to the binary directory if different to the -+# source directory. Needed for ctest, but also so the tclIndex file -+# is generated in the binary tree not the source tree. -+if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - set(tclIndex_WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - set(tclIndex_DEPENDS) - foreach(file ${tcl_SCRIPTS} ${tcl_FILES}) -@@ -84,11 +80,13 @@ - ) - endforeach(file ${tcl_SCRIPTS} ${tcl_FILES}) - add_custom_target(tcl_examples ALL DEPENDS ${tclIndex_DEPENDS}) --endif(BUILD_TEST AND --NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}" --) -+else(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") -+ set(tclIndex_DEPENDS ${tcl_FILES} ${tcl_SCRIPTS}) -+ set(tclIndex_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -+endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - --add_custom_target(tclIndex_examples_tcl ALL -+add_custom_command( -+OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex - COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS} - DEPENDS ${tclIndex_DEPENDS} - WORKING_DIRECTORY ${tclIndex_WORKING_DIRECTORY} -@@ -98,3 +96,7 @@ - FILES ${tclIndex_WORKING_DIRECTORY}/tclIndex - DESTINATION ${DATA_DIR}/examples/tcl - ) -+ -+add_custom_target(tclIndex_examples_tcl ALL -+ DEPENDS ${tclIndex_DEPENDS} ${CMAKE_CURRENT_BINARY_DIR}/tclIndex -+) ---- plplot-5.7.4.orig/examples/tk/CMakeLists.txt -+++ plplot-5.7.4/examples/tk/CMakeLists.txt -@@ -18,7 +18,9 @@ - # along with PLplot; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - --set(tk_FILES -+set(tk_FILES) -+ -+set(tk_SRC_FILES - README.tkdemos - runAllDemos.tcl - runExtendedDemos.tcl -@@ -48,28 +50,45 @@ - "22" - ) - -+# Copy files to the binary directory (if different) for generating tclIndex -+# This ensures no files are created in the source tree. -+if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") -+foreach(_file ${tk_SRC_FILES}) -+ add_custom_command( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file} -+ COMMAND ${CMAKE_COMMAND} -+ -E copy -+ ${CMAKE_CURRENT_SOURCE_DIR}/${_file} -+ ${CMAKE_CURRENT_BINARY_DIR}/${_file} -+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_file} -+ ) -+ set(tk_FILES ${tk_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${_file}) -+endforeach(_file ${tk_SRC_FILES}) -+endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") -+ - foreach(STRING_INDEX ${tk_STRING_INDICES}) - set(_file x${STRING_INDEX}.tcl) - add_custom_command( -- OUTPUT ${_file} -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file} - COMMAND ${CMAKE_COMMAND} - -E copy - ${CMAKE_SOURCE_DIR}/examples/tcl/${_file} -- ${CMAKE_CURRENT_SOURCE_DIR}/${_file} -+ ${CMAKE_CURRENT_BINARY_DIR}/${_file} - DEPENDS ${CMAKE_SOURCE_DIR}/examples/tcl/${_file} - ) -- set(tk_FILES ${tk_FILES} ${_file}) -+ set(tk_FILES ${tk_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${_file}) - endforeach(STRING_INDEX ${tk_STRING_INDICES}) - - install(FILES ${tk_FILES} DESTINATION ${DATA_DIR}/examples/tk) - --add_custom_target(tclIndex_examples_tk ALL -+add_custom_command( -+OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex - COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS} - DEPENDS ${tk_FILES} --WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - ) - --install(FILES tclIndex DESTINATION ${DATA_DIR}/examples/tk) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tclIndex DESTINATION ${DATA_DIR}/examples/tk) - - set(tk_SCRIPTS - tk01 -@@ -89,6 +108,7 @@ - install(FILES ${tk_SRC} DESTINATION ${DATA_DIR}/examples/tk) - - set(CC ${CMAKE_C_COMPILER}) -+ - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.examples.in - ${CMAKE_CURRENT_BINARY_DIR}/Makefile.examples -@@ -99,3 +119,6 @@ - RENAME Makefile - ) - -+add_custom_target(tclIndex_examples_tk ALL -+ DEPENDS ${tk_FILES} ${CMAKE_CURRENT_BINARY_DIR}/tclIndex -+) Deleted: trunk/debian/patches/04_python-scripts-perms.dpatch =================================================================== --- trunk/debian/patches/04_python-scripts-perms.dpatch 2007-10-25 21:03:36 UTC (rev 7971) +++ trunk/debian/patches/04_python-scripts-perms.dpatch 2007-10-25 21:07:42 UTC (rev 7972) @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_python-scripts-perms.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: This patch is taken from the upstream SVN repository and relates -## DP: to the following change: -## DP: -## DP: plplot.py, plplotc.py and plplotcanvas.py are not scripts which should -## DP: be executed and therefore they do not need the executable permission -## DP: bit set. - -@DPATCH@ - ---- plplot-5.7.4.orig/bindings/python/CMakeLists.txt -+++ plplot-5.7.4/bindings/python/CMakeLists.txt -@@ -95,7 +95,6 @@ - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot.py ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py - DESTINATION ${PYTHON_INSTDIR} --PERMISSIONS ${PERM_SCRIPTS} - ) - - endif(ENABLE_python) ---- plplot-5.7.4.orig/bindings/gnome2/python/CMakeLists.txt -+++ plplot-5.7.4/bindings/gnome2/python/CMakeLists.txt -@@ -184,7 +184,6 @@ - install( - FILES plplotcanvas.py - DESTINATION ${PYTHON_INSTDIR} --PERMISSIONS ${PERM_SCRIPTS} - ) - - endif(ENABLE_pygcw) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-26 09:57:08
|
Revision: 7976 http://plplot.svn.sourceforge.net/plplot/?rev=7976&view=rev Author: rlaboiss Date: 2007-10-26 02:57:09 -0700 (Fri, 26 Oct 2007) Log Message: ----------- * Added note about closing Bug#415303 * Updated description of the plplot-bin package Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-26 03:49:04 UTC (rev 7975) +++ trunk/debian/changelog 2007-10-26 09:57:09 UTC (rev 7976) @@ -1,13 +1,16 @@ plplot (5.8.0~RC1-1) UNRELEASED; urgency=low [ Andrew Ross ] - * New upstream release. + * New upstream release. The pstex driver is not support anymore + (closes: #415303). * New maintainer (closes: #396999) * debian/control, debian/rules: Fix python settings to work with numpy rather than Numeric. [ Rafael Laboissiere ] * debian/control: + + Updated description of plplot-bin package, since support for plmeta + and pstex is not enabled by default + Replaced the deprecated variable ${Source-Version} by ${binary:Version} + Added Homepage, XS-Vcs-Svn, and XS-Vcs-Browser fields Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-10-26 03:49:04 UTC (rev 7975) +++ trunk/debian/control 2007-10-26 09:57:09 UTC (rev 7976) @@ -116,11 +116,9 @@ This package contains the following utilities associated with PLplot, a scientific plotting library: . - * plrender - render a PLplot metafile * pltek - review a Tektronix vector file * plm2gif - converts PLplot metafiles to GIF files * plpr - converts PLplot metafile to something the printer will understand - * pstex2eps - Generate EPS file from PLplot pstex driver . 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-10-26 12:39:15
|
Revision: 7979 http://plplot.svn.sourceforge.net/plplot/?rev=7979&view=rev Author: rlaboiss Date: 2007-10-26 05:39:20 -0700 (Fri, 26 Oct 2007) Log Message: ----------- Added me as an Uploader Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-26 11:54:04 UTC (rev 7978) +++ trunk/debian/changelog 2007-10-26 12:39:20 UTC (rev 7979) @@ -14,11 +14,10 @@ + Replaced the deprecated variable ${Source-Version} by ${binary:Version} + Added Homepage, XS-Vcs-Svn, and XS-Vcs-Browser fields - * debian/rules: - + Do not set the RPATH when building shared libraries, complying with - the Debian Policy + + Added me as an uploader + * debian/rules: Do not set the RPATH when building shared libraries - -- Andrew Ross <and...@us...> Tue, 14 Aug 2007 15:32:07 +0100 + -- Rafael Laboissiere <ra...@de...> Fri, 26 Oct 2007 14:38:36 +0200 plplot (5.7.4.svn.20070523-2) unstable; urgency=low Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-10-26 11:54:04 UTC (rev 7978) +++ trunk/debian/control 2007-10-26 12:39:20 UTC (rev 7979) @@ -2,6 +2,7 @@ Section: math Priority: optional Maintainer: Andrew Ross <and...@us...> +Uploaders: Rafael Laboissiere <ra...@de...> Standards-Version: 3.7.2 Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-29 16:12:07
|
Revision: 7984 http://plplot.svn.sourceforge.net/plplot/?rev=7984&view=rev Author: rlaboiss Date: 2007-10-29 09:12:08 -0700 (Mon, 29 Oct 2007) Log Message: ----------- * debian/patches/03_tclIndex-src-tree.dpatch: Added patch from the upstream SVN repository to ensure tk/tclIndex is generated in the build tree and not in the source tree. * debian/rules: Drop the removal of bindings/tk/tclIndex Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/00list Added Paths: ----------- trunk/debian/patches/03_tclIndex-src-tree.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-29 10:34:48 UTC (rev 7983) +++ trunk/debian/changelog 2007-10-29 16:12:08 UTC (rev 7984) @@ -16,8 +16,11 @@ + Added Homepage, XS-Vcs-Svn, and XS-Vcs-Browser fields + Added me as an uploader * debian/rules: Do not set the RPATH when building shared libraries + * debian/patches/03_tclIndex-src-tree.dpatch: Added patch from the + upstream SVN repository to ensure tk/tclIndex is generated in the + build tree and not in the source tree. - -- Rafael Laboissiere <ra...@de...> Fri, 26 Oct 2007 14:38:36 +0200 + -- Rafael Laboissiere <ra...@de...> Mon, 29 Oct 2007 17:06:13 +0100 plplot (5.7.4.svn.20070523-2) unstable; urgency=low Modified: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2007-10-29 10:34:48 UTC (rev 7983) +++ trunk/debian/patches/00list 2007-10-29 16:12:08 UTC (rev 7984) @@ -1,2 +1,3 @@ 01_check-for-octave2.1 02_unset-python-path +03_tclIndex-src-tree Added: trunk/debian/patches/03_tclIndex-src-tree.dpatch =================================================================== --- trunk/debian/patches/03_tclIndex-src-tree.dpatch (rev 0) +++ trunk/debian/patches/03_tclIndex-src-tree.dpatch 2007-10-29 16:12:08 UTC (rev 7984) @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_tclIndex-src-tree.dpatch by Rafael Laboissiere <ra...@de...> +## +## DP: Ensure tclIndex is generated in the build tree and not in the source +## DP: tree. (This patch was taken from the upstream SVN repository.) + +@DPATCH@ + +--- plplot-5.8.0~RC1.orig/bindings/tk/CMakeLists.txt ++++ plplot-5.8.0~RC1/bindings/tk/CMakeLists.txt +@@ -57,6 +57,29 @@ + cmap1d.pal + ) + ++# Ugly hack to copy all .tcl files to the build tree so that tclIndex ++# can be generated there. This is a limitation is tcl's auto_mkindex which ++# always generates the index in the directory with the files. ++if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") ++ set(tclIndex_DEPENDS) ++ foreach(file ${tcldata} ${itkdata}) ++ set( ++ tclIndex_DEPENDS ++ ${tclIndex_DEPENDS} ++ ${CMAKE_CURRENT_BINARY_DIR}/${file} ++ ) ++ add_custom_command( ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} ++ COMMAND ${CMAKE_COMMAND} -E copy ++ ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} ++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} ++ ) ++ endforeach(file ${tcldata} ${itkdata}) ++ add_custom_target(tcl_files ALL DEPENDS ${tclIndex_DEPENDS}) ++else(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") ++ set(tclIndex_DEPENDS ${tcldata} ${itkdata}) ++endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") ++ + install( + FILES ${tcldata} ${itkdata} ${paldata} + DESTINATION ${TCL_DIR} +@@ -86,13 +109,18 @@ + install(TARGETS plserver DESTINATION ${BIN_DIR}) + + add_custom_target(tclIndex_tk ALL ++ DEPENDS ${tclIndex_DEPENDS} ${CMAKE_CURRENT_BINARY_DIR}/tclIndex ++) ++ ++add_custom_command( ++OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex + COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS} +-DEPENDS ${tcldata} ${itkdata} +-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++DEPENDS ${tclIndex_DEPENDS} ++WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + + install( +-FILES ${CMAKE_CURRENT_SOURCE_DIR}/tclIndex ++FILES ${CMAKE_CURRENT_BINARY_DIR}/tclIndex + DESTINATION ${TCL_DIR} + ) + Property changes on: trunk/debian/patches/03_tclIndex-src-tree.dpatch ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-29 16:20:22
|
Revision: 7986 http://plplot.svn.sourceforge.net/plplot/?rev=7986&view=rev Author: rlaboiss Date: 2007-10-29 09:20:26 -0700 (Mon, 29 Oct 2007) Log Message: ----------- * debian/control: Made octave-plplot depend on libplplot9, otherwise a broken symlink may show up in /usr/share/doc Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-29 16:13:54 UTC (rev 7985) +++ trunk/debian/changelog 2007-10-29 16:20:26 UTC (rev 7986) @@ -9,6 +9,8 @@ [ Rafael Laboissiere ] * debian/control: + + Made octave-plplot depend on libplplot9, otherwise a broken symlink + may show up in /usr/share/doc + Updated description of plplot-bin package, since support for plmeta and pstex is not enabled by default + Replaced the deprecated variable ${Source-Version} by Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-10-29 16:13:54 UTC (rev 7985) +++ trunk/debian/control 2007-10-29 16:20:26 UTC (rev 7986) @@ -221,7 +221,7 @@ Package: octave-plplot Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${octave:Depends} +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends} Description: Octave support for PLplot, a plotting library This package contains the Octave bindings for PLplot, a scientific plotting library. It provides an almost drop-in replacement for the traditional This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-29 16:22:34
|
Revision: 7987 http://plplot.svn.sourceforge.net/plplot/?rev=7987&view=rev Author: rlaboiss Date: 2007-10-29 09:22:39 -0700 (Mon, 29 Oct 2007) Log Message: ----------- Added dpatch 04_use-mkoctfile Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/00list Added Paths: ----------- trunk/debian/patches/04_use-mkoctfile.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-29 16:20:26 UTC (rev 7986) +++ trunk/debian/changelog 2007-10-29 16:22:39 UTC (rev 7987) @@ -18,9 +18,11 @@ + Added Homepage, XS-Vcs-Svn, and XS-Vcs-Browser fields + Added me as an uploader * debian/rules: Do not set the RPATH when building shared libraries - * debian/patches/03_tclIndex-src-tree.dpatch: Added patch from the - upstream SVN repository to ensure tk/tclIndex is generated in the - build tree and not in the source tree. + * Added dpatches: + + 03_tclIndex-src-tree.dpatch: Ensure tk/tclIndex is generated in the + build tree and not in the source tree + + 04_use-mkoctfile: Build plplot_octave.oct using mkoctfile and not as + a shared library -- Rafael Laboissiere <ra...@de...> Mon, 29 Oct 2007 17:06:13 +0100 Modified: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2007-10-29 16:20:26 UTC (rev 7986) +++ trunk/debian/patches/00list 2007-10-29 16:22:39 UTC (rev 7987) @@ -1,3 +1,4 @@ 01_check-for-octave2.1 02_unset-python-path 03_tclIndex-src-tree +04_use-mkoctfile Added: trunk/debian/patches/04_use-mkoctfile.dpatch =================================================================== --- trunk/debian/patches/04_use-mkoctfile.dpatch (rev 0) +++ trunk/debian/patches/04_use-mkoctfile.dpatch 2007-10-29 16:22:39 UTC (rev 7987) @@ -0,0 +1,114 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_use-mkoctfile.dpatch by Rafael Laboissiere <ra...@de...> +## +## DP: Build plplot_octave.oct using mkoctfile and not as a shared library + +@DPATCH@ + +--- plplot-5.8.0~RC1.orig/bindings/octave/CMakeLists.txt ++++ plplot-5.8.0~RC1/bindings/octave/CMakeLists.txt +@@ -128,66 +128,24 @@ + ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h + ) + +-# Build octave interface. +-set(octave_interface_INCLUDE_PATHS +-${CMAKE_SOURCE_DIR}/include +-${CMAKE_BINARY_DIR} +-${CMAKE_BINARY_DIR}/include +-${CMAKE_CURRENT_SOURCE_DIR} +-${CMAKE_CURRENT_BINARY_DIR} +-${OCTAVE_INCLUDE_PATH} +-) +-include_directories(${octave_interface_INCLUDE_PATHS}) +- +-add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc) +-target_link_libraries( +-plplot_octave +-plplot${LIB_TAG} +-"${OCTAVE_LIBRARIES}" +-"${OCTINTERP_LIBRARIES}" +-) +- +-if(USE_RPATH) +- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) +- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and +- # OCTINTERP_LIBRARIES have the same path. +- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH) +- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH}) +- set_target_properties( +- plplot_octave +- PROPERTIES +- PREFIX "" +- SUFFIX ".oct" +- INSTALL_RPATH "${LIB_INSTALL_RPATH}" +- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" +- ) +-else(USE_RPATH) +- set_target_properties( +- plplot_octave +- PROPERTIES +- PREFIX "" +- SUFFIX ".oct" +- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" +- ) +-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 ++add_custom_command( ++OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct ++DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc ++COMMAND ${MKOCTFILE} ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc ++-I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/bindings/octave ++-I${CMAKE_SOURCE_DIR}/include --strip ++-L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ++) ++ ++add_custom_target( ++plplot_octave_oct_file ALL ++DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct + ) + + install( +-TARGETS +-plplot_octave +-LIBRARY ++FILES ++${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct + DESTINATION ${OCTAVE_OCT_DIR} +-PERMISSIONS ${PERM_MODULES} + ) + + # Build and install plplot_stub.m +@@ -233,23 +191,4 @@ + DESTINATION ${PLPLOT_OCTAVE_DIR} + ) + +-if(never) +-add_custom_command( +-OUTPUT +-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct +-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o +-COMMAND +-touch +-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct +-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o +-DEPENDS +-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc +-) +- +-# Link octave interface. +-add_custom_target( +-plplot_octave-libdir.oct ALL +-DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o +-) +-endif(never) + endif(ENABLE_octave) Property changes on: trunk/debian/patches/04_use-mkoctfile.dpatch ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-29 21:27:45
|
Revision: 7988 http://plplot.svn.sourceforge.net/plplot/?rev=7988&view=rev Author: rlaboiss Date: 2007-10-29 14:27:42 -0700 (Mon, 29 Oct 2007) Log Message: ----------- Use the now official Vcs-* fields instead of XS-Vcs-* Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-29 16:22:39 UTC (rev 7987) +++ trunk/debian/changelog 2007-10-29 21:27:42 UTC (rev 7988) @@ -15,7 +15,7 @@ and pstex is not enabled by default + Replaced the deprecated variable ${Source-Version} by ${binary:Version} - + Added Homepage, XS-Vcs-Svn, and XS-Vcs-Browser fields + + Added Homepage, Vcs-Svn, and Vcs-Browser fields + Added me as an uploader * debian/rules: Do not set the RPATH when building shared libraries * Added dpatches: Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-10-29 16:22:39 UTC (rev 7987) +++ trunk/debian/control 2007-10-29 21:27:42 UTC (rev 7988) @@ -20,8 +20,8 @@ Build-Conflicts: libplplot5 XS-Python-Version: all Homepage: http://www.plplot.org -XS-Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian -XS-Vcs-Browser: http://plplot.svn.sourceforge.net/viewvc/plplot/trunk/debian/ +Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian +Vcs-Browser: http://plplot.svn.sourceforge.net/viewvc/plplot/trunk/debian/ Package: libplplot9 Architecture: any This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-30 12:19:27
|
Revision: 7990 http://plplot.svn.sourceforge.net/plplot/?rev=7990&view=rev Author: rlaboiss Date: 2007-10-30 05:19:27 -0700 (Tue, 30 Oct 2007) Log Message: ----------- Build-depend on octave2.9-headers instead of octave2.1-headers. Also, build-conflict with the later. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-29 21:54:59 UTC (rev 7989) +++ trunk/debian/changelog 2007-10-30 12:19:27 UTC (rev 7990) @@ -11,6 +11,8 @@ * debian/control: + Made octave-plplot depend on libplplot9, otherwise a broken symlink may show up in /usr/share/doc + + Build-depend on octave2.9-headers instead of octave2.1-headers. + Also, build-conflict with the later. + Updated description of plplot-bin package, since support for plmeta and pstex is not enabled by default + Replaced the deprecated variable ${Source-Version} by Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-10-29 21:54:59 UTC (rev 7989) +++ trunk/debian/control 2007-10-30 12:19:27 UTC (rev 7990) @@ -6,7 +6,7 @@ Standards-Version: 3.7.2 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.1-headers (>= 2.1.65), + libxi-dev, gfortran, itk3-dev, octave2.9-headers, libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, liblasi-dev (>= 1.0.6), m4, libqhull-dev, libxml-parser-perl, libxml-dom-perl, @@ -17,7 +17,7 @@ python-numpy, ttf-freefont, docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex, jikes-kaffe, kaffe-dev, fastjar, swig -Build-Conflicts: libplplot5 +Build-Conflicts: libplplot5, octave2.1-headers XS-Python-Version: all Homepage: http://www.plplot.org Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-31 13:40:14
|
Revision: 7995 http://plplot.svn.sourceforge.net/plplot/?rev=7995&view=rev Author: rlaboiss Date: 2007-10-31 06:40:17 -0700 (Wed, 31 Oct 2007) Log Message: ----------- In debian/rules, set the environment variable ITCL_LIBRARY when calling ctest, such that the examples_tcl test passes. (N.B.: it is strange that this is needed and it is probably an indication that something in test scripts is wrong). Modified Paths: -------------- trunk/debian/changelog trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-30 22:01:21 UTC (rev 7994) +++ trunk/debian/changelog 2007-10-31 13:40:17 UTC (rev 7995) @@ -21,7 +21,10 @@ ${binary:Version} + Added Homepage, Vcs-Svn, and Vcs-Browser fields + Added me as an uploader - * debian/rules: Do not set the RPATH when building shared libraries + * debian/rules: + + Do not set the RPATH when building shared libraries + + Set the environment variable ITCL_LIBRARY when calling ctest, such + that the examples_tcl test passes * Added dpatches: + 03_tclIndex-src-tree.dpatch: Ensure tk/tclIndex is generated in the build tree and not in the source tree Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-30 22:01:21 UTC (rev 7994) +++ trunk/debian/rules 2007-10-31 13:40:17 UTC (rev 7995) @@ -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) ; ctest ) + -( cd $(BUILD_DIR) ; ITCL_LIBRARY=/usr/lib/itcl3.2 ctest ) touch build-stamp clean: unpatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-31 16:02:53
|
Revision: 7996 http://plplot.svn.sourceforge.net/plplot/?rev=7996&view=rev Author: rlaboiss Date: 2007-10-31 09:02:56 -0700 (Wed, 31 Oct 2007) Log Message: ----------- Move libplplotwxwidgetsd.so* into the plplot9-driver-wxwidgets package Modified Paths: -------------- trunk/debian/changelog trunk/debian/plplot9-driver-wxwidgets.files Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-10-31 13:40:17 UTC (rev 7995) +++ trunk/debian/changelog 2007-10-31 16:02:56 UTC (rev 7996) @@ -30,6 +30,8 @@ build tree and not in the source tree + 04_use-mkoctfile: Build plplot_octave.oct using mkoctfile and not as a shared library + * debian/plplot9-driver-wxwidgets.files: Move libplplotwxwidgetsd.so* + into the plplot9-driver-wxwidgets package -- Rafael Laboissiere <ra...@de...> Mon, 29 Oct 2007 17:06:13 +0100 Modified: trunk/debian/plplot9-driver-wxwidgets.files =================================================================== --- trunk/debian/plplot9-driver-wxwidgets.files 2007-10-31 13:40:17 UTC (rev 7995) +++ trunk/debian/plplot9-driver-wxwidgets.files 2007-10-31 16:02:56 UTC (rev 7996) @@ -1,4 +1,5 @@ usr/lib/plplot*/driversd/wxwidgets.* +usr/lib/libplplotwxwidgetsd.so* usr/share/doc/plplot9-driver-wxwidgets This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-11-04 18:20:26
|
Revision: 8003 http://plplot.svn.sourceforge.net/plplot/?rev=8003&view=rev Author: rlaboiss Date: 2007-11-04 10:20:30 -0800 (Sun, 04 Nov 2007) Log Message: ----------- Preparation for 5.8.0~RC1-2, where the cairo driver package will replace the psttf one Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/rules Added Paths: ----------- trunk/debian/NEWS trunk/debian/plplot9-driver-cairo.files Removed Paths: ------------- trunk/debian/plplot9-driver-psttf.files Added: trunk/debian/NEWS =================================================================== --- trunk/debian/NEWS (rev 0) +++ trunk/debian/NEWS 2007-11-04 18:20:30 UTC (rev 8003) @@ -0,0 +1,10 @@ +plplot (5.8.0~RC1-2) unstable; urgency=low + + * The psttf driver is dropped in this release. The cairo driver + provides all of its functionality and will replace it eventually. The + plplot9-driver-cairo package has relationships Conflicts/Replaces with + plplot9-driver-pstff, which should make the transition smoother for + the users. + + -- Rafael Laboissiere <ra...@de...> Thu, 01 Nov 2007 10:19:31 +0100 + Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-11-01 20:47:59 UTC (rev 8002) +++ trunk/debian/changelog 2007-11-04 18:20:30 UTC (rev 8003) @@ -1,3 +1,10 @@ +plplot (5.8.0~RC1-2) UNRELEASED; urgency=low + + * Added Cairo driver and dropped psttf driver, making the former + replace/conflict with the later + + -- Rafael Laboissiere <ra...@de...> Wed, 31 Oct 2007 22:20:25 +0100 + plplot (5.8.0~RC1-1) unstable; urgency=low [ Andrew Ross ] Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-11-01 20:47:59 UTC (rev 8002) +++ trunk/debian/control 2007-11-04 18:20:30 UTC (rev 8003) @@ -8,7 +8,7 @@ tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave2.9-headers, libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, - libgnomeprintui2.2-dev, libgnomeui-dev, liblasi-dev (>= 1.0.6), + libgnomeprintui2.2-dev, libgnomeui-dev, m4, libqhull-dev, libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, dpatch, atlas3-base-dev [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k], @@ -29,7 +29,7 @@ Conflicts: libplplot5, plplot (<< 5) Depends: ${shlibs:Depends} Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd, - plplot-driver-psttf, plplot-driver-wxwidgets, plplot-tcl + plplot-driver-cairo, plplot-driver-wxwidgets, plplot-tcl Description: Scientific 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 @@ -147,16 +147,6 @@ . Homepage: http://www.plplot.org -Package: plplot9-driver-psttf -Architecture: any -Section: libs -Depends: libplplot9, ${shlibs:Depends} -Description: Scientific plotting library (PostScript with Unicode support) - This package provides the PostScript driver module with Unicode - support for PLplot, a scientific plotting library. - . - Homepage: http://www.plplot.org - Package: plplot9-driver-wxwidgets Architecture: any Section: libs @@ -204,6 +194,20 @@ . Homepage: http://www.plplot.org +Package: plplot9-driver-cairo +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Conflicts: plplot9-driver-psttf +Replaces: plplot9-driver-psttf +Description: Scientific plotting library (Cairo driver) + This package provides the Cairo driver module for PLplot, a + 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 Section: python Added: trunk/debian/plplot9-driver-cairo.files =================================================================== --- trunk/debian/plplot9-driver-cairo.files (rev 0) +++ trunk/debian/plplot9-driver-cairo.files 2007-11-04 18:20:30 UTC (rev 8003) @@ -0,0 +1,2 @@ +usr/lib/plplot*/driversd/cairo.* +usr/share/doc/plplot9-driver-cairo Deleted: trunk/debian/plplot9-driver-psttf.files =================================================================== --- trunk/debian/plplot9-driver-psttf.files 2007-11-01 20:47:59 UTC (rev 8002) +++ trunk/debian/plplot9-driver-psttf.files 2007-11-04 18:20:30 UTC (rev 8003) @@ -1,2 +0,0 @@ -usr/lib/plplot*/driversd/psttf* -usr/share/doc/plplot9-driver-psttf Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-11-01 20:47:59 UTC (rev 8002) +++ trunk/debian/rules 2007-11-04 18:20:30 UTC (rev 8003) @@ -35,7 +35,7 @@ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF + -DUSE_RPATH=OFF -DPLD_psttf=OFF BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) @@ -104,7 +104,7 @@ plplot9-driver-gd plplot9-driver-xwin octave-plplot \ python-plplot plplot-bin libplplot-c++9c2 \ plplot9-driver-gnome2 plplot9-driver-wxwidgets \ - plplot9-driver-psttf libplplot-fortran9 \ + plplot9-driver-cairo libplplot-fortran9 \ libplplot9-java; 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...> - 2007-11-14 23:21:46
|
Revision: 8023 http://plplot.svn.sourceforge.net/plplot/?rev=8023&view=rev Author: rlaboiss Date: 2007-11-14 15:21:48 -0800 (Wed, 14 Nov 2007) Log Message: ----------- * debian/control: Build-depends on java-gcj-compat-dev and make the libplplot9-java package depend on java-gcj-compat. It seems that the Java binding only work well with gcj/gij. * debian/rules: Set the appropriate JAVA_HOME according to the above. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-11-13 18:58:30 UTC (rev 8022) +++ trunk/debian/changelog 2007-11-14 23:21:48 UTC (rev 8023) @@ -1,3 +1,12 @@ +plplot (5.8.0~RC1-3) UNRELEASED; urgency=low + + * debian/control: Build-depends on java-gcj-compat-dev and make the + libplplot9-java package depend on java-gcj-compat. It seems that the + Java binding only work well with gcj/gij. + * debian/rules: Set the appropriate JAVA_HOME according to the above. + + -- Rafael Laboissiere <ra...@de...> Wed, 14 Nov 2007 23:51:54 +0100 + plplot (5.8.0~RC1-2) unstable; urgency=low * Added Cairo driver and dropped psttf driver, making the former Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-11-13 18:58:30 UTC (rev 8022) +++ trunk/debian/control 2007-11-14 23:21:48 UTC (rev 8023) @@ -16,7 +16,7 @@ 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, jikes-kaffe, kaffe-dev, fastjar, swig + opensp, jadetex, java-gcj-compat-dev, fastjar, swig Build-Conflicts: libplplot5, octave2.1-headers XS-Python-Version: all Homepage: http://www.plplot.org @@ -84,7 +84,7 @@ Package: libplplot9-java Architecture: any Section: libs -Depends: java-runtime, ${shlibs:Depends} +Depends: java-gcj-compat, ${shlibs:Depends} Description: Scientific plotting library This packages contains the Java bindings for PLplot, a scientific plotting library. Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-11-13 18:58:30 UTC (rev 8022) +++ trunk/debian/rules 2007-11-14 23:21:48 UTC (rev 8023) @@ -26,7 +26,7 @@ debinfo := $(debshr)/info debex := $(debshr)/plplot$(version)/examples -JAVA_HOME = /usr/lib/kaffe +JAVA_HOME = /usr/lib/jvm/java-gcj PYVERS = $(shell pyversions -vr) CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-11-28 09:51:39
|
Revision: 8042 http://plplot.svn.sourceforge.net/plplot/?rev=8042&view=rev Author: andrewross Date: 2007-11-28 01:51:40 -0800 (Wed, 28 Nov 2007) Log Message: ----------- configure.ac has been removed along with the rest of the old autotools build system. Now need to determine version information from cmake files instead. Modified Paths: -------------- trunk/debian/get-upstream-version.pl trunk/debian/rules Modified: trunk/debian/get-upstream-version.pl =================================================================== --- trunk/debian/get-upstream-version.pl 2007-11-25 00:16:53 UTC (rev 8041) +++ trunk/debian/get-upstream-version.pl 2007-11-28 09:51:40 UTC (rev 8042) @@ -1,7 +1,7 @@ #!/usr/bin/perl -w while (<>) { - if (/^AC_INIT\(plplot, ([^,)]+)/) { + if (/^set\(VERSION ([^,)]+)/) { print $1; last; } Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-11-25 00:16:53 UTC (rev 8041) +++ trunk/debian/rules 2007-11-28 09:51:40 UTC (rev 8042) @@ -14,7 +14,7 @@ include /usr/share/octave/debian/defs.make include /usr/share/dpatch/dpatch.make -version := $(shell perl debian/get-upstream-version.pl < configure.ac) +version := $(shell perl debian/get-upstream-version.pl < cmake/modules/plplot_version.cmake) libpkg := libplplot9 docpkg := plplot-doc debbase := $(shell pwd)/debian This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-11-30 14:58:23
|
Revision: 8043 http://plplot.svn.sourceforge.net/plplot/?rev=8043&view=rev Author: andrewross Date: 2007-11-30 06:58:26 -0800 (Fri, 30 Nov 2007) Log Message: ----------- Correct recommends errors in debian/control file and update README.Debian to reflect recent package changes. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/libplplot9.README.Debian Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-11-28 09:51:40 UTC (rev 8042) +++ trunk/debian/changelog 2007-11-30 14:58:26 UTC (rev 8043) @@ -1,3 +1,15 @@ +plplot (5.8.0) unstable; urgency=low + + [ Andrew Ross ] + * New upstream release. + * debian/rules: use cmake to get version information rather than configure.ac. + Autotools build is now obsolete. + * debian/control: correct libplplot9 suggests - correct package names are + plplot9-driver-cairo and plplot9-driver-wxwidgets. + * debian/libplplot9.README.Debian: Update to reflect changes to + octave-plplot and replacement of psttf driver with cairo driver. + + plplot (5.8.0~RC1-3) unstable; urgency=low * debian/control: Build-depends on java-gcj-compat-dev and make the Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-11-28 09:51:40 UTC (rev 8042) +++ trunk/debian/control 2007-11-30 14:58:26 UTC (rev 8043) @@ -29,7 +29,7 @@ Conflicts: libplplot5, plplot (<< 5) Depends: ${shlibs:Depends} Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd, - plplot-driver-cairo, plplot-driver-wxwidgets, plplot-tcl + plplot9-driver-cairo, plplot9-driver-wxwidgets, plplot-tcl Description: Scientific 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 Modified: trunk/debian/libplplot9.README.Debian =================================================================== --- trunk/debian/libplplot9.README.Debian 2007-11-28 09:51:40 UTC (rev 8042) +++ trunk/debian/libplplot9.README.Debian 2007-11-30 14:58:26 UTC (rev 8043) @@ -35,9 +35,12 @@ * plplot9-driver-gnome2: Provides the Gnome canvas driver module. - * plplot9-driver-psttf: Provides the psttf driver module. This uses - liblasi0 to produce postscript with higher quality text using - truetype fonts. + * 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. @@ -58,10 +61,10 @@ * python-plplot: Glue library with bindings for Python. - * octave-plplot: Glue library with bindings for Octave 2.1. In order - to use this package, issue the command "use_plplot" at the Octave - 2.1 prompt. This will have the effect of replacing the traditional - Gnuplot interface by a PLplot based one. + * 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-11-30 18:17:02
|
Revision: 8046 http://plplot.svn.sourceforge.net/plplot/?rev=8046&view=rev Author: andrewross Date: 2007-11-30 10:17:07 -0800 (Fri, 30 Nov 2007) Log Message: ----------- Debian files to build packages from 5.8.0 source release. tclIndex patch no longer needed (included in 5.8.0). Add patch to update octave documentation (from SVN). Closes Debian bug #453128. Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/00list Removed Paths: ------------- trunk/debian/patches/03_tclIndex-src-tree.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-11-30 15:49:04 UTC (rev 8045) +++ trunk/debian/changelog 2007-11-30 18:17:07 UTC (rev 8046) @@ -9,6 +9,7 @@ * debian/libplplot9.README.Debian: Update to reflect changes to octave-plplot and replacement of psttf driver with cairo driver. + -- Andrew Ross <and...@us...> Fri, 30 Nov 2007 17:47:54 +0000 plplot (5.8.0~RC1-3) unstable; urgency=low Modified: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2007-11-30 15:49:04 UTC (rev 8045) +++ trunk/debian/patches/00list 2007-11-30 18:17:07 UTC (rev 8046) @@ -1,4 +1,4 @@ 01_check-for-octave2.9 02_unset-python-path -03_tclIndex-src-tree 04_use-mkoctfile +05_octave_documentation Deleted: trunk/debian/patches/03_tclIndex-src-tree.dpatch =================================================================== --- trunk/debian/patches/03_tclIndex-src-tree.dpatch 2007-11-30 15:49:04 UTC (rev 8045) +++ trunk/debian/patches/03_tclIndex-src-tree.dpatch 2007-11-30 18:17:07 UTC (rev 8046) @@ -1,62 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_tclIndex-src-tree.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Ensure tclIndex is generated in the build tree and not in the source -## DP: tree. (This patch was taken from the upstream SVN repository.) - -@DPATCH@ - ---- plplot-5.8.0~RC1.orig/bindings/tk/CMakeLists.txt -+++ plplot-5.8.0~RC1/bindings/tk/CMakeLists.txt -@@ -57,6 +57,29 @@ - cmap1d.pal - ) - -+# Ugly hack to copy all .tcl files to the build tree so that tclIndex -+# can be generated there. This is a limitation is tcl's auto_mkindex which -+# always generates the index in the directory with the files. -+if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") -+ set(tclIndex_DEPENDS) -+ foreach(file ${tcldata} ${itkdata}) -+ set( -+ tclIndex_DEPENDS -+ ${tclIndex_DEPENDS} -+ ${CMAKE_CURRENT_BINARY_DIR}/${file} -+ ) -+ add_custom_command( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} -+ COMMAND ${CMAKE_COMMAND} -E copy -+ ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} -+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} -+ ) -+ endforeach(file ${tcldata} ${itkdata}) -+ add_custom_target(tcl_files ALL DEPENDS ${tclIndex_DEPENDS}) -+else(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") -+ set(tclIndex_DEPENDS ${tcldata} ${itkdata}) -+endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") -+ - install( - FILES ${tcldata} ${itkdata} ${paldata} - DESTINATION ${TCL_DIR} -@@ -86,13 +109,18 @@ - install(TARGETS plserver DESTINATION ${BIN_DIR}) - - add_custom_target(tclIndex_tk ALL -+ DEPENDS ${tclIndex_DEPENDS} ${CMAKE_CURRENT_BINARY_DIR}/tclIndex -+) -+ -+add_custom_command( -+OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex - COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS} --DEPENDS ${tcldata} ${itkdata} --WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+DEPENDS ${tclIndex_DEPENDS} -+WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - ) - - install( --FILES ${CMAKE_CURRENT_SOURCE_DIR}/tclIndex -+FILES ${CMAKE_CURRENT_BINARY_DIR}/tclIndex - DESTINATION ${TCL_DIR} - ) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |