[SCM] Image Reduction and Analysis Facility branch, debian, updated. 3d75e75788a690b1d54944c559a370ed86c97c88

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 3d75e75788a690b1d54944c559a370ed86c97c88
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jun 4 13:58:44 2013 +0200

    Move binaries back from /usr/lib/<arch>/iraf to /usr/lib/iraf and make them co-installable with other architectures

diff --git a/debian/control b/debian/control
index e588ae8..385acb5 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Package: iraf
 Architecture: any
 Depends: csh|c-shell, iraf-common, ${misc:Depends}, ${shlibs:Depends}
 Recommends: iraf-noao, iraf-vo
+Multi-Arch: foreign
 Description: Image Reduction and Analysis Facility
  IRAF is the "Image Reduction and Analysis Facility". The main
  IRAF distribution includes a good selection of programs for
@@ -44,6 +45,7 @@ Description: Image Reduction and Analysis Facility
 
 Package: iraf-common
 Architecture: all
+Multi-Arch: foreign
 Depends: csh|c-shell, ${misc:Depends}
 Recommends: iraf
 Description: Image Reduction and Analysis Facility (common files)
@@ -58,6 +60,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}
+Multi-Arch: foreign
 Description: IRAF NOAO data reduction package
  IRAF is the "Image Reduction and Analysis Facility". The main
  IRAF distribution includes a good selection of programs for
@@ -69,6 +72,7 @@ Description: IRAF NOAO data reduction package
 
 Package: iraf-noao-common
 Architecture: all
+Multi-Arch: foreign
 Depends: csh|c-shell, ${misc:Depends}
 Recommends: iraf-noao
 Description: IRAF NOAO data reduction package (common files)
@@ -83,6 +87,7 @@ Description: IRAF NOAO data reduction package (common files)
 
 Package: iraf-vo
 Architecture: any
+Multi-Arch: foreign
 Depends: csh|c-shell, iraf, iraf-vo-common, ${misc:Depends}, ${shlibs:Depends}
 Description: IRAF virtual observatory package
  IRAF is the "Image Reduction and Analysis Facility". The main
@@ -95,6 +100,7 @@ Description: IRAF virtual observatory package
 
 Package: iraf-vo-common
 Architecture: all
+Multi-Arch: foreign
 Depends: csh|c-shell, ${misc:Depends}
 Recommends: iraf-vo
 Description: IRAF virtual observatory package (common files)
diff --git a/debian/iraf-noao.install b/debian/iraf-noao.install
old mode 100755
new mode 100644
index f8f4605..b0d2c04
--- a/debian/iraf-noao.install
+++ b/debian/iraf-noao.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-noao/bin/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/bin
+noao/bin/* usr/lib/iraf/noao/bin
diff --git a/debian/iraf-vo.install b/debian/iraf-vo.install
old mode 100755
new mode 100644
index 998f523..e9dc19b
--- a/debian/iraf-vo.install
+++ b/debian/iraf-vo.install
@@ -1,2 +1,2 @@
 #! /usr/bin/dh-exec
-vo/bin/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/bin
+vo/bin/* usr/lib/iraf/vo/bin
diff --git a/debian/iraf-vo.links b/debian/iraf-vo.links
old mode 100755
new mode 100644
index 5ebb1e8..17bb14c
--- a/debian/iraf-vo.links
+++ b/debian/iraf-vo.links
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/java/voclientd /usr/bin/voclientd
+usr/lib/iraf/vo/java/voclientd /usr/bin/voclientd
diff --git a/debian/iraf.install b/debian/iraf.install
old mode 100755
new mode 100644
index 22054e7..28066b5
--- a/debian/iraf.install
+++ b/debian/iraf.install
@@ -1,3 +1,3 @@
-#! /usr/bin/dh-exec
-unix/bin/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin
-bin/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/bin/
+unix/bin/*.e usr/lib/iraf/unix/bin
+unix/bin/I* usr/lib/iraf/unix/bin
+bin/* usr/lib/iraf/bin/
diff --git a/debian/iraf.links b/debian/iraf.links
old mode 100755
new mode 100644
index 74c6de9..c5cf7e7
--- a/debian/iraf.links
+++ b/debian/iraf.links
@@ -1,12 +1,11 @@
-#! /usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/generic.e /usr/bin/iraf-generic
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/rmbin.e /usr/bin/rmbin
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/mkpkg.e /usr/bin/mkpkg
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/rmfiles.e /usr/bin/rmfiles
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/rtar.e /usr/bin/rtar
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/wtar.e /usr/bin/wtar
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/sgidispatch.e /usr/bin/sgidispatch
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/rpp.e /usr/bin/iraf-rpp
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/xyacc.e /usr/bin/iraf-xyacc
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/xpp.e /usr/bin/iraf-xpp
-usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/xc.e /usr/bin/xc
+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/rmfiles.e /usr/bin/rmfiles
+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/xc.e /usr/bin/xc
diff --git a/debian/patches/remove-absolute-path.patch b/debian/patches/remove-absolute-path.patch
index b44a458..926a566 100644
--- a/debian/patches/remove-absolute-path.patch
+++ b/debian/patches/remove-absolute-path.patch
@@ -15,7 +15,7 @@
      setenv iraf "$d_iraf"
  endif
  
-+setenv iraf_b /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/iraf/
++setenv iraf_b /usr/lib/iraf/
 +
  # Check for a version query.
  if ($#argv > 0) then

-- 
Image Reduction and Analysis Facility