[Pkg-octave-commit] rev 79 - trunk/packages/octave2.1/debian
Rafael Laboissiere
rafael@costa.debian.org
Mon, 21 Feb 2005 17:38:08 +0100
Author: rafael
Date: 2005-02-21 17:38:08 +0100 (Mon, 21 Feb 2005)
New Revision: 79
Added:
trunk/packages/octave2.1/debian/defs.make
trunk/packages/octave2.1/debian/octave-depends
Modified:
trunk/packages/octave2.1/debian/changelog
trunk/packages/octave2.1/debian/control
trunk/packages/octave2.1/debian/octave2.1.dirs
trunk/packages/octave2.1/debian/rules
Log:
* Added build-infrastrucure files defs.make and octave-depends to the
octave2.1-headers package
* Include PDF instead of PS files in octave2.1-doc pakcage
Modified: trunk/packages/octave2.1/debian/changelog
===================================================================
--- trunk/packages/octave2.1/debian/changelog 2005-02-21 16:05:50 UTC (rev 78)
+++ trunk/packages/octave2.1/debian/changelog 2005-02-21 16:38:08 UTC (rev 79)
@@ -1,29 +1,35 @@
octave2.1 (2.1.65-1) unstable; urgency=low
NOT YET RELEASED!
-
+
+++ Changes by J. Rafael Rodriguez Galvan:
* New upstream release 2.1.65 released 24 hours ago
+++ Changes by Rafael Laboissiere
-
+
* debian/*.postinst.in, debian/*.prerm.in: Moved these files from the
original *.postinst and *. prerm ones
* debian/octave2.1.lintian.in: Idem from octave2.1.lintian
- * debian/rules:
+ * debian/defs.make, debian/octave-depends: Added files
+ * debian/rules:
- (configure-stamp) Generate *.postinst, *.prerm, and *.lintian by
replacing the @VERSION@ string with the current Octave version number
- (clean) Remove the *.postinst, *.prerm, *.lintian files generated
- automatically
+ automatically
+ - (install) Install files defs.make and octave-depends in
+ octave2.1-headers package
* debian/control,v, debian/rules,v: Removed these obsolete files
+ * Install PDF documentation files instead of the PS ones. There is a
+ pdfdocs variable in debian/rules now that control which files are
+ built/installed. Added tetex-bin to Build-Depends. (Closes: #293562)
+++ Changes by Adam Conrad:
* Add logic to debian/rules and debian/control to make sure that
octave2.1-headers depends on f2c on m68k (closes: #292917)
- --
+ --
octave2.1 (2.1.64-3) unstable; urgency=low
@@ -31,7 +37,7 @@
* debian/rules: Get the logic around octave-bug.in right. This was
causing a FTBFS in all architectures because the test failed and,
- consequently, maker failed (closes: #292403).
+ consequently, make failed (closes: #292403).
* debian/changelog: Start using "Debian Octave Group" in the signature
of entries. Also, added Emacs variable settings at the end, handy
when using debian-changelog-mode. This avoids two warnings issued by
Modified: trunk/packages/octave2.1/debian/control
===================================================================
--- trunk/packages/octave2.1/debian/control 2005-02-21 16:05:50 UTC (rev 78)
+++ trunk/packages/octave2.1/debian/control 2005-02-21 16:38:08 UTC (rev 79)
@@ -2,7 +2,7 @@
Section: math
Priority: optional
Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 3.0.0), autoconf, texinfo, g77 [!m68k], fort77 [m68k], libreadline5-dev, libncurses5-dev, gperf, refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, gnuplot, fftw3-dev, dejagnu, texi2html, less, libhdf5-serial-dev
+Build-Depends: debhelper (>= 3.0.0), autoconf, texinfo, tetex-bin, g77 [!m68k], fort77 [m68k], libreadline5-dev, libncurses5-dev, gperf, refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, gnuplot, fftw3-dev, dejagnu, texi2html, less, libhdf5-serial-dev
Standards-Version: 3.6.1.1
Package: octave2.1
Added: trunk/packages/octave2.1/debian/defs.make
===================================================================
--- trunk/packages/octave2.1/debian/defs.make 2005-02-21 16:05:50 UTC (rev 78)
+++ trunk/packages/octave2.1/debian/defs.make 2005-02-21 16:38:08 UTC (rev 79)
@@ -0,0 +1,6 @@
+# Installation paths for use in debian/rules of Octave-related packages
+# Written by Rafael Laboissiere <rafael@debian.org>
+# $Id$
+
+MDIR = $(shell octave-config --print LOCALFCNFILEDIR)
+OCTDIR = $(shell octave-config --print LOCALAPIOCTFILEDIR)
Added: trunk/packages/octave2.1/debian/octave-depends
===================================================================
--- trunk/packages/octave2.1/debian/octave-depends 2005-02-21 16:05:50 UTC (rev 78)
+++ trunk/packages/octave2.1/debian/octave-depends 2005-02-21 16:38:08 UTC (rev 79)
@@ -0,0 +1,73 @@
+#!/usr/bin/perl -w
+
+# Copyright (c) 2005 Rafael Laboissiere <rafael@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+=head1 NAME
+
+octave-deps - calculates Octave dependencies
+
+=cut
+
+use strict;
+use File::Find;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<octave-deps> [S<I<debhelper options>>]
+
+=head1 DESCRIPTION
+
+octave-deps is a debhelper-like program that is responsible for generating
+the ${octave:Depends} substitutions and adding them to substvars files.
+
+If you use this program, your package must build-depend on octave2.1-headers
+(>= 2.1.65).
+
+=cut
+
+init ();
+
+my $octcfg = 'octave-config';
+my $octpkg = 'octave2.1';
+
+# The current Octave version
+my $octver = `$octcfg --version 2>&1`
+ or die "Command $octcfg not found";
+chomp $octver;
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+
+ delsubstvar($package, "octave:Depends");
+ addsubstvar($package, "octave:Depends", $octpkg, ">= $octver");
+
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is not part of debhelper.
+
+=head1 AUTHOR
+
+Rafael Laboissiere <rafael@debian.org>
+
+Most ideas borrowed from dh_python by Josselin Mouette <joss@debian.org>,
+who apparently took ideas from Brendan O'Dea <bod@debian.org>.
+
+=cut
Modified: trunk/packages/octave2.1/debian/octave2.1.dirs
===================================================================
--- trunk/packages/octave2.1/debian/octave2.1.dirs 2005-02-21 16:05:50 UTC (rev 78)
+++ trunk/packages/octave2.1/debian/octave2.1.dirs 2005-02-21 16:38:08 UTC (rev 79)
@@ -1,3 +1,4 @@
etc
usr/bin
usr/share/lintian/overrides
+usr/share/octave/debian
\ No newline at end of file
Modified: trunk/packages/octave2.1/debian/rules
===================================================================
--- trunk/packages/octave2.1/debian/rules 2005-02-21 16:05:50 UTC (rev 78)
+++ trunk/packages/octave2.1/debian/rules 2005-02-21 16:38:08 UTC (rev 79)
@@ -28,6 +28,14 @@
debini := $(debtmp)/usr/share/octave/site/m/startup
debininew := $(debtmp)/usr/share/octave/$(version)/m/startup
+pdfdocs := doc/faq/Octave-FAQ.pdf \
+ doc/interpreter/octave.pdf \
+ doc/liboctave/liboctave.pdf \
+ doc/refcard/refcard-a4.pdf \
+ doc/refcard/refcard-legal.pdf \
+ doc/refcard/refcard-letter.pdf
+
+
## edd 3 Feb 2003 gcc 3.2, also imposed uniformly via Build-Depends
## edd 27 Jun 2003 now that gcc 3.3 is in unstable and testing, relax this
#c_compiler = /usr/bin/gcc-3.2
@@ -79,6 +87,16 @@
build: build-stamp configure-stamp make-stamp check-stamp
build-stamp: configure make check
+ # make all PDF documentation files
+ @for i in $(pdfdocs) ; do \
+ d=`dirname $$i` ; \
+ f=`basename $$i .pdf` ; \
+ ( cd $$d ; \
+ if test ! -e $$f.pdf ; then \
+ TEXINPUTS=".:./..::" texi2pdf $$f.texi ; \
+ echo "Generated $$d/$$f.pdf" ; \
+ fi ) ; \
+ done
touch build-stamp
configure: configure-stamp
@@ -126,6 +144,8 @@
perl -p -e 's/\@VERSION@/$(version)/g' < debian/octave2.1.lintian.in \
> debian/octave2.1.lintian
+ pod2man debian/octave-depends > octave-depends.1
+
touch configure-stamp
make: configure-stamp make-stamp
@@ -160,7 +180,7 @@
rm -f debian/$${i}.$${j} ; \
done ; \
done
- rm -f debian/octave2.1.lintian
+ rm -f debian/octave2.1.lintian octave-depends.1 $(pdfdocs)
dh_clean
# install files
@@ -177,7 +197,9 @@
libdir=$(debtmp)/usr/lib \
libexecdir=$(debtmp)/usr/lib \
mandir=$(debtmp)/usr/share/man install
-# dh_installman -p$(package) debian/octave-config.1
+ dh_installman octave-depends.1
+ install debian/octave-depends $(debtmp)/usr/bin
+ install --mode=644 debian/defs.make $(debtmp)/usr/share/octave/debian
(cd $(debtmp)/usr/share/man/man1; \
mv -v octave.1 octave-$(version).1; \
mv -v octave-bug.1 octave-bug-$(version).1; \
@@ -192,7 +214,7 @@
dh_testroot -i
# dh_clean -i -k
#$(MAKE) prefix=`pwd`/debian/tmp install
- dh_installdocs -n -p$(doc_package) doc/*/*.ps
+ dh_installdocs -n -p$(doc_package) doc/*/*.pdf
dh_installdocs -n -p$(html_package) doc/*/*.html
dh_installdocs -i
# install Octave Emacs files and Debian Emacsen files
@@ -237,7 +259,10 @@
# save the include files for the header package
dh_movefiles -p$(dev_package) usr/include/ \
usr/bin/mkoctfile-$(version) \
- usr/share/man/man1/mkoctfile-$(version).1
+ usr/bin/octave-depends \
+ usr/share/man/man1/mkoctfile-$(version).1 \
+ usr/share/man/man1/octave-depends.1 \
+ usr/share/octave/debian/defs.make
rm -r $(debtmp)/usr/include
# save the info files for the info package
dh_movefiles -p$(info_package) usr/share/info/