[Debian-astro-commits] [iraf] 02/03: Get version number from d/changelog
Ole Streicher
olebole at moszumanska.debian.org
Wed Nov 29 13:06:00 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 c826b0a76cfd0e146fe5afa93777818d02d94e9e
Author: Ole Streicher <olebole at debian.org>
Date: Tue Nov 28 17:15:51 2017 +0100
Get version number from d/changelog
---
debian/changelog | 6 +++---
debian/irafcl | 2 +-
debian/patches/Adjust-version-number-and-motd.patch | 20 ++++++++++----------
debian/patches/Don-t-call-back-home-on-start.patch | 2 +-
.../patches/Make-the-installation-FHS-conform.patch | 6 +++---
debian/patches/Separate-NOAO-and-dev-packages.patch | 4 ++--
debian/rules | 2 ++
7 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b759c20..8b0b8e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-iraf (2.16.1+2017.11.22-1~1.gbp84085f) UNRELEASED; urgency=low
+iraf (2.16.1+2017.11.22-1~2.gbp32635f) UNRELEASED; urgency=low
- ** SNAPSHOT build @84085feb44408d7be12bee49eb06c765ecae8b81 **
+ ** SNAPSHOT build @32635fce7d000559e43f8602cc121e5c53ac11c7 **
* New upstream release
* Complete packaging restart from scratch. Closes: #690531
@@ -11,7 +11,7 @@ iraf (2.16.1+2017.11.22-1~1.gbp84085f) UNRELEASED; urgency=low
* Remove dangling symlinks. Closes: #138086
* Fix startup. Closes: #168867
- -- Ole Streicher <olebole at debian.org> Sat, 25 Nov 2017 18:03:53 +0100
+ -- Ole Streicher <olebole at debian.org> Tue, 28 Nov 2017 21:32:19 +0100
iraf (2.11.3-2) unstable; urgency=high
diff --git a/debian/irafcl b/debian/irafcl
index 493cb25..b1a1f2b 100755
--- a/debian/irafcl
+++ b/debian/irafcl
@@ -38,7 +38,7 @@ while getopts "h?vcef:" opt; do
echo ''
;;
v)
- head -1 $iraf/unix/hlib/motd
+ grep version\\s ${iraf}unix/hlib/zzsetenv.def |cut -d\" -f2
exit 0
;;
e)
diff --git a/debian/patches/Adjust-version-number-and-motd.patch b/debian/patches/Adjust-version-number-and-motd.patch
index 36f1324..7669e4b 100644
--- a/debian/patches/Adjust-version-number-and-motd.patch
+++ b/debian/patches/Adjust-version-number-and-motd.patch
@@ -5,12 +5,12 @@ Subject: Adjust version number and motd
---
unix/hlib/login.cl | 6 ++++--
unix/hlib/mkpkg.inc | 2 +-
- unix/hlib/motd | 7 ++-----
+ unix/hlib/motd | 8 ++------
unix/hlib/zzsetenv.def | 2 +-
- 4 files changed, 8 insertions(+), 9 deletions(-)
+ 4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index bd10cd2..7c1a2dd 100644
+index bd10cd2..da9dae1 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -2,7 +2,7 @@
@@ -27,8 +27,8 @@ index bd10cd2..7c1a2dd 100644
menus = no
else {
- clear; type hlib$motd
-+ clear;
-+ print (getenv("version")
++ clear
++ printf ("\n %s\n\n", envget("version"))
+ type hlib$motd
}
@@ -47,11 +47,11 @@ 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..55da343 100644
+index 77d4f03..22be2ec 100644
--- a/unix/hlib/motd
+++ b/unix/hlib/motd
-@@ -1,14 +1,11 @@
-
+@@ -1,14 +1,10 @@
+-
- 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.
-
@@ -68,7 +68,7 @@ index 77d4f03..55da343 100644
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index 881d9c7..6527a32 100644
+index 881d9c7..f0fb384 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
@@ -54,7 +54,7 @@ set terminal = xgterm
@@ -76,7 +76,7 @@ index 881d9c7..6527a32 100644
set ttyncols = 80
set ttynlines = 40
-set version = "NOAO/IRAF V2.16.1"
-+set version = "Debian IRAF V2.16.1+"
++set version = "Debian IRAF __VERSION__ __DATE__"
# System directories.
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 20bbc5a..4df2060 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 7c1a2dd..b0132b2 100644
+index da9dae1..b72126e 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -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 5869847..0316cfc 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Make-the-installation-FHS-conform.patch
@@ -239,7 +239,7 @@ index 17293ef..240b97b 100644
+noaobin$libsmw.a
```
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index b0132b2..c3ceaef 100644
+index b72126e..3417757 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -4,19 +4,20 @@
@@ -283,10 +283,10 @@ index b0132b2..c3ceaef 100644
;
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index 6527a32..877fabd 100644
+index f0fb384..55f41d1 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
-@@ -58,8 +58,9 @@ set version = "Debian IRAF V2.16.1+"
+@@ -58,8 +58,9 @@ set version = "Debian IRAF __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 aca0a76..3da946e 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 c3ceaef..e2aeac9 100644
+index 3417757..39571b9 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -124,9 +124,12 @@ if (deftask ("proto"))
@@ -120,7 +120,7 @@ index c3ceaef..e2aeac9 100644
cache directory page type help
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index 877fabd..34e5954 100644
+index 55f41d1..e478418 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
@@ -108,7 +108,6 @@ set lists = "pkg$lists/"
diff --git a/debian/rules b/debian/rules
index a0cfb71..48babe4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,8 @@ export IRAFARCH=$(shell ./unix/hlib/irafarch.sh)
override_dh_auto_configure:
mkdir -p $(BUILD_TMP)
+ sed "s/__VERSION__/$(shell dpkg-parsechangelog -S Version)/" -i unix/hlib/zzsetenv.def
+ sed "s/__DATE__/$(shell dpkg-parsechangelog -S Date)/" -i unix/hlib/zzsetenv.def
./install -v --term xterm \
--bindir $(BUILD_TMP)/bin \
--cache $(BUILD_TMP)/cache \
--
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