[Debian-astro-commits] [iraf] 01/04: Reorganize patches a bit
Ole Streicher
olebole at moszumanska.debian.org
Tue Dec 5 12:21:07 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 443dc14b2df07b333ca63a688a6c0c2403b5aa23
Author: Ole Streicher <olebole at debian.org>
Date: Tue Dec 5 13:18:47 2017 +0100
Reorganize patches a bit
---
debian/patches/Add-reportbug-CL-command.patch | 88 ----------------------
...re-dependency-in-the-names-of-bin-subdir.patch} | 29 ++++++-
...ths.patch => Skip-source-dependent-tests.patch} | 31 ++------
debian/patches/series | 5 +-
4 files changed, 33 insertions(+), 120 deletions(-)
diff --git a/debian/patches/Add-reportbug-CL-command.patch b/debian/patches/Add-reportbug-CL-command.patch
deleted file mode 100644
index 6c91fa6..0000000
--- a/debian/patches/Add-reportbug-CL-command.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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/Make-the-installation-FHS-conform.patch b/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
similarity index 77%
rename from debian/patches/Make-the-installation-FHS-conform.patch
rename to debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
index 50c842a..16ab31d 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
@@ -1,15 +1,16 @@
From: Ole Streicher <olebole at debian.org>
Date: Sat, 25 Nov 2017 15:45:49 +0100
-Subject: Make the installation FHS conform
+Subject: Remove architecture dependency in the names of `bin` subdirs.
-This moves the IRAF installation from /iraf/iraf/ to /usr/lib/iraf/
+Instead of bin.linux, bin.linux64 they will be names just "bin".
---
noao/lib/zzsetenv.def | 4 ++--
pkg/cl/exec.c | 2 +-
pkg/ecl/exec.c | 2 +-
+ test/run_tests | 10 ++++------
unix/hlib/zzsetenv.def | 3 ++-
unix/os/irafpath.c | 16 ----------------
- 5 files changed, 6 insertions(+), 21 deletions(-)
+ 6 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/noao/lib/zzsetenv.def b/noao/lib/zzsetenv.def
index c38a4be..f70c92f 100644
@@ -51,6 +52,28 @@ index 322a3ce..4e70bf6 100644
/* The binary wasn't found in the expected bin directory, but
* on certain platforms look for alternate binaries that may
* work. This supports backward compatability with older
+diff --git a/test/run_tests b/test/run_tests
+index 72c58cb..1731304 100755
+--- a/test/run_tests
++++ b/test/run_tests
+@@ -12,13 +12,11 @@
+ if [ -z "$iraf" ] ; then
+ export iraf=$(cd $(dirname $0)/..; pwd)/
+ fi
+-if [ -z "$IRAFARCH" ] ; then
+- export IRAFARCH=$(${iraf}unix/hlib/irafarch.sh)
+-fi
+
+-export arch=.${IRAFARCH}
+-export IRAFBIN=${iraf}bin${arch}/
+-export PATH=$HOME/.iraf/bin:${PATH}
++export LANG=C
++export iraf=/usr/lib/iraf/
++export src=$(cd $(dirname $0)/..; pwd)/
++export IRAFBIN=${iraf}bin/
+
+ TEST_FILES=""
+ IRAF_SHELLS=""
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
index 6fc73f6..2ae6d54 100644
--- a/unix/hlib/zzsetenv.def
diff --git a/debian/patches/Adjust-tests-for-FHS-paths.patch b/debian/patches/Skip-source-dependent-tests.patch
similarity index 70%
rename from debian/patches/Adjust-tests-for-FHS-paths.patch
rename to debian/patches/Skip-source-dependent-tests.patch
index 41fe227..eaaae0a 100644
--- a/debian/patches/Adjust-tests-for-FHS-paths.patch
+++ b/debian/patches/Skip-source-dependent-tests.patch
@@ -1,11 +1,12 @@
From: Ole Streicher <olebole at debian.org>
-Date: Thu, 30 Nov 2017 14:43:05 +0100
-Subject: Adjust tests for FHS paths
+Date: Sat, 25 Nov 2017 15:45:49 +0100
+Subject: Skip source dependent tests
+The sources are not available in the installed IRAF, so we skip the
+tests that need them.
---
test/numerical-recipes.md | 11 +++++++----
- test/run_tests | 10 ++++------
- 2 files changed, 11 insertions(+), 10 deletions(-)
+ 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/test/numerical-recipes.md b/test/numerical-recipes.md
index 495962a..f2801b8 100644
@@ -71,25 +72,3 @@ index 495962a..f2801b8 100644
```
cl> softools
cl> xc -x test_twofft.x numrep.x -lfftpack
-diff --git a/test/run_tests b/test/run_tests
-index 72c58cb..1731304 100755
---- a/test/run_tests
-+++ b/test/run_tests
-@@ -12,13 +12,11 @@
- if [ -z "$iraf" ] ; then
- export iraf=$(cd $(dirname $0)/..; pwd)/
- fi
--if [ -z "$IRAFARCH" ] ; then
-- export IRAFARCH=$(${iraf}unix/hlib/irafarch.sh)
--fi
-
--export arch=.${IRAFARCH}
--export IRAFBIN=${iraf}bin${arch}/
--export PATH=$HOME/.iraf/bin:${PATH}
-+export LANG=C
-+export iraf=/usr/lib/iraf/
-+export src=$(cd $(dirname $0)/..; pwd)/
-+export IRAFBIN=${iraf}bin/
-
- TEST_FILES=""
- IRAF_SHELLS=""
diff --git a/debian/patches/series b/debian/patches/series
index 50e7e22..f1845e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,8 +3,7 @@ Allow-plus-sign-in-build-path.patch
Create-a-global-login.cl-in-etc.patch
Adjust-version-number-and-motd.patch
Don-t-call-back-home-on-start.patch
-Make-the-installation-FHS-conform.patch
-Adjust-tests-for-FHS-paths.patch
+Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
Separate-NOAO-and-dev-packages.patch
Propagate-CFLAGS-and-debug-flag-to-xc.patch
-Add-reportbug-CL-command.patch
+Skip-source-dependent-tests.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