← Back to branch summary

~ubuntu-branches/ubuntu/natty/pymca/natty

« back to all changes in this revision

Viewing changes to PyMca/PyMcaMain.py

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad
  • Date: 2010-11-18 22:28:16 UTC
  • mfrom: (2.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20101118222816-b8g5f3bmjp97cckq
Tags: 4.4.0-2ubuntu1
https://launchpad.net/bugs/677221
* Merge from debian unstable (LP: #677221). Remaining changes:
  - rm -f the data files from the pymca package instead of rm. fix FTBFS

Show diffs side-by-side

added added

removed removed

Lines of Context:
PyMca/PyMcaMain.py
1617
1617
                self.menuBrowser.setCaption(qt.QString("Main Menu Help"))
1618
1618
            else:
1619
1619
                self.menuBrowser.setWindowTitle(qt.QString("Main Menu Help"))
1620
 
#            dir=os.path.dirname(PyMcaMdi.__file__)
1621
1620
            dir="/usr/share/doc/pymca"
1622
1621
            if not os.path.exists(os.path.join(dir,"HTML","Menu.html")):
1623
1622
                dir = os.path.dirname(dir)
1639
1638
                self.displayBrowser.setCaption(qt.QString("Data Display HOWTO"))
1640
1639
            else:
1641
1640
                self.displayBrowser.setWindowTitle(qt.QString("Data Display HOWTO"))                
1642
 
#            dir=os.path.dirname(PyMcaMdi.__file__)
1643
1641
            dir="/usr/share/doc/pymca"
1644
1642
            if not os.path.exists(os.path.join(dir,"HTML","Display-HOWTO.html")):
1645
1643
                dir = os.path.dirname(dir)
1661
1659
                self.mcaBrowser.setCaption(qt.QString("MCA HOWTO"))
1662
1660
            else:
1663
1661
                self.mcaBrowser.setWindowTitle(qt.QString("MCA HOWTO"))
1664
 
#            dir=os.path.dirname(PyMcaMdi.__file__)
1665
1662
            dir="/usr/share/doc/pymca"
1666
1663
            if not os.path.exists(dir+"/HTML"+"/MCA-HOWTO.html"):
1667
1664
                dir = os.path.dirname(dir)