[Debian-astro-commits] [iraf] 03/03: Re-init Debian files
Ole Streicher
olebole at moszumanska.debian.org
Wed Nov 22 15:44:27 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 4c8bf71baea875d6961889fd0e0805e56f3153a8
Author: Ole Streicher <olebole at debian.org>
Date: Wed Nov 22 13:42:08 2017 +0100
Re-init Debian files
---
debian/changelog | 2 +-
debian/clean | 3 --
debian/control | 27 ++++++-------
debian/copyright | 2 +-
debian/iraf-common.docs | 1 -
debian/iraf-common.install | 1 -
debian/iraf-common.manpages | 2 +-
debian/iraf-noao.install | 2 +-
debian/iraf.install | 5 +--
debian/iraf.links | 10 ++---
debian/iraf.manpages | 6 +--
debian/rules | 97 +++++++++------------------------------------
12 files changed, 45 insertions(+), 113 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bea2b9d..f4a4f38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-iraf (2.16+repack0~0-1) UNRELEASED; urgency=low
+iraf (2.16.1+2017.11.22-0) UNRELEASED; urgency=low
* New upstream release
* Complete packaging restart from scratch. Closes: #690531
diff --git a/debian/clean b/debian/clean
index 92ff03d..58d2e81 100644
--- a/debian/clean
+++ b/debian/clean
@@ -4,6 +4,3 @@ unix/as
unix/bin
unix/hlib/iraf.h
unix/hlib/mach.h
-vendor/voclient/libsamp/.BASE
-vendor/voclient/libvotable/.BASE
-vo/bin
diff --git a/debian/control b/debian/control
index 201b2c2..dd1119f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,25 @@
Source: iraf
-Build-Depends: csh|c-shell,
- debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
dh-exec,
- f2c,
- flex-old,
- libcfitsio3-dev,
+ libcfitsio-dev,
libcurl4-gnutls-dev,
libexpat1-dev,
+ liblapack-dev,
libncurses5-dev,
- libreadline-dev,
- libxmlrpc-c3-dev
+ libreadline-dev
Section: science
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Ole Streicher <debian at liska.ath.cx>
-Standards-Version: 3.9.4
+Standards-Version: 4.1.1
Homepage: http://www.iraf.net
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/iraf.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/iraf.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/iraf.git
+Vcs-Git: https://anonscm.debian.org/cgit/debian-astro/packages/iraf.git
Package: iraf
Architecture: any
-Depends: csh|c-shell, iraf-common, ${misc:Depends}, ${shlibs:Depends}
-Recommends: iraf-noao, iraf-vo
+Depends: iraf-common, ${misc:Depends}, ${shlibs:Depends}
+Recommends: iraf-noao
Multi-Arch: foreign
Description: Image Reduction and Analysis Facility
IRAF is the "Image Reduction and Analysis Facility". The main
@@ -45,7 +42,7 @@ Description: Image Reduction and Analysis Facility
Package: iraf-common
Architecture: all
Multi-Arch: foreign
-Depends: csh|c-shell, ${misc:Depends}
+Depends: ${misc:Depends}
Recommends: iraf
Description: Image Reduction and Analysis Facility (common files)
IRAF is the "Image Reduction and Analysis Facility". The main
@@ -58,7 +55,7 @@ Description: Image Reduction and Analysis Facility (common files)
Package: iraf-noao
Architecture: any
-Depends: csh|c-shell, iraf, iraf-noao-common, ${misc:Depends}, ${shlibs:Depends}
+Depends: iraf, iraf-noao-common, ${misc:Depends}, ${shlibs:Depends}
Multi-Arch: foreign
Description: IRAF NOAO data reduction package
IRAF is the "Image Reduction and Analysis Facility". The main
@@ -72,7 +69,7 @@ Description: IRAF NOAO data reduction package
Package: iraf-noao-common
Architecture: all
Multi-Arch: foreign
-Depends: csh|c-shell, ${misc:Depends}
+Depends: ${misc:Depends}
Recommends: iraf-noao
Description: IRAF NOAO data reduction package (common files)
IRAF is the "Image Reduction and Analysis Facility". The main
diff --git a/debian/copyright b/debian/copyright
index b447034..4035942 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -453,7 +453,7 @@ License: Non-free
Used by permission of the authors.
.
See also http://iraf.net/forum/viewtopic.php?showtopic=1468262
-Remark:
+Remark:
The following common procedures from NR are used here, that can probably
easily replaced from other sources:
.
diff --git a/debian/iraf-common.docs b/debian/iraf-common.docs
index 7521718..0300682 100644
--- a/debian/iraf-common.docs
+++ b/debian/iraf-common.docs
@@ -1,2 +1 @@
debian/tmp/usr/share/iraf/doc
-
diff --git a/debian/iraf-common.install b/debian/iraf-common.install
index 28ebe5a..5ce3b33 100644
--- a/debian/iraf-common.install
+++ b/debian/iraf-common.install
@@ -5,4 +5,3 @@ usr/share/iraf/math
usr/share/iraf/pkg
usr/share/iraf/sys
usr/share/iraf/unix
-usr/share/iraf/vendor
diff --git a/debian/iraf-common.manpages b/debian/iraf-common.manpages
index 31a23ce..cb73943 100644
--- a/debian/iraf-common.manpages
+++ b/debian/iraf-common.manpages
@@ -1,4 +1,4 @@
-debian/manpages/iraf-ecl.1
debian/manpages/iraf-cl.1
+debian/manpages/iraf-ecl.1
debian/manpages/mkiraf.1
debian/manpages/mkmlist.1
diff --git a/debian/iraf-noao.install b/debian/iraf-noao.install
index b0d2c04..90eecc4 100644
--- a/debian/iraf-noao.install
+++ b/debian/iraf-noao.install
@@ -1 +1 @@
-noao/bin/* usr/lib/iraf/noao/bin
+noao/bin.*/* usr/lib/iraf/noao/bin
diff --git a/debian/iraf.install b/debian/iraf.install
index d0f7dd0..173866d 100644
--- a/debian/iraf.install
+++ b/debian/iraf.install
@@ -1,3 +1,2 @@
-bin/*.e usr/lib/iraf/bin/
-bin/I* usr/lib/iraf/bin/
-unix/bin/* usr/lib/iraf/unix/bin
+bin.*/*.e usr/lib/iraf/bin/
+unix/bin.*/* usr/lib/iraf/unix/bin
diff --git a/debian/iraf.links b/debian/iraf.links
index c5cf7e7..189d5fb 100644
--- a/debian/iraf.links
+++ b/debian/iraf.links
@@ -1,11 +1,11 @@
usr/lib/iraf/unix/bin.linux64/generic.e /usr/bin/iraf-generic
-usr/lib/iraf/unix/bin.linux64/rmbin.e /usr/bin/rmbin
usr/lib/iraf/unix/bin.linux64/mkpkg.e /usr/bin/mkpkg
+usr/lib/iraf/unix/bin.linux64/rmbin.e /usr/bin/rmbin
usr/lib/iraf/unix/bin.linux64/rmfiles.e /usr/bin/rmfiles
+usr/lib/iraf/unix/bin.linux64/rpp.e /usr/bin/iraf-rpp
usr/lib/iraf/unix/bin.linux64/rtar.e /usr/bin/rtar
-usr/lib/iraf/unix/bin.linux64/wtar.e /usr/bin/wtar
usr/lib/iraf/unix/bin.linux64/sgidispatch.e /usr/bin/sgidispatch
-usr/lib/iraf/unix/bin.linux64/rpp.e /usr/bin/iraf-rpp
-usr/lib/iraf/unix/bin.linux64/xyacc.e /usr/bin/iraf-xyacc
-usr/lib/iraf/unix/bin.linux64/xpp.e /usr/bin/iraf-xpp
+usr/lib/iraf/unix/bin.linux64/wtar.e /usr/bin/wtar
usr/lib/iraf/unix/bin.linux64/xc.e /usr/bin/xc
+usr/lib/iraf/unix/bin.linux64/xpp.e /usr/bin/iraf-xpp
+usr/lib/iraf/unix/bin.linux64/xyacc.e /usr/bin/iraf-xyacc
diff --git a/debian/iraf.manpages b/debian/iraf.manpages
index 85c0915..e9aa6eb 100644
--- a/debian/iraf.manpages
+++ b/debian/iraf.manpages
@@ -1,11 +1,11 @@
debian/manpages/iraf-generic.1
+debian/manpages/iraf-rpp.1
+debian/manpages/iraf-xpp.1
+debian/manpages/iraf-xyacc.1
debian/manpages/mkpkg.1
debian/manpages/rmbin.1
debian/manpages/rmfiles.1
-debian/manpages/iraf-rpp.1
debian/manpages/rtar.1
debian/manpages/sgidispatch.1
debian/manpages/wtar.1
debian/manpages/xc.1
-debian/manpages/iraf-xpp.1
-debian/manpages/iraf-xyacc.1
diff --git a/debian/rules b/debian/rules
index 3c12bb0..bfb7440 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,74 +3,24 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export iraf=$(shell pwd)/
-export iraf_b=${iraf}
-export host=${iraf}unix/
-export hlib=${host}hlib/
-export pkglibs=${iraf}noao/lib/,${hlib}libc/,${host}bin/
-export PATH := ${PATH}:${host}bin/:${hlib}bin/
-export HOST_CURL=1
-export HOST_READLINE=1
-export HOST_EXPAT=1
-export HOST_CFITSIO=1
-export IRAFARCH=$(shell ${hlib}irafarch.csh)
-export CC=gcc
-
%:
dh $@
-tmp_links:
- if [ ! -d bin.${IRAFARCH} ] ; then \
- mkdir -p bin.${IRAFARCH} ; \
- touch bin.${IRAFARCH}/IRAF.NET ; \
- touch bin.${IRAFARCH}/IB.LNUX ; \
- fi
- ln -sf bin.${IRAFARCH} bin
- if [ ! -d noao/bin.${IRAFARCH} ] ; then \
- mkdir -p noao/bin.${IRAFARCH} ; \
- touch noao/bin.${IRAFARCH}/IRAF.NET ; \
- touch noao/bin.${IRAFARCH}/IB.LNUX ; \
- fi
- ln -sf bin.${IRAFARCH} noao/bin
- if [ ! -d unix/bin.${IRAFARCH} ] ; then \
- mkdir -p unix/bin.${IRAFARCH} ; \
- fi
- ln -sf bin.${IRAFARCH} unix/bin
- if [ ! -d unix/as.linuxarm ] ; then \
- mkdir -p unix/as.linuxarm ; \
- fi
- ( cd unix/as.linuxarm ; ln -s ../as.linux/*[cx] . )
- ln -sf mach`getconf LONG_BIT`.h ${hlib}mach.h
- ln -sf iraf`getconf LONG_BIT`.h ${hlib}iraf.h
-
-override_dh_auto_configure: tmp_links
-
-libf2c:
- if [ `getconf LONG_BIT` = 64 ] ; then \
- make -C ${host}f2c/libf2c -f makefile.u ; \
- fi
-
-libvo_novos: libf2c
- make src
- NOVOS=1 make -C vendor/voclient mylib
- cp vendor/voclient/libvo/libVO.a ${iraf}lib
+BUILD_TMP=$(CURDIR)/irafbuild
+export HOME=$(BUILD_TMP)
+export IRAFARCH=$(shell ./unix/hlib/irafarch.sh)
-sysnovos: libvo_novos
- chmod a+x util/mksysnovos
- ${iraf}util/mksysnovos
- ln -sf xc.e unix/bin/xc
+override_dh_auto_configure:
+ mkdir -p $(BUILD_TMP)
+ ./install -v --term xterm \
+ --bindir $(BUILD_TMP)/bin \
+ --cache $(BUILD_TMP)/cache \
+ --imdir $(BUILD_TMP)/imdir \
+ --root $(CURDIR) < /dev/null || true
+ $(MAKE) $(IRAFARCH)
-libvo: sysnovos
- pkglibs=${iraf}noao/lib/,${host}bin/,${hlib} \
- make -C vendor/voclient clean mylib
- cp vendor/voclient/libvo/libVO.a ${iraf}lib
-
-override_dh_auto_build-arch: libvo
- chmod a+x util/mksysvos
- pkglibs=${iraf}noao/lib/,${host}bin/,${hlib}libc/ \
- csh -f ${iraf}util/mksysvos
-
-override_dh_auto_build: override_dh_auto_build-arch
+override_dh_auto_build-arch:
+ $(MAKE) sysgen
override_dh_auto_build-indep:
# Nothing to do
@@ -88,8 +38,6 @@ override_dh_auto_install-indep:
-o -name \*.mip \
-o -name \*.fits \
-o -path ./dev/\* | \
- fgrep -v ./vendor/voclient/libsamp | \
- fgrep -v ./vendor/voclient/common | \
fgrep -v ./dev/README | \
fgrep -v ./dev/tapecap. | \
cut -c3-) \
@@ -100,21 +48,14 @@ override_dh_auto_install-indep:
touch debian/tmp/usr/share/iraf/$$f ; \
done
# The "touch" above is for Ubuntu
- for f in unix/hlib/cl.csh \
- unix/hlib/mkiraf.csh unix/hlib/mkmlist.csh \
- unix/hlib/irafarch.csh ; do \
+ for f in unix/hlib/cl.sh \
+ unix/hlib/mkiraf.sh unix/hlib/mkmlist.sh \
+ unix/hlib/irafarch.sh ; do \
install -p -D -m 755 $$f debian/tmp/usr/share/iraf/$$f ; \
done
install -p -D -m644 unix/hlib/libc/iraf.h debian/tmp/usr/include/iraf.h
-
override_dh_clean:
- find . -name \*.[ao] |xargs rm -f
- rm -f sys/vops/ak/*.x
- rm -f unix/bin.*/[a-z]* vo/bin.*/[a-z]*
- rm -f unix/as.linuxarm/*[cx]
- rm -rf bin.linuxarm bin.linuxppc noao/bin.linuxarm
- rm -rf unix/bin.*
- rm -rf noao/bin.linuxarm noao/bin.linuxppc
- rm -rf vendor/voclient/include/
- dh_clean
\ No newline at end of file
+ make src
+ dh_clean
+ rm -rf $(BUILD_TMP)
--
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