diff -Nru openastro.org-1.1.48/debian/changelog openastro.org-1.1.50/debian/changelog --- openastro.org-1.1.48/debian/changelog 2015-02-15 19:37:40.000000000 +0000 +++ openastro.org-1.1.50/debian/changelog 2017-07-09 10:01:29.000000000 +0000 @@ -1,4 +1,4 @@ -openastro.org (1.1.48-0ubuntu1~trusty) trusty; urgency=low +openastro.org (1.1.50-0ubuntu1~trusty) trusty; urgency=low -- Pelle van der Scheer Wed, 02 Jan 2013 21:22:35 +0100 diff -Nru openastro.org-1.1.48/debian/control openastro.org-1.1.50/debian/control --- openastro.org-1.1.48/debian/control 2015-02-15 19:37:40.000000000 +0000 +++ openastro.org-1.1.50/debian/control 2017-07-09 09:58:50.000000000 +0000 @@ -8,7 +8,7 @@ Package: openastro.org Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, openastro.org-data, pyswisseph, python-gtk2, python-dateutil, python-rsvg, python-cairo, python-tz, imagemagick +Depends: ${misc:Depends}, ${python:Depends}, openastro.org-data, pyswisseph, python-gtk2, python-dateutil, python-rsvg, python-cairo, python-tz, imagemagick, librsvg2-bin Description: A fully featured Open Source Astrology software Current features include: * Natal/Radix Charts Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/ar/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/ar/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/bg/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/bg/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/ca/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/ca/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/cs/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/cs/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/da/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/da/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/de/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/de/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/el/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/el/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/en/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/en/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/eo/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/eo/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/es/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/es/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/fi/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/fi/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/fr/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/fr/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/frp/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/frp/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/hu/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/hu/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/it/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/it/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/ja/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/ja/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/nb/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/nb/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/nds/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/nds/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/nl/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/nl/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/pl/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/pl/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/pt_BR/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/pt_BR/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/rom/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/rom/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/ru/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/ru/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/sr@latin/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/sr@latin/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/sv/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/sv/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/ta/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/ta/LC_MESSAGES/openastro.mo differ diff -Nru openastro.org-1.1.48/locale/templates/openastro.pot openastro.org-1.1.50/locale/templates/openastro.pot --- openastro.org-1.1.48/locale/templates/openastro.pot 2015-02-15 19:37:40.000000000 +0000 +++ openastro.org-1.1.50/locale/templates/openastro.pot 2017-07-09 09:58:50.000000000 +0000 @@ -10,8 +10,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-15 18:48+0000\n" -"X-Generator: Launchpad (build 16963)\n" +"X-Launchpad-Export-Date: 2017-03-11 18:36+0000\n" +"X-Generator: Launchpad (build 18331)\n" "Generated-By: pygettext.py 1.5\n" #: openastro.org/current/openastro:385 Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/uk/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/uk/LC_MESSAGES/openastro.mo differ Binary files /tmp/tmpakSqqM/vg7bIxOh9V/openastro.org-1.1.48/locale/zh_TW/LC_MESSAGES/openastro.mo and /tmp/tmpakSqqM/KWYnfrevbL/openastro.org-1.1.50/locale/zh_TW/LC_MESSAGES/openastro.mo differ diff -Nru openastro.org-1.1.48/openastro openastro.org-1.1.50/openastro --- openastro.org-1.1.48/openastro 2015-02-15 19:37:40.000000000 +0000 +++ openastro.org-1.1.50/openastro 2017-07-09 09:58:50.000000000 +0000 @@ -41,19 +41,27 @@ import rsvg #internal openastro modules +sys.path.append("/usr/lib/python2.7/dist-packages") #trying to 'fix' some problems importing openastromod on some distros +sys.path.append("/usr/lib/python2.7/site-packages") #trying to 'fix' some problems importing openastromod on some distros from openastromod import zonetab, geoname, importfile, dignities, timeoutsocket, swiss as ephemeris #debug LOCAL=False DEBUG=False -VERSION='1.1.48' +VERSION='1.1.50' #directories if LOCAL: DATADIR=os.path.dirname(__file__) -else: +elif os.path.exists(os.path.join(sys.prefix,'share','openastro.org')): DATADIR=os.path.join(sys.prefix,'share','openastro.org') -TMPDIR='/tmp' +elif os.path.exists(os.path.join('usr','local','share','openastro.org')): + DATADIR=os.path.join('usr','local','share','openastro.org') +elif os.path.exists(os.path.join('usr','share','openastro.org')): + DATADIR=os.path.join('usr','share','openastro.org') +else: + print "Exiting... can't find data directory" + sys.exit() #Translations LANGUAGES_LABEL={ @@ -69,17 +77,19 @@ "fi":"suomi", "fr":"Français", "de":"Deutsch", - "nds":"Plattdüütsch", "el":"ελληνικά", "hu":"magyar nyelv", "it":"Italiano", "ja":"日本", + "nds":"Plattdüütsch", "nb":"Bokmål", "pl":"język polski", "rom":"rromani ćhib", "ru":"Русский", "es":"Español", - "sv":"svenska" + "sv":"svenska", + "uk":"українська мова", + "zh_TW":"正體字" } TDomain = os.path.join(DATADIR,'locale') @@ -108,10 +118,24 @@ dprint(' OpenAstro.org '+str(self.version)) dprint("-------------------------------") self.homedir = os.path.expanduser("~") + + #check for astrodir self.astrodir = os.path.join(self.homedir, '.openastro.org') + if os.path.isdir(self.astrodir) == False: + os.mkdir(self.astrodir) + + #check for tmpdir + self.tmpdir = os.path.join(self.astrodir, 'tmp') + if os.path.isdir(self.tmpdir) == False: + os.mkdir(self.tmpdir) + + #check for swiss local dir + self.swissLocalDir = os.path.join(self.astrodir, 'swiss_ephemeris') + if os.path.isdir(self.swissLocalDir) == False: + os.mkdir(self.swissLocalDir) #geonames database - self.geonamesdb = os.path.join(sys.prefix,'share','openastro.org', 'geonames.sql' ) + self.geonamesdb = os.path.join(DATADIR, 'geonames.sql' ) #icons icons = os.path.join(DATADIR,'icons') @@ -119,20 +143,18 @@ self.iconAspects = os.path.join(icons, 'aspects') #basic files - self.tempfilename = os.path.join(TMPDIR,"openAstroChart.svg") - self.tempfilenameprint = os.path.join(TMPDIR,"openAstroChartPrint.svg") - self.tempfilenametable = os.path.join(TMPDIR,"openAstroChartTable.svg") - self.tempfilenametableprint = os.path.join(TMPDIR,"openAstroChartTablePrint.svg") + self.tempfilename = os.path.join(self.tmpdir,"openAstroChart.svg") + self.tempfilenameprint = os.path.join(self.tmpdir,"openAstroChartPrint.svg") + self.tempfilenametable = os.path.join(self.tmpdir,"openAstroChartTable.svg") + self.tempfilenametableprint = os.path.join(self.tmpdir,"openAstroChartTablePrint.svg") self.xml_ui = os.path.join(DATADIR, 'openastro-ui.xml') self.xml_svg = os.path.join(DATADIR, 'openastro-svg.xml') - self.xml_svg_table = os.path.join(DATADIR, 'openastro-svg-table.xml') - #check for astrodir - if os.path.isdir(self.astrodir) == False: - os.mkdir(self.astrodir) - #check for swiss local dir - self.swissLocalDir = os.path.join(self.astrodir, 'swiss_ephemeris') - if os.path.isdir(self.swissLocalDir) == False: - os.mkdir(self.swissLocalDir) + self.xml_svg_table = os.path.join(DATADIR, 'openastro-svg-table.xml') + + + + + #sqlite databases self.astrodb = os.path.join(self.astrodir, 'astrodb.sql') self.peopledb = os.path.join(self.astrodir, 'peopledb.sql') diff -Nru openastro.org-1.1.48/openastro.desktop openastro.org-1.1.50/openastro.desktop --- openastro.org-1.1.48/openastro.desktop 2015-02-15 19:37:40.000000000 +0000 +++ openastro.org-1.1.50/openastro.desktop 2017-07-09 09:58:50.000000000 +0000 @@ -4,7 +4,7 @@ Name=Open Source Astrology GenericName=Open Source Astrology Categories=Graphics;2DGraphics;GTK; -Exec=/usr/bin/openastro -Icon=/usr/share/openastro.org/icons/openastro.svg +Exec=openastro +Icon=openastro StartupNotify=true Terminal=false diff -Nru openastro.org-1.1.48/openastromod/zonetab.py openastro.org-1.1.50/openastromod/zonetab.py --- openastro.org-1.1.48/openastromod/zonetab.py 2015-02-15 19:37:40.000000000 +0000 +++ openastro.org-1.1.50/openastromod/zonetab.py 2017-07-09 09:58:50.000000000 +0000 @@ -6,9 +6,7 @@ http://en.wikipedia.org/wiki/Zoneinfo """ -import re, struct, math -from datetime import datetime -from dateutil.tz import tzfile +import re, math def nearest_tz(lat, lon, zones): """ diff -Nru openastro.org-1.1.48/README openastro.org-1.1.50/README --- openastro.org-1.1.48/README 2015-02-15 19:37:40.000000000 +0000 +++ openastro.org-1.1.50/README 2017-07-09 09:58:50.000000000 +0000 @@ -9,6 +9,7 @@ python-dateutil python-gnome2-desktop (>= 2.16) /* for python bindings to librsvg, pyrsvg */ python-cairo (>= 1.2.0) + librsvg2-bin (for rsvg-convert binary) imagemagick /* export features */ pyswisseph /* http://pyswisseph.atarax.org/ */ openastro.org-data diff -Nru openastro.org-1.1.48/setup.py openastro.org-1.1.50/setup.py --- openastro.org-1.1.48/setup.py 2015-02-15 19:37:40.000000000 +0000 +++ openastro.org-1.1.50/setup.py 2017-07-09 09:58:50.000000000 +0000 @@ -25,7 +25,7 @@ version=VERSION, description='Open Source Astrology', author='Pelle van der Scheer', - author_email='pellesimon@gmail.com', + author_email='devel@openastro.org', url='http://www.openastro.org', license='GPL', scripts=['openastro'], diff -Nru openastro.org-1.1.48/VERSION openastro.org-1.1.50/VERSION --- openastro.org-1.1.48/VERSION 2015-02-15 19:37:40.000000000 +0000 +++ openastro.org-1.1.50/VERSION 2017-07-09 09:58:50.000000000 +0000 @@ -1 +1 @@ -1.1.48 +1.1.50