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

Ole Streicher debian at liska.ath.cx
Tue Jun 4 19:50:50 UTC 2013 

The following commit has been merged in the debian branch:
commit 52eeaa7f3354a6a9a1b8fdfac8067c23217f96db
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jun 4 21:11:22 2013 +0200

    Adopt repackaged upstream

diff --git a/debian/changelog b/debian/changelog
index dd7bbca..11f13f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-iraf (2.16-1) UNRELEASED; urgency=low
+iraf (2.16+repack-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Complete packaging restart from scratch. Closes: #690531
diff --git a/debian/clean b/debian/clean
index 9407183..92ff03d 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,42 +1,9 @@
 bin
-lib/libmain.o
 noao/bin
 unix/as
 unix/bin
 unix/hlib/iraf.h
 unix/hlib/mach.h
-pkg/vocl/readline/config.log
-pkg/vocl/readline/config.status
-pkg/vocl/readline/support/config.guess
-pkg/vocl/readline/support/config.sub
-pkg/ecl/readline/config.log
-pkg/ecl/readline/config.status
-pkg/ecl/readline/support/config.guess
-pkg/ecl/readline/support/config.sub
-vendor/cfitsio/config.status
-vendor/voclient/common/expat-2.0.1/config.status
-vendor/voclient/common/expat-2.0.1/conftools/config.guess
-vendor/voclient/common/expat-2.0.1/conftools/config.sub
-vendor/voclient/common/curl-7.18.2/config.guess
-vendor/voclient/common/curl-7.18.2/config.sub
-vendor/voclient/common/curl-7.18.2/config.status
-vendor/voclient/voclient/config.status
-vendor/voclient/voclient/config/config.guess
-vendor/voclient/voclient/config/config.sub
-vendor/voclient/libsamp/cfitsio/config.status
-vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/config.guess
-vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/config.sub
-vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/config.log
-vendor/voclient/libsamp/libxrpc/curl-7.20.1/config.guess
-vendor/voclient/libsamp/libxrpc/curl-7.20.1/config.sub
 vendor/voclient/libsamp/.BASE
-vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/_spool
 vendor/voclient/libvotable/.BASE
 vo/bin
-vo/java/.DS_Store
-vo/.DS_Store
-vo/votools/x_votools.o
-vo/votools/xx_votools.e
-vo/bin.linux64/x_votools.e
-
-
diff --git a/debian/patches/voclient.patch b/debian/patches/voclient.patch
index 50f7f4d..f8cc24d 100644
--- a/debian/patches/voclient.patch
+++ b/debian/patches/voclient.patch
@@ -282,3 +282,31 @@
  
  %.o: %.c $(INCS)
  	/usr/bin/gcc -Wall $(CINCS) $(CFLAGS) -c $< -o $@
+--- a/vendor/voclient/libsamp/libxrpc/mkclean
++++ b/vendor/voclient/libsamp/libxrpc/mkclean
+@@ -8,25 +8,6 @@
+ /bin/rm -f */_spool 				>& /dev/null
+ 
+ 
+-echo -n "    Cleaning CURL libs ...."
+-foreach i (curl-*)
+-  (chdir $i ;  \
+-    find . -name .libs -exec /bin/rm -rf {} \;  >& /dev/null ; \
+-    find . -name .deps -exec /bin/rm -rf {} \;  >& /dev/null ; \
+-    find . -name curl.list -exec rm -rf {} \;   >& /dev/null ; \
+-    find . -name Makefile -exec rm -rf {} \;    >& /dev/null ; \
+-    find . -name libcurl.la -exec rm -rf {} \;  >& /dev/null ; \
+-    /bin/rm -f config.status curl-config libcurl.pc ;\
+-    make clean maintainer-clean-am 		>>& _spool )
+-end
+-echo "done"
+-
+-echo -n "    Cleaning XMLRPC-C libs ...."
+-foreach i (xmlrpc-c-1*)
+-    (chdir $i ; make clean distclean		>>& _spool )
+-end
+-echo "done"
+-
+ # Real clean
+ find . -name \*.a -print -exec /bin/rm -f {} \;		>& /dev/null
+ find . -name \*.o -print -exec /bin/rm -f {} \;		>& /dev/null
diff --git a/debian/repack.sh b/debian/repack.sh
new file mode 100755
index 0000000..d870882
--- /dev/null
+++ b/debian/repack.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+# ./debian/repack
+# Repackage the IRAF source files with unnecessary files removed. 
+
+ver=$2
+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 -rf
+find $srcdir -name "*.e" | xargs rm -rf
+find $srcdir -name "*.o" | xargs rm -rf
+find $srcdir -name "*.cache" | xargs rm -rf
+find $srcdir -name "*.bak" | xargs rm -rf
+find $srcdir -name "*.orig" | xargs rm -rf
+find $srcdir -name ".DS_Store" | xargs rm -rf
+
+#remove finished docs
+find $srcdir -name "*.ps" | xargs rm -rf
+find $srcdir -name "*.pdf" | xargs rm -rf
+rm -rf $srcdir/tags
+rm -rf $srcdir/unix/shlib
+rm -rf $srcdir/unix/sun
+rm -rf $srcdir/unix/mc68000
+rm -rf $srcdir/pkg/ecl/readline $srcdir/pkg/vocl/readline
+
+# Keep copy of cfitsio in libsamp for now
+rm -rf $srcdir/vendor/cfitsio
+rm -rf $srcdir/pkg/tbtables/cfitsio
+
+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
+
+# 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*
+
+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 -rf $srcdir/unix/boot/xyacc
+
+repack_tar=$tardir/iraf_$ver+repack.orig.tar.xz
+tar cJf $repack_tar -C $wd .
+rm -rf $wd
+
+exec uupdate --no-symlink --upstream-version $ver+repack $repack_tar
diff --git a/debian/rules b/debian/rules
index 8fe26e8..77b0269 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,17 +85,10 @@ override_dh_auto_install-indep:
 	done
 	install -p -D -m644 unix/hlib/libc/iraf.h debian/tmp/usr/include/iraf.h
 
-override_dh_auto_clean:
-	rm -rf vo/votools/.old
-	rm -rf vo/votools/.url*
-	rm -f  ${host}bin/*
-	rm -rf ${host}bin.*/*
-	find . -name "*.a" | xargs rm -f
+
+override_dh_clean:
+	find . -name \*.[ao] |xargs rm -f
 	rm -f sys/vops/ak/*.x
-	find pkg -name "*.e"  | xargs rm -f
-	find vendor/voclient -name "*.o" | xargs rm -f
-	find vendor/voclient/libsamp/libxrpc -name depend.mk | xargs rm -f
+	rm -f unix/bin.*/[a-z]* vo/bin.*/[a-z]*
 	rm -rf vendor/voclient/include/
-	dh_auto_clean
-
-
+	dh_clean
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
index 86ab504..b257556 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,6 @@
 version=3
 opts=uversionmangle=s/(.)(.+)/$1.$2/ \
- http://iraf.noao.edu/ ftp://iraf.noao.edu/iraf/v(.+)/PCIX/iraf-src.tar.gz
+ http://iraf.noao.edu/ ftp://iraf.noao.edu/iraf/v(.+)/PCIX/iraf-src.tar.gz \
+ debian \
+ debian/repack.sh
+

-- 
Image Reduction and Analysis Facility

More information about the debian-science-commits mailing list