I am not sure on how -6, which is stated to have dealt with the config file
issue, actually dealt with it... since there is no Vcs fields (hint: please add
them/expose Vcs if it is not public yet), I just re-imported all the revisions
using git-import-dscs to discover the actual change (listed below) which seems
to have nothing to do about making .modulespath a config file (i.e. shipping it
under /etc, and if needed symlinking back to under original location, or just
patching the sources). May be there was a forgotten 'git add' or something
like that? ;)
Also I am still wondering about a logical location where to install custom
modulefiles by other packages?
commit 56162ca19eeb6dc426844cb3582c1215c435783b
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sun Nov 10 18:50:04 2013 +0000
Imported Debian patch 3.2.10-6
diff --git a/debian/changelog b/debian/changelog
index 8a9c32a..1e0bdc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+modules (3.2.10-6) unstable; urgency=low
+
+ * Make init/.modulespath a conffile. Closes: #711955.
+
+ -- Alastair McKinstry <mckins...@debian.org> Sun, 10 Nov 2013 18:50:04 +0000
+
modules (3.2.10-5) unstable; urgency=low
* Undo tcl8.6-dev change until the transition as it breaks buildds.
diff --git a/debian/patches/testsuite-fix.patch
b/debian/patches/testsuite-fix.patch
index 20046e9..021c7e5 100644
--- a/debian/patches/testsuite-fix.patch
+++ b/debian/patches/testsuite-fix.patch
@@ -1,13 +1,13 @@
Author: Alastair McKinstry <mckins...@debian.org>
Description: Fix needed for version strings with braces in them.
-Last-Updated: 2013-10-14
+Last-Updated: 2013-11-10
Forwarded: no
Index: modules-3.2.10/testsuite/modules.50-cmds/095-uname.exp
===================================================================
---- modules-3.2.10.orig/testsuite/modules.50-cmds/095-uname.exp 2013-10-14
13:48:52.000000000 +0100
-+++ modules-3.2.10/testsuite/modules.50-cmds/095-uname.exp 2013-10-14
14:05:41.000000000 +0100
-@@ -43,6 +43,8 @@
+--- modules-3.2.10.orig/testsuite/modules.50-cmds/095-uname.exp
2013-10-26 22:16:15.000000000 +0100
++++ modules-3.2.10/testsuite/modules.50-cmds/095-uname.exp 2013-11-10
18:53:48.000000000 +0000
+@@ -43,13 +43,19 @@
regsub -all \# $u_version {\\#} u_version
regsub -all { } $u_version {\\ } u_version
@@ -16,3 +16,14 @@ Index: modules-3.2.10/testsuite/modules.50-cmds/095-uname.exp
regsub -all {\(} $u_domainname {\\(} u_domainname
regsub -all {\)} $u_domainname {\\)} u_domainname
+ test_cmd "csh" "load $module/sysname" "$lm/sysname ;$lmf/sysname
;$ts$u_sysname ;"
+ test_cmd "csh" "load $module/nodename" "$lm/nodename ;$lmf/nodename
;$ts$u_nodename ;"
+ if { $u_domainname != "unknown" } {
++ if { $u_domainname == "" } {
++ test_cmd "csh" "load $module/domain" "$lm/domain ;$lmf/domain ;"
++ } else {
+ test_cmd "csh" "load $module/domain" "$lm/domain ;$lmf/domain
;$ts$u_domainname ;"
++ }
+ } else {
+ test_cmd_re "csh" "load $module/domain" "$lm/domain ;$lmf/domain ;$ts.* ;"
+ }
On Sat, 21 Sep 2013, Yaroslav Halchenko wrote:
> Package: environment-modules
> Version: 3.2.10-3
> Followup-For: Bug #711955
> looking into .spec all the init/ modulefiles/ get installed under
> /etc/Modules
> which is imho sensible... also atm it is not clear (or not supported at all
> per
> se since /usr/share/modules/init/.modulespath is not a config file) where
> custom modules should be configured/reside on Debian systems.
> thanks in advance Alastair for looking into this
--
Yaroslav O. Halchenko, Ph.D.
http://neuro.debian.net http://www.pymvpa.org http://www.fail2ban.org
Senior Research Associate, Psychological and Brain Sciences Dept.
Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755
Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419
WWW: http://www.linkedin.com/in/yarik
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
