[Debian-astro-commits] [iraf] 01/03: Add reportbug CL command
Ole Streicher
olebole at moszumanska.debian.org
Wed Nov 29 13:05:59 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 c80df914ea232d1e707d29e810da633be72bf89e
Author: Ole Streicher <olebole at debian.org>
Date: Tue Nov 28 17:36:22 2017 +0100
Add reportbug CL command
---
debian/control | 2 +-
debian/patches/Add-reportbug-CL-command.patch | 88 ++++++++++++++++++++++
.../patches/Adjust-version-number-and-motd.patch | 48 ++++++++++--
debian/patches/Don-t-call-back-home-on-start.patch | 4 +-
.../Make-the-installation-FHS-conform.patch | 6 +-
.../patches/Separate-NOAO-and-dev-packages.patch | 2 +-
debian/patches/series | 1 +
7 files changed, 137 insertions(+), 14 deletions(-)
diff --git a/debian/control b/debian/control
index 97884e1..3caf28e 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Vcs-Git: https://anonscm.debian.org/cgit/debian-astro/packages/iraf.git
Package: iraf
Architecture: any-i386 any-amd64
Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: iraf-noao
+Recommends: iraf-noao, reportbug
Suggests: iraf-dev
Multi-Arch: foreign
Description: Image Reduction and Analysis Facility
diff --git a/debian/patches/Add-reportbug-CL-command.patch b/debian/patches/Add-reportbug-CL-command.patch
new file mode 100644
index 0000000..6c91fa6
--- /dev/null
+++ b/debian/patches/Add-reportbug-CL-command.patch
@@ -0,0 +1,88 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Tue, 28 Nov 2017 17:35:11 +0100
+Subject: Add reportbug CL command
+
+---
+ pkg/system/doc/reportbug.hlp | 26 ++++++++++++++++++++++++++
+ pkg/system/system.cl | 5 ++++-
+ pkg/system/system.hd | 1 +
+ unix/hlib/reportbug.cl | 9 +++++++++
+ 4 files changed, 40 insertions(+), 1 deletion(-)
+ create mode 100644 pkg/system/doc/reportbug.hlp
+ create mode 100644 unix/hlib/reportbug.cl
+
+diff --git a/pkg/system/doc/reportbug.hlp b/pkg/system/doc/reportbug.hlp
+new file mode 100644
+index 0000000..5c1bfc9
+--- /dev/null
++++ b/pkg/system/doc/reportbug.hlp
+@@ -0,0 +1,26 @@
++.help reportbug Jan18 system
++.ih
++NAME
++reportbug -- send an IRAF bug to Debian
++.ih
++USAGE
++reportbug subject
++.ih
++PARAMETERS
++.ls subject
++The subject of the bug; any string, usually including the name of package
++or task to which the bug refers.
++.le
++.ih
++DESCRIPTION
++
++\fBreportbug\fR is primarily designed to report bugs in the Debian
++distribution; by default, it creates an email to the Debian bug
++tracking system at submit at bugs.debian.org with information about the
++bug you've found, and makes a carbon copy of the report for you as
++well.
++
++.ih
++SEE ALSO
++gripes
++.endhelp
+diff --git a/pkg/system/system.cl b/pkg/system/system.cl
+index 1e114d7..33ab941 100644
+--- a/pkg/system/system.cl
++++ b/pkg/system/system.cl
+@@ -40,7 +40,10 @@ task $news = "system$news.cl"
+ task $bench = "system$bench.cl"
+
+ task allocate = "hlib$allocate.cl"
+-task gripes = "hlib$gripes.cl"
++if (access("/usr/bin/reportbug"))
++ task reportbug = "hlib$reportbug.cl"
++else
++ task gripes = "hlib$gripes.cl"
+ task deallocate = "hlib$deallocate.cl"
+ task devstatus = "hlib$devstatus.cl"
+ task $diskspace = "hlib$diskspace.cl"
+diff --git a/pkg/system/system.hd b/pkg/system/system.hd
+index be4b1bb..69d7887 100644
+--- a/pkg/system/system.hd
++++ b/pkg/system/system.hd
+@@ -18,6 +18,7 @@ diskspace hlp=doc$diskspace.hlp, src=hlib$diskspace.cl
+ fcache hlp=doc$fcache.hlp, src=t_fcache.x
+ files hlp=doc$files.hlp, src=files.x
+ gripes hlp=doc$gripes.hlp, src=hlib$gripes.cl
++reportbug hlp=doc$reportbug.hlp, src=hlib$reportbug.cl
+ head hlp=doc$head.hlp, src=head.x
+ help hlp=doc$help.hlp, src=help$t_help.x
+ lprint hlp=doc$lprint.hlp, src=lprint.x
+diff --git a/unix/hlib/reportbug.cl b/unix/hlib/reportbug.cl
+new file mode 100644
+index 0000000..001ff3d
+--- /dev/null
++++ b/unix/hlib/reportbug.cl
+@@ -0,0 +1,9 @@
++# REPORTBUG -- Send a bug report to Debian
++
++procedure reportbug (subject)
++
++string subject { prompt = "Subject" }
++begin
++ print ("!!reportbug -S '", subject, "' iraf") | cl
++ subject = ""
++end
diff --git a/debian/patches/Adjust-version-number-and-motd.patch b/debian/patches/Adjust-version-number-and-motd.patch
index e7272aa..36f1324 100644
--- a/debian/patches/Adjust-version-number-and-motd.patch
+++ b/debian/patches/Adjust-version-number-and-motd.patch
@@ -3,11 +3,36 @@ Date: Thu, 23 Nov 2017 23:31:11 +0100
Subject: Adjust version number and motd
---
+ unix/hlib/login.cl | 6 ++++--
unix/hlib/mkpkg.inc | 2 +-
- unix/hlib/motd | 4 +---
+ unix/hlib/motd | 7 ++-----
unix/hlib/zzsetenv.def | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
+ 4 files changed, 8 insertions(+), 9 deletions(-)
+diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
+index bd10cd2..7c1a2dd 100644
+--- a/unix/hlib/login.cl
++++ b/unix/hlib/login.cl
+@@ -2,7 +2,7 @@
+
+ # Identify login.cl version (checked in images.cl).
+ if (defpar ("logver"))
+- logver = "IRAF V2.16.1 Oct 2013"
++ logver = envget("version")
+
+ set home = "U_HOME"
+ set imdir = "U_IMDIR"
+@@ -133,7 +133,9 @@ cache directory page type help
+ if (access (".hushiraf"))
+ menus = no
+ else {
+- clear; type hlib$motd
++ clear;
++ print (getenv("version")
++ type hlib$motd
+ }
+
+
diff --git a/unix/hlib/mkpkg.inc b/unix/hlib/mkpkg.inc
index 4192384..ead98b9 100644
--- a/unix/hlib/mkpkg.inc
@@ -22,17 +47,26 @@ 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..71fcdcc 100644
+index 77d4f03..55da343 100644
--- a/unix/hlib/motd
+++ b/unix/hlib/motd
-@@ -1,6 +1,4 @@
--
+@@ -1,14 +1,11 @@
+
- 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+
+-
+-
+ 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 or to report problems.
++ Visit http://iraf.net if you have questions. Report bugs to Debian
++ with the "reportbug" command.
- Welcome to IRAF. To list the available commands, type ? or ??. To get
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
index 881d9c7..6527a32 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 24d00a0..20bbc5a 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 bd10cd2..d30a9d2 100644
+index 7c1a2dd..b0132b2 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
-@@ -138,8 +138,6 @@ else {
+@@ -140,8 +140,6 @@ else {
#============================================================================
diff --git a/debian/patches/Make-the-installation-FHS-conform.patch b/debian/patches/Make-the-installation-FHS-conform.patch
index 4f89b03..5869847 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Make-the-installation-FHS-conform.patch
@@ -239,12 +239,12 @@ index 17293ef..240b97b 100644
+noaobin$libsmw.a
```
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index d30a9d2..cc3198d 100644
+index b0132b2..c3ceaef 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -4,19 +4,20 @@
if (defpar ("logver"))
- logver = "IRAF V2.16.1 Oct 2013"
+ logver = envget("version")
-set home = "U_HOME"
-set imdir = "U_IMDIR"
@@ -273,7 +273,7 @@ index d30a9d2..cc3198d 100644
#============================================================================
# Uncomment and edit to change the defaults.
-@@ -142,7 +143,7 @@ else {
+@@ -144,7 +145,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 cdc3975..aca0a76 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 cc3198d..17df370 100644
+index c3ceaef..e2aeac9 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -124,9 +124,12 @@ if (deftask ("proto"))
diff --git a/debian/patches/series b/debian/patches/series
index 620f00b..0aa8065 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Don-t-call-back-home-on-start.patch
Make-the-installation-FHS-conform.patch
Separate-NOAO-and-dev-packages.patch
Propagate-CFLAGS-and-debug-flag-to-xc.patch
+Add-reportbug-CL-command.patch
--
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