[Debian-astro-commits] [iraf] 03/03: Revert to default watch file

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository iraf.

commit 362d95b27fb365ab89b24c0fda4e746e999a606b
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Nov 23 13:33:46 2017 +0100

    Revert to default watch file
---
 debian/repack.sh       | 44 ------------------------------------------
 debian/upstream.remove | 52 --------------------------------------------------
 debian/watch           |  4 +---
 3 files changed, 1 insertion(+), 99 deletions(-)

diff --git a/debian/repack.sh b/debian/repack.sh
deleted file mode 100755
index d81f0f8..0000000
--- a/debian/repack.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# ./debian/repack
-# Repackage the source files with unnecessary files removed. 
-
-TMPDIR=$(mktemp --directory)
-
-trap "rm -fr ${TMPDIR} || exit 1" EXIT INT TERM
-
-ver=$2
-orig_tar=$3
-tardir=$(dirname ${orig_tar})
-debiandir=$(dirname $0)
-pkgname=$(grep ^[^[:space:]] ${debiandir}/changelog | head -1|cut -d' ' -f1)
-
-repack=$(fgrep ${pkgname} ${debiandir}/changelog | head -1 |\
-  cut -d+ -f2 | cut -d- -f1)
-
-echo $pkgname $ver $repack $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
deleted file mode 100755
index e8a4942..0000000
--- a/debian/upstream.remove
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 **/*.redhat
-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 **/*.jar **/*.cache **/*.bak **/*.orig **/.DS_Store tags
-**/config.status **/config.guess **/config.sub **/spool **/_spool **/_spool2
-**/.gdb_history
-sys/vops/ak/*.x
-vendor/voclient/include/
-unix/bin.*/*.h unix/hlib/iraf.h unix/hlib/mach.h
-bin noao/bin unix/as unix/bin vo/bin
-
-# 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/ lib/pkgconfig
-vendor/voclient/libsamp/cfitsio/bin/pkgconfig
-vendor/voclient/libsamp/cfitsio/cfitsio.pc
-vendor/voclient/libsamp/cfitsio/lib/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
-
-# F2c except libf2c
-# is different from fedoras
-unix/bin.*/f2c*
-unix/f2c/lib?77 unix/f2c/src unix/f2c/ms* unix/f2c/f2c* unix/f2c/*.c unix/f2c/fc
-unix/f2c/*change* unix/f2c/index* unix/f2c/MD5 unix/f2c/README
-
-# 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/java vo/src/OLD vo/votools/.old
diff --git a/debian/watch b/debian/watch
index 38e112f..bf6c4b4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,4 @@
 version=3
 opts=dversionmangle=s/\+.+//,uversionmangle=s/(.)(.+)/$1.$2/ \
- http://iraf.noao.edu/ ftp://iraf.noao.edu/iraf/v(.+)/PCIX/iraf-src.tar.gz \
- debian \
- debian/repack.sh
+ http://iraf.noao.edu/ ftp://iraf.noao.edu/iraf/v(.+)/PCIX/iraf-src.tar.gz
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/iraf.git