[SCM] Image Reduction and Analysis Facility branch, debian, updated. c9b67d7e16cb8ab9152262292996856cc35831fb
Ole Streicher
debian at liska.ath.cx
Fri May 31 17:11:07 UTC 2013
The following commit has been merged in the debian branch:
commit c9b67d7e16cb8ab9152262292996856cc35831fb
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri May 31 19:11:01 2013 +0200
Include only files needed for runtime in -common packages
diff --git a/debian/iraf-common.docs b/debian/iraf-common.docs
new file mode 100644
index 0000000..7521718
--- /dev/null
+++ b/debian/iraf-common.docs
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/iraf/doc
+
diff --git a/debian/iraf-common.install b/debian/iraf-common.install
index e4403d7..28ebe5a 100644
--- a/debian/iraf-common.install
+++ b/debian/iraf-common.install
@@ -1,8 +1,8 @@
-dev usr/share/iraf
-extern usr/share/iraf
-lib usr/share/iraf
-pkg usr/share/iraf
-unix/boot unix/[f-zR]* usr/share/iraf/unix
-unix/hlib/*.h usr/include/iraf/
-unix/hlib/libc/iraf.h usr/include/
-util usr/share/iraf
+usr/share/iraf/dev
+usr/share/iraf/lib
+usr/share/iraf/local
+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-noao-common.install b/debian/iraf-noao-common.install
index eddc326..f8d2f65 100644
--- a/debian/iraf-noao-common.install
+++ b/debian/iraf-noao-common.install
@@ -1 +1 @@
-noao/[ad-z]* usr/share/iraf/noao/
+usr/share/iraf/noao/
diff --git a/debian/iraf-noao.links b/debian/iraf-noao.links
index 8c40c18..442b758 100755
--- a/debian/iraf-noao.links
+++ b/debian/iraf-noao.links
@@ -8,8 +8,6 @@ usr/share/iraf/noao/filterphot usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/filterpho
usr/share/iraf/noao/focas usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/focas
usr/share/iraf/noao/imred usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/imred
usr/share/iraf/noao/lib usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/lib
-usr/share/iraf/noao/mkpkg usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/mkpkg
-usr/share/iraf/noao/mtlocal usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/mtlocal
usr/share/iraf/noao/noao.cl usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/noao.cl
usr/share/iraf/noao/noao.hd usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/noao.hd
usr/share/iraf/noao/noao.men usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/noao.men
diff --git a/debian/iraf-vo-common.install b/debian/iraf-vo-common.install
index cb1a326..b4d46dd 100644
--- a/debian/iraf-vo-common.install
+++ b/debian/iraf-vo-common.install
@@ -1 +1 @@
-vo/[d-zRN]* usr/share/iraf/vo
+usr/share/iraf/vo
diff --git a/debian/iraf-vo.links b/debian/iraf-vo.links
index b906ec4..9bf1734 100755
--- a/debian/iraf-vo.links
+++ b/debian/iraf-vo.links
@@ -3,11 +3,6 @@ usr/share/iraf/vo/doc usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/doc
usr/share/iraf/vo/handlers usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/handlers
usr/share/iraf/vo/java usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/java
usr/share/iraf/vo/lib usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/lib
-usr/share/iraf/vo/mkpkg usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/mkpkg
-usr/share/iraf/vo/Notes usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/Notes
-usr/share/iraf/vo/Notes.vo usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/Notes.vo
-usr/share/iraf/vo/README usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/README
-usr/share/iraf/vo/Revisions usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/Revisions
usr/share/iraf/vo/src usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/src
usr/share/iraf/vo/vo.cl usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/vo.cl
usr/share/iraf/vo/vo.hd usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/vo.hd
diff --git a/debian/iraf.docs b/debian/iraf.docs
deleted file mode 100644
index 30d29de..0000000
--- a/debian/iraf.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/*
diff --git a/debian/iraf.install b/debian/iraf.install
index 4324a92..64cb926 100755
--- a/debian/iraf.install
+++ b/debian/iraf.install
@@ -1,5 +1,4 @@
#! /usr/bin/dh-exec
unix/as/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/as
unix/bin/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin
-unix/hlib/*.sh usr/lib/${DEB_HOST_MULTIARCH}/iraf/bin/
bin/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/bin/
diff --git a/debian/rules b/debian/rules
index 1355e89..d4d8fc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,12 +46,28 @@ override_dh_auto_build: libvo
sed -i ${hlib}mkiraf.csh -e s!/iraf/iraf!/usr/lib/iraf!g
sed -i ${hlib}cl.csh -e s!/iraf/iraf!/usr/lib/iraf!g
sed -i ${hlib}libc/iraf.h -e s!/iraf/iraf!/usr/lib/iraf!g
- cp ${iraf}${host}/bin/*.a ${iraf}lib
- cp -p ${iraf}${host}/bin/*.e ${iraf}bin
- find pkg lib vo noao -name \*.\[eoa\] |xargs rm -f
+# cp -a ${iraf}${host}/bin/*.a ${iraf}lib
+# cp -p ${iraf}${host}/bin/*.e ${iraf}bin
+
+override_dh_auto_install:
+ for f in $(shell find . -name \*.hlp \
+ -o -name \*.hd \
+ -o -name \*.men \
+ -o -name \*.cl \
+ -o -name \*.par \
+ -o -name \*.key \
+ -o -name \*.dat \
+ -o -name \*.mip \
+ -o -name \*.fits \
+ -o -path ./dev/\* | \
+ fgrep -v ./vendor/voclient/libsamp | \
+ fgrep -v ./dev/README | \
+ fgrep -v ./dev/tapecap. | \
+ cut -c3-) ; do \
+ install -p -D -m 644 $$f debian/tmp/usr/share/iraf/$$f ; \
+ done
override_dh_auto_clean:
- echo ${PATH}
rm -rf vo/votools/.old
rm -rf vo/votools/.url*
rm -f ${host}/bin/*
--
Image Reduction and Analysis Facility
More information about the debian-science-commits
mailing list