diff -Nru yorick-2.2.04+dfsg1/debian/changelog yorick-2.2.04+dfsg1/debian/changelog --- yorick-2.2.04+dfsg1/debian/changelog 2016-10-22 02:00:50.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/changelog 2018-02-07 09:45:31.000000000 +0000 @@ -1,8 +1,10 @@ -yorick (2.2.04+dfsg1-6build1) zesty; urgency=medium +yorick (2.2.04+dfsg1-7) unstable; urgency=low - * No-change rebuild against libopenmpi2 + * Move YAO and Spydr from Depends to Suggests of yorick-full, because + they both depend on python-gtk which is deprecated. + * Bump debhelper compat version to 10. - -- Steve Langasek Sat, 22 Oct 2016 02:00:50 +0000 + -- Thibaut Paumard Wed, 07 Feb 2018 10:45:31 +0100 yorick (2.2.04+dfsg1-6) unstable; urgency=low diff -Nru yorick-2.2.04+dfsg1/debian/compat yorick-2.2.04+dfsg1/debian/compat --- yorick-2.2.04+dfsg1/debian/compat 2015-05-20 07:42:00.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/compat 2018-02-06 16:42:46.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru yorick-2.2.04+dfsg1/debian/control yorick-2.2.04+dfsg1/debian/control --- yorick-2.2.04+dfsg1/debian/control 2016-10-22 02:00:50.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/control 2018-02-07 09:42:25.000000000 +0000 @@ -1,13 +1,11 @@ Source: yorick -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Science Maintainers +Maintainer: Debian Science Maintainers Uploaders: Thibaut Paumard Section: science -Testsuite: autopkgtest -Priority: extra +Priority: optional Build-Depends: libx11-dev, texinfo, - debhelper (>= 7.0.0), + debhelper (>= 10.0.0), quilt, po-debconf, libopenmpi-dev [alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32], @@ -16,9 +14,9 @@ xauth, xfonts-base Build-Depends-Indep: imagemagick -Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/yorick.git -Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/yorick.git +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/science-team/yorick +Vcs-Git: https://salsa.debian.org/science-team/yorick.git Homepage: http://yorick.sourceforge.net Package: yorick @@ -30,7 +28,6 @@ Recommends: rlwrap, yorick-z Suggests: yorick-full, - yorick-dbg, yorick-mpy-openmpi | yorick-mpy-mpich2, emacsen, curl @@ -56,21 +53,6 @@ package names begin with "yorick-"). You may want to install the yorick-full metapackage which depends on the vast majority of them. -Package: yorick-dbg -Architecture: any -Section: debug -Depends: yorick (= ${binary:Version}), - ${misc:Depends} -Description: debugging symbols for Yorick - Yorick is an interpreted programming language for: - * scientific simulations or calculations - * postprocessing or steering large simulation codes - * interactive scientific graphics - * reading, writing, and translating large files of numbers - . - This package contains the debugging symbols for the yorick - executable. - Package: yorick-data Architecture: all Depends: ${shlibs:Depends}, @@ -197,9 +179,7 @@ yorick-mpeg, yorick-optimpack, yorick-soy, - yorick-spydr, yorick-svipc, - yorick-yao, yorick-yeti, yorick-yeti-fftw, yorick-yeti-regex, @@ -208,7 +188,8 @@ yorick-ynfft, yorick-yutils, yorick-z -Suggests: yorick-mpy-openmpi | yorick-mpy-mpich2 +Suggests: yorick-mpy-openmpi | yorick-mpy-mpich2, + yorick-yao, yorick-spydr Description: full installation of the Yorick interpreter and add-ons Yorick is an interpreted programming language for: * scientific simulations or calculations diff -Nru yorick-2.2.04+dfsg1/debian/lintian-overrides.d/yorick-data yorick-2.2.04+dfsg1/debian/lintian-overrides.d/yorick-data --- yorick-2.2.04+dfsg1/debian/lintian-overrides.d/yorick-data 2015-05-20 07:42:00.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/lintian-overrides.d/yorick-data 2018-02-06 17:24:04.000000000 +0000 @@ -1,6 +1,3 @@ -yorick-data: extra-license-file usr/share/yorick/LICENSE.md -# This file is read by Yorick's "legal" command - yorick-data: package-contains-empty-directory usr/share/yorick/packages/installed/ yorick-data: package-contains-empty-directory usr/share/yorick/python/ yorick-data: package-contains-empty-directory usr/share/yorick/glade/ diff -Nru yorick-2.2.04+dfsg1/debian/patches/info_section yorick-2.2.04+dfsg1/debian/patches/info_section --- yorick-2.2.04+dfsg1/debian/patches/info_section 2015-05-20 07:42:00.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/patches/info_section 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Author: Thibaut Paumard -Description: Change section in yorick.info from Miscellaneous to Math -Forwarded: not-needed - -diff -urN orig/doc/yorick.tex tp/doc/yorick.tex ---- orig/doc/yorick.tex 2006-05-05 13:51:17.168930800 +0200 -+++ tp/doc/yorick.tex 2006-05-05 13:52:39.001490360 +0200 -@@ -2,7 +2,7 @@ - @comment %**start of header (This is for running Texinfo on a region.) - @setfilename yorick.info - @settitle Yorick --@dircategory Miscellaneous -+@dircategory Math - @direntry - * Yorick: (yorick). Yorick interpreted language. - @end direntry diff -Nru yorick-2.2.04+dfsg1/debian/patches/mpy1_breaks_htmldoc yorick-2.2.04+dfsg1/debian/patches/mpy1_breaks_htmldoc --- yorick-2.2.04+dfsg1/debian/patches/mpy1_breaks_htmldoc 2015-05-20 07:42:00.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/patches/mpy1_breaks_htmldoc 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -Author: Thibaut Paumard -Description: update-yorickdoc failed on mpy1.i - fix DOCUMENT comment syntax to something supported by htmldoc.i -Forwarded: yes - ---- a/mpy/mpy1.i -+++ b/mpy/mpy1.i -@@ -9,7 +9,9 @@ - */ - - func mp_recv1(..) --/* DOCUMENT mp_recv1 ***implements obsolete mpy1 mp_recv API*** */ -+/* DOCUMENT mp_recv1 -+ ***implements obsolete mpy1 mp_recv API*** -+ */ - { - local dims; - while (more_args()) accum_dimlist, dims, next_arg(); -@@ -18,7 +20,9 @@ - if (is_void(mp_recv2)) mp_recv2 = mp_recv; - - func mp_from(flag) --/* DOCUMENT mp_from ***obsolete mpy1 function*** (see mp_probe) */ -+/* DOCUMENT mp_from -+ ***obsolete mpy1 function*** (see mp_probe) -+ */ - { - if (!flag) return mp_probe(-1); /* undocumented mp_probe feature */ - f = mp_probe(flag != 1); -@@ -26,7 +30,9 @@ - } - - func mp_task(task) --/* DOCUMENT mp_task ***obsolete mpy1 function*** */ -+/* DOCUMENT mp_task -+ ***obsolete mpy1 function*** -+ */ - { - name = nameof(task); - if (!is_func(task)) error, "cannot register non-function: "+name; -@@ -85,11 +91,15 @@ - } - - local mp_start; --/* DOCUMENT mp_start ***obsolete mpy1 function*** */ -+/* DOCUMENT mp_start -+ ***obsolete mpy1 function*** -+ */ - mp_start = call; /* work already done by _mpy1_starter */ - - func mp_bcast(origin, msg, .., nfan=) --/* DOCUMENT mp_bcast ***obsolete mpy1 function*** (see mp_handout) */ -+/* DOCUMENT mp_bcast -+***obsolete mpy1 function*** (see mp_handout) -+*/ - { - me = (mp_rank - origin + mp_size)%mp_size; - if (is_void(nfan)) nfan = 2; diff -Nru yorick-2.2.04+dfsg1/debian/patches/mpy_manpage yorick-2.2.04+dfsg1/debian/patches/mpy_manpage --- yorick-2.2.04+dfsg1/debian/patches/mpy_manpage 2015-05-20 07:42:00.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/patches/mpy_manpage 1970-01-01 00:00:00.000000000 +0000 @@ -1,263 +0,0 @@ -Author: Thibaut Paumard -Description: add a manpage for mpy command -Forwarded: yes - ---- /dev/null -+++ b/mpy/mpy.1 -@@ -0,0 +1,256 @@ -+.TH MPY 1 "2010 MARCH 21" -+.UC 4 -+.SH NAME -+mpy \- Message Passing Yorick -+.SH SYNOPSIS -+mpirun \-np mp_size -+.B mpy -+[ \-j -+.I pfile1.i -+[ \-j -+.I pfile2.i -+[ ... ]]] -+[ \-i -+.I file1.i -+[ \-i -+.I file2.i -+[ ... ]]] -+.br -+mpirun \-np mp_size -+.B mpy -+\-batch -+.I file.i -+.br -+.SH DESCRIPTION -+.I Yorick -+is an interpreted language like Basic or Lisp, but far faster. See -+.I yorick -+(1) to learn more about it. -+.br -+.I Mpy -+is a parallel version of -+.I Yorick -+based on the Message Passing Interface (MPI). The exact syntax for launching a parallel job depends on your MPI environment. It may be necessary to launch a special daemon before calling -+.I mirun -+or an equivalent command. -+.SS Explanations -+ -+The mpy package interfaces yorick to the MPI parallel programming -+library. MPI stands for Message Passing Interface; the idea is to -+connect multiple instances of yorick that communicate among themselves -+via messages. Mpy can either perform simple, highly parallel tasks as -+pure interpreted programs, or it can start and steer arbitrarily -+complex compiled packages which are free to use the compiled MPI API. -+The interpreted API is not intended to be an MPI wrapper; instead it -+is stripped to the bare minimum. -+ -+This is version 2 of mpy (released in 2010); it is incompatible with -+version 1 of mpy (released in the mid 1990s), because version 1 had -+numerous design flaws making it very difficult to write programs free -+of race conditions, and impossible to scale to millions of processors. -+However, you can run most version 1 mpy programs under version 2 by -+doing mp_include,"mpy1.i" before you mp_include any file defining an -+mpy1 parallel task (that is before any file containg a call to -+mp_task.) -+.SS Usage notes -+The MPI environment is not really specified by the standard; existing -+environments are very crude, and strongly favor non-interactive batch -+jobs. The number of processes is fixed before MPI begins; each -+process has a rank, a number from 0 to one less than the number of -+processes. You use the rank as an address to send messages, and the -+process receiving the message can probe to see which ranks have sent -+messages to it, and of course receive those messages. -+ -+A major problem in writing a message passing program is handling -+events or messages arriving in an unplanned order. MPI guarantees -+only that a sequence of messages send by rank A to rank B will arrive -+in the order sent. There is no guarantee about the order of arrival -+of those messages relative to messages sent to B from a third rank C. -+In particular, suppose A sends a message to B, then A sends a message -+to C (or even exchanges several messages with C) which results in C -+sending a message to B. The message from C may arrive at B before the -+message from A. An MPI program which does not allow for this -+possibility has a bug called a "race condition". Race conditions may -+be extremely subtle, especially when the number of processes is large. -+ -+The basic mpy interpreted interface consists of two variables: -+ mp_size = number of proccesses -+ mp_rank = rank of this process -+and four functions: -+ mp_send, to, msg; // send msg to rank "to" -+ msg = mp_recv(from); // receive msg from rank "from" -+ ranks = mp_probe(block); // query senders of pending messages -+ mp_exec, string; // parse and execute string on every rank -+ -+You call mp_exec on rank 0 to start a parallel task. When the main -+program thus created finishes, all ranks other than rank 0 return to -+an idle loop, waiting for the next mp_exec. Rank 0 picks up the next -+input line from stdin (that is, waits for input at its prompt in an -+interactive session), or terminates all processes if no more input is -+available in a batch session. -+ -+The mpy package modifies how yorick handles the #include parser -+directive, and the include and require functions. Namely, if a -+parallel task is running (that is, a function started by mp_exec), -+these all become collective operations. That is, rank 0 reads the -+entire file contents, and sends the contents to the other processes as -+an MPI message (like mp_exec of the file contents). Every process -+other than rank 0 is only running during parallel tasks; outside a -+parallel task when only rank 0 is running (and all other ranks are -+waiting for the next mp_exec), the #include directive and the include -+and require functions return to their usual serial operation, -+affecting only rank 0. -+ -+When mpy starts, it is in parallel mode, so that all the files yorick -+includes when it starts (the files in Y_SITE/i0) are included as -+collective operations. Without this feature, every yorick process -+would attempt to open and read the startup include files, overloading -+the file system before mpy ever gets started. Passing the contents of -+these files as MPI messages is the only way to ensure there is enough -+bandwidth for every process to read the contents of a single file. -+ -+The last file included at startup is either the file specified in the -+\-batch option, or the custom.i file. To avoid problems with code in -+custom.i which may not be safe for parallel execution, mpy does not -+look for custom.i, but for custommp.i instead. The instructions in -+the \-batch file or in custommp.i are executed in serial mode on rank 0 -+only. Similarly, mpy overrides the usual process_argv function, so -+that \-i and other command line options are processed only on rank 0 in -+serial mode. The intent in all these cases is to make the \-batch or -+custommp.i or \-i include files execute only on rank 0, as if you had -+typed them there interactively. You are free to call mp_exec from any -+of these files to start parallel tasks, but the file itself is serial. -+ -+An additional command line option is added to the usual set: -+ mpy \-j somefile.i -+.br -+includes somefile.i in parallel mode on all ranks (again, \-i other.i -+includes other.i only on rank 0 in serial mode). If there are -+multiple \-j options, the parallel includes happen in command line -+order. If \-j and \-i options are mixed, however, all \-j includes -+happen before any \-i includes. -+ -+As a side effect of the complexity of include functions in mpy, the -+autoload feature is disabled; if your code actually triggers an -+include by calling an autoloaded function, mpy will halt with an -+error. You must explicitly load any functions necessary for a -+parallel tasks using require function calls themselves inside a -+parallel task. -+ -+The mp_send function can send any numeric yorick array (types char, -+short, int, long, float, double, or complex), or a scalar string -+value. The process of sending the message via MPI preserves only the -+number of elements, so mp_recv produces only a scalar value or a 1D -+array of values, no matter what dimensionality was passed to mp_send. -+ -+The mp_recv function requires you to specify the sender of the message -+you mean to receive. It blocks until a message actually arrives from -+that sender, queuing up any messages from other senders that may -+arrive beforehand. The queued messages will be retrieved it the order -+received when you call mp_recv for the matching sender. The queuing -+feature makes it dramatically easier to avoid the simplest types of -+race condition when you are write interpreted parallel programs. -+ -+The mp_probe function returns the list of all the senders of queued -+messages (or nil if the queue is empty). Call mp_probe(0) to return -+immediately, even if the queue is empty. Call mp_probe(1) to block if -+the queue is empty, returning only when at least one message is -+available for mp_recv. Call mp_probe(2) to block until a new message -+arrives, even if some messages are currently available. -+ -+The mp_exec function uses a logarithmic fanout - rank 0 sends to F -+processes, each of which sends to F more, and so on, until all -+processes have the message. Once a process completes all its send -+operations, it parses and executes the contents of the message. The -+fanout algorithm reaches N processes in log to the base F of N steps. -+The F processes rank 0 sends to are ranks 1, 2, 3, ..., F. In -+general, the process with rank r sends to ranks r*F+1, r*F+2, ..., -+r*F+F (when these are less than N-1 for N processes). This set is -+called the "staff" of rank r. Ranks with r>0 receive the message from -+rank (r\-1)/F, which is called the "boss" of r. The mp_exec call -+interoperates with the mp_recv queue; in other words, messages from -+a rank other than the boss during an mp_exec fanout will be queued for -+later retrieval by mp_recv. (Without this feature, any parallel task -+which used a message pattern other than logarithmic fanout would be -+susceptible to race conditions.) -+ -+The logarithmic fanout and its inward equivalent are so useful that -+mpy provides a couple of higher level functions that use the same -+fanout pattern as mp_exec: -+ mp_handout, msg; -+ total = mp_handin(value); -+.br -+To use mp_handout, rank 0 computes a msg, then all ranks call -+mp_handout, which sends msg (an output on all ranks other than 0) -+everywhere by the same fanout as mp_exec. To use mp_handin, every -+process computes value, then calls mp_handin, which returns the sum of -+their own value and all their staff, so that on rank 0 mp_handin -+returns the sum of the values from every process. -+ -+You can call mp_handin as a function with no arguments to act as a -+synchronization; when rank 0 continues after such a call, you know -+that every other rank has reached that point. All parallel tasks -+(anything started with mp_exec) must finish with a call to mp_handin, -+or an equivalent guarantee that all processes have returned to an idle -+state when the task finishes on rank 0. -+ -+You can retrieve or change the fanout parameter F using the mp_nfan -+function. The default value is 16, which should be reasonable even -+for very large numbers of processes. -+ -+One special parallel task is called mp_connect, which you can use to -+feed interpreted command lines to any single non-0 rank, while all -+other ranks sit idle. Rank 0 sits in a loop reading the keyboard and -+sending the lines to the "connected" rank, which executes them, and -+sends an acknowledgment back to rank 0. You run the mp_disconnect -+function to complete the parallel task and drop back to rank 0. -+ -+Finally, a note about error recovery. In the event of an error during -+a parallel task, mpy attempts to gracefully exit the mp_exec, so that -+when rank 0 returns, all other ranks are known to be idle, ready for -+the next mp_exec. This procedure will hang forever if any one of the -+processes is in an infinite loop, or otherwise in a state where it -+will never call mp_send, mp_recv, or mp_probe, because MPI provides no -+means to send a signal that interrupts all processes. (This is one of -+the ways in which the MPI environment is "crude".) The rank 0 process -+is left with the rank of the first process that reported a fault, plus -+a count of the number of processes that faulted for a reason other -+than being sent a message that another rank had faulted. The first -+faulting process can enter dbug mode via mp_connect; use mp_disconnect -+or dbexit to drop back to serial mode on rank 0. -+.SS Options -+.TP 20 -+.RI \-j \0file.i -+includes the Yorick source file -+.I file.i -+as mpy starts in parallel mode on all ranks. This is equivalent to -+the mp_include function after mpy has started. -+.TP -+.RI \-i \0file.i -+includes the Yorick source file -+.I file.i -+as mpy starts, in serial mode. This is equivalent to the #include -+directive after mpy has started. -+.TP -+.RI \-batch \0file.i -+includes the Yorick source file -+.I file.i -+as mpy starts, in serial mode. Your customization file custommp.i, if any, is -+.I not -+read, -+and mpy is placed in batch mode. Use the help command on the batch -+function (help, batch) to find out more about batch mode. In batch -+mode, all errors are fatal; normally, mpy will halt execution and -+wait for more input after an error. -+.PP -+.SH AUTHOR -+.PP -+David H. Munro, Lawrence Livermore National Laboratory -+.PP -+.SH FILES -+.PP -+Mpy uses the same files as yorick, except that custom.i is replaced by -+custommp.i (located in /etc/yorick/mpy/ on Debian based systems) and -+the Y_SITE/i\-start/ directory is ignored. -+.SH SEE ALSO -+yorick(1) diff -Nru yorick-2.2.04+dfsg1/debian/patches/texi2html80 yorick-2.2.04+dfsg1/debian/patches/texi2html80 --- yorick-2.2.04+dfsg1/debian/patches/texi2html80 2015-05-20 07:42:00.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/patches/texi2html80 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ -Author: Thibaut Paumard -Description: Adapt doc build system to texi2html 1.82 -Forwarded: http://yorick.sourceforge.net/phpBB2/viewtopic.php?t=251 -Bug-Debian: http://bugs.debian.org/552966 - -# Adapt doc build system to texi2html 1.82 thanks to Lucas Nussbaum -# (Closes: #552966). - ---- a/doc/html/Makefile -+++ b/doc/html/Makefile -@@ -5,7 +5,7 @@ - # http://www.nongnu.org/texi2html/ - YORICK = ../../yorick/yorick - DESTDIR = /usr/local/share/doc/yorick --TEXI2HTML = texi2html -init_file html/texi2html.init -+TEXI2HTML = texi2html -init_file html/texi2html.init -output yorick - #select mac or win version of ../README.html - PLATFORM=mac - BUILDDIR=compiled-doc/ ---- a/doc/html/texi2html.tpl -+++ b/doc/html/texi2html.tpl -@@ -107,18 +107,17 @@ - - sub my_print_navigation($$$) - { -- my $fh = shift; -+# my $fh = shift; - my $buttons = shift; - my $vertical = shift; - my $spacing = 1; -- print $fh '\n"; -+ my $result = '
\n"; - -- print $fh "" unless $vertical; -+ $result .= "" unless $vertical; - for my $button (@$buttons) - { -- print $fh qq{\n} if $vertical; -- print $fh qq{\n} if $vertical; -+ $result .= qq{\n"; -- print $fh "\n" if $vertical; -+ $result .= "\n"; -+ $result .= "\n" if $vertical; - } -- print $fh "" unless $vertical; -- print $fh "
}; -+ $result .= qq{
}; - - if (ref($button) eq 'CODE') - { -@@ -126,7 +125,7 @@ - } - elsif (ref($button) eq 'SCALAR') - { -- print $fh "$$button" if defined($$button); -+ $result .= "$$button" if defined($$button); - } - elsif (ref($button) eq 'ARRAY') - { -@@ -138,7 +137,7 @@ - my $btn_hr = $Texi2HTML::HREF{$button_href}; - if ($btn_hr) - { -- print $fh "" . -+ $result .= "" . - &$anchor('', - my_strip_href($btn_hr), - $$text -@@ -147,13 +146,13 @@ - } - else - { -- print $fh $$text; -+ $result .= $$text; - } - } - } - elsif ($button eq ' ') - { # handle space button -- print $fh -+ $result .= - $ICONS && $ACTIVE_ICONS{' '} ? - &$button_icon_img($button, $ACTIVE_ICONS{' '}) : - $NAVIGATION_TEXT{' '}; -@@ -166,7 +165,7 @@ - 'title="' . ucfirst($BUTTONS_GOTO{$button}) . '"' : ''; - if ($ICONS && $ACTIVE_ICONS{$button}) - { # use icon -- print $fh '' . -+ $result .= '' . - &$anchor('', - my_strip_href($btn_hr), - &$button_icon_img($button, -@@ -178,7 +177,7 @@ - } - else - { # use text -- print $fh -+ $result .= - '[' . - &$anchor('', - my_strip_href($btn_hr), -@@ -190,7 +189,7 @@ - } - else - { # button is passive -- print $fh -+ $result .= - $ICONS && $PASSIVE_ICONS{$button} ? - &$button_icon_img($button, - $PASSIVE_ICONS{$button}, -@@ -199,11 +198,12 @@ - - "[" . $NAVIGATION_TEXT{$button} . "]"; - } -- print $fh "
\n"; -+ $result .= "" unless $vertical; -+ $result .= "\n"; -+ return $result; - } - - 1; # This must be the last non-comment line diff -Nru yorick-2.2.04+dfsg1/debian/patches/yorick-auto_el yorick-2.2.04+dfsg1/debian/patches/yorick-auto_el --- yorick-2.2.04+dfsg1/debian/patches/yorick-auto_el 2015-05-20 07:42:00.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/patches/yorick-auto_el 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Author: Thibaut Paumard -Description: Enables yorick-mode even if yorick is not yet loaded -Forwarded: yes (by e-mail, 20091202 - -diff -urN a/emacs/yorick-auto.el b/emacs/yorick-auto.el ---- a/emacs/yorick-auto.el 2007-08-20 09:13:52.000000000 +0200 -+++ b/emacs/yorick-auto.el 2007-08-20 09:15:43.000000000 +0200 -@@ -4,6 +4,7 @@ - (autoload 'yorick "yorick" "see yorick.el in site-lisp dir" t) - (autoload 'ysh "yorick" "see yorick.el in site-lisp dir" t) - (autoload 'yssh "yorick" "see yorick.el in site-lisp dir" t) -+(autoload 'yorick-mode "yorick" "see yorick.el in site-lisp dir" t) - (autoload 'yutil-setup "yorick" "see yorick.el in site-lisp dir" nil) - (if (assoc "\\.i$" auto-mode-alist) - ;; this presumes user doesn't want .i files to be in C mode (default) diff -Nru yorick-2.2.04+dfsg1/debian/rules yorick-2.2.04+dfsg1/debian/rules --- yorick-2.2.04+dfsg1/debian/rules 2016-02-15 13:18:03.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/rules 2018-02-06 17:05:49.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) # start by saving the path to debian/rules (useful in get-orig-source) PATH_TO_DEBIAN := $(shell dirname $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) @@ -131,7 +131,7 @@ dh_installdebconf dh_installman dh_link - dh_strip -pyorick --dbg-package=yorick-dbg + dh_strip -pyorick --dbgsym-migration='yorick-dbg (<< 2.2.04+dfsg1-7~)' dh_strip -pyorick-dev -pyorick-mpy-openmpi -pyorick-mpy-mpich2 dh_usrlocal dh_compress diff -Nru yorick-2.2.04+dfsg1/debian/yorick-doc.triggers yorick-2.2.04+dfsg1/debian/yorick-doc.triggers --- yorick-2.2.04+dfsg1/debian/yorick-doc.triggers 2015-05-20 07:42:00.000000000 +0000 +++ yorick-2.2.04+dfsg1/debian/yorick-doc.triggers 2018-02-06 17:22:27.000000000 +0000 @@ -1,3 +1,3 @@ -interest /usr/share/yorick-doc -interest /usr/share/yorick/i -interest /usr/share/yorick/i0 +interest-noawait /usr/share/yorick-doc +interest-noawait /usr/share/yorick/i +interest-noawait /usr/share/yorick/i0