[plplot] 02/68: Import Debian changes 4.99j-11
Ole Streicher
olebole at moszumanska.debian.org
Mon Jul 10 07:38:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository plplot.
commit 7d1902de67545db2644736eecabd08b4de170fe9
Author: Rafael Laboissiere <rafael at icp.inpg.fr>
Date: Wed Jun 7 18:00:18 2000 +0200
Import Debian changes 4.99j-11
plplot (4.99j-11) frozen unstable; urgency=low
* Added --disable-linuxvga to configure options fixing an important bug
report (closes: #65216).
* The lib*tk files are moved to the right package now (plplot-tcl).
This fixes the unnecessary dependency of the bare library package
(plplot) on the TCl/Tk libraries.
plplot (4.99j-10) unstable; urgency=low
* debian/rules:
- Using option --without-f2c with ./configure. This should avoid the
build problems when the package f2c (which provides /usr/bin/fc) is
installed (closes: #30944).
- Erase empty dir usr/share/doc/examples after dh_movefiles. This
prevents the plplot from having junk in it.
* debian/control: Excluded problematic package python-plplot. Created
file debian/control-pyhton for easy reversal in the future (closes:
#33150).
plplot (4.99j-9) unstable; urgency=low
* Added "#define PLPLOT_DOUBLE" to plcdemos.h. This will allow
compilation of the examples, due to the lacking of `PLPLOT_DOUBLE'
definition (Closes: #49120, #36993). Also added a note in
plplot-dev.README.Debian indicating how to compile correctly.
* FHS compliant.
* Upgraded to Standards-Version 3.0.1 (requires debhelper >= 2.0.68).
* debian/copyright: Right location for the LGPL.
* cf/sysconf.in: Added `SHLIB_F77FLAGS="-fpic -fPIC"'.
---
cf/sysloc.in | 4 +++
debian/README.debian | 26 ++++++++++++-------
debian/changelog | 37 ++++++++++++++++++++++++++
debian/compress | 9 -------
debian/control | 16 +++---------
debian/control-python | 9 +++++++
debian/copyright | 2 +-
debian/plm2gif.1 | 2 +-
debian/plplot-dev.README.Debian | 5 ++--
debian/plplot-doc.README.Debian | 4 +--
debian/plplot-doc.compress | 9 -------
debian/plplot-doc.docs | 2 ++
debian/plplot-doc.files | 4 +--
debian/plplot-tcl.README.Debian | 2 +-
debian/plplot-tcl.files | 13 +++++-----
debian/plplot.dirs | 1 +
debian/plpr.1 | 2 +-
debian/plrender.1 | 2 +-
debian/plserver.1 | 2 +-
debian/pltcl.1 | 2 +-
debian/pltek.1 | 2 +-
debian/postinst | 4 ++-
debian/python-plplot.postinst.debhelper | 7 +++++
debian/python-plplot.prerm.debhelper | 5 ++++
debian/rules | 46 ++++++++++++++++++---------------
examples/c/plcdemos.h | 4 +++
x16.py | 22 ++++++++++++++++
27 files changed, 158 insertions(+), 85 deletions(-)
diff --git a/cf/sysloc.in b/cf/sysloc.in
index 252683e..6b28b0b 100644
--- a/cf/sysloc.in
+++ b/cf/sysloc.in
@@ -656,6 +656,10 @@ if test "$with_shlib" = "yes"; then
SHLIB_BUILD="gcc -shared -fpic -o"
;;
Linux* )
+ # Added by Rafael Laboissiere <rafael at icp.inpg.fr>
+ # on Sat Nov 6 20:57:55 CET 1999
+ SHLIB_F77FLAGS="-fpic -fPIC"
+
# Should do something to make sure this is an ELF system, as
# don't have patience for DLL...
AC_MSG_RESULT([Assuming Linux ELF. Otherwise, reconfigure --without-shlib])
diff --git a/debian/README.debian b/debian/README.debian
index f1b083f..54b4275 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -53,28 +53,34 @@ plplot for DEBIAN
number
* cf/lib_sh_linux.in: the libMatrix is generated with a
corrected soname and a link called libMatrix.so.4 is created.
- * cf/sysconf.in: LDC is set to F77 (symbols s_cmp and s_copy
- were causing problems when linking plrender).
+ * cf/sysconf.in:
+ - LDC is set to F77 (symbols s_cmp and s_copy were causing
+ problems when linking plrender).
+ - Added `SHLIB_F77FLAGS="-fpic -fPIC"' in case "$system" in
+ Linux*. This avoids having non-PIC code in the libraries.
4. DOCUMENTATION
Further documentation for PLplot can be found in
- /usr/infp/plplot.info.gz (Info format) or in the plplot-doc
+ /usr/share/info/plplot.info.gz (Info format) or in the plplot-doc
package.
5. DEMOS & EXAMPLES
- A lot of examples were included in the plplot-doc package. Look at
- /usr/doc/plplot/exemples. Instructions to compile the C and C++
- examples are in /usr/doc/plplot-dev/README.Debian. To run the
+ A lot of examples were included in the plplot-doc package. Look at
+ /usr/share/doc/plplot/exemples. Instructions to compile the C and C++
+ examples are in /usr/share/doc/plplot-dev/README.Debian. To run the
Tcl/Tk demos you will have to figure out how to source the plplot
- modules under /usr/lib/tcl8.0/plplot. As I never used Tcl in my
- life, I have no clue how to do it. If you figure out how to run
- the Tcl/Tk demos, please let me know (or file a bug report against
- the Debian package plplot-doc).
+ modules under /usr/lib/tcl8.0/plplot. As I never used Tcl in my life,
+ I have no clue how to do it. If you figure out how to run the Tcl/Tk
+ demos, please let me know (or file a bug report against the Debian
+ package plplot-doc).
Rafael Laboissiere <rafael at icp.inpg.fr>, Thu Nov 12 16:38:26 CET 1998
+Local Variables:
+mode: indented-text
+End:
diff --git a/debian/changelog b/debian/changelog
index fe0c64d..7e13b79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,40 @@
+plplot (4.99j-11) frozen unstable; urgency=low
+
+ * Added --disable-linuxvga to configure options fixing an important bug
+ report (closes: #65216).
+ * The lib*tk files are moved to the right package now (plplot-tcl).
+ This fixes the unnecessary dependency of the bare library package
+ (plplot) on the TCl/Tk libraries.
+
+ -- Rafael Laboissiere <rafael at icp.inpg.fr> Wed, 7 Jun 2000 18:00:18 +0200
+
+plplot (4.99j-10) unstable; urgency=low
+
+ * debian/rules:
+ - Using option --without-f2c with ./configure. This should avoid the
+ build problems when the package f2c (which provides /usr/bin/fc) is
+ installed (closes: #30944).
+ - Erase empty dir usr/share/doc/examples after dh_movefiles. This
+ prevents the plplot from having junk in it.
+ * debian/control: Excluded problematic package python-plplot. Created
+ file debian/control-pyhton for easy reversal in the future (closes:
+ #33150).
+
+ -- Rafael Laboissiere <rafael at icp.inpg.fr> Mon, 8 Nov 1999 12:17:27 +0100
+
+plplot (4.99j-9) unstable; urgency=low
+
+ * Added "#define PLPLOT_DOUBLE" to plcdemos.h. This will allow
+ compilation of the examples, due to the lacking of `PLPLOT_DOUBLE'
+ definition (Closes: #49120, #36993). Also added a note in
+ plplot-dev.README.Debian indicating how to compile correctly.
+ * FHS compliant.
+ * Upgraded to Standards-Version 3.0.1 (requires debhelper >= 2.0.68).
+ * debian/copyright: Right location for the LGPL.
+ * cf/sysconf.in: Added `SHLIB_F77FLAGS="-fpic -fPIC"'.
+
+ -- Rafael Laboissiere <rafael at icp.inpg.fr> Sat, 6 Nov 1999 21:01:13 +0100
+
plplot (4.99j-8) frozen unstable; urgency=low
* Recompiled with new release of libc6 (cf discussion in debian-devel
diff --git a/debian/compress b/debian/compress
deleted file mode 100644
index 5e153be..0000000
--- a/debian/compress
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-# compress (debhelper file) for plplot package
-# Written by Rafael Laboissiere <rafael at icp.inpg.fr>
-# on Mon, 22 Jun 1998 19:56:26 +0200
-
-find usr/info usr/man -type f
-find usr/doc -type f \
- \( -size +4k -or -name "changelog*" \) \
- ! -name "copyright"
diff --git a/debian/control b/debian/control
index 77d3365..19f55ee 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: plplot
Section: math
Priority: optional
Maintainer: Rafael Laboissiere <rafael at icp.inpg.fr>
-Standards-Version: 2.4.0.0
+Standards-Version: 3.0.1
Package: plplot
Architecture: any
@@ -17,9 +17,8 @@ Description: Scientific plotting library
handful of function calls is typically required. For more advanced use,
virtually all aspects of plotting are configurable.
.
- APIs are provided for C, C++, and Fortran (Tcl/Tk and Python bindings
- are available as separate packages, plplot-tcl and python-plplot
- respectively).
+ APIs are provided for C, C++, and Fortran (Tcl/Tk bindings are available
+ in a separate package plplot-tcl).
.
A program for rendering Tektronix vector files is also included in
this package.
@@ -47,15 +46,6 @@ Description: Header and static libraries for PLplot, a plotting library
.
See http://emma.la.asu.edu/plplot for more information on PLplot.
-Package: python-plplot
-Architecture: any
-Depends: plplot, python-base, python-tk
-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.
- .
- See http://emma.la.asu.edu/plplot for more information on PLplot.
-
Package: plplot-doc
Architecture: all
Recommends: plplot
diff --git a/debian/control-python b/debian/control-python
new file mode 100644
index 0000000..af14929
--- /dev/null
+++ b/debian/control-python
@@ -0,0 +1,9 @@
+Package: python-plplot
+Architecture: any
+Depends: plplot, python-base, python-tk
+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.
+ .
+ See http://emma.la.asu.edu/plplot for more information on PLplot.
+
diff --git a/debian/copyright b/debian/copyright
index 562974b..13759d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,7 +38,7 @@ The PLplot package may be distributed under the following terms:
The text of this license is given in the file COPYING.LIB in the
distribution directory. [In Debian systems, see the file
-/usr/doc/copyright/LGPL.] Exceptions are noted below.
+/usr/share/common-licenses/LGPL.] Exceptions are noted below.
The intent behind distributing PLplot under the LGPL is to ensure that it
continues to evolve in a positive way, while remaining freely
diff --git a/debian/plm2gif.1 b/debian/plm2gif.1
index 386fe76..7811e57 100644
--- a/debian/plm2gif.1
+++ b/debian/plm2gif.1
@@ -26,7 +26,7 @@ files ending with
(one for each page) is created.
.PP
.SH "SEE ALSO"
-See /usr/doc/plplot/plplot.ps.gz for more details.
+See /usr/share/doc/plplot/plplot.ps.gz for more details.
.SH AUTHOR
This manual page was written by Rafael Laboissiere <rafael at icp.inpg.fr>,
for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/plplot-dev.README.Debian b/debian/plplot-dev.README.Debian
index b9d0fe6..4642dbb 100644
--- a/debian/plplot-dev.README.Debian
+++ b/debian/plplot-dev.README.Debian
@@ -1,7 +1,7 @@
plplot-dev for DEBIAN
----------------------
-To link with plplot, specify:
+To link with plplot, use g77 and specify:
-lplplotdX -L/usr/X11R6/lib -lX11 -lm
for X support alone (xwin driver)
@@ -17,7 +17,8 @@ use the definition
#define PL_DOUBLE
-and use PLFLT as floating point type everywhere in your code.
+before `#include "plplot.h"' and use PLFLT as floating point type
+everywhere in your code.
Rafael Laboissiere <rafael at icp.inpg.fr>, Tue, 16 Jun 1998 20:14:20 +0200
diff --git a/debian/plplot-doc.README.Debian b/debian/plplot-doc.README.Debian
index 8826423..028e065 100644
--- a/debian/plplot-doc.README.Debian
+++ b/debian/plplot-doc.README.Debian
@@ -4,9 +4,9 @@ plplot-doc for DEBIAN
This package contains documentation for PLplot, a scientific plotting
library, in PostScript and info formats. Also included are several
examples of code in C, C++, Fortran, Tcl/Tk, and Python. Almost
-everything is under /usr/doc/plplot.
+everything is under /usr/share/doc/plplot.
-See file /usr/doc/plplot/README.Debian for additional information.
+See file /usr/share/doc/plplot/README.Debian for additional information.
Rafael Laboissiere <rafael at icp.inpg.fr>, Fri Nov 13 02:50:16 CET 1998
diff --git a/debian/plplot-doc.compress b/debian/plplot-doc.compress
deleted file mode 100644
index a24fc86..0000000
--- a/debian/plplot-doc.compress
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-# compress (debhelper file) for plplot package
-# Written by Rafael Laboissiere <rafael at icp.inpg.fr>
-# on Mon, 22 Jun 1998 19:56:26 +0200
-
-find usr/doc -type f \
- ! -name "copyright" ! -name "*.tcl" ! -name "tk??" \
- ! -name "*.py" ! -name "xtkpy" ! -name "pytkdemo"
-
diff --git a/debian/plplot-doc.docs b/debian/plplot-doc.docs
new file mode 100644
index 0000000..b932fa1
--- /dev/null
+++ b/debian/plplot-doc.docs
@@ -0,0 +1,2 @@
+FAQ
+doc/plplot.ps.gz
diff --git a/debian/plplot-doc.files b/debian/plplot-doc.files
index 08b82ef..3f76b8c 100644
--- a/debian/plplot-doc.files
+++ b/debian/plplot-doc.files
@@ -1,3 +1 @@
-usr/doc/plplot/FAQ
-usr/doc/plplot/examples
-usr/doc/plplot/plplot.ps.gz
+usr/share/doc/plplot/examples
diff --git a/debian/plplot-tcl.README.Debian b/debian/plplot-tcl.README.Debian
index cabd65f..fd3a984 100644
--- a/debian/plplot-tcl.README.Debian
+++ b/debian/plplot-tcl.README.Debian
@@ -6,7 +6,7 @@ Contains Tcl/Tk bindings for PLplot, a scientific plotting library.
Programs for interactive use of PLplot, as well as some utilities for
converting PLplot meta files are also included.
-See file /usr/doc/plplot/README.Debian for additional information.
+See file /usr/share/doc/plplot/README.Debian for additional information.
Rafael Laboissiere <rafael at icp.inpg.fr>, Fri Nov 13 02:51:13 CET 1998
diff --git a/debian/plplot-tcl.files b/debian/plplot-tcl.files
index a4b9aca..8dd9e37 100644
--- a/debian/plplot-tcl.files
+++ b/debian/plplot-tcl.files
@@ -1,13 +1,12 @@
+usr/lib/libplplotdtk*.so.*
usr/bin/plrender
usr/bin/plserver
usr/bin/plm2gif
usr/bin/plpr
usr/bin/pltcl
-usr/man/man1/plrender.1
-usr/man/man1/plserver.1
-usr/man/man1/plm2gif.1
-usr/man/man1/plpr.1
-usr/man/man1/pltcl.1
+usr/share/man/man1/plrender.1
+usr/share/man/man1/plserver.1
+usr/share/man/man1/plm2gif.1
+usr/share/man/man1/plpr.1
+usr/share/man/man1/pltcl.1
usr/lib/tcl8.0
-
-
diff --git a/debian/plplot.dirs b/debian/plplot.dirs
index eea63d6..84763b0 100644
--- a/debian/plplot.dirs
+++ b/debian/plplot.dirs
@@ -1,3 +1,4 @@
usr/lib
usr/lib/plplot
usr/lib/python1.5
+usr/share
diff --git a/debian/plpr.1 b/debian/plpr.1
index fefed7d..d579ee5 100644
--- a/debian/plpr.1
+++ b/debian/plpr.1
@@ -19,7 +19,7 @@ printers and printer settings. Only intended for use from the
plplot/TK driver! It deletes the named metafile after converting to
the proper type so this is not suitable for general use.
.SH "SEE ALSO"
-See /usr/doc/plplot/plplot.ps.gz for more details.
+See /usr/share/doc/plplot/plplot.ps.gz for more details.
.SH AUTHOR
This manual page was written by Rafael Laboissiere <rafael at icp.inpg.fr>,
for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/plrender.1 b/debian/plrender.1
index d053ef8..dbda6d5 100644
--- a/debian/plrender.1
+++ b/debian/plrender.1
@@ -17,7 +17,7 @@ is a program that renders files in PLplot metafile format, written by
the metafile driver, which is one of the drivers available for PLplot.
At least one file must be given as argument.
.SH "SEE ALSO"
-See /usr/doc/plplot/plplot.ps.gz for more details.
+See /usr/share/doc/plplot/plplot.ps.gz for more details.
.SH AUTHOR
This manual page was written by Rafael Laboissiere <rafael at icp.inpg.fr>,
for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/plserver.1 b/debian/plserver.1
index 0b19d62..ae37989 100644
--- a/debian/plserver.1
+++ b/debian/plserver.1
@@ -22,7 +22,7 @@ Note that plserver can be used the same way as wish or dpwish, as it
contains the functionality of each of these (except the -notk Tcl-DP
command-line option is not supported).
.SH "SEE ALSO"
-See /usr/doc/plplot/plplot.ps.gz for more details.
+See /usr/share/doc/plplot/plplot.ps.gz for more details.
.SH AUTHOR
This manual page was written by Rafael Laboissiere <rafael at icp.inpg.fr>,
for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/pltcl.1 b/debian/pltcl.1
index 51ad904..2db5286 100644
--- a/debian/pltcl.1
+++ b/debian/pltcl.1
@@ -15,7 +15,7 @@ because the original program does not have a manual page.
is the main program for Tcl nterface to PLplot. Allows interpretive
execution of plotting primitives without regard to output driver.
.SH "SEE ALSO"
-See /usr/doc/plplot/plplot.ps.gz for more details.
+See /usr/share/doc/plplot/plplot.ps.gz for more details.
.SH AUTHOR
This manual page was written by Rafael Laboissiere <rafael at icp.inpg.fr>,
for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/pltek.1 b/debian/pltek.1
index 025a548..b1f5c9a 100644
--- a/debian/pltek.1
+++ b/debian/pltek.1
@@ -16,7 +16,7 @@ because the original program does not have a manual page.
is a program that review a Tektronix vector file whose name is given
as argument.
.SH "SEE ALSO"
-See /usr/doc/plplot/plplot.ps.gz for more details.
+See /usr/share/doc/plplot/plplot.ps.gz for more details.
.SH AUTHOR
This manual page was written by Rafael Laboissiere <rafael at icp.inpg.fr>,
for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/postinst b/debian/postinst
index 3e5174b..c4fb346 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,7 +12,7 @@ case "$1" in
ldconfig
install-info --quiet --section Math PLplot \
--description="A scientific plotting package" \
- /usr/info/plplot.info.gz
+ /usr/share/info/plplot.info.gz
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
@@ -22,3 +22,5 @@ case "$1" in
esac
exit 0
+
+#DEBHELPER#
diff --git a/debian/python-plplot.postinst.debhelper b/debian/python-plplot.postinst.debhelper
new file mode 100644
index 0000000..2579893
--- /dev/null
+++ b/debian/python-plplot.postinst.debhelper
@@ -0,0 +1,7 @@
+# Automatically added by dh_installdocs
+if [ "$1" = "configure" ]; then
+ if [ -d /usr/doc -a ! -e /usr/doc/python-plplot -a -d /usr/share/doc/python-plplot ]; then
+ ln -sf ../share/doc/python-plplot /usr/doc/python-plplot
+ fi
+fi
+# End automatically added section
diff --git a/debian/python-plplot.prerm.debhelper b/debian/python-plplot.prerm.debhelper
new file mode 100644
index 0000000..ae5f025
--- /dev/null
+++ b/debian/python-plplot.prerm.debhelper
@@ -0,0 +1,5 @@
+# Automatically added by dh_installdocs
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/python-plplot ]; then
+ rm -f /usr/doc/python-plplot
+fi
+# End automatically added section
diff --git a/debian/rules b/debian/rules
index dc6fee5..d468386 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ version=$(major_version).$(minor_version)
debbase := $(shell pwd)/debian
debtmp := $(debbase)/tmp
+debdoc := $(debtmp)/usr/share/doc
+cfflags := --with-double --without-f2c
build: build-stamp
build-stamp:
@@ -27,12 +29,13 @@ build-stamp:
# Build first bare libraries (no Tcl/Tk) and save them
./configure --prefix=/usr --enable-tcl=no --enable-tk=no \
--enable-cxx=no --enable-python=no \
- --with-double
+ --disable-linuxvga \
+ $(cfflags)
make
cp tmp/libplplotdX.{a,so}* debian
# Now build the normal ones
make clean
- ./configure --prefix=/usr --with-double
+ ./configure --prefix=/usr --disable-linuxvga $(cfflags)
# Save the generated Makefile, as it contains the right references to /usr
cp tmp/Makefile $(debbase)/Makefile.save
make
@@ -57,21 +60,22 @@ install-stamp: build-stamp
# because the python installation procedure tests for its existence
dh_installdirs -a -i usr/lib/python1.5
- ./configure --prefix=$(debtmp)/usr --with-double
+ ./configure --prefix=$(debtmp)/usr $(cfflags)
cp tmp/libMatrix.so.$(version) $(debtmp)/usr/lib
( cd $(debtmp)/usr/lib ; \
ln -fs libMatrix.so.$(version) libMatrix.so.$(major_version) ; \
ln -fs libMatrix.so.$(major_version) libMatrix.so )
make install
- cp doc/plplot.ps.gz $(debtmp)/usr/doc/plplot
- cp doc/plplot.info.gz $(debtmp)/usr/info
+# FHS compliance
+ mv $(debtmp)/usr/doc $(debtmp)/usr/info $(debtmp)/usr/share
+
# Replaces the right Makefile in examples directory
- mv $(debbase)/Makefile.save $(debtmp)/usr/doc/plplot/examples/Makefile
+ mv $(debbase)/Makefile.save $(debdoc)/plplot/examples/Makefile
# Put the right Debian python command in python scripts
# Suggested by Mathias Klose <doko at cs.tu-berlin.de>
# Special fix for x16.py (Grmpf...)
- ( cd $(debtmp)/usr/doc/plplot/examples/python ; \
+ ( cd $(debdoc)/plplot/examples/python ; \
for i in * ; do \
cp $$i TMP ; \
sed -e 's,^#!.*python.*,#! /usr/bin/python,' < TMP > $$i ; \
@@ -84,21 +88,21 @@ install-stamp: build-stamp
# Has to make scripts executable, so that permissions are right in the
# source package (suggested by Paul Slootman <paul at wau.mis.ah.nl> )
chmod +x $(debbase)/fix-tk-path.pl
- ( for i in $(debtmp)/usr/doc/plplot/examples/tk/tk* ; do \
+ ( for i in $(debdoc)/plplot/examples/tk/tk* ; do \
cp $$i TMP ; \
$(debbase)/fix-tk-path.pl < TMP > $$i ; \
chmod +x $$i ; \
done ; \
rm TMP )
# Fix symbolic links in examples directory
- ( cd $(debtmp)/usr/doc/plplot/examples ; \
+ ( cd $(debdoc)/plplot/examples ; \
for i in c c++ f77 python tcl tk ; do \
rm -f $$i/Makefile ; \
ln -fs ../Makefile $$i/Makefile ; \
done )
# Fix permission for plcolor.tcl and tkdemos.tcl
chmod -x $(debtmp)/usr/lib/tcl8.0/plplot/plcolor.tcl \
- $(debtmp)/usr/doc/plplot/examples/tk/tkdemos.tcl
+ $(debdoc)/plplot/examples/tk/tkdemos.tcl
# Move library files and create links
mv $(debbase)/libplplot*.{a,so.$(version).0} $(debtmp)/usr/lib
( cd $(debtmp)/usr/lib ; \
@@ -108,28 +112,23 @@ install-stamp: build-stamp
ln -fs $$lib.so.$(major_version) $$lib.so ; \
done )
- ( cd $(debtmp)/usr/doc/plplot ; \
+ ( cd $(debdoc)/plplot ; \
mv CHANGES changelog ; \
rm -f Copyright COPYING.LIB mklinks README.local )
-# Install man pages by hand
- mkdir -p $(debtmp)/usr/man/man1
- cp $(debbase)/*.1 $(debtmp)/usr/man/man1
-
+ dh_installmanpages --package=plplot
+ dh_installinfo doc/plplot.info.gz
- dh_movefiles
-# Do not know why dh_movefiles does not delete empty directories
- ( cd $(debtmp)/usr ; \
- rm -rf doc/plplot/examples \
- lib/python1.5 lib/tcl8.0 include )
touch install-stamp
# Build architecture-independent files here.
binary-indep: build install
+ dh_testversion ge 2.0.68
dh_testdir -i
dh_testroot -i
dh_installdocs -i
dh_installchangelogs -i
+ dh_movefiles -i
dh_compress -i
dh_fixperms -i
dh_suidregister -i
@@ -139,10 +138,15 @@ binary-indep: build install
dh_builddeb -i
binary-arch: build install
+ dh_testversion ge 2.0.68
dh_testdir -a
dh_testroot -a
dh_installdocs -a
dh_installchangelogs -a
+ dh_movefiles -a
+# Why do not dh_movefiles remove empty dirs? Grumpf...
+ ( cd $(debtmp) ; rm -rf usr/lib/python1.5 usr/lib/tcl8.0 \
+ usr/share/doc/examples )
dh_strip -a
dh_compress -a
dh_fixperms -a
@@ -152,7 +156,7 @@ binary-arch: build install
dh_gencontrol -a
dh_makeshlibs -a
dh_md5sums -a
- dh_builddeb -a
+ dh_builddeb -a --no-package=python-plplot
source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
diff --git a/examples/c/plcdemos.h b/examples/c/plcdemos.h
index f62cdb2..a706363 100644
--- a/examples/c/plcdemos.h
+++ b/examples/c/plcdemos.h
@@ -21,6 +21,10 @@
#ifndef __PLCDEMOS_H__
#define __PLCDEMOS_H__
+/* Next line added by Rafael Laboissier <rafael at icp.inpg.fr>
+ on Sat Nov 6 17:35:14 CET 1999 */
+#define PL_DOUBLE
+
#include "plplot.h"
#include <math.h>
#include <string.h>
diff --git a/x16.py b/x16.py
new file mode 100644
index 0000000..3c1c89f
--- /dev/null
+++ b/x16.py
@@ -0,0 +1,22 @@
+#! /usr/bin/python
+#!/bin/sh
+#
+# File: zipup
+# Usage: zipup
+#
+# Builds zip archive of plplot files for distribution.
+# No binary or CVS files should be included.
+
+# Build archive from parent directory. It must also be unpacked from there.
+
+pldir="`basename $PWD`"
+zipfile=${pldir}
+cd ..
+
+# Store files, leaving out contents of certain directories as well as all
+# CVS-related junk.
+
+zip ${zipfile} ${pldir}/tmp/.dummy ${pldir}/private/.dummy
+
+zip -ru ${zipfile} ${pldir}/* -x ${pldir}/tmp* ${pldir}/PROBLEMS \
+ ${pldir}/private ${pldir}/new ${pldir}/old "*/CVS/*" "*~"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git
More information about the debian-science-commits
mailing list