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

Fri Jun 7 22:08:24 UTC 2013

The following commit has been merged in the debian branch:
commit 84b395479da9c2230bfa72d65f461f92bca7baec
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Jun 8 00:07:11 2013 +0200

    Remove VO package

diff --git a/debian/README.Debian b/debian/README.Debian
index 2fbe130..3699acd 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -33,4 +33,7 @@ Important deviations from the original package:
 * There is still no development package. Some development files are in
   iraf and iraf-common; however they are not complete.
 
+* The vo subpackage is currently not build since its dependencies (Aladin,
+  topcal, samp, voclient) are not in Debian.
+
  -- Ole Streicher <debian at liska.ath.cx>  Mon, 03 Jun 2013 16:15:00 +0200
diff --git a/debian/control b/debian/control
index 385acb5..bcdb50f 100644
--- a/debian/control
+++ b/debian/control
@@ -84,31 +84,3 @@ Description: IRAF NOAO data reduction package (common files)
  .
  This file contains the architecture independent files of the
  NOAO data reduction package.
-
-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
- IRAF distribution includes a good selection of programs for
- general image processing and graphics, plus a large number of
- programs for the reduction and analysis of optical and IR
- astronomy data.
- .
- This file contains the 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)
- IRAF is the "Image Reduction and Analysis Facility". The main
- IRAF distribution includes a good selection of programs for
- general image processing and graphics, plus a large number of
- programs for the reduction and analysis of optical and IR
- astronomy data.
- .
- This file contains the architecture independent files of the
- virtual observatory package.
diff --git a/debian/iraf-vo-common.install b/debian/iraf-vo-common.install
deleted file mode 100644
index b4d46dd..0000000
--- a/debian/iraf-vo-common.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/iraf/vo
diff --git a/debian/iraf-vo-common.lintian-overrides b/debian/iraf-vo-common.lintian-overrides
deleted file mode 100644
index 4312d3e..0000000
--- a/debian/iraf-vo-common.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-# Since the package is really old, we will find some really old
-# files here. This is not a bug.
-package-contains-ancient-file *
-# The GPL is just mentioned in a notice.
-copyright-should-refer-to-common-license-file-for-gpl
diff --git a/debian/iraf-vo.install b/debian/iraf-vo.install
deleted file mode 100644
index e9dc19b..0000000
--- a/debian/iraf-vo.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-vo/bin/* usr/lib/iraf/vo/bin
diff --git a/debian/iraf-vo.links b/debian/iraf-vo.links
deleted file mode 100644
index 17bb14c..0000000
--- a/debian/iraf-vo.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/iraf/vo/java/voclientd /usr/bin/voclientd
diff --git a/debian/iraf-vo.lintian-overrides b/debian/iraf-vo.lintian-overrides
deleted file mode 100644
index 922503e..0000000
--- a/debian/iraf-vo.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-# Since the package is really old, we will find some really old
-# files here. This is not a bug.
-package-contains-ancient-file *
-# This is a false positive.
-spelling-error-in-binary usr/lib/iraf/vo/bin/* tEH the
-# The GPL is just mentioned in a notice.
-copyright-should-refer-to-common-license-file-for-gpl
diff --git a/debian/patches/mksys.patch b/debian/patches/mksys.patch
index dce37bc..0866f80 100644
--- a/debian/patches/mksys.patch
+++ b/debian/patches/mksys.patch
@@ -48,7 +48,7 @@
 +echo "  End:  $c_end"
 --- /dev/null
 +++ b/util/mksysvos
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,41 @@
 +#!/bin/csh -f
 +#
 +
@@ -82,12 +82,6 @@
 +setenv noao $cwd/
 +mkpkg -p noao |& tee -a spool
 +
-+echo "=== VO ==="
-+cd $iraf/vo				# build VO package
-+setenv vo $cwd/
-+cd votools				# build VOTOOLS package
-+mkpkg -p vo update
-+
 +set  c_end	= `date`
 +
 +
diff --git a/debian/patches/series b/debian/patches/series
index 462ea75..6c0db9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ irafuser_csh.patch
 libc.patch
 xc.patch
 voclient.patch
-vodata.patch
 shared-readline.patch
 shared-xmlrpc.patch
 fhs.patch
diff --git a/debian/patches/xc.patch b/debian/patches/xc.patch
index dac5cea..1605518 100644
--- a/debian/patches/xc.patch
+++ b/debian/patches/xc.patch
@@ -79,3 +79,12 @@ Description: Link xc to the needed shared libs, and adjust compile flags
  $else $ifeq (MACH, redhat) then
  $set	XFLAGS		= "-c -w"	# default XC compile flags
  $set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
+@@ -54,7 +54,7 @@
+ 
+ $set	USE_LIBMAIN	= yes		# update lib$libmain.o (root object)
+ $set	USE_KNET	= yes		# use the KI (network interface)
+-$set	USE_SHLIB	= no		# use (update) the shared library
++$set	USE_SHLIB	= yes		# use (update) the shared library
+ $set	USE_CCOMPILER	= yes		# use the C compiler
+ $set	USE_GENERIC	= yes		# use the generic preprocessor
+ $set	USE_NSPP	= no		# make the NCAR/NSPP graphics kernel
diff --git a/debian/rules b/debian/rules
index 0b037d6..cdbbb71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ export CC=gcc
 tmp_links:
 	ln -sf bin.${IRAFARCH} bin
 	ln -sf bin.${IRAFARCH} noao/bin
-	ln -sf bin.${IRAFARCH} vo/bin
 	ln -sf mach`getconf LONG_BIT`.h ${hlib}/mach.h
 	ln -sf iraf`getconf LONG_BIT`.h ${hlib}/iraf.h
 
diff --git a/debian/upstream.remove b/debian/upstream.remove
index 00c5528..c9b31f9 100755
--- a/debian/upstream.remove
+++ b/debian/upstream.remove
@@ -40,3 +40,7 @@ vendor/voclient/libsamp/libxrpc/share
 # Most of f2c but keep the f2c.h as the stock f2c.h 
 # is different from fedoras
 unix/f2c/lib* unix/f2c/src unix/f2c/ms* unix/bin.*/f2c*
+
+# The "VO" package is not build from source here. We will re-include it once
+# the packages (Aladin, jsamp, topcat, voclient) are in Debian.
+vo

-- 
Image Reduction and Analysis Facility

