[Debian-astro-commits] [iraf] 04/05: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Tue Dec 5 20:24:08 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 fb2537dfefd878b1729ba2582dee5df117747c53
Author: Ole Streicher <olebole at debian.org>
Date: Tue Dec 5 20:57:55 2017 +0100
Rediff patches
---
.../patches/Adjust-version-number-and-motd.patch | 41 +++++++++++-----------
.../patches/Create-a-global-login.cl-in-etc.patch | 23 +++++++-----
debian/patches/Don-t-call-back-home-on-start.patch | 4 +--
...ure-dependency-in-the-names-of-bin-subdir.patch | 4 +--
.../patches/Separate-NOAO-and-dev-packages.patch | 2 +-
5 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/debian/patches/Adjust-version-number-and-motd.patch b/debian/patches/Adjust-version-number-and-motd.patch
index 074b592..ad21ffb 100644
--- a/debian/patches/Adjust-version-number-and-motd.patch
+++ b/debian/patches/Adjust-version-number-and-motd.patch
@@ -5,14 +5,14 @@ Subject: Adjust version number and motd
---
unix/hlib/login.cl | 7 +++++--
unix/hlib/mkpkg.inc | 2 +-
- unix/hlib/motd | 5 +++--
- unix/hlib/motd.etc | 8 ++++++++
+ unix/hlib/motd | 6 ++++--
+ unix/hlib/motd.etc | 9 +++++++++
unix/hlib/zzsetenv.def | 2 +-
- 5 files changed, 18 insertions(+), 6 deletions(-)
+ 5 files changed, 20 insertions(+), 6 deletions(-)
create mode 100644 unix/hlib/motd.etc
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index 24b1c98..5fd0201 100644
+index 1f3fc5f..202ab9e 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -2,7 +2,7 @@
@@ -30,7 +30,7 @@ index 24b1c98..5fd0201 100644
else {
- clear; type hlib$motd
+ clear
-+ printf ("\n %s\n\n\n", envget("version"))
++ printf ("\n %s\n\n", envget("version"))
+ type /etc/iraf/motd
+ printf ("\n\n")
}
@@ -50,39 +50,40 @@ 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..82e1661 100644
+index 50b71af..bc7fd08 100644
--- a/unix/hlib/motd
+++ b/unix/hlib/motd
-@@ -1,6 +1,5 @@
-
+@@ -1,5 +1,5 @@
- 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.
-+ Debian/IRAF PC-IRAF Revision 2.16.1+
++ NOAO/IRAF PC-IRAF Revision 2.16.1+ DEBIAN
++ This is the DEBIAN version of IRAF V2.16+ supporting PC systems.
+ This product includes results achieved by the IRAF64 project in 2006-
+ 2009 directed by Chisato Yamauchi (C-SODA/ISAS/JAXA).
+@@ -12,3 +12,5 @@
- Welcome to IRAF. To list the available commands, type ? or ??. To get
-@@ -12,3 +11,5 @@
Visit http://iraf.net if you have questions or to report problems.
-
+ A common global login file is available at /etc/iraf/login.cl. You may
+ consider removing or replacing your personal login script.
diff --git a/unix/hlib/motd.etc b/unix/hlib/motd.etc
new file mode 100644
-index 0000000..1156c0c
+index 0000000..3693658
--- /dev/null
+++ b/unix/hlib/motd.etc
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,9 @@
++ This product includes results achieved by the IRAF64 project in 2006-
++ 2009 directed by Chisato Yamauchi (C-SODA/ISAS/JAXA).
++
+ 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.
++ package, or `logout' to get out of the CL.
+
-+ Visit http://iraf.net if you have questions. Report bugs to Debian
-+ with the "reportbug" command.
++ Visit http://iraf.net if you have questions.
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index ee0cbcd..6fc73f6 100644
+index ee0cbcd..e1c3db9 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
@@ -40,7 +40,7 @@ set terminal = xgterm
@@ -90,7 +91,7 @@ index ee0cbcd..6fc73f6 100644
set ttyncols = 80
set ttynlines = 40
-set version = "NOAO/IRAF V2.16.1"
-+set version = "Debian IRAF __VERSION__ __DATE__"
++set version = "NOAO/IRAF Debian __VERSION__ __DATE__"
# System directories.
diff --git a/debian/patches/Create-a-global-login.cl-in-etc.patch b/debian/patches/Create-a-global-login.cl-in-etc.patch
index 7f5ae68..e690368 100644
--- a/debian/patches/Create-a-global-login.cl-in-etc.patch
+++ b/debian/patches/Create-a-global-login.cl-in-etc.patch
@@ -5,8 +5,8 @@ Subject: Create a global login.cl in /etc
---
pkg/cl/main.c | 12 +++++++++++-
pkg/ecl/main.c | 12 +++++++++++-
- unix/hlib/login.cl | 19 +++++++------------
- 3 files changed, 29 insertions(+), 14 deletions(-)
+ unix/hlib/login.cl | 24 +++++++-----------------
+ 3 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/pkg/cl/main.c b/pkg/cl/main.c
index 0471f4c..6027bf3 100644
@@ -55,7 +55,7 @@ index ee1aeae..7e927c9 100644
} else {
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index 5a4d375..24b1c98 100644
+index 5a4d375..1f3fc5f 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -4,19 +4,14 @@
@@ -84,12 +84,17 @@ index 5a4d375..24b1c98 100644
#============================================================================
# Uncomment and edit to change the defaults.
-@@ -147,7 +142,7 @@ chkupdate
+@@ -145,12 +140,7 @@ else {
+ chkupdate
+
# Notify the user if we're using the global login.
- path (".") | scan (s1)
- if ( osfn("home$") != substr (s1, strldx("!",s1)+1, strlen(s1)) ) {
+-path (".") | scan (s1)
+-if ( osfn("home$") != substr (s1, strldx("!",s1)+1, strlen(s1)) ) {
- printf (" *** Using global login file: %slogin.cl\n", osfn("home$"))
-+ printf (" *** Using global login file: /etc/iraf/login.cl\n")
- }
- ;
+-}
+-;
+-
++printf (" *** Using global login file: /etc/iraf/login.cl\n")
+ #============================================================================
+ # Uncomment to initialize the SAMP interface on startup.
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 2ad140e..84d8142 100644
--- a/debian/patches/Don-t-call-back-home-on-start.patch
+++ b/debian/patches/Don-t-call-back-home-on-start.patch
@@ -7,7 +7,7 @@ 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 5fd0201..4677fa4 100644
+index 202ab9e..edc1a20 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -139,8 +139,6 @@ else {
@@ -18,4 +18,4 @@ index 5fd0201..4677fa4 100644
-chkupdate
# Notify the user if we're using the global login.
- path (".") | scan (s1)
+ printf (" *** Using global login file: /etc/iraf/login.cl\n")
diff --git a/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch b/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
index 16ab31d..201b9bd 100644
--- a/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
+++ b/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
@@ -75,10 +75,10 @@ index 72c58cb..1731304 100755
TEST_FILES=""
IRAF_SHELLS=""
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index 6fc73f6..2ae6d54 100644
+index e1c3db9..006eb26 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
-@@ -44,8 +44,9 @@ set version = "Debian IRAF __VERSION__ __DATE__"
+@@ -44,8 +44,9 @@ set version = "NOAO/IRAF Debian __VERSION__ __DATE__"
# System directories.
diff --git a/debian/patches/Separate-NOAO-and-dev-packages.patch b/debian/patches/Separate-NOAO-and-dev-packages.patch
index 60cfd60..be9ddc7 100644
--- a/debian/patches/Separate-NOAO-and-dev-packages.patch
+++ b/debian/patches/Separate-NOAO-and-dev-packages.patch
@@ -52,7 +52,7 @@ index 4e8b3a6..40b80e7 100644
list = dpkg
while (fscan (list, s1) != EOF) {
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index 2ae6d54..2f36382 100644
+index 006eb26..488ac51 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
@@ -94,7 +94,6 @@ set lists = "pkg$lists/"
--
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