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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit d2b2b013405c20364f64eb56bc569ea9b82923c1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jun 7 20:22:22 2013 +0200

    Reimplement repack script: separate data from code

diff --git a/debian/repack.sh b/debian/repack.sh
index 2fc5fb9..74ec3f7 100755
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -1,75 +1,43 @@
 #!/bin/sh
 # ./debian/repack
-# Repackage the IRAF source files with unnecessary files removed. 
+# Repackage the source files with unnecessary files removed. 
 
-ver=$2
-repack_ver=$ver+repack0~0
-orig_tar=$3
-tardir=$(dirname $orig_tar)
-wd=$(mktemp -d)
-echo $ver $orig_tar $tardir $wd
-
-tar xf $orig_tar -C $wd 
-srcdir=$wd/
-
-find $srcdir -name "*.cygwin" | xargs rm -rf 
-find $srcdir -name "*.freebsd" | xargs rm -rf 
-find $srcdir -name "*.ipad" | xargs rm -rf 
-find $srcdir -name "*.sunos" | xargs rm -rf 
-find $srcdir -name "*.macintel" | xargs rm -rf 
-find $srcdir -name "*.macosx" | xargs rm -rf 
-find $srcdir -name "*.solaris" | xargs rm -rf 
-find $srcdir -name "*.a" | xargs rm -f
-find $srcdir -name "*.e" | xargs rm -f
-find $srcdir -name "*.o" | xargs rm -f
-find $srcdir -name "*.cache" | xargs rm -rf
-find $srcdir -name "*.bak" | xargs rm -f
-find $srcdir -name "*.orig" | xargs rm -f
-find $srcdir -name ".DS_Store" | xargs rm -rf
-
-#remove finished docs
-find $srcdir -name "*.ps" | xargs rm -f
-find $srcdir -name "*.pdf" | xargs rm -f
-rm -f $srcdir/tags
-rm -rf $srcdir/unix/shlib
-rm -rf $srcdir/unix/sun
-rm -rf $srcdir/unix/mc68000
-rm -f $srcdir/unix/hlib/libc/stdarg-freebsd.h $srcdir/unix/hlib/libc/stdarg-solaris.h
-# Keep readline.h in vocl/readline/
-mv  $srcdir/pkg/vocl/readline/readline.h  $srcdir/pkg/vocl/
-rm -rf $srcdir/pkg/ecl/readline $srcdir/pkg/vocl/readline/*
-mv  $srcdir/pkg/vocl/readline.h  $srcdir/pkg/vocl/readline/
-
-# Keep copy of cfitsio in libsamp for now
-rm -rf $srcdir/vendor/cfitsio
-rm -rf $srcdir/pkg/tbtables/cfitsio
+repack="repack0~0"
 
-rm -rf $srcdir/vendor/voclient/common/curl*
-rm -rf $srcdir/vendor/voclient/common/expat*
-rm -rf $srcdir/vendor/voclient/libsamp/libxrpc/curl
-rm -rf $srcdir/vendor/voclient/libsamp/libxrpc/curl-*/*
-rm -rf $srcdir/vendor/voclient/libsamp/libxrpc/xmlrpc-c
-rm -rf $srcdir/vendor/voclient/libsamp/libxrpc/xmlrpc-c-*/*
-rm -rf $srcdir/vendor/voclient/libsamp/libxrpc/share
+TMPDIR=$(mktemp --directory)
 
-# remove most of f2c but keep the f2c.h as the stock f2c.h 
-# is different from fedoras
-rm -rf $srcdir/unix/f2c/lib*
-rm -rf $srcdir/unix/f2c/src
-rm -rf $srcdir/unix/f2c/ms*
-rm -rf $srcdir/unix/bin.*/f2c*
+trap "rm -fr ${TMPDIR} || exit 1" EXIT INT TERM
 
-rm -rf $srcdir/sys/vops/ak/*.x
-rm -rf $srcdir/vendor/voclient/include/
-rm -f $srcdir/vendor/voclient/voclient/config.status
-rm -f $srcdir/vendor/voclient/voclient/config/config.guess
-rm -f $srcdir/vendor/voclient/voclient/config/config.sub
-rm -f $srcdir/vendor/voclient/libsamp/cfitsio/config.status
-
-#rm -rf $srcdir/unix/boot/xyacc
-
-repack_tar=$tardir/iraf_$repack_ver.orig.tar.xz
-tar cJf $repack_tar -C $wd .
-rm -rf $wd
-
-exec uupdate --no-symlink --upstream-version $repack_ver $repack_tar
+ver=$2
+orig_tar=$3
+tardir=$(dirname ${orig_tar})
+debiandir=$(dirname $0)
+pkgname=$(grep ^[^[:space:]] ${debiandir}/changelog | head -1|cut -d' ' -f1)
+
+echo $pkgname $ver $orig_tar $tardir $wd
+
+tar xf ${orig_tar} -C ${TMPDIR} 
+srcdir=$(ls -d ${TMPDIR})
+
+if [ -f ${debiandir}/upstream.move ] ; then
+  ( while read source target ; do
+      mkdir -p ${srcdir}/${target}
+      mv ${srcdir}/${source} ${srcdir}/${target}
+    done ) < ${debiandir}/upstream.move
+fi
+
+for fname in $(cat ${debiandir}/upstream.remove | sed s/\#.\*//); do
+  if [ $(echo "${fname}" | fgrep "**") ] ; then
+    path=$(echo "${fname}" | sed "s+\*\*/+\|+" | cut -d\| -f1)
+    fname=$(echo "${fname}" | sed "s+\*\*/+\|+" | cut -d\| -f2)
+    find "${srcdir}/${path}" -name "${fname}" -print0 | xargs -0 rm -rf
+  else
+    rm -rf ${srcdir}/${fname}
+  fi
+done
+
+repack_ver=${ver}+${repack}
+repack_tar=${tardir}/${pkgname}_${repack_ver}.orig.tar.xz
+tar cJf ${repack_tar} -C ${TMPDIR} .
+
+exec uupdate --no-symlink --upstream-version ${repack_ver} ${repack_tar}
diff --git a/debian/upstream.remove b/debian/upstream.remove
new file mode 100755
index 0000000..c59e21a
--- /dev/null
+++ b/debian/upstream.remove
@@ -0,0 +1,41 @@
+# This file is processed with the "debian/repack.sh" script.
+#
+# It contains files and directories that we don't need to build IRAF.
+# They may even disturb the make process.
+#
+# Foreign architectures
+**/*.cygwin **/*.freebsd **/*.ipad **/*.macintel **/*.macosx
+**/*.sunos **/*.solaris
+unix/shlib unix/sun unix/mc68000
+unix/hlib/libc/stdarg-freebsd.h unix/hlib/libc/stdarg-solaris.h
+
+# Old built files, and stuff accidently leftover
+**/*.a **/*.e **/*.o **/*.cache **/*.bak **/*.orig **/.DS_Store tags
+**/config.status **/config.guess **/config.sub **/spool
+sys/vops/ak/*.x
+vendor/voclient/include/
+unix/bin.*/*.h unix/hlib/iraf.h unix/hlib/mach.h
+
+# Prebuild documentation
+**/*.ps **/*.pdf
+
+# Readline convienience copies
+pkg/ecl/readline pkg/vocl/readline
+
+# cfitsion convienience copies: Keep copy in libsamp for now
+vendor/cfitsio pkg/tbtables/cfitsio
+bin.linux64/pkgconfig/
+
+# Curl convienience copies
+vendor/voclient/common/curl* vendor/voclient/common/expat*
+vendor/voclient/libsamp/libxrpc/curl
+vendor/voclient/libsamp/libxrpc/curl-*/*
+
+# Xmlrpc convienience copies
+vendor/voclient/libsamp/libxrpc/xmlrpc-c
+vendor/voclient/libsamp/libxrpc/xmlrpc-c-*/*
+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*

-- 
Image Reduction and Analysis Facility