Clarifying affiliation and updating dependencies
authorEd Page <eopage@byu.net>
Fri, 24 Sep 2010 02:30:12 +0000 (21:30 -0500)
committerEd Page <eopage@byu.net>
Fri, 24 Sep 2010 02:30:12 +0000 (21:30 -0500)
src/windows/_base.py
support/builddeb.py

index 6983439..2efba0b 100644 (file)
@@ -636,7 +636,7 @@ class AboutWindow(BasicWindow):
 
                self._titleLabel = gtk.Label()
                self._titleLabel.set_markup("""
 
                self._titleLabel = gtk.Label()
                self._titleLabel.set_markup("""
-<big><b>Mormon Channel</b></big>
+<big><b>Waters of Shiloahl</b></big>
 <i>Maemo Edition</i>
 Version %s
 """ % (constants.__version__, ))
 <i>Maemo Edition</i>
 Version %s
 """ % (constants.__version__, ))
@@ -644,19 +644,30 @@ Version %s
 
                self._copyLabel = gtk.Label()
                self._copyLabel.set_markup("""
 
                self._copyLabel = gtk.Label()
                self._copyLabel.set_markup("""
-<small>(c) 2010 Intellectual Reserve, Inc.
-All rights reserved.</small>
+<small>Developed by: Ed Page
+Images by: Various Sources, See COPYING for author and license information (mix of various CC licenses, commercial, and non-commercial
+This application nor various images are not endorsed by The Church of Jesus Christ of Latter-day Saints</small>
 """)
                self._copyLabel.set_property("justify", gtk.JUSTIFY_CENTER)
 
 """)
                self._copyLabel.set_property("justify", gtk.JUSTIFY_CENTER)
 
-               self._linkButton = gtk.LinkButton("http://www.lds.org")
-               self._linkButton.set_label("LDS.org")
+               self._linkButton = gtk.LinkButton("http://watersofshiloah.garage.maemo.org")
+               self._linkButton.set_label("Waters of Shiloah")
                self._linkButton.connect("clicked", self._on_website)
 
                self._linkButton.connect("clicked", self._on_website)
 
+               self._radioLinkButton = gtk.LinkButton("http://radio.lds.org")
+               self._radioLinkButton.set_label("Mormon Channel")
+               self._radioLinkButton.connect("clicked", self._on_website)
+
+               self._ldsLinkButton = gtk.LinkButton("http://www.lds.org")
+               self._ldsLinkButton.set_label("LDS.org")
+               self._ldsLinkButton.connect("clicked", self._on_website)
+
                self._spacedLayout = gtk.VBox(True)
                self._spacedLayout.pack_start(self._titleLabel, False, False)
                self._spacedLayout.pack_start(self._copyLabel, False, False)
                self._spacedLayout.pack_start(self._linkButton, False, False)
                self._spacedLayout = gtk.VBox(True)
                self._spacedLayout.pack_start(self._titleLabel, False, False)
                self._spacedLayout.pack_start(self._copyLabel, False, False)
                self._spacedLayout.pack_start(self._linkButton, False, False)
+               self._spacedLayout.pack_start(self._radioLinkButton, False, False)
+               self._spacedLayout.pack_start(self._ldsLinkButton, False, False)
 
                self._separator = gtk.HSeparator()
                self._presenter = presenter.NavControl(self._player, self._store)
 
                self._separator = gtk.HSeparator()
                self._presenter = presenter.NavControl(self._player, self._store)
index fa86426..a99e14c 100755 (executable)
@@ -12,13 +12,15 @@ import constants
 
 
 __appname__ = constants.__app_name__
 
 
 __appname__ = constants.__app_name__
-__description__ = """Player for inspirational streaming radio and audiobooks including the KJV Bible
+__description__ = """Streaming media player for inspirational streaming radio and audiobooks including the KJV Bible
 Supports streaming:
 * "Mormon Channel" inspirational radio station
 * Conference precedings and magazines from The Church of Jesus Christ of Latter-day Saints
 * Scriptures, including King James Version of the Bible and the Book of Mormon
 .
 Supports streaming:
 * "Mormon Channel" inspirational radio station
 * Conference precedings and magazines from The Church of Jesus Christ of Latter-day Saints
 * Scriptures, including King James Version of the Bible and the Book of Mormon
 .
-Homepage:
+.This application is not endorsed by The Church of Jesus Christ of Latter-day Saints
+.
+Homepage: http://watersofshiloah.garage.maemo.org
 """
 __author__ = "Ed Page"
 __email__ = "eopage@byu.net"
 """
 __author__ = "Ed Page"
 __email__ = "eopage@byu.net"
@@ -79,9 +81,9 @@ def build_package(distribution):
        ])
        maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
        p.depends += {
        ])
        maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
        p.depends += {
-               "debian": ", python-glade2",
-               "diablo": maemoSpecificDepends + "",
-               "fremantle": maemoSpecificDepends + ", python-glade2",
+               "debian": "",
+               "diablo": maemoSpecificDepends,
+               "fremantle": maemoSpecificDepends,
        }[distribution]
        p.recommends = ", ".join([
        ])
        }[distribution]
        p.recommends = ", ".join([
        ])