diff --git a/README.md b/README.md index e18cff8..ded0907 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## openplotter-kplex -OpenPlotter app to manage kplex devices +OpenPlotter app to manage NMEA 0183 data ### Installing @@ -12,10 +12,9 @@ Install [openplotter-settings](https://github.com/openplotter/openplotter-settin Install [openplotter-settings](https://github.com/openplotter/openplotter-settings) for **development**. -Install dependencies: -Download kplex from http://www.stripydog.com/kplex/download.html +Install openplotter-kplex dependencies: -`dpkg -i ./kplex_1.x-x_xxx.deb` +`sudo apt install gpsd gpsd-clients kplex` Clone the repository: @@ -43,7 +42,7 @@ Run: `openplotter-kplex` -Make your changes and repeat package, installation and post-installation steps to test. Pull request your changes to github and we will check and add them to the next version of the [Debian package](https://cloudsmith.io/~openplotter/repos/openplotter/packages/). +Make your changes and repeat package, installation and post-installation steps to test. Pull request your changes to github and we will check and add them to the next version of the [Debian package](https://launchpad.net/~openplotter/+archive/ubuntu/openplotter). ### Documentation diff --git a/debian/changelog b/debian/changelog index 5ffa95c..c637b76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -openplotter-kplex (2.0.0-dev) buster; urgency=medium +openplotter-kplex (2.0.0-dev) bionic; urgency=medium - * Release Candidate + * Development release -- Sailoog Fri, 22 Feb 2020 13:41:02 +0100 diff --git a/debian/control b/debian/control index 88b8e37..e96d608 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,6 @@ X-Python3-Version: >= 3.2 Package: openplotter-kplex Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, openplotter-settings, python3-pyudev, kplex -Description: OpenPlotter app to manage kplex devices - OpenPlotter app to manage kplex devices +Depends: ${misc:Depends}, ${python3:Depends}, openplotter-settings, gpsd, gpsd-clients, kplex +Description: OpenPlotter app to manage NMEA 0183 data + OpenPlotter app to manage NMEA 0183 data diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 diff --git a/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.mo b/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.mo index 6075add..e9aa8f3 100644 Binary files a/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.mo and b/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.mo differ diff --git a/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po b/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po index 22801ae..704a319 100644 --- a/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po +++ b/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po @@ -1,15 +1,15 @@ msgid "" msgstr "" -"Project-Id-Version: openplotter-serial\n" -"POT-Creation-Date: 2020-02-26 22:49+0100\n" -"PO-Revision-Date: 2020-02-26 22:49+0100\n" -"Last-Translator: e-sailing \n" +"Project-Id-Version: openplotter-kplex\n" +"POT-Creation-Date: 2020-02-29 19:38+0100\n" +"PO-Revision-Date: 2020-02-29 19:38+0100\n" +"Last-Translator: \n" "Language-Team: \n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 1.8.7.1\n" "X-Poedit-Basepath: ../../..\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -190,14 +190,6 @@ msgstr "" msgid "You must select a Filter type." msgstr "" -#: data/openplotter-kplex.desktop:3 -msgid "Kplex" -msgstr "" - -#: data/openplotter-kplex.desktop:5 -msgid "kplex" -msgstr "" - #: diagnostic-NMEA.py:56 msgid "Device" msgstr "" @@ -264,10 +256,6 @@ msgstr "" msgid "Removing version..." msgstr "" -#: openplotterKplex.py:52 -msgid "Kplex (NMEA 0183 multiplexer) Graphical user interface" -msgstr "" - #: openplotterKplex.py:62 msgid "Help" msgstr "" diff --git a/openplotterKplex/openplotterKplex.py b/openplotterKplex/openplotterKplex.py index 8fc161b..3ac0b00 100644 --- a/openplotterKplex/openplotterKplex.py +++ b/openplotterKplex/openplotterKplex.py @@ -49,7 +49,7 @@ def __init__(self): if os.path.dirname(os.path.abspath(__file__))[0:4] == '/usr': v = version else: v = version.version - wx.Frame.__init__(self, None, title=_('Kplex (NMEA 0183 multiplexer) Graphical user interface')+' '+v, size=(800,444)) + wx.Frame.__init__(self, None, title='Kplex '+v, size=(800,444)) self.SetFont(wx.Font(10, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL)) icon = wx.Icon(self.currentdir+"/data/kplex.png", wx.BITMAP_TYPE_PNG) self.SetIcon(icon) diff --git a/setup.py b/setup.py index edfa2e8..292e95b 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ setup ( name = 'openplotterKplex', version = version.version, - description = 'OpenPlotter app to manage serial devices', + description = 'OpenPlotter app to manage NMEA 0183 data', license = 'GPLv3', author="e-sailing", author_email='e.minus.sailing@gmail.com',