--- sixpack-0.66.orig/setup.py +++ sixpack-0.66/setup.py @@ -1,6 +1,7 @@ # setup.py from distutils.core import setup -import py2exe +# Must comment out before patching (CUS) +#import py2exe import spglobalfuncs setup(name="SixPACK", --- sixpack-0.66.orig/debian/docs +++ sixpack-0.66/debian/docs @@ -0,0 +1 @@ +debian/README.Debian --- sixpack-0.66.orig/debian/control +++ sixpack-0.66/debian/control @@ -0,0 +1,22 @@ +Source: sixpack +Section: contrib/science +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Carlo Segre +Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), + python-central (>= 0.5), python-tk, python-pmw, quilt +XS-Python-Version: all +Homepage: http://www-ssrl.slac.stanford.edu/~swebb/sixpack.htm +Standards-Version: 3.8.3 + +Package: sixpack +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, ifeffit, python-tk, python-pmw, + tix, python-ifeffit, python-numpy, blt, python-scientific +XB-Python-Version: ${python:Versions} +Provides: ${python:Provides} +Description: full-featured package for XAS analysis + Sam's Interface for XAS Package, or SIXPack for short, is the unification + of the previously named SamXAS and SamView programs into a single analysis + package. Thus the package can guide the user through data averaging and + calibration, background removal, and many aspects of fitting. --- sixpack-0.66.orig/debian/menu +++ sixpack-0.66/debian/menu @@ -0,0 +1,5 @@ +?package(sixpack):needs="X11" \ + section="Applications/Science/Data Analysis" \ + title="SIXpack" \ + command="/usr/bin/SIXpack" \ + icon="/usr/share/pixmaps/SIXpack.xpm" --- sixpack-0.66.orig/debian/README.Debian +++ sixpack-0.66/debian/README.Debian @@ -0,0 +1,34 @@ +Ubuntu sixpack rename +--------------------- + +The original Ubuntu sixpack package has been renamed to sixpack-bibtex, due to +a different package going by the same name being added to Debian. + + -- William Grant + +The executable name for this program has been changed to SIXpack +to avoid conflict with another program in Debian. + +The original tarball for this program has been modified to remove +extra Carriage Return characters left over from the Windows source +and to make a tarball from the distributed zip file. + +This is done with the following shell script: + + +---- convert.sh ---- + +#! /bin/sh + +mkdir sixpack-$1 +cd sixpack-$1 +unzip ../sixpacksource.zip +rm *.pyc +dos2unix *.py +dos2unix *.inp +cd .. +tar czvf sixpack_$1.orig.tar.gz sixpack-$1 +rm -rf sixpack-$1 + + +Carlo Segre --- sixpack-0.66.orig/debian/dirs +++ sixpack-0.66/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/SIXpack --- sixpack-0.66.orig/debian/changelog +++ sixpack-0.66/debian/changelog @@ -0,0 +1,225 @@ +sixpack (1:0.66-3ubuntu1) natty; urgency=low + + * Merge from debian testing, remaining changes: + - debian/README.Debian: Note about sixpack -> sixpack-bibtex rename. + + -- Bhavani Shankar Sun, 31 Oct 2010 23:22:22 +0530 + +sixpack (1:0.66-3) unstable; urgency=low + + * Apply python-numpy to spline.py. + + -- Carlo Segre Sat, 24 Oct 2009 09:21:22 -0500 + +sixpack (1:0.66-2) unstable; urgency=low + + * Apply patch to use python-numpy instesd of python-numeric, + thanks to Kumar Appaiah + (Closes: #478463). + * Convert all patched of original source to quilt. + + -- Carlo Segre Mon, 05 Oct 2009 00:01:27 -0500 + +sixpack (1:0.66-1) unstable; urgency=low + + * New upstream release + * Update to Stndards-Version 3.8.3 (no changes) + + -- Carlo Segre Sat, 29 Aug 2009 21:16:41 -0500 + +sixpack (1:0.64-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #255069): + - debian/README.Debian: Note about sixpack -> sixpack-bibtex rename. + + -- Nathan Handler Tue, 05 Aug 2008 12:55:09 -0500 + +sixpack (1:0.64-2) unstable; urgency=low + + * Modify debian/SIXpack.desktop to validate with desktop-file-validate + (Closes: #492269). Thanks to Nathan Handler + + -- Carlo Segre Thu, 24 Jul 2008 14:11:14 -0500 + +sixpack (1:0.64-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #250323): + - debian/README.Debian: Note about sixpack -> sixpack-bibtex rename. + * Modify debian/SIXpack.desktop to validate with desktop-file-validate + + -- Nathan Handler Sun, 20 Jul 2008 16:17:46 -0500 + +sixpack (1:0.64-1) unstable; urgency=low + + * New upstream release + * add call to dh_desktop + + -- Carlo Segre Sat, 19 Jul 2008 11:00:32 -0500 + +sixpack (1:0.62-2) unstable; urgency=low + + * Upgrade to Standards Version 3.8.0: + - Added note in debian/copyright to explain contrib status of + package; + - Added Homepage field to debian/control. + * Rebuild to correct placement of files into /usr/share/pyshared + (Closes: #490507). + + -- Carlo Segre Sat, 12 Jul 2008 09:27:48 -0500 + +sixpack (1:0.62-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/README.Debian: Note about sixpack -> sixpack-bibtex rename. + + -- William Grant Wed, 12 Dec 2007 16:38:21 +1100 + +sixpack (1:0.62-1) unstable; urgency=low + + * New upstream release + + -- Carlo Segre Wed, 21 Nov 2007 01:07:42 -0600 + +sixpack (1:0.61-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/README.Debian: Note about sixpack -> sixpack-bibtex rename. + + -- William Grant Mon, 29 Oct 2007 11:40:59 +1100 + +sixpack (1:0.61-1) unstable; urgency=low + + * New upstream release + * Setting epoch to 1 for better coordination with Ubuntu and to avoid + conflict with a package previously named sixpack (now sixpack-bibtex) + which had higher version numbers than this in Ubuntu. + + -- Carlo Segre Sun, 23 Sep 2007 02:04:11 -0500 + +sixpack (0.60-3) unstable; urgency=low + + * Restoring sane desktop settings despite lintian warning + + -- Carlo Segre Sun, 23 Sep 2007 01:33:32 -0500 + +sixpack (0.60-2) unstable; urgency=low + + * Comply with menu and desktop policy + + -- Carlo Segre Sat, 18 Aug 2007 13:52:31 -0500 + +sixpack (0.60-1) unstable; urgency=low + + * New upstream release + + -- Carlo Segre Sat, 21 Jul 2007 21:24:17 -0500 + +sixpack (1:0.59-1ubuntu1) gutsy; urgency=low + + * Add epoch to allow upgrades from old sixpack package. + * debian/README.Debian: Note that the old sixpack has been renamed to + sixpack-bibtex. + * debian/control: Replace Maintainer field. + + -- William Grant Sun, 29 Apr 2007 12:16:08 +1000 + +sixpack (0.59-1) unstable; urgency=low + + * New upstream release + + -- Carlo Segre Mon, 12 Feb 2007 23:00:42 -0600 + +sixpack (0.57-5) unstable; urgency=low + + * Remove ifeffit from build dependencies + + -- Carlo Segre Fri, 24 Nov 2006 13:07:15 -0600 + +sixpack (0.57-4) unstable; urgency=low + + * Change executable name to SixPACK to avoid conflict with another + program which is to be placed in Debian (Closes: #397873 again!). + + -- Carlo Segre Sat, 11 Nov 2006 15:37:31 -0600 + +sixpack (0.57-3) unstable; urgency=low + + * Clean up debian/copyright and add a manpage + * First Debian release (Closes: #397873) + + -- Carlo Segre Thu, 9 Nov 2006 22:37:18 -0600 + +sixpack (0.57-2) unstable; urgency=low + + * Convert to python-central build system + * Corrected program version number in spglobalfuncs.py + + -- Carlo Segre Thu, 31 Aug 2006 09:20:26 -0500 + +sixpack (0.57-1) unstable; urgency=low + + * New upstream release + + -- Carlo Segre Fri, 26 May 2006 00:29:50 -0500 + +sixpack (0.55-3) unstable; urgency=low + + * Corrected typo in previous patch (oops!) + + -- Carlo Segre Tue, 18 Apr 2006 08:36:19 -0500 + +sixpack (0.55-2) unstable; urgency=low + + * Fix more SystemButtonFace lines in lsqfitter.py and sixpack.py + + -- Carlo Segre Mon, 17 Apr 2006 15:00:28 -0500 + +sixpack (0.55-1) unstable; urgency=low + + * New upstream release + + -- Carlo Segre Sat, 15 Apr 2006 18:03:52 -0500 + +sixpack (0.52-3) unstable; urgency=low + + * Apply patches by Ken McIvor to avoid errors on Linux systems when + SystemButtonFace is invoked. + + -- Carlo Segre Wed, 25 Jan 2006 22:40:50 -0600 + +sixpack (0.52-2) unstable; urgency=low + + * Change dependency to "tix" OR "tix8.1" for sid and etch + + -- Carlo Segre Mon, 16 Jan 2006 00:03:50 -0600 + +sixpack (0.52-1) unstable; urgency=low + + * New upstream release + + -- Carlo Segre Sat, 28 Aug 2004 19:06:45 -0500 + +sixpack (0.50-1) unstable; urgency=low + + * New upstream release + + -- Carlo Segre Fri, 4 Jun 2004 00:47:06 -0500 + +sixpack (0.48-2) unstable; urgency=low + + * Fix build depends. + + -- Carlo Segre Fri, 4 Jun 2004 00:12:14 -0500 + +sixpack (0.48-1) unstable; urgency=low + + * New upstream release + + -- Carlo Segre Tue, 23 Dec 2003 17:18:53 -0600 + +sixpack (0.47-1) unstable; urgency=low + + * Initial Release. + + -- Carlo Segre Sun, 21 Dec 2003 22:37:48 -0600 + --- sixpack-0.66.orig/debian/compat +++ sixpack-0.66/debian/compat @@ -0,0 +1 @@ +5 --- sixpack-0.66.orig/debian/pycompat +++ sixpack-0.66/debian/pycompat @@ -0,0 +1 @@ +2 --- sixpack-0.66.orig/debian/copyright +++ sixpack-0.66/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Carlo Segre on +Sun, 21 Dec 2003 22:37:48 -0600. + +It was downloaded from http://www-ssrl.slac.stanford.edu/~swebb/sixpack.htm + +Upstream Author: Sam Webb + +Copyright (c) 2006 Samuel Webb, Stanford Synchrotron Radiation Laboratory + +NOTE: This package is not part of the Debian GNU/Linux distribution because +of its dependence on the pgplot5 package. + +The source code and documentation are copyrighted and distributed under the +terms of the following license: + +Permission to use and redistribute the source code or binary forms of this +software and its documentation, with or without modification is hereby +granted provided that the above notice of copyright, these terms of use, and +the disclaimer of warranty below appear in the source code and +documentation, and that none of the names of Stanford Synchrotron Research +Laboratory or the author appear in advertising or endorsement of works +derived from this software without specific prior written permission from +all parties. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +IN THIS SOFTWARE. --- sixpack-0.66.orig/debian/SIXpack.xpm +++ sixpack-0.66/debian/SIXpack.xpm @@ -0,0 +1,353 @@ +/* XPM */ +static char * sixpack_xpm[] = { +"32 32 318 2", +" c None", +". c #FFFFFF", +"+ c #FFF5FF", +"@ c #F8FCFD", +"# c #FFF5E9", +"$ c #9D1C09", +"% c #FFF2E8", +"& c #EEFCFD", +"* c #FFF8FF", +"= c #FAF8F9", +"- c #A11B02", +"; c #A21F0D", +"> c #A2171A", +", c #AF8070", +"' c #9F8B73", +") c #8B1E17", +"! c #B40F09", +"~ c #AB1C0E", +"{ c #AA1705", +"] c #FBFAFF", +"^ c #C11008", +"/ c #AB1C0C", +"( c #C7D1C8", +"_ c #D7E0DD", +": c #DBDFDE", +"< c #DDDDDD", +"[ c #DCDEDD", +"} c #D7E1D8", +"| c #D5E5DA", +"1 c #B81413", +"2 c #A91002", +"3 c #FEFCFD", +"4 c #FFF5F3", +"5 c #AE110A", +"6 c #DDDBCE", +"7 c #DDDCD8", +"8 c #DEDCDD", +"9 c #DDDCE1", +"0 c #E0E9E4", +"a c #AF160E", +"b c #F9FBED", +"c c #B8180C", +"d c #D2DDD9", +"e c #DADFDB", +"f c #DDE4DD", +"g c #030079", +"h c #01006C", +"i c #DDDDDB", +"j c #E7D7E4", +"k c #A8180D", +"l c #A05B4C", +"m c #B3121A", +"n c #AF0C11", +"o c #DEDDD9", +"p c #DED9DF", +"q c #E0DDE4", +"r c #D8DDD6", +"s c #010048", +"t c #010066", +"u c #020167", +"v c #DEE0D3", +"w c #00016D", +"x c #010050", +"y c #E4E0DF", +"z c #E1DDDE", +"A c #DCDEDB", +"B c #81271E", +"C c #B5120B", +"D c #F5FFFC", +"E c #FDFEF9", +"F c #ECFFFF", +"G c #B11008", +"H c #DCDAE7", +"I c #02035D", +"J c #02006D", +"K c #D2D2D2", +"L c #DADDE4", +"M c #000166", +"N c #DDDED9", +"O c #DCDED0", +"P c #00006C", +"Q c #010372", +"R c #DEDDDB", +"S c #DADFD8", +"T c #9A0A13", +"U c #F3D6C6", +"V c #FDFFFA", +"W c #F9FFFD", +"X c #A81913", +"Y c #DADBDD", +"Z c #01035A", +"` c #DFDCD5", +" . c #010068", +".. c #02036D", +"+. c #E5DFE3", +"@. c #DDDFD2", +"#. c #000065", +"$. c #DDDDDF", +"%. c #000064", +"&. c #DCDED9", +"*. c #DDDBE6", +"=. c #06056B", +"-. c #DEDFD1", +";. c #B7190E", +">. c #FEFBF2", +",. c #9F290D", +"'. c #DEDCDF", +"). c #100D42", +"!. c #090858", +"~. c #E3DEE5", +"{. c #D1D4C9", +"]. c #00005E", +"^. c #DAD9FF", +"/. c #000364", +"(. c #00005C", +"_. c #D5D6DB", +":. c #08086C", +"<. c #010165", +"[. c #000067", +"}. c #A31803", +"|. c #FDFFFE", +"1. c #FBFFFE", +"2. c #AF1709", +"3. c #05036E", +"4. c #000062", +"5. c #000261", +"6. c #000056", +"7. c #04044E", +"8. c #E0DAE6", +"9. c #08026C", +"0. c #000070", +"a. c #020065", +"b. c #B7B9B6", +"c. c #DCDCDC", +"d. c #A4150D", +"e. c #FDFDFD", +"f. c #FFFEFF", +"g. c #9A151A", +"h. c #D7DDDB", +"i. c #00006F", +"j. c #D8DBCA", +"k. c #030268", +"l. c #01017D", +"m. c #DEDFD9", +"n. c #D7E0E7", +"o. c #B0180B", +"p. c #F9FEF8", +"q. c #A91A0C", +"r. c #D9DBDA", +"s. c #03016E", +"t. c #CCD2C8", +"u. c #DBD9E4", +"v. c #D9DCE5", +"w. c #E2E0E5", +"x. c #030569", +"y. c #DEDEDC", +"z. c #AC1608", +"A. c #FDFDFF", +"B. c #F9FCFF", +"C. c #AC150E", +"D. c #E0DBDF", +"E. c #02006B", +"F. c #E5E0E4", +"G. c #110E65", +"H. c #E0DDD6", +"I. c #0E105A", +"J. c #000164", +"K. c #DCD9E0", +"L. c #BE0B0E", +"M. c #FBFFFB", +"N. c #FFFBF6", +"O. c #A51811", +"P. c #E0DCDD", +"Q. c #14106F", +"R. c #DBDBD9", +"S. c #DDDFEB", +"T. c #D6DBD7", +"U. c #DF686E", +"V. c #FBFFF1", +"W. c #B0171C", +"X. c #DBDBE7", +"Y. c #CDCDC1", +"Z. c #DDDEE2", +"`. c #DED9E0", +" + c #E7D5C9", +".+ c #9F1C21", +"++ c #FFF6ED", +"@+ c #AB191A", +"#+ c #E0DFDB", +"$+ c #E2DEDF", +"%+ c #D8D8D6", +"&+ c #040065", +"*+ c #01006F", +"=+ c #01006A", +"-+ c #E0E0E0", +";+ c #DDE2CE", +">+ c #E6E3DE", +",+ c #D3D9CF", +"'+ c #E8D5CE", +")+ c #A1221C", +"!+ c #F1FFFF", +"~+ c #BA1815", +"{+ c #00036C", +"]+ c #030069", +"^+ c #020266", +"/+ c #010163", +"(+ c #000269", +"_+ c #100968", +":+ c #DAD7EA", +"<+ c #DDDCE2", +"[+ c #D2535C", +"}+ c #9A1A0F", +"|+ c #E4E6E5", +"1+ c #000168", +"2+ c #000267", +"3+ c #0A0363", +"4+ c #B70F0C", +"5+ c #F6FFFE", +"6+ c #FEFEFE", +"7+ c #AD1508", +"8+ c #DADEDD", +"9+ c #00026D", +"0+ c #C2C3C5", +"a+ c #E0DDD4", +"b+ c #DDDFEE", +"c+ c #00016B", +"d+ c #DCDDE1", +"e+ c #DDE0CD", +"f+ c #AE150D", +"g+ c #FFFAFF", +"h+ c #A02021", +"i+ c #DADAD8", +"j+ c #DADBE0", +"k+ c #030365", +"l+ c #DEDED6", +"m+ c #D6DFE6", +"n+ c #B00E01", +"o+ c #FFFCFF", +"p+ c #A9150B", +"q+ c #DED9DD", +"r+ c #03006D", +"s+ c #020169", +"t+ c #AE0D12", +"u+ c #FAFAFC", +"v+ c #FEFEFC", +"w+ c #B61608", +"x+ c #DFDFD5", +"y+ c #DBDCDE", +"z+ c #DEDEDE", +"A+ c #A6180E", +"B+ c #FEFFFD", +"C+ c #FFFDF9", +"D+ c #A9140D", +"E+ c #030166", +"F+ c #DCDDD8", +"G+ c #DDDBDE", +"H+ c #E4D8DC", +"I+ c #AE130E", +"J+ c #F8F9FD", +"K+ c #F6FFFA", +"L+ c #B01206", +"M+ c #DFDDE8", +"N+ c #020070", +"O+ c #0C0960", +"P+ c #040464", +"Q+ c #B21619", +"R+ c #FFF4ED", +"S+ c #FCFEFD", +"T+ c #952C28", +"U+ c #C11511", +"V+ c #05046C", +"W+ c #AC121C", +"X+ c #CA2020", +"Y+ c #FDFEFF", +"Z+ c #FEFFFF", +"`+ c #F6FFFB", +" @ c #A8130F", +".@ c #DDE8EC", +"+@ c #D3E2DD", +"@@ c #DEE2EE", +"#@ c #00025F", +"$@ c #010075", +"%@ c #DAD9DE", +"&@ c #E2D7DF", +"*@ c #B40C03", +"=@ c #FFFCF7", +"-@ c #AB1507", +";@ c #CAE4DB", +">@ c #DEDDE3", +",@ c #E0DCD9", +"'@ c #D3E2DF", +")@ c #E0E4E3", +"!@ c #BC0F15", +"~@ c #FFFEF1", +"{@ c #FCFFFF", +"]@ c #AA1710", +"^@ c #AD1406", +"/@ c #DCDDDF", +"(@ c #E0D9E0", +"_@ c #BC1E1B", +":@ c #AB160F", +"<@ c #FEFFFA", +"[@ c #FEFFF9", +"}@ c #AA1D01", +"|@ c #B6110B", +"1@ c #AB1B10", +"2@ c #AB120D", +"3@ c #A91A1C", +"4@ c #AD131D", +"5@ c #A81A18", +"6@ c #AA160C", +"7@ c #A31B0D", +"8@ c #A81B00", +"9@ c #FFF9F0", +"0@ c #FFFFFB", +"a@ c #FDFCEA", +"b@ c #F7FFE8", +"c@ c #F5FFFA", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . + @ # $ $ % & * . . . . . . . . . . . . ", +". . . . . . . . . = $ $ - ; > , ' ) ! ~ { $ ] . . . . . . . . . ", +". . . . . . . . ^ / ( _ : < < < < < < [ } | 1 2 3 . . . . . . . ", +". . . . . . 4 5 6 7 8 < < < < < < < < < < < 9 0 a $ . . . . . . ", +". . . . . b c d e < < < < f < g h < i < < < < < j k l . . . . . ", +". . . . m n o o p q < < < r s t u < < < v w x y z A B C D . . . ", +". . E F G 8 H I J I K < < < L t M N < < < O t P Q R S T U V . . ", +". . W X A Y Z ` ...+.@.< < L t #.< < < < $.%.u &.*.=.-.;.>.. . ", +". . ,.'.< ).!.~.< {.].t < < ^.t /.N < < < < (.M _.:.<.[.d }.|.. ", +". 1.2.e < 3. .4.I 5.t t 6.< 7.t #.o 8.!.!.9.[.u 0.a.b.c.c.d.e.. ", +"f.g.h.< < < t t I < < t i.j.0.t <.5.< .k.< l.u m.< < < < n.o.p.", +". q.$.< < N < < < < r.t s.< < t.u.v.w.< < < x.t y.< < < < < z.A.", +"B.C.D.< < < < %.t E.F.G.I < < < < < < < H.I.J.t K.< < < < < L.M.", +"N.O.P.< < < N u .I Q.I < < < < < < < < R.S.[.t T.< < < < < U.$ ", +"V.W.< < < < < X.< Y.Z.< < < < < < < < < < < `.< t t < < < < +.+", +"++@+#+$.$+%+&+*+=+-+$.< < < < < < < < < < < ;+< t t >+< ,+< '+)+", +"!+~+{+]+^+/+/+(+h _+i < < < < < < < < t t t :+t t < < < <+< [+$ ", +"f.}+|+1+/.t E.< 2+3+< . . .< < < < < [ t t t t t < < < < < 4+5+", +"6+7+8+9+0+N <.a+b+c+d+< . .< < < < < < < t t t < < e+t t < f+g+", +". h+8+i+< j+t k+t t < l+< . .< < . . . .< t t t t t t t m+n+o+", +". f.p+q+< < r+t t t s+ . . . .< . . . . .< t t t t t t < t+u+. ", +". v+w+x+< < < y+< ]+t < < . .< . .< < < < < t t < < < z+A+B+. ", +". . C+D+< < < < c.E+t F+G+ .t < . .< < < < < < t t < H+I+J+. . ", +". . 6+K+L+< < < M+ .N+O+< P+t < . .< < < .t < t t < Q+R+. . . ", +". . . S+T+U+< < '.V+t t t t t K.< . . . . .t < < < W+X+Y+. . . ", +". . . . Z+`+ @.@+@< 9 9 @@r+#@$@9 . . . .%@< < &@*@$ 1.. . . . ", +". . . . . 6+=@-@$ ;@d+< 9 $.i >@< < < N ,@< '@)@!@~@{@. . . . . ", +". . . . . . . . $ ]@^@< A /@< < < < [ ,@(@_@:@$ <@f.. . . . . . ", +". . . . . . . . . . [@}@|@1@2@3@4@5@6@7@8@9@0@. . . . . . . . . ", +". . . . . . . . . . . . . . . a@b@>.c@. 6+. . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "}; --- sixpack-0.66.orig/debian/manpages +++ sixpack-0.66/debian/manpages @@ -0,0 +1 @@ +debian/SIXpack.1 --- sixpack-0.66.orig/debian/SIXpack.1 +++ sixpack-0.66/debian/SIXpack.1 @@ -0,0 +1,37 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH SIXPACK 1 "November 1, 2006" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +SIXpack \- a full-featured XAS analysis package +.SH SYNOPSIS +.B sixpack +.SH DESCRIPTION +This manual page briefly documents the +.B SIXpack +command. +.PP +This manual page was written for the Debian distribution +because the original program does not have a manual page. +The latest documentation may be found at: +.br +http://www-ssrl.slac.stanford.edu/~swebb/sixpack.htm +.PP +.SH OPTIONS +This program has no options. +.SH AUTHOR +This manual page was written by Carlo Segre , +for the Debian project (but may be used by others). --- sixpack-0.66.orig/debian/rules +++ sixpack-0.66/debian/rules @@ -0,0 +1,100 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +PYVERS=$(shell pyversions -vr) + +build: build-stamp + +build-stamp: $(QUILT_STAMPFN) build-prereq $(PYVERS:%=build-python%) +# This is to force building of the sixpack script without an explicit +# python version in the #! line. + python setup.py build_scripts --build-dir=build/scripts || exit 1 ; + touch $@ + +build-prereq: +# Rename main program to the Debian name. This is to avoid a naming conflict +# with a command line program in the EMBOSS suite. Not the optimal solution +# but acceptable. (CUS) + cp -a sixpack.py SIXpack + +build-python%: + dh_testdir + python$* setup.py build || exit 1; + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp build-python* + + # Clean up after the build process. + /usr/bin/python setup.py clean + rm -f *.pyc +# Remove the copied file. + rm -f SIXpack + rm -rf build + + dh_clean + +install: build install-prereq install-all-pythons + +install-prereq: + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + +install-all-pythons: $(PYVERS:%=install-python%) +# This is to force installation of the sixpack script without a specific +# version of python explicitly names in the #! line (Debian idiosyncracy). +# It actually overwrites the scripts installed by each of the install-python% +# rules below... + python setup.py install_scripts --force \ + --install-dir=$(CURDIR)/debian/sixpack/usr/bin \ + --build-dir=build/scripts || exit 1 ; + cp -a xbms/* $(CURDIR)/debian/sixpack/usr/share/SIXpack/ + cp -a splogo.gif $(CURDIR)/debian/sixpack/usr/share/SIXpack/splogo.gif + cp -a test.inp $(CURDIR)/debian/sixpack/usr/share/SIXpack/ + cp -a mnexafsfit.iff $(CURDIR)/debian/sixpack/usr/share/SIXpack/ + dh_install debian/SIXpack.xpm usr/share/pixmaps + dh_install debian/SIXpack.desktop usr/share/applications + +install-python%: + # Install the package into debian/sixpack. + dh_installdirs usr/lib/python$* usr/lib/python$*/site-packages + python$* setup.py install \ + --prefix=$(CURDIR)/debian/sixpack/usr || exit 1; + -find $(CURDIR)/debian/ -name '*.py[co]' | xargs rm -f + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i + dh_installexamples -i + dh_installmenu -i +# dh_desktop -i + dh_installman -i + dh_installinfo -i + dh_installchangelogs -i + dh_pycentral + dh_link -i + dh_strip -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do by default. + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- sixpack-0.66.orig/debian/SIXpack.desktop +++ sixpack-0.66/debian/SIXpack.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=SIXpack +Comment=EXAFS data analysis +GenericName=EXAFS analysis +Icon=/usr/share/pixmaps/SIXpack.xpm +Exec=SIXpack %F +Terminal=false +StartupNotify=true +Categories=Education;Science;DataVisualization; --- sixpack-0.66.orig/debian/patches/series +++ sixpack-0.66/debian/patches/series @@ -0,0 +1,4 @@ +distribution_info +fix_paths +add_newlines +remove_numeric --- sixpack-0.66.orig/debian/patches/fix_paths +++ sixpack-0.66/debian/patches/fix_paths @@ -0,0 +1,135 @@ +--- a/lsqfitter.py ++++ b/lsqfitter.py +@@ -12,6 +12,7 @@ + import tkMessageBox + import tkSimpleDialog + import os ++import sys + import math + import types + from string import * +@@ -21,11 +22,11 @@ + #Pmw.initialise(root) + + if os.name=='nt':os.sep='/' +-filepath=os.getcwd()+os.sep ++sharepath=os.sep+"usr"+os.sep+"share"+os.sep+"SIXpack"+os.sep + pm='+/-' + + iffc=Ifeffit(screen_echo=1) +-iffc.ifeffit("load mnexafsfit.iff") ++iffc.ifeffit("load /usr/share/SIXpack/mnexafsfit.iff") + + + ############################################################### +@@ -168,6 +169,8 @@ + filebar=Frame(efwin, relief=SUNKEN,bd=2) + self.fileentry=Pmw.EntryField(filebar, label_text="Data File:",labelpos=W,validate=None,entry_width=80) + self.fileentry.pack(side=LEFT,padx=5,pady=2,fill=X) ++ # point to proper location for images (CUS) ++ b=Button(filebar,bitmap="@"+sharepath+"openfolder.xbm",command=self.fileme,height=21,width=30,bg='lightyellow') + b=Button(filebar,bitmap="@"+filepath+"xbms"+os.sep+"openfolder.xbm",command=self.fileme,height=21,width=30,bg='lightyellow') + b.pack(side=LEFT,padx=2,pady=2) + b=Button(filebar,text="Load",bg='darkgreen',fg='snow',width=7,command=self.load_data_file) +--- a/sixpack.py ++++ b/sixpack.py +@@ -1,3 +1,5 @@ ++#!/usr/bin/env python ++ + #MAIN SamXAS Routine GUI + + from Tkinter import * +@@ -8,6 +10,7 @@ + import tkMessageBox + import Pmw + import os ++import sys + import Tix + from math import * + from string import * +@@ -20,14 +23,15 @@ + import cbselfabs + + root=Tix.Tk() +-root.title("SixPACK") ++root.title("SIXpack") + Pmw.initialise(root) + pm='+/-' + if os.name=='nt':os.sep='/' ++sharepath=os.sep+"usr"+os.sep+"share"+os.sep+"SIXpack"+os.sep + filepath=os.getcwd()+os.sep + #if count(upper(filepath),'IFEFFIT')>0:filepath=filepath+'sixpack'+os.sep + iffc=Ifeffit(screen_echo=1) +-iffc.ifeffit("load mnexafsfit.iff") ++iffc.ifeffit("load /usr/share/SIXpack/mnexafsfit.iff") + + global lastfeffdir + lastfeffdir='' +@@ -341,6 +345,8 @@ + cb.pack(side=LEFT,padx=10,pady=2) + cb=Checkbutton(f,text="Set DEGEN = 1?",variable=self.dset,anchor=W) + cb.pack(side=LEFT,padx=10,pady=2) ++ # point to proper location for images (CUS) ++ b=Button(f,bitmap="@"+sharepath+"openfolder.xbm",command=self.feffpathme,height=21,width=30,bg='lightyellow') + b=Button(f,bitmap="@"+filepath+"xbms"+os.sep+"openfolder.xbm",command=self.feffpathme,height=21,width=30,bg='lightyellow') + b.pack(side=LEFT,padx=2,pady=2) + l=Label(f,text="Choose Path") +@@ -490,7 +496,8 @@ + filebar=Frame(adwin, relief=SUNKEN,bd=2) + self.fileentry=Pmw.EntryField(filebar, label_text="Data File:",labelpos=W,validate=None,entry_width=60) + self.fileentry.pack(side=LEFT,padx=5,pady=2,fill=X) +- b=Button(filebar,bitmap="@"+filepath+"xbms"+os.sep+"openfolder.xbm",command=self.fileme,height=21,width=30,bg='lightyellow') ++ # point to proper location for images (CUS) ++ b=Button(filebar,bitmap="@"+sharepath+"openfolder.xbm",command=self.fileme,height=21,width=30,bg='lightyellow') + b.pack(side=LEFT,padx=2,pady=2) + b=Button(filebar,text="Load",bg='darkgreen',fg='snow',command=self.load_data_file) + b.pack(side=LEFT,padx=2,pady=2) +@@ -3701,7 +3708,7 @@ + class SamXAS: + #main window + #Logo image +- logo=PhotoImage(file=filepath+"splogo.gif") ++ logo=PhotoImage(file=sharepath+"splogo.gif") + px=logo.width() + py=logo.height() + samlogo=Canvas(root,borderwidth=2, relief=GROOVE, height=py, width=px) +@@ -3753,9 +3760,9 @@ + if line[a] not in ['<','>','p','/']: + stripline=stripline+line[a] + if float(stripline)<=float(version): +- spversion='You have the latest version of SixPack' ++ spversion='You have the latest version of SIXpack' + else: +- spversion='Version '+stripline+' of SixPack now available!' ++ spversion='Version '+stripline+' of SIXpack now available!' + except: + spversion='Cannot check current version' + #Program Buttons +@@ -3769,7 +3776,7 @@ + but3=Button(root, text="Least Sq. Fitting", font=butfont,command=RunLSF, width=defbutwdth) + but4=Button(root, text="PC Analysis", font=butfont,command=RunPCA, width=defbutwdth) + but6=Button(root, text="Make FEFF SS Paths", font=butfont,command=PT, width=defbutwdth) +- but7=Button(root, text="About SixPACK/SamXAS", font=butfont,command=callprogramabout, width=defbutwdth) ++ but7=Button(root, text="About SIXpack/SamXAS", font=butfont,command=callprogramabout, width=defbutwdth) + butf=Button(root, text="Quit", font=butfont,command=root.quit, width=defbutwdth) + #grid these in main window + i=0 +--- a/spsamview.py ++++ b/spsamview.py +@@ -121,12 +121,14 @@ + l.pack(side=TOP,fill=X,padx=2,pady=2) + f1=Frame(e0win) + f1.pack(side=TOP,padx=5,pady=2) +- b=Button(f1,text='prev',bitmap="@"+filepath+"xbms"+os.sep+"previous.xbm") ++ # point to proper location for images (CUS) ++ b=Button(f1,text='prev',bitmap="@"+os.sep+"usr"+os.sep+"share"+os.sep+"SIXpack"+os.sep+"previous.xbm") + b.bind("",self.e0moveline) + b.pack(side=LEFT,padx=2,pady=5) + b=Button(f1,text="Find Data E0",width=20,command=self.findenot,bg='darkblue',fg='snow') + b.pack(side=LEFT,padx=5,pady=5) +- b=Button(f1,text='next',bitmap="@"+filepath+"xbms"+os.sep+"next.xbm") ++ # point to proper location for images (CUS) ++ b=Button(f1,text='next',bitmap="@"+os.sep+"usr"+os.sep+"share"+os.sep+"SIXpack"+os.sep+"next.xbm") + b.bind("",self.e0moveline) + b.pack(side=LEFT,padx=2,pady=5) + self.e0app=Pmw.EntryField(e0win,labelpos='w',label_text='Apparent: ',value='0',validate='real') --- sixpack-0.66.orig/debian/patches/remove_numeric +++ sixpack-0.66/debian/patches/remove_numeric @@ -0,0 +1,180 @@ +--- a/lsqfitter.py ++++ b/lsqfitter.py +@@ -3,7 +3,7 @@ + from spdirvars import * + from spglobalfuncs import * + import spplotter +-from Numeric import * ++from numpy import * + from Tkinter import * + from Ifeffit import * + import Pmw +--- a/spsamview.py ++++ b/spsamview.py +@@ -3,7 +3,7 @@ + import xasinput + from spdirvars import * + from spglobalfuncs import * +-from Numeric import * ++from numpy import * + from Tkinter import * + import Pmw + import Tix +@@ -13,7 +13,6 @@ + import os + import math + from string import * +-import MLab + from Scientific.Functions.LeastSquares import leastSquaresFit + + #root=Tix.Tk() +@@ -714,8 +713,8 @@ + def getderiv(self,x,y): + #returns deriv in ans(x,y) + ans=[] +- difx=MLab.diff(x,n=1) +- dify=MLab.diff(y,n=1) ++ difx=diff(x,n=1) ++ dify=diff(y,n=1) + ans.append(self.dxdata(x)) + ans.append(dify/difx) + return ans +--- a/func.py ++++ b/func.py +@@ -1,11 +1,11 @@ +-import Numeric +-from Numeric import * ++import numpy ++from numpy import * + import operator + import math + from types import * + + ArrayType = type(asarray(1.0)) +-UfuncType = type(Numeric.add) ++UfuncType = type(numpy.add) + + # unary function objects (maybe rename to UN_FUNC?) + +@@ -19,22 +19,22 @@ + return UnCompose(self, f) + + def __add__(self, f): +- return BinCompose(Numeric.add, self, f) ++ return BinCompose(numpy.add, self, f) + + def __sub__(self, f): +- return BinCompose(Numeric.subtract, self, f) ++ return BinCompose(numpy.subtract, self, f) + + def __mul__(self, f): +- return BinCompose(Numeric.multiply, self, f) ++ return BinCompose(numpy.multiply, self, f) + + def __div__(self, f): +- return BinCompose(Numeric.divide, self, f) ++ return BinCompose(numpy.divide, self, f) + + def __neg__(self): +- return UnCompose(Numeric.negative, self) ++ return UnCompose(numpy.negative, self) + + def __pow__(self, f): +- return BinCompose(Numeric.power, self, f) ++ return BinCompose(numpy.power, self, f) + + def __coerce__(self, x): + if type(x) in [IntType, FloatType, LongType, ComplexType]: +@@ -50,10 +50,10 @@ + return self.call(arg) + + def exp(self): +- return UnCompose(Numeric.exp, self) ++ return UnCompose(numpy.exp, self) + + def log(self): +- return UnCompose(Numeric.log, self) ++ return UnCompose(numpy.log, self) + + + +--- a/spkpca.py ++++ b/spkpca.py +@@ -3,7 +3,7 @@ + import xasinput + from spdirvars import * + from spglobalfuncs import * +-from Numeric import * ++from numpy import * + from Tkinter import * + #from Ifeffit import * + import Pmw +@@ -15,7 +15,6 @@ + import math + import types + from string import * +-import LinearAlgebra + import spline + import varimax + +@@ -736,7 +735,7 @@ + #reshape datmat + datmat=transpose(datmat) + #do svd and eigens for pca +- (evect,eval,weight)=LinearAlgebra.singular_value_decomposition(datmat) ++ (evect,eval,weight)=linalg.singular_value_decomposition(datmat) + evalmat=identity(len(eval))*eval + #prop=matrixmultiply(evalmat,weight) + prop=weight +--- a/xasinput.py ++++ b/xasinput.py +@@ -17,7 +17,7 @@ + # self.iF -- will be array if multielement is used + # self.ICR -- data for Ge13's, else array of ones + +-from Numeric import * ++from numpy import * + from string import * + from struct import * + import Pmw +--- a/varimax.py ++++ b/varimax.py +@@ -4,10 +4,8 @@ + #Adapted from MATLAB code modified by Tevor Park in 2002 from original code by J.O. Ramsay + # + +-from Numeric import * ++from numpy import * + from math import * +-import MLab +-import LinearAlgebra + + def angle(z): + a=z.real +@@ -15,7 +13,7 @@ + return arctan2(b,a) + + def var(z): +- s=MLab.std(z) ++ s=std(z) + return s**2 + + def vcomplex(a,b): +@@ -41,7 +39,7 @@ + if len(target_basis.shape)!=2: + raise ValueError, 'TARGET_BASIS must be 2-dimensional' + if alltrue(target_basis.shape==(n,n)): +- amat=LinearAlgebra.solve_linear_equations(target_basis,amat) ++ amat=linalg.solve_linear_equations(target_basis,amat) + else: + raise ValueError, 'TARGET_BASIS must be a basis for the column space' + else: +--- a/spline.py ++++ b/spline.py +@@ -1,5 +1,5 @@ + import func +-from Numeric import * ++from numpy import * + + BadInput = "Bad xa input to routine splint." + --- sixpack-0.66.orig/debian/patches/distribution_info +++ sixpack-0.66/debian/patches/distribution_info @@ -0,0 +1,48 @@ +--- a/setup.py ++++ b/setup.py +@@ -4,9 +4,16 @@ + #import py2exe + import spglobalfuncs + +-setup(name="SixPACK", +- scripts=["sixpack.py"], ++setup(name="sixpack", + version=spglobalfuncs.version, + author="Sam Webb", ++ author_email="samwebb@slac.stanford.edu", ++ description="A full-featured package for XAS analysis", ++ scripts=["SIXpack"], ++ py_modules=[ ++ "atomic_sub", "cbselfabs", "func", "lsqfitter", ++ "mucal", "spdirvars", "spglobalfuncs", ++ "spkpca", "spline", "spplotter", "spsamview", ++ "tkFileDialogDir", "varimax", "xasinput" ++ ] + ) +- +--- a/spglobalfuncs.py ++++ b/spglobalfuncs.py +@@ -9,7 +9,7 @@ + from math import * + from string import * + +-version='0.64' ++version='0.66' + + #file dialog + def ask_for_file(defaults,dir,check=1): +@@ -111,7 +111,7 @@ + def programabout(root): + Pmw.aboutversion(version) + Pmw.aboutcopyright('Copyright Samuel Webb, 2006\nStanford Synchrotron Radiation Laboratory') +- Pmw.aboutcontact("""SixPACK is Sam's Interface for XAS Package ++ Pmw.aboutcontact("""SIXpack is Sam's Interface for XAS Package + Unifying SamView with SamXAS + + email: swebb@ssrl.slac.stanford.edu +@@ -120,4 +120,4 @@ + Reference: + Webb S.M. (2005) "Sixpack: A graphical user interface for XAS analysis using IFEFFIT." + Physica Scripta, T115, 1011-1014. """) +- about=Pmw.AboutDialog(root,applicationname='SixPACK') ++ about=Pmw.AboutDialog(root,applicationname='SIXpack') --- sixpack-0.66.orig/debian/patches/add_newlines +++ sixpack-0.66/debian/patches/add_newlines @@ -0,0 +1,64 @@ +--- a/spplotter.py ++++ b/spplotter.py +@@ -344,4 +344,4 @@ + #export to clipboard + self.root.clipboard_clear() + self.root.clipboard_append(text) +- setstatus(self.status,"Graph data copied to clipboard") +\ No newline at end of file ++ setstatus(self.status,"Graph data copied to clipboard") +--- a/spsamview.py ++++ b/spsamview.py +@@ -1466,4 +1466,4 @@ + + #start event handler + #Main(root) +-#root.mainloop() +\ No newline at end of file ++#root.mainloop() +--- a/xasinput.py ++++ b/xasinput.py +@@ -1580,6 +1580,4 @@ + return generic(fn,master) + #except: + # return generic(fn,master) +- +- + +\ No newline at end of file +--- a/examples/cumetal.prm ++++ b/examples/cumetal.prm +@@ -206,4 +206,4 @@ + 1 + G + 0.000491715072597 +-END +\ No newline at end of file ++END +--- a/examples/mncalib.prm ++++ b/examples/mncalib.prm +@@ -32,4 +32,4 @@ + 2 + 2 + 0.0 +-END +\ No newline at end of file ++END +--- a/examples/selfabsex1.prm ++++ b/examples/selfabsex1.prm +@@ -32,4 +32,4 @@ + 4.29 + 5.29 + 0.0 +-END +\ No newline at end of file ++END +--- a/examples/selfabsex2.prm ++++ b/examples/selfabsex2.prm +@@ -32,4 +32,4 @@ + 4.29 + 5.29 + 0.0 +-END +\ No newline at end of file ++END