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

Ole Streicher debian at liska.ath.cx
Thu Jun 6 22:05:29 UTC 2013


The following commit has been merged in the debian branch:
commit 3bc3649004b26623eaf767700029492539f8a5ac
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 6 23:55:16 2013 +0200

    re-add pkg/vocl/readline/readline.h

diff --git a/debian/repack.sh b/debian/repack.sh
index 767eb55..a7ba9e2 100755
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -18,23 +18,26 @@ 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 "*.a" | xargs rm -f
+find $srcdir -name "*.e" | xargs rm -f
+find $srcdir -name "*.o" | xargs rm -f
+find $srcdir -name "*.cache" | xargs rm -f
+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 -rf
-find $srcdir -name "*.pdf" | xargs rm -rf
-rm -rf $srcdir/tags
+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 -rf $srcdir/unix/hlib/libc/stdarg-freebsd.h $srcdir/unix/hlib/libc/stdarg-solaris.h
+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/readline.h  $srcdir/pkg/vocl/readline
 
 # Keep copy of cfitsio in libsamp for now
 rm -rf $srcdir/vendor/cfitsio
diff --git a/debian/rules b/debian/rules
index 3601acb..0b037d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,6 @@ tmp_links:
 	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
-	ls -l ${hlib}*.h
 
 override_dh_auto_configure: tmp_links
 

-- 
Image Reduction and Analysis Facility



More information about the debian-science-commits mailing list