From: <rla...@us...> - 2008-03-24 10:11:14
|
Revision: 8329 http://plplot.svn.sourceforge.net/plplot/?rev=8329&view=rev Author: rlaboiss Date: 2008-03-24 03:11:14 -0700 (Mon, 24 Mar 2008) Log Message: ----------- Rename dontrol into control.in and process the later with slice Modified Paths: -------------- trunk/debian/changelog trunk/debian/rules Added Paths: ----------- trunk/debian/control.in Removed Paths: ------------- trunk/debian/control Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-03-24 09:57:42 UTC (rev 8328) +++ trunk/debian/changelog 2008-03-24 10:11:14 UTC (rev 8329) @@ -1,9 +1,18 @@ 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 + * debian/control.in: + + Renamed from debian/control. + + Build-depend on slice + + Build-depend on gnat-4.1 on alpha and mipsel, since gnat-4.3, the + default ADA compiler in Debian unstable, has issues on those + architectures + * debian/rules: + + Do not issue commands related to the libplplot9-java and + libplplot-ada packages on arm + + Process debian/control.in through the slice command to produce a + debian/control file with some packages excluded for some + architectures (currently, libplplot9-java and libplplot-ada are + excluded for arm) -- Rafael Laboissiere <ra...@de...> Mon, 24 Mar 2008 10:57:11 +0100 Deleted: trunk/debian/control =================================================================== --- trunk/debian/control 2008-03-24 09:57:42 UTC (rev 8328) +++ trunk/debian/control 2008-03-24 10:11:14 UTC (rev 8329) @@ -1,220 +0,0 @@ -Source: plplot -Section: math -Priority: optional -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), 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, - libgnomeprintui2.2-dev, libgnomeui-dev, - m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, - 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], - 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 -XS-Python-Version: all -Homepage: http://www.plplot.org -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 -Section: libs -Conflicts: libplplot5, plplot (<< 5) -Depends: ${shlibs:Depends} -Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd, - 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 - line (linear, log), contour, 3D, fill, and almost 1000 characters - (including Greek and mathematical) in its extended font set. The package - is designed to make it easy to quickly get graphical output; only a - handful of function calls is typically required. For more advanced use, - virtually all aspects of plotting are configurable. - . - This package contains the PLplot libraries for C and Fortran77, as - well as the necessary data files. - -Package: libplplot-dev -Architecture: any -Section: libdevel -Recommends: pkg-config -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 - 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. - -Package: libplplot-c++9c2 -Architecture: any -Section: libs -Conflicts: libplplot5, libplplot-c++9 -Replaces: libplplot-c++9 -Depends: ${shlibs:Depends} -Description: Scientific plotting library - This package contains the C++ binding for PLplot, a scientific plotting - library. - -Package: libplplot-fortran9 -Architecture: any -Section: libs -Depends: ${shlibs:Depends} -Description: Scientific plotting library - This package contains the Fortran 77 and Fortran 95 bindings for - PLplot, a scientific plotting library. - -Package: libplplot9-java -Architecture: any -Section: libs -Depends: java-gcj-compat [!arm] , ${shlibs:Depends} -Description: Scientific plotting library - This packages contains the Java bindings for PLplot, a scientific - plotting library. - -Package: libcsiro0 -Architecture: any -Section: libs -Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303) -Depends: ${shlibs:Depends} -Description: Scientific plotting library - This package contains two libraries developed by Pavel Sakov, from the - CSIRO Marine Research, used in geometry applications: - . - * libcsirocsa: bivariate Cubic Spline Approximation library - * libcsironn: Natural Neighbours interpolation library - . - The source code for these libraries are part of the plplot source - package. - -Package: plplot-bin -Architecture: any -Section: math -Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5) -Depends: ${shlibs:Depends} -Description: Scientific plotting library (utilities) - This package contains the following utilities associated with PLplot, - a scientific plotting library: - . - * pltek - review a Tektronix vector file - * plm2gif - converts PLplot metafiles to GIF files - * plpr - converts PLplot metafile to something the printer will understand - -Package: plplot9-driver-xwin -Architecture: any -Section: libs -Depends: ${shlibs:Depends} -Conflicts: plplot-lib, plplot (<< 5) -Description: Scientific plotting library (X11 driver) - This package provides the X11 driver module for PLplot, a scientific - plotting library. - -Package: plplot9-driver-gnome2 -Architecture: any -Section: libs -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 - scientific plotting library. This package replaces the (now deprecated) - plplot9-driver-gnome package. - -Package: plplot9-driver-wxwidgets -Architecture: any -Section: libs -Depends: libplplot9, ${shlibs:Depends} -Description: Scientific plotting library (wxWidgets driver) - This package provides the wxWidgets driver module for PLplot, a - scientific plotting library. - -Package: plplot-tcl -Architecture: any -Priority: extra -Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends} -Description: Tcl/Tk support for PLplot, a plotting library - This package contains the Tcl/Tk support for PLplot, a scientific - plotting library: shared libraries, Tcl modules, the Tk driver, and - some programs for interactive use of PLplot (plserver and pltcl). - Also included is the utility program plrender to render PLplot - metafiles. - -Package: plplot-tcl-dev -Architecture: any -Priority: extra -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 - with PLplot, a scientific plotting library: header files, shared - libraries links, and examples. - -Package: plplot9-driver-gd -Architecture: any -Section: libs -Depends: ${shlibs:Depends} -Recommends: ttf-freefont -Description: Scientific plotting library (GD driver) - 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. - -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). - -Package: python-plplot -Architecture: any -Section: python -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, - ${python:Depends}, python-numpy -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 - scientific plotting library into Python applications. Examples are also - provided. - -Package: octave-plplot -Architecture: any -Priority: extra -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 - 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 -Suggests: libplplot-dev -Description: Documentation for PLplot, a plotting library - This package contains the HTML, PDF, PostScript and info forms of the - PLplot documentation. It also contains the man pages for the API - functions. - Copied: trunk/debian/control.in (from rev 8328, trunk/debian/control) =================================================================== --- trunk/debian/control.in (rev 0) +++ trunk/debian/control.in 2008-03-24 10:11:14 UTC (rev 8329) @@ -0,0 +1,220 @@ +Source: plplot +Section: math +Priority: optional +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), 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, + libgnomeprintui2.2-dev, libgnomeui-dev, + m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, + libltdl3-dev, pkg-config, dpatch, slice, + 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 [!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 +XS-Python-Version: all +Homepage: http://www.plplot.org +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 +Section: libs +Conflicts: libplplot5, plplot (<< 5) +Depends: ${shlibs:Depends} +Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd, + 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 + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package contains the PLplot libraries for C and Fortran77, as + well as the necessary data files. + +Package: libplplot-dev +Architecture: any +Section: libdevel +Recommends: pkg-config +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 + 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. + +Package: libplplot-c++9c2 +Architecture: any +Section: libs +Conflicts: libplplot5, libplplot-c++9 +Replaces: libplplot-c++9 +Depends: ${shlibs:Depends} +Description: Scientific plotting library + This package contains the C++ binding for PLplot, a scientific plotting + library. + +Package: libplplot-fortran9 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: Scientific plotting library + This package contains the Fortran 77 and Fortran 95 bindings for + PLplot, a scientific plotting library. + +[JAVA:Package: libplplot9-java +Architecture: any +Section: libs +Depends: java-gcj-compat [!arm] , ${shlibs:Depends} +Description: Scientific plotting library + This packages contains the Java bindings for PLplot, a scientific + plotting library. +:] +Package: libcsiro0 +Architecture: any +Section: libs +Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303) +Depends: ${shlibs:Depends} +Description: Scientific plotting library + This package contains two libraries developed by Pavel Sakov, from the + CSIRO Marine Research, used in geometry applications: + . + * libcsirocsa: bivariate Cubic Spline Approximation library + * libcsironn: Natural Neighbours interpolation library + . + The source code for these libraries are part of the plplot source + package. + +Package: plplot-bin +Architecture: any +Section: math +Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5) +Depends: ${shlibs:Depends} +Description: Scientific plotting library (utilities) + This package contains the following utilities associated with PLplot, + a scientific plotting library: + . + * pltek - review a Tektronix vector file + * plm2gif - converts PLplot metafiles to GIF files + * plpr - converts PLplot metafile to something the printer will understand + +Package: plplot9-driver-xwin +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Conflicts: plplot-lib, plplot (<< 5) +Description: Scientific plotting library (X11 driver) + This package provides the X11 driver module for PLplot, a scientific + plotting library. + +Package: plplot9-driver-gnome2 +Architecture: any +Section: libs +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 + scientific plotting library. This package replaces the (now deprecated) + plplot9-driver-gnome package. + +Package: plplot9-driver-wxwidgets +Architecture: any +Section: libs +Depends: libplplot9, ${shlibs:Depends} +Description: Scientific plotting library (wxWidgets driver) + This package provides the wxWidgets driver module for PLplot, a + scientific plotting library. + +Package: plplot-tcl +Architecture: any +Priority: extra +Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends} +Description: Tcl/Tk support for PLplot, a plotting library + This package contains the Tcl/Tk support for PLplot, a scientific + plotting library: shared libraries, Tcl modules, the Tk driver, and + some programs for interactive use of PLplot (plserver and pltcl). + Also included is the utility program plrender to render PLplot + metafiles. + +Package: plplot-tcl-dev +Architecture: any +Priority: extra +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 + with PLplot, a scientific plotting library: header files, shared + libraries links, and examples. + +Package: plplot9-driver-gd +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Recommends: ttf-freefont +Description: Scientific plotting library (GD driver) + 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. + +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). + +Package: python-plplot +Architecture: any +Section: python +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, + ${python:Depends}, python-numpy +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 + scientific plotting library into Python applications. Examples are also + provided. + +Package: octave-plplot +Architecture: any +Priority: extra +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 + Gnuplot graphical interface in Octave. Examples are also provided. + +[ADA: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 +Suggests: libplplot-dev +Description: Documentation for PLplot, a plotting library + This package contains the HTML, PDF, PostScript and info forms of the + PLplot documentation. It also contains the man pages for the API + functions. + Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-03-24 09:57:42 UTC (rev 8328) +++ trunk/debian/rules 2008-03-24 10:11:14 UTC (rev 8329) @@ -54,7 +54,14 @@ BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) -config: config-stamp +debian/control: debian/control.in +ifneq ($(DEB_BUILD_ARCH),arm) + slice -o UNDEF+JAVA+ADA:$@ $< +else + slice -o UNDEF:$@ $< +endif + +config: config-stamp debian/control config-stamp: mkdir $(BUILD_DIR) (cd $(BUILD_DIR) ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-24 10:47:15
|
Revision: 8334 http://plplot.svn.sourceforge.net/plplot/?rev=8334&view=rev Author: rlaboiss Date: 2008-03-24 03:47:22 -0700 (Mon, 24 Mar 2008) Log Message: ----------- Build-depend alternatively on gnat-4.1 on mips, too Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-03-24 10:39:24 UTC (rev 8333) +++ trunk/debian/changelog 2008-03-24 10:47:22 UTC (rev 8334) @@ -3,8 +3,8 @@ * debian/control.in: + Renamed from debian/control. + Build-depend on slice - + Build-depend on gnat-4.1 on alpha and mipsel, since gnat-4.3, the - default Ada compiler in Debian unstable, has issues on those + + Build-depend on gnat-4.1 on alpha, mips, and mipsel, since gnat-4.3, + the default Ada compiler in Debian unstable, has issues on those architectures * debian/rules: + Do not issue commands related to the libplplot9-java and Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2008-03-24 10:39:24 UTC (rev 8333) +++ trunk/debian/control.in 2008-03-24 10:47:22 UTC (rev 8334) @@ -14,7 +14,8 @@ 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 [!alpha !arm !mipsel], gnat-4.1 [alpha mipsel] + fastjar, swig, gnat [!alpha !arm !mips !mipsel], + gnat-4.1 [alpha mips mipsel] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers @@ -76,7 +77,7 @@ [JAVA:Package: libplplot9-java Architecture: any Section: libs -Depends: java-gcj-compat [!arm] , ${shlibs:Depends} +Depends: java-gcj-compat, ${shlibs:Depends} Description: Scientific plotting library This packages contains the Java bindings for PLplot, a scientific plotting library. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-28 13:17:02
|
Revision: 8340 http://plplot.svn.sourceforge.net/plplot/?rev=8340&view=rev Author: rlaboiss Date: 2008-03-28 06:17:08 -0700 (Fri, 28 Mar 2008) Log Message: ----------- Do not build the Ada binding on mips and mipsel Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-03-28 12:10:05 UTC (rev 8339) +++ trunk/debian/changelog 2008-03-28 13:17:08 UTC (rev 8340) @@ -1,3 +1,15 @@ +plplot (5.9.0-5) UNRELEASED; urgency=low + + [ Andrew Ross ] + * debian/control.in: Make it clear that the ada bindings are still + experimental + + [ Rafael Laboissiere ] + * debian/control.in, debian/rules: Do not build the Ada binding on mips + and mipsel + + -- Rafael Laboissiere <ra...@de...> Fri, 28 Mar 2008 11:32:20 +0100 + plplot (5.9.0-4) unstable; urgency=low * debian/control.in: Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2008-03-28 12:10:05 UTC (rev 8339) +++ trunk/debian/control.in 2008-03-28 13:17:08 UTC (rev 8340) @@ -14,8 +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 [!alpha !arm !mips !mipsel], - gnat-4.1 [alpha mips mipsel] + fastjar, swig, gnat [!alpha !arm !mips !mipsel], gnat-4.1 [alpha] 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-28 12:10:05 UTC (rev 8339) +++ trunk/debian/rules 2008-03-28 13:17:08 UTC (rev 8340) @@ -32,17 +32,38 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +BUILD_ADA = yes +BUILD_JAVA = yes + # Disable java and ada build on arm - problems with java-gcj-compat-dev -# at the moment. Also gnat not available on arm. +# at the moment. Also gnat not available on arm, mips, and mipsel. + ifeq ($(DEB_BUILD_ARCH),arm) +BUILD_ADA = no +BUILD_JAVA = no +endif + +ifeq ($(DEB_BUILD_ARCH),mips) +BUILD_ADA = no +endif + +ifeq ($(DEB_BUILD_ARCH),mipsel) +BUILD_ADA = no +endif + +ifeq ($(BUILD_ADA),yes) +ADA_OPTIONS = -DENABLE_ada=ON +else ADA_OPTIONS = -DENABLE_ada=OFF -JAVA_OPTIONS = -DENABLE_java=OFF -else -ADA_OPTIONS = -DENABLE_ada=ON +endif + +ifeq ($(BUILD_JAVA),yes) JAVA_OPTIONS = \ -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar +else +JAVA_OPTIONS = -DENABLE_java=OFF endif CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ @@ -54,12 +75,21 @@ BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) + control: -ifneq ($(DEB_BUILD_ARCH),arm) - slice -o UNDEF+JAVA+ADA:debian/control debian/control.in +ifeq ($(BUILD_ADA),no) +ifeq ($(BUILD_JAVA),no) + slice -o UNDEF:debian/control debian/control.in else - slice -o UNDEF:debian/control debian/control.in + slice -o UNDEF+JAVA:debian/control debian/control.in endif +else +ifeq ($(BUILD_JAVA),no) + slice -o UNDEF+ADA:debian/control debian/control.in +else + slice -o UNDEF+JAVA+ADA:debian/control debian/control.in +endif +endif config: config-stamp config-stamp: control @@ -105,9 +135,11 @@ --no-package=libplplot9-java --no-package=libplplot-ada dh_movefiles --package=python-plplot dh_movefiles --package=plplot-bin -ifneq ($(DEB_BUILD_ARCH),arm) +ifeq ($(BUILD_JAVA),yes) + dh_movefiles --package=libplplot9-java +endif +ifeq ($(BUILD_ADA),yes) dh_movefiles --package=libplplot-ada - dh_movefiles --package=libplplot9-java dh_movefiles --package=libplplot-dev usr/share/ada else dh_movefiles --package=libplplot-dev @@ -140,14 +172,16 @@ 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 +ifeq ($(BUILD_JAVA),yes) + ln -s $(libpkg) $(debdoc)/libplplot9-java mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar ( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar ) endif +ifeq ($(BUILD_ADA),yes) + ln -s $(libpkg) $(debdoc)/libplplot-ada +endif + touch install-arch-stamp install-indep: install-indep-stamp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-04-03 10:09:09
|
Revision: 8356 http://plplot.svn.sourceforge.net/plplot/?rev=8356&view=rev Author: rlaboiss Date: 2008-04-03 03:09:15 -0700 (Thu, 03 Apr 2008) Log Message: ----------- Disable building of Ada binding on alpha Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-04-02 04:26:05 UTC (rev 8355) +++ trunk/debian/changelog 2008-04-03 10:09:15 UTC (rev 8356) @@ -1,3 +1,10 @@ +plplot (5.9.0-6) UNRELEASED; urgency=low + + * debian/control.in, debian/rules: Disable building of the Ada binding + on alpha + + -- Rafael Laboissiere <ra...@de...> Thu, 03 Apr 2008 11:59:36 +0200 + plplot (5.9.0-5) unstable; urgency=low [ Andrew Ross ] Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2008-04-02 04:26:05 UTC (rev 8355) +++ trunk/debian/control.in 2008-04-03 10:09:15 UTC (rev 8356) @@ -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 [!alpha !arm !mips !mipsel], gnat-4.1 [alpha] + fastjar, swig, gnat [!alpha !arm !mips !mipsel] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers @@ -207,8 +207,8 @@ 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. The ada bindings are currently under development and should be - considered experimental. + library. The ada bindings are currently under development and should be + considered experimental. :] Package: plplot-doc Architecture: all Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-04-02 04:26:05 UTC (rev 8355) +++ trunk/debian/rules 2008-04-03 10:09:15 UTC (rev 8356) @@ -38,6 +38,10 @@ # Disable java and ada build on arm - problems with java-gcj-compat-dev # at the moment. Also gnat not available on arm, mips, and mipsel. +ifeq ($(DEB_BUILD_ARCH),alpha) +BUILD_ADA = no +endif + ifeq ($(DEB_BUILD_ARCH),arm) BUILD_ADA = no BUILD_JAVA = no This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-05-02 13:39:27
|
Revision: 8383 http://plplot.svn.sourceforge.net/plplot/?rev=8383&view=rev Author: rlaboiss Date: 2008-05-02 06:39:32 -0700 (Fri, 02 May 2008) Log Message: ----------- Build-Depends on default-jdk-builddep instead of java-gcj-compat-dev and prevents building of the libplplot9-java package on alpha, hppa, and hurd-i386 Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-04-18 21:23:24 UTC (rev 8382) +++ trunk/debian/changelog 2008-05-02 13:39:32 UTC (rev 8383) @@ -1,3 +1,12 @@ +plplot (5.9.0-7) UNRELEASED; urgency=low + + * debian/control.in, debian/rules: Build-Depends on default-jdk-builddep + instead of java-gcj-compat-dev and prevents building of the + libplplot9-java package on alpha, hppa, and hurd-i386 (closes: + #477902) + + -- Rafael Laboissiere <ra...@de...> Fri, 02 May 2008 15:37:17 +0200 + plplot (5.9.0-6) unstable; urgency=low * debian/control.in, debian/rules: Disable building of the Ada binding Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2008-04-18 21:23:24 UTC (rev 8382) +++ trunk/debian/control.in 2008-05-02 13:39:32 UTC (rev 8383) @@ -13,7 +13,7 @@ libltdl3-dev, pkg-config, dpatch, slice, 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], + python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386], fastjar, swig, gnat [!alpha !arm !mips !mipsel] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-04-18 21:23:24 UTC (rev 8382) +++ trunk/debian/rules 2008-05-02 13:39:32 UTC (rev 8383) @@ -40,6 +40,7 @@ ifeq ($(DEB_BUILD_ARCH),alpha) BUILD_ADA = no +BUILD_JAVA = no endif ifeq ($(DEB_BUILD_ARCH),arm) @@ -47,6 +48,14 @@ BUILD_JAVA = no endif +ifeq ($(DEB_BUILD_ARCH),hppa) +BUILD_JAVA = no +endif + +ifeq ($(DEB_BUILD_ARCH),hurd-i386) +BUILD_JAVA = no +endif + ifeq ($(DEB_BUILD_ARCH),mips) BUILD_ADA = no endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-05-02 13:45:47
|
Revision: 8385 http://plplot.svn.sourceforge.net/plplot/?rev=8385&view=rev Author: rlaboiss Date: 2008-05-02 06:45:55 -0700 (Fri, 02 May 2008) Log Message: ----------- Prevent libplplot-ada of building on armeb and armel Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-05-02 13:40:12 UTC (rev 8384) +++ trunk/debian/changelog 2008-05-02 13:45:55 UTC (rev 8385) @@ -1,11 +1,12 @@ plplot (5.9.0-7) UNRELEASED; urgency=low - * debian/control.in, debian/rules: Build-Depends on default-jdk-builddep - instead of java-gcj-compat-dev and prevents building of the - libplplot9-java package on alpha, hppa, and hurd-i386 (closes: - #477902) + * debian/control.in, debian/rules: + + Build-depend on default-jdk-builddep instead of java-gcj-compat-dev + and prevents building of the libplplot9-java package on alpha, hppa, + and hurd-i386 (closes: #477902) + + Prevent libplplot-ada of building on armeb and armel (closes: #478891) - -- Rafael Laboissiere <ra...@de...> Fri, 02 May 2008 15:37:17 +0200 + -- Rafael Laboissiere <ra...@de...> Fri, 02 May 2008 15:45:20 +0200 plplot (5.9.0-6) unstable; urgency=low Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2008-05-02 13:40:12 UTC (rev 8384) +++ trunk/debian/control.in 2008-05-02 13:45:55 UTC (rev 8385) @@ -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, default-jdk-builddep [!alpha !arm !hppa !hurd-i386], - fastjar, swig, gnat [!alpha !arm !mips !mipsel] + fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel] 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-05-02 13:40:12 UTC (rev 8384) +++ trunk/debian/rules 2008-05-02 13:45:55 UTC (rev 8385) @@ -48,6 +48,14 @@ BUILD_JAVA = no endif +ifeq ($(DEB_BUILD_ARCH),armeb) +BUILD_ADA = no +endif + +ifeq ($(DEB_BUILD_ARCH),armel) +BUILD_ADA = no +endif + ifeq ($(DEB_BUILD_ARCH),hppa) BUILD_JAVA = no endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-06-01 21:19:58
|
Revision: 8448 http://plplot.svn.sourceforge.net/plplot/?rev=8448&view=rev Author: andrewross Date: 2008-06-01 14:20:06 -0700 (Sun, 01 Jun 2008) Log Message: ----------- Fix debian bug which prevented java package building on i386. Modified Paths: -------------- trunk/debian/changelog trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-05-30 09:08:33 UTC (rev 8447) +++ trunk/debian/changelog 2008-06-01 21:20:06 UTC (rev 8448) @@ -1,3 +1,11 @@ +plplot (5.9.0-8) unreleased; urgency=low + + * debian/rules: + + Fix use of findstring in debian/rules which prevented java + building on i386 (closes: #483826) + + -- Andrew Ross <and...@us...> Sun, 01 Jun 2008 22:10:34 +0100 + plplot (5.9.0-7) unstable; urgency=low * debian/control.in, debian/rules: Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-05-30 09:08:33 UTC (rev 8447) +++ trunk/debian/rules 2008-06-01 21:20:06 UTC (rev 8448) @@ -35,13 +35,13 @@ # Disable java and ada build on arm - problems with java-gcj-compat-dev # at the moment. Also gnat not available on arm, mips, and mipsel. -ifneq (,$(findstring $(DEB_BUILD_ARCH):,alpha:arm:armeb:armel:mips:mipsel:)) +ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:armeb:armel:mips:mipsel:)) BUILD_ADA = no else BUILD_ADA = yes endif -ifneq (,$(findstring $(DEB_BUILD_ARCH):,alpha:arm:hppa:hurd-i386:)) +ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:hppa:hurd-i386:)) BUILD_JAVA = no else BUILD_JAVA = yes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |