Control: tags 793355 + patch
Control: tags 793355 + pending

Dear maintainer,

I've prepared an NMU for lmod (versioned as 6.6-0.1) and uploaded it
to DELAYED/10. This means in 10 days my package will be automatically
uploaded to the archive unless you upload a package yourself or
ask me to remove the package from the delayed queue.

I'm doing the NMU because it would be a pity to release Stretch with an
old version of lmod. Since you're maintaining the package in github,
I forked your repository and you can see easily my changes at:
https://github.com/ana/lmod-deb

Please, take a look, some of my changes are quite intrusive since I
made some changes to have lmod behaving like environment-modules:
- MODULEPATH can be set in a file /etc/lmod/modulespath
- added /etc/profile.d/lmod.sh so /usr/share/lmod/lmod/init/$SHELL
is automatically run.

Best regards,
Ana
diff -Nru lmod-5.8/debian/changelog lmod-6.6/debian/changelog
--- lmod-5.8/debian/changelog	2014-11-04 23:46:05.000000000 +0100
+++ lmod-6.6/debian/changelog	2016-11-11 23:37:24.000000000 +0100
@@ -1,3 +1,21 @@
+lmod (6.6-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release. (Closes: #793355)
+  * Refresh patch change_paths
+  * Update debhelper compatibility 9.
+  * Install README.md, it has been renamed from README.
+  * Add build-depends on procps.
+  * Add build-depends and depends on tcl.
+  * Update Standars-Version to 3.9.8, no changes required.
+  * Update lintian overrides.
+  * Make lmod to behave like environment-modules:
+    - Allow to configure the list of modules path at /etc/lmod/modulespath
+    - Install /etc/profile.d/lmod.sh and read MODULESPATH from
+      /etc/lmod/modulespath
+
+ -- Ana Beatriz Guerrero Lopez <a...@debian.org>  Fri, 11 Nov 2016 23:37:24 +0100
+
 lmod (5.8-1) unstable; urgency=medium
 
   * Imported Upstream version 5.8 (Closes: #764722)
diff -Nru lmod-5.8/debian/compat lmod-6.6/debian/compat
--- lmod-5.8/debian/compat	2014-05-21 00:44:01.000000000 +0200
+++ lmod-6.6/debian/compat	2016-11-11 16:56:05.000000000 +0100
@@ -1 +1 @@
-8
+9
diff -Nru lmod-5.8/debian/control lmod-6.6/debian/control
--- lmod-5.8/debian/control	2014-11-04 23:46:05.000000000 +0100
+++ lmod-6.6/debian/control	2016-11-11 16:56:06.000000000 +0100
@@ -2,15 +2,15 @@
 Section: devel
 Priority: optional
 Maintainer: Aaron Zauner <a...@azet.org>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, lua5.2, lua-filesystem, lua-posix, lua-term, lua-json
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9), autotools-dev, lua5.2, lua-filesystem, lua-posix, lua-term, lua-json, procps, tcl
+Standards-Version: 3.9.8
 Homepage: https://www.tacc.utexas.edu/tacc-projects/lmod
 Vcs-Git: git://github.com/azet/lmod-deb.git
 Vcs-Browser: https://github.com/azet/lmod-deb
 
 Package: lmod
 Architecture: all
-Depends: ${misc:Depends}, lua5.2, lua-filesystem, lua-posix, lua-term, lua-json
+Depends: ${misc:Depends}, lua5.2, lua-filesystem, lua-posix, lua-term, lua-json, tcl
 Description: Lua based environment modules
  Lmod is a Lua based module system that easily handles the MODULEPATH
  Hierarchical problem. Environment Modules provide a convenient way to
diff -Nru lmod-5.8/debian/dirs lmod-6.6/debian/dirs
--- lmod-5.8/debian/dirs	1970-01-01 01:00:00.000000000 +0100
+++ lmod-6.6/debian/dirs	2016-11-11 23:27:58.000000000 +0100
@@ -0,0 +1,3 @@
+etc/profile.d
+etc/lmod
+etc/lmod/modules
diff -Nru lmod-5.8/debian/docs lmod-6.6/debian/docs
--- lmod-5.8/debian/docs	2014-05-21 01:07:05.000000000 +0200
+++ lmod-6.6/debian/docs	2016-11-11 16:56:05.000000000 +0100
@@ -1,2 +1,2 @@
-README
+README.md
 README_lua_modulefiles.txt
diff -Nru lmod-5.8/debian/lmod.lintian-overrides lmod-6.6/debian/lmod.lintian-overrides
--- lmod-5.8/debian/lmod.lintian-overrides	2014-06-07 17:52:14.000000000 +0200
+++ lmod-6.6/debian/lmod.lintian-overrides	2016-11-11 16:57:52.000000000 +0100
@@ -5,7 +5,6 @@
 lmod: missing-dep-for-interpreter csh => tcsh | csh | c-shell (usr/share/lmod/*/init/cshrc)
 lmod: csh-considered-harmful usr/share/lmod/*/init/tcsh
 lmod: missing-dep-for-interpreter csh => tcsh | csh | c-shell (usr/share/lmod/*/init/tcsh)
-lmod: tclsh-script-but-no-tclsh-dep usr/share/lmod/*/libexec/ModulesVersion.tcl
-lmod: tclsh-script-but-no-tclsh-dep usr/share/lmod/*/libexec/RC2lua.tcl
-lmod: tclsh-script-but-no-tclsh-dep usr/share/lmod/*/libexec/tcl2lua.tcl
 lmod: executable-not-elf-or-script usr/share/lmod/*/init/perl
+lmod: script-not-executable usr/share/lmod/6.6/libexec/ignore_dirs_converter
+lmod: executable-not-elf-or-script usr/share/lmod/6.6/init/r
diff -Nru lmod-5.8/debian/modulespath lmod-6.6/debian/modulespath
--- lmod-5.8/debian/modulespath	1970-01-01 01:00:00.000000000 +0100
+++ lmod-6.6/debian/modulespath	2016-11-11 23:26:31.000000000 +0100
@@ -0,0 +1,8 @@
+#
+#  This file defines the initial setup for the module files search path.
+#  Comments must begin with # and continue until the end of the line.
+#  Each line containing a single path will be added to the MODULEPATH
+#  environment variable.
+#
+/etc/lmod/modules
+/usr/share/lmod/lmod/modulefiles/
diff -Nru lmod-5.8/debian/patches/change_paths lmod-6.6/debian/patches/change_paths
--- lmod-5.8/debian/patches/change_paths	2014-11-04 23:46:05.000000000 +0100
+++ lmod-6.6/debian/patches/change_paths	2016-11-11 16:55:56.000000000 +0100
@@ -1,11 +1,9 @@
-diff --git a/Makefile.in b/Makefile.in
-index 8938ca6..160fe7b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -41,15 +41,15 @@ GIT_VERSION               := $(shell if [ -n "$(GIT_PROG)" -a -d .git ]; then lm
+@@ -60,15 +60,15 @@
  prefix		  	  := @prefix@
  package		  	  := lmod
- version		  	  := $(shell cd $(PATH_TO_SRC)/src; $(PATH_TO_LUA)/lua -e "V=require('Version'); print(V.tag())")
+ version		  	  := $(shell cd $(srcdir)/src; $(PATH_TO_LUA)/lua -e "V=require('Version'); print(V.tag())")
 -PKGV		  	  := $(prefix)/$(package)/$(version)
 -PKG		  	  := $(prefix)/$(package)/$(package)
 -LIBEXEC		  	  := $(prefix)/$(package)/$(version)/libexec
@@ -23,7 +21,7 @@
 +SETTARG                   := $(prefix)/share/$(package)/$(version)/settarg
 +INIT		  	  := $(prefix)/share/$(package)/$(version)/init
 +LMOD_MF 	  	  := $(prefix)/share/$(package)/$(version)/modulefiles/Core
-+MAN_PAGES                 := $(prefix)/share/$(package)/$(version)/share/man/cat1
- LMOD_MF_SOURCE            := MF/*.version.lua
- SETTARG_SOURCE            := settarg/*.lua  settarg/targ.in
++MAN_PAGES                 := $(prefix)/share/man/man1
+ LMOD_MF_SOURCE            := $(patsubst %, $(srcdir)/%, MF/*.version.lua)
+ SETTARG_SOURCE            := $(patsubst %, $(srcdir)/%, settarg/*.lua  settarg/targ.in)
  
diff -Nru lmod-5.8/debian/patches/series lmod-6.6/debian/patches/series
--- lmod-5.8/debian/patches/series	2014-05-21 00:52:41.000000000 +0200
+++ lmod-6.6/debian/patches/series	2016-11-11 23:29:58.000000000 +0100
@@ -1 +1,2 @@
 change_paths
+set_modulespath
diff -Nru lmod-5.8/debian/patches/set_modulespath lmod-6.6/debian/patches/set_modulespath
--- lmod-5.8/debian/patches/set_modulespath	1970-01-01 01:00:00.000000000 +0100
+++ lmod-6.6/debian/patches/set_modulespath	2016-11-11 23:29:50.000000000 +0100
@@ -0,0 +1,18 @@
+This patch makes MODULEPATH to be set with the contents of the file
+/etc/lmod/modulespath
+
+Date: 2016-11-10
+Author: Ana Guerrero López <a...@debian.org>
+--- a/init/profile.in
++++ b/init/profile.in
+@@ -23,8 +23,8 @@
+     export LMOD_FULL_SETTARG_SUPPORT=@lmod_full_settarg_support@
+     export LMOD_COLORIZE=@colorize@
+     export LMOD_PREPEND_BLOCK=@prepend_block@
+-    export MODULEPATH=$(@PKG@/libexec/addto --append MODULEPATH $MODULEPATH_ROOT/$LMOD_sys $MODULEPATH_ROOT/Core)
+-    export MODULEPATH=$(@PKG@/libexec/addto --append MODULEPATH @PKG@/modulefiles/Core)
++	MODULEPATH=`sed -n 's/[   #].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p; }' /etc/lmod/modulespath`
++    export MODULEPATH
+     export MODULESHOME=@PKG@
+ 
+     export BASH_ENV=$MODULESHOME/init/bash
diff -Nru lmod-5.8/debian/rules lmod-6.6/debian/rules
--- lmod-5.8/debian/rules	2014-05-21 00:44:01.000000000 +0200
+++ lmod-6.6/debian/rules	2016-11-11 23:24:57.000000000 +0100
@@ -4,6 +4,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+TDIR=debian/lmod
+
+
 %:
 	dh $@  --with autotools-dev
 
@@ -11,3 +14,7 @@
 
 override_dh_pysupport:
 
+override_dh_auto_install:
+	dh_auto_install
+	cp ${TDIR}/usr/share/lmod/lmod/init/profile ${TDIR}/etc/profile.d/lmod.sh
+	cp debian/modulespath ${TDIR}/etc/lmod/

Reply via email to