[Pkg-octave-commit] rev 816 - in trunk/packages/octplot/debian: .
patches
Thomas Weber
thomas-guest at alioth.debian.org
Sun Dec 3 15:25:36 CET 2006
Author: thomas-guest
Date: 2006-12-03 15:25:35 +0100 (Sun, 03 Dec 2006)
New Revision: 816
Added:
trunk/packages/octplot/debian/check-symlink.sh
trunk/packages/octplot/debian/octplot.install
trunk/packages/octplot/debian/patches/50_quiet_subplot.patch
trunk/packages/octplot/debian/patches/50_supply_paths.patch
Modified:
trunk/packages/octplot/debian/changelog
trunk/packages/octplot/debian/compat
trunk/packages/octplot/debian/control
trunk/packages/octplot/debian/copyright
trunk/packages/octplot/debian/rules
Log:
Bug fix for #401138 and #391117; the latter changes configure.ac, so we need
automake in the control file and definitions in rules for CDBS.
We also put copyright files for the fonts under octplot's doc/ directory, using
octplot.install (dh_installdocs does not seem to be capable of creating
sub-directories of doc/, without moving everything from the subdirectory there
as well).
Compat level 5
Small typo fix in copyright
check-symlink.sh: abusing octplot as guinea-pig, see
http://lists.alioth.debian.org/pipermail/pkg-octave-devel/2006-November/001965.html
Modified: trunk/packages/octplot/debian/changelog
===================================================================
--- trunk/packages/octplot/debian/changelog 2006-11-28 18:02:09 UTC (rev 815)
+++ trunk/packages/octplot/debian/changelog 2006-12-03 14:25:35 UTC (rev 816)
@@ -1,3 +1,15 @@
+octplot (0.3.9-2) unstable; urgency=low
+
+ [ Thomas Weber ]
+ * debian/patches/50_quiet_subplot.patch: Quiet subplot.m (Closes: #401138)
+ * debian/patches/50_supply_paths.patch: Separate architecture-dependent and
+ -independent files (Closes: #391117)
+ * Compat Level 5
+ * Introduce a call to octave-config, abusing the package as guinea-pig to
+ get the auto-builders fixed (see #400214)
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com> Tue, 28 Nov 2006 18:52:20 +0100
+
octplot (0.3.9-1) unstable; urgency=low
* New upstream release (closes: #391927)
Copied: trunk/packages/octplot/debian/check-symlink.sh (from rev 804, trunk/packages/octaviz/debian/check-symlink.sh)
===================================================================
--- trunk/packages/octaviz/debian/check-symlink.sh 2006-11-16 20:19:34 UTC (rev 804)
+++ trunk/packages/octplot/debian/check-symlink.sh 2006-12-03 14:25:35 UTC (rev 816)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Check the octave-config symlink;
+
+status=$(/usr/sbin/update-alternatives --display octave-config | grep -c "status is manual");
+version_false=$(file -n /etc/alternatives/octave-config | grep -c 2.1.71)
+symlink_false=$(file -n /etc/alternatives/octave-config | grep -c "broken")
+# Normal output of file for a broken symlink:
+# $ file file2
+# file2: broken symbolic link to `file1'
+fqdn=$(/bin/hostname --fqdn);
+
+if [ $status == "1" ] && [ $version_false == "1" ] && [ $symlink_false == "1" ]
+ then
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ echo " octave-config alternative symlink is set to 'manual'"
+ echo " and pointing to a non-existent octave-config-2.1.71."
+ echo
+ echo " If you are the buildd admin of this machine, please read"
+ echo " http://lists.debian.org/debian-devel/2006/01/msg01566.html"
+ echo " for an explanation."
+ echo
+ echo " FQDN of this host: $fqdn"
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+
+ fi
+
+/usr/sbin/update-alternatives --display octave-config
+ls -l /usr/bin/oct*
+ls -l /etc/alternatives/oct*
+
+exit $status
Modified: trunk/packages/octplot/debian/compat
===================================================================
--- trunk/packages/octplot/debian/compat 2006-11-28 18:02:09 UTC (rev 815)
+++ trunk/packages/octplot/debian/compat 2006-12-03 14:25:35 UTC (rev 816)
@@ -1 +1 @@
-4
+5
Modified: trunk/packages/octplot/debian/control
===================================================================
--- trunk/packages/octplot/debian/control 2006-11-28 18:02:09 UTC (rev 815)
+++ trunk/packages/octplot/debian/control 2006-12-03 14:25:35 UTC (rev 816)
@@ -5,7 +5,7 @@
Uploaders: Rafael Laboissiere <rafael at debian.org>
Build-Depends: debhelper (>= 4.1.0), octave2.1-headers (>= 2.1.65),
libfltk1.1-dev (>= 1.1.4), xlibmesa-gl-dev,
- libglu1-xorg-dev | libglu-dev, libfreetype6-dev, cdbs
+ libglu1-xorg-dev | libglu-dev, libfreetype6-dev, cdbs, automake1.9
Standards-Version: 3.7.2
Package: octplot
Modified: trunk/packages/octplot/debian/copyright
===================================================================
--- trunk/packages/octplot/debian/copyright 2006-11-28 18:02:09 UTC (rev 815)
+++ trunk/packages/octplot/debian/copyright 2006-12-03 14:25:35 UTC (rev 816)
@@ -7,7 +7,7 @@
The upstream developer and the copyright holder of most files is Shai Ayal
<shaiay at users.sourceforge.net> (notice that the e-mail address appearing in
all source files is shaiay at yahoo.com, but the author told us to use the
-SourceForge one). Files with different copyright holders are listed bellow.
+SourceForge one). Files with different copyright holders are listed below.
Octplot is released under the terms of the GNU General Public License,
version 2, but some files have a different license (LGPL). Those files
Added: trunk/packages/octplot/debian/octplot.install
===================================================================
--- trunk/packages/octplot/debian/octplot.install 2006-11-28 18:02:09 UTC (rev 815)
+++ trunk/packages/octplot/debian/octplot.install 2006-12-03 14:25:35 UTC (rev 816)
@@ -0,0 +1,3 @@
+fonts/ChangeLog /usr/share/doc/octplot/fonts
+fonts/README.tweaks /usr/share/doc/octplot/fonts
+fonts/readme /usr/share/doc/octplot/fonts
Added: trunk/packages/octplot/debian/patches/50_quiet_subplot.patch
===================================================================
--- trunk/packages/octplot/debian/patches/50_quiet_subplot.patch 2006-11-28 18:02:09 UTC (rev 815)
+++ trunk/packages/octplot/debian/patches/50_quiet_subplot.patch 2006-12-03 14:25:35 UTC (rev 816)
@@ -0,0 +1,12 @@
+diff -Nur octplot-0.3.9/src/subplot.m octplot-0.3.9.new/src/subplot.m
+--- octplot-0.3.9/src/subplot.m 2006-03-21 19:46:17.000000000 +0000
++++ octplot-0.3.9.new/src/subplot.m 2006-12-02 10:40:00.000000000 +0000
+@@ -35,7 +35,7 @@
+ if (nargin==1)
+ if(isscalar(m))
+ if(m<=999 & m>=111)
+- m=num2str(floor(m))
++ m=num2str(floor(m));
+ endif
+ endif
+
Added: trunk/packages/octplot/debian/patches/50_supply_paths.patch
===================================================================
--- trunk/packages/octplot/debian/patches/50_supply_paths.patch 2006-11-28 18:02:09 UTC (rev 815)
+++ trunk/packages/octplot/debian/patches/50_supply_paths.patch 2006-12-03 14:25:35 UTC (rev 816)
@@ -0,0 +1,244 @@
+diff -Nur octplot-0.3.9/configure.ac octplot-0.3.9.new/configure.ac
+--- octplot-0.3.9/configure.ac 2006-10-07 21:07:50.000000000 +0200
++++ octplot-0.3.9.new/configure.ac 2006-11-28 19:08:41.000000000 +0100
+@@ -53,27 +53,37 @@
+
+ AC_SUBST(ver)
+ AC_SUBST(subver)
+-AC_SUBST(minpath)
+ AC_SUBST(path)
++AC_SUBST(mpath)
+ AC_SUBST(opath)
++AC_SUBST(octplotmpath)
++AC_SUBST(fontpath)
+ dnl AC_SUBST(compile_femtotex)
+
+ AC_ARG_WITH(path,
+- [ --with-path install path prefix],
++ [ --with-path install path prefix],
+ [ path=$withval ])
+ AC_ARG_WITH(opath,
+- [ --with-opath override path for octplot-files],
++ [ --with-opath override path for octplot-files],
+ [ opath=$withval ])
+-AC_ARG_WITH(minpath,
+- [ --with-minpath override path for toggle_octplot (should be in your path)],
+- [ minpath=$withval ])
++AC_ARG_WITH(mpath,
++ [ --with-mpath override path for toggle_octplot.m (should be in your Octave path)],
++ [ mpath=$withval ])
++AC_ARG_WITH(octplotmpath,
++ [ --with-octplotmpath override path for Octplots' m files (this should NOT be in your Octave path)],
++ [ octplotmpath=$withval ])
++AC_ARG_WITH(fontpath,
++ [ --with-fontpath override font path],
++ [ fontpath=$withval ])
+
+ if test -n "$path" ; then
+ test -z "$opath" && opath=$path/octplot-$VERSION
++ test -z "$octplotmpath" && octplotmpath=$path/octplot-$VERSION
++ test -z "$fontpath" && fontpath=$path/octplot-$VERSION/fonts
+ fi
+
+ dnl Don't query if path/ver are given in the configure environment
+-if test -z "$opath" || test -z "$minpath";
++if test -z "$opath" || test -z "$mpath";
+ then
+
+ dnl Construct program to get mkoctfile version and local install paths
+@@ -121,9 +131,15 @@
+ subver=`echo $INFOV | sed -e "s/^[^.]*[.][^.]*[.]//"`
+ alt_obase=`echo $INFOO | sed -e "[s,/site.*$,/site,]"`
+ test -z "$opath" && opath=$alt_obase/octplot-$VERSION
+- test -z "$minpath" && minpath=$INFOM/octplot
++ test -z "$mpath" && mpath=$INFOM/octplot
+ fi
+
++dnl If not given on command line, set the font path;
++test -z "$fontpath" && fontpath=$opath/fonts
++
++dnl If not given on command line, set the path for Octplots' m-files
++test -z "$octplotmpath" && octplotmpath=$opath
++
+ AC_CHECK_PROG(OCTAVE,octave,octave)
+ OCTAVE_VERSION=`echo "disp(OCTAVE_VERSION)" | $OCTAVE -qf`
+
+@@ -195,13 +211,13 @@
+ LIBS="$LIBS $FT2_LIBS"
+
+ AC_DEFINE_UNQUOTED(
+- MINPATH,
+- "$minpath",
+- m-file install path -- in the normal octave path)
+-AC_DEFINE_UNQUOTED(
+ OPATH,
+ "$opath",
+- octplot install path -- all of octplot will go here)
++ Octplot install path -- all .oct files will go here)
++AC_DEFINE_UNQUOTED(
++ FONTPATH,
++ "$fontpath",
++ Octplot font install path -- all .afm and .pfb font files will go here)
+
+ AC_CONFIG_FILES(Makefile src/Makefile src/tests/Makefile fonts/Makefile demos/Makefile src/toggle_octplot.m)
+ AC_OUTPUT
+@@ -209,11 +225,17 @@
+ AC_MSG_RESULT([
+ ===================================================================
+
+-octplot files will install into:
++.oct files will install into:
+ $opath
+
+ toggle_octplot.m will install into:
+- $minpath
++ $mpath
++
++other .m files will install into:
++ $octplotmpath
++
++font files will install into:
++ $fontpath
+
+ octplot is configured with:
+ fltk: version $FLTK_VERSION with OpenGl support
+diff -Nur octplot-0.3.9/fonts/Makefile.am octplot-0.3.9.new/fonts/Makefile.am
+--- octplot-0.3.9/fonts/Makefile.am 2006-03-21 20:46:30.000000000 +0100
++++ octplot-0.3.9.new/fonts/Makefile.am 2006-11-28 19:08:41.000000000 +0100
+@@ -1,4 +1,4 @@
+-fontdir = $(opath)/fonts
++fontdir = $(fontpath)
+
+ dist_font_DATA = \
+ ChangeLog README.tweaks copying fonts.dir \
+diff -Nur octplot-0.3.9/README octplot-0.3.9.new/README
+--- octplot-0.3.9/README 2006-03-21 20:46:33.000000000 +0100
++++ octplot-0.3.9.new/README 2006-11-28 19:08:41.000000000 +0100
+@@ -30,8 +30,16 @@
+
+ invoking toggle_octplot will add/remove the octplot dir to your
+ loadpath and setup other stuff so that octplot will work. You can
+-control what the install directories are using the --with-path and
+---with-minpath configure options. So:
++control what the install directories are using the following options:
++
++ --with-path: the install path prefix (rarely needed)
++ --with-mpath: where toggle_octplot.m goes (this should lie in Octave's
++ LOADPATH)
++ --with-opath: where octplot's .oct files go (this should *not* lie in
++ Octave's LOADPATH)
++ --with-octplotmpath: where octplot's .m files go (this should *not* lie in
++ Octave's LOADPATH)
++ --with-fontpath: where octplot's font files go
+
+ ./configure && make && make install
+ is the way to go.
+diff -Nur octplot-0.3.9/src/Makefile.am octplot-0.3.9.new/src/Makefile.am
+--- octplot-0.3.9/src/Makefile.am 2006-10-07 21:08:34.000000000 +0200
++++ octplot-0.3.9.new/src/Makefile.am 2006-11-28 19:08:41.000000000 +0100
+@@ -1,5 +1,11 @@
+ destinationdir = $(opath)
+-mpathdir = $(minpath)
++
++# path for toggle_octplot.m; this should lie in Octave's LOADPATH
++mpathdir = $(mpath)
++
++# path for Octplots' normal m-files; this should *not* lie in Octave's
++# LOADPATH, otherwise toggle_octplot becomes useless.
++octplotmdir = $(octplotmpath)
+
+ destination_PROGRAMS = octplot
+
+@@ -49,7 +55,11 @@
+ FTGL/COPYING.txt FTGL/HISTORY.txt FTGL/license.txt \
+ FTGL/README.txt
+
+-dist_destination_DATA = \
++nodist_octplotm_DATA = ohold.m oset.m
++
++mpath_DATA = toggle_octplot.m
++
++octplotm_DATA = \
+ __plt__.m figure_props.m line_props.m area.m \
+ __pltopt__.m freqz_plot.m loglog.m stem.m \
+ gca.m octplot_atexit.m subplot.m \
+@@ -67,10 +77,6 @@
+ isproperty.m __nxtplt__.m pareto.m plotyy.m \
+ __drawnow__.m quiver.m box.m
+
+-nodist_destination_DATA = ohold.m oset.m
+-
+-mpath_DATA = toggle_octplot.m
+-
+ ############################################################################
+ ### all files built from this point must be explicitly listed in the
+ ### CLEANFILES var at the end of this Makefile -- otherwise make clean
+@@ -111,6 +117,14 @@
+ __contourc__.oct octplot_command.oct octplot_path.oct octplot_redraw.oct \
+ oset.m ohold.m op_com.o
+
+-
++# create symlinks; as the install command from coreutils can't handle symlinks,
++# we link the files at install time, again!
++install-data-hook:
++ cd $(DESTDIR)$(octplotmdir) && \
++ $(LN_S) -f set.m oset.m && \
++ $(LN_S) -f hold.m ohold.m
++ cd $(DESTDIR)$(destinationdir) && \
++ $(LN_S) -f octplot_command.oct octplot_redraw.oct && \
++ $(LN_S) -f octplot_command.oct octplot_path.oct
+
+
+diff -Nur octplot-0.3.9/src/root.cpp octplot-0.3.9.new/src/root.cpp
+--- octplot-0.3.9/src/root.cpp 2006-10-05 20:28:13.000000000 +0200
++++ octplot-0.3.9.new/src/root.cpp 2006-11-28 19:08:41.000000000 +0100
+@@ -137,7 +137,7 @@
+ new Radio("|n|{ne}|e|se|s|sw|w|nw|north|northeast|east|southeast|south|southwest|west|northwest|");
+
+ // FontDir
+- Properties["DefaultFontDir"] = new String(OPATH "/fonts/");
++ Properties["DefaultFontDir"] = new String(FONTPATH);
+ }
+
+ //! Addes a new Figure object, taking care of the numbering etc...
+diff -Nur octplot-0.3.9/src/toggle_octplot.m.in octplot-0.3.9.new/src/toggle_octplot.m.in
+--- octplot-0.3.9/src/toggle_octplot.m.in 2006-07-28 11:20:26.000000000 +0200
++++ octplot-0.3.9.new/src/toggle_octplot.m.in 2006-11-28 19:08:41.000000000 +0100
+@@ -27,13 +27,15 @@
+
+ if( ~exist("octplot_config_info","var"))
+ global octplot_config_info
+- octplot_config_info.path = \
++ octplot_config_info.mpath = \
++ "@octplotmpath@";
++ octplot_config_info.opath = \
+ "@opath@";
+ octplot_config_info.version = \
+ "@VERSION@";
+ octplot_config_info.in_use = 0;
+ octplot_config_info.clear_command = "clear ";
+- octplot_tmp1 = glob (sprintf ("%s/*.m", octplot_config_info.path));
++ octplot_tmp1 = glob (sprintf ("%s/*.m", octplot_config_info.mpath));
+ if(isempty(octplot_tmp1))
+ % running inside the distribution directory
+ octplot_tmp1 = glob ("*.m");
+@@ -87,7 +89,8 @@
+ octplot_path("./octplot");
+ set(0,"DefaultFontDir","../fonts/");
+ else
+- addpath(octplot_config_info.path);
++ addpath(octplot_config_info.mpath);
++ addpath(octplot_config_info.opath);
+ eval (octplot_config_info.clear_command);
+ endif
+
+@@ -104,7 +107,8 @@
+ ## kill octplot
+ octplot_atexit;
+
+- rmpath(octplot_config_info.path);
++ rmpath(octplot_config_info.mpath);
++ rmpath(octplot_config_info.opath);
+ eval (octplot_config_info.clear_command);
+ octplot_config_info.in_use = 0;
+
Modified: trunk/packages/octplot/debian/rules
===================================================================
--- trunk/packages/octplot/debian/rules 2006-11-28 18:02:09 UTC (rev 815)
+++ trunk/packages/octplot/debian/rules 2006-12-03 14:25:35 UTC (rev 816)
@@ -1,28 +1,46 @@
#!/usr/bin/make -f
+# debian/rules for octplot
# Define Makefile variables MDIR and OCTDIR, as sugested in DOG Guidelines.
include /usr/share/octave/debian/defs.make
+# export DH_VERBOSE=1
+
# Include cdbs stuff
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# 50_supply_paths.patch changes configure.ac
+DEB_AUTO_UPDATE_AUTOCONF := 1
+DEB_AUTO_UPDATE_AUTOMAKE := 1.9
+DEB_AUTO_UPDATE_AUTOHEADER := 1
+
+OCTPLOTMPATH := /usr/share/$(DEB_SOURCE_PACKAGE)/m
+FONTPATH := /usr/share/$(DEB_SOURCE_PACKAGE)/fonts
+OPATH := /usr/lib/$(DEB_SOURCE_PACKAGE)
+
# kick out Makefile.in and Makefile.am from the demos/ directory when copying
DEB_INSTALL_DOCS_octplot += --exclude=Makefile
# Pass correct flags to configure script:
-DEB_CONFIGURE_EXTRA_FLAGS := --with-minpath=$(MDIR)
-OCTPLOT_LIB = /usr/lib/octplot
-DEB_CONFIGURE_EXTRA_FLAGS += --with-opath=$(OCTPLOT_LIB)
+DEB_CONFIGURE_EXTRA_FLAGS := --with-mpath=$(MDIR) \
+ --with-octplotmpath=$(OCTPLOTMPATH) \
+ --with-fontpath=$(FONTPATH) \
+ --with-opath=$(OPATH)
+
CXXFLAGS += -fPIC
binary-predeb/octplot::
- rm -f $(DEB_DESTDIR)$(OCTPLOT_LIB)/fonts/copying
+ cd $(DEB_DESTDIR)/$(FONTPATH) && \
+ rm -f copying ChangeLog README.tweaks readme
install/octplot::
octave-depends
+# check for dangling symlink -- octplot as guinea pig
+configure/octplot::
+ /bin/sh debian/check-symlink.sh
rulesinfo:
@echo MDIR: $(MDIR)
More information about the Pkg-octave-commit
mailing list