[Debian-astro-commits] [iraf] 02/02: Separate new motd from the old one, for users of local login.cl
Ole Streicher
olebole at moszumanska.debian.org
Wed Nov 29 19:21:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository iraf.
commit 6c605a2b77f2784554ddd907f82b88664fd314a1
Author: Ole Streicher <olebole at debian.org>
Date: Wed Nov 29 20:18:51 2017 +0100
Separate new motd from the old one, for users of local login.cl
---
.../patches/Adjust-version-number-and-motd.patch | 50 +++++++++++++---------
debian/patches/Don-t-call-back-home-on-start.patch | 4 +-
.../Make-the-installation-FHS-conform.patch | 4 +-
.../patches/Separate-NOAO-and-dev-packages.patch | 2 +-
debian/rules | 3 +-
5 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/debian/patches/Adjust-version-number-and-motd.patch b/debian/patches/Adjust-version-number-and-motd.patch
index 7669e4b..67834f1 100644
--- a/debian/patches/Adjust-version-number-and-motd.patch
+++ b/debian/patches/Adjust-version-number-and-motd.patch
@@ -3,14 +3,16 @@ Date: Thu, 23 Nov 2017 23:31:11 +0100
Subject: Adjust version number and motd
---
- unix/hlib/login.cl | 6 ++++--
+ unix/hlib/login.cl | 7 +++++--
unix/hlib/mkpkg.inc | 2 +-
- unix/hlib/motd | 8 ++------
+ unix/hlib/motd | 5 +++--
+ unix/hlib/motd.etc | 8 ++++++++
unix/hlib/zzsetenv.def | 2 +-
- 4 files changed, 8 insertions(+), 10 deletions(-)
+ 5 files changed, 18 insertions(+), 6 deletions(-)
+ create mode 100644 unix/hlib/motd.etc
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index bd10cd2..da9dae1 100644
+index bd10cd2..804ead4 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -2,7 +2,7 @@
@@ -22,14 +24,15 @@ index bd10cd2..da9dae1 100644
set home = "U_HOME"
set imdir = "U_IMDIR"
-@@ -133,7 +133,9 @@ cache directory page type help
+@@ -133,7 +133,10 @@ cache directory page type help
if (access (".hushiraf"))
menus = no
else {
- clear; type hlib$motd
+ clear
-+ printf ("\n %s\n\n", envget("version"))
-+ type hlib$motd
++ printf ("\n %s\n\n\n", envget("version"))
++ type /etc/iraf/motd
++ printf ("\n\n")
}
@@ -47,26 +50,33 @@ index 4192384..ead98b9 100644
$set XFLAGS = "-c -w" # default XC compile flags
$set XVFLAGS = "-c -w" # VOPS XC compile flags
diff --git a/unix/hlib/motd b/unix/hlib/motd
-index 77d4f03..22be2ec 100644
+index 77d4f03..a6d9cbe 100644
--- a/unix/hlib/motd
+++ b/unix/hlib/motd
-@@ -1,14 +1,10 @@
--
+@@ -1,6 +1,7 @@
+
- NOAO/IRAF PC-IRAF Revision 2.16.1 EXPORT Mon Oct 14 21:40:13 MST 2013
- This is the EXPORT version of IRAF V2.16 supporting PC systems.
--
--
- Welcome to IRAF. To list the available commands, type ? or ??. To get
- detailed information about a command, type `help <command>'. To run a
- command or load a package, type its name. Type `bye' to exit a
- package, or `logout' to get out of the CL. Type `news' to find out
- what is new in the version of the system you are using.
++ Debian/IRAF PC-IRAF Revision 2.16.1+
++ You may consider removing your personal login.cl or replacing it with
++ /etc/iraf/local.cl.
+
-- Visit http://iraf.net if you have questions or to report problems.
+ Welcome to IRAF. To list the available commands, type ? or ??. To get
+diff --git a/unix/hlib/motd.etc b/unix/hlib/motd.etc
+new file mode 100644
+index 0000000..1156c0c
+--- /dev/null
++++ b/unix/hlib/motd.etc
+@@ -0,0 +1,8 @@
++ Welcome to IRAF. To list the available commands, type ? or ??. To get
++ detailed information about a command, type `help <command>'. To run a
++ command or load a package, type its name. Type `bye' to exit a
++ package, or `logout' to get out of the CL. Type `news' to find out
++ what is new in the version of the system you are using.
++
+ Visit http://iraf.net if you have questions. Report bugs to Debian
+ with the "reportbug" command.
-
-
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
index 881d9c7..f0fb384 100644
--- a/unix/hlib/zzsetenv.def
diff --git a/debian/patches/Don-t-call-back-home-on-start.patch b/debian/patches/Don-t-call-back-home-on-start.patch
index 4df2060..a06589d 100644
--- a/debian/patches/Don-t-call-back-home-on-start.patch
+++ b/debian/patches/Don-t-call-back-home-on-start.patch
@@ -7,10 +7,10 @@ Subject: Don't call back home on start
1 file changed, 2 deletions(-)
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index da9dae1..b72126e 100644
+index 804ead4..3cb7d72 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
-@@ -140,8 +140,6 @@ else {
+@@ -141,8 +141,6 @@ else {
#============================================================================
diff --git a/debian/patches/Make-the-installation-FHS-conform.patch b/debian/patches/Make-the-installation-FHS-conform.patch
index decb132..9d5a938 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Make-the-installation-FHS-conform.patch
@@ -239,7 +239,7 @@ index 755104c..f703377 100644
+noaobin$libsmw.a
```
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index b72126e..3d14219 100644
+index 3cb7d72..65076c0 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -4,19 +4,23 @@
@@ -278,7 +278,7 @@ index b72126e..3d14219 100644
#============================================================================
# Uncomment and edit to change the defaults.
-@@ -144,7 +148,7 @@ else {
+@@ -145,7 +149,7 @@ else {
# Notify the user if we're using the global login.
path (".") | scan (s1)
if ( osfn("home$") != substr (s1, strldx("!",s1)+1, strlen(s1)) ) {
diff --git a/debian/patches/Separate-NOAO-and-dev-packages.patch b/debian/patches/Separate-NOAO-and-dev-packages.patch
index bc94f5d..59de878 100644
--- a/debian/patches/Separate-NOAO-and-dev-packages.patch
+++ b/debian/patches/Separate-NOAO-and-dev-packages.patch
@@ -100,7 +100,7 @@ index 4e8b3a6..40b80e7 100644
list = dpkg
while (fscan (list, s1) != EOF) {
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index 3d14219..2c7ba1a 100644
+index 65076c0..e91682a 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -127,9 +127,12 @@ if (deftask ("proto"))
diff --git a/debian/rules b/debian/rules
index 48babe4..e4f2313 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ override_dh_auto_install:
-o -name \*.fits \
-o -path ./dev/\* | \
cut -c3-) \
- unix/hlib/motd \
+ unix/hlib/motd* \
lib/syserrmsg lib/syshelpdir ; do \
install -p -D -m 644 $$f debian/tmp/usr/share/iraf/$$f ; \
done
@@ -48,6 +48,7 @@ override_dh_auto_install:
> debian/tmp/usr/share/iraf/extern/.zzsetenv.def
mkdir -p debian/tmp/etc/iraf
mv debian/tmp/usr/share/iraf/unix/hlib/login.cl debian/tmp/etc/iraf/
+ mv debian/tmp/usr/share/iraf/unix/hlib/motd.etc debian/tmp/etc/iraf/motd
for f in unix/hlib/util.sh \
unix/hlib/mkiraf.sh unix/hlib/mkmlist.sh \
unix/hlib/irafarch.sh ; do \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/iraf.git
More information about the Debian-astro-commits
mailing list