Rename project to oxitopped - phase 1

As it appears Pyinstaller finds having a project containing multiple
utilities, one of which is named after the package ... confusing

Author: waveform80

Diff for: MANIFEST.in

@@ -5,5 +5,5 @@ prune icons
 prune etc
 include README.rst
 include LICENSE.txt
-include oxitopdump/example.xml
-recursive-include oxitopdump/windows *.ui *.png *.svg
+include oxitopped/example.xml
+recursive-include oxitopped/windows *.ui *.png *.svg

Diff for: README.rst

@@ -1,6 +1,6 @@
-==========
-oxitopdump
-==========
+=========
+oxitopped
+=========
 
 Oxitopdump is a small suite of utilies for extracting data from an OxiTop data
 logger via a serial (RS-232) port and dumping it to a specified file in various
@@ -18,7 +18,7 @@ modes.
 Installation
 ============
 
-The `project homepage <http://www.waveform.org.uk/oxitopdump/>`_ has links to
+The `project homepage <http://www.waveform.org.uk/oxitopped/>`_ has links to
 packages or instructions for all supported platforms.
 
 
@@ -44,17 +44,17 @@ matplotlib (if it is installed) to graph the pressure results from bottles.
 License
 =======
 
-This file is part of oxitopdump.
+This file is part of oxitopped.
 
-oxitopdump is free software: you can redistribute it and/or modify it under the
+oxitopped is free software: you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-oxitopdump is distributed in the hope that it will be useful, but WITHOUT ANY
+oxitopped is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
-oxitopdump.  If not, see <http://www.gnu.org/licenses/>.
+oxitopped.  If not, see <http://www.gnu.org/licenses/>.
 

Diff for: debian/changelog

@@ -1,4 +1,4 @@
-oxitopdump (0.1-1~ppa1) precise; urgency=low
+oxitopped (0.1-1~ppa1) precise; urgency=low
 
   * Initial release
 

Diff for: debian/control

@@ -1,18 +1,18 @@
-Source: oxitopdump
+Source: oxitopped
 Maintainer: Dave Hughes <[email protected]>
-Homepage: https://www.waveform.org.uk/oxitopdump/
+Homepage: https://www.waveform.org.uk/oxitopped/
 Section: science
 Priority: extra
 Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 8.0.0)
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.6
 
-Package: oxitopdump
+Package: oxitopped
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-serial, python-matplotlib, python-qt4, python-optcomplete, python-daemon
 Suggests: python-xlwt
 Description: Tools for interacting with an OxiTop OC110 Data Logger.
- oxitopdump is a small suite of utilies for extracting data from an OxiTop data
+ oxitopped is a small suite of utilies for extracting data from an OxiTop data
  logger via a serial (RS-232) port and dumping it to a specified file in
  various formats. Options are provided for controlling the output, and for
  listing the content of the device.

Diff for: debian/copyright

@@ -1,6 +1,6 @@
 Format: http://dep.debian.net/deps/dep5
-Upstream-Name: oxitopdump
-Source: https://www.waveform.org.uk/oxitopdump/
+Upstream-Name: oxitopped
+Source: https://www.waveform.org.uk/oxitopped/
 
 Files: *
 Copyright: 2012-2013 Dave Hughes <[email protected]>

Diff for: debian/install

@@ -1,5 +1,5 @@
 debian/oxitopview.desktop /usr/share/applications/
-etc/bash_completion.d/oxitopdump /etc/bash_completion.d/
+etc/bash_completion.d/oxitopped /etc/bash_completion.d/
 icons/xpm/oxitopview.xpm /usr/share/pixmaps/
 icons/scalable/oxitopview.svg /usr/share/icons/hicolor/scalable/apps/
 icons/128x128/oxitopview.png /usr/share/icons/hicolor/128x128/apps/

Diff for: debian/oxitopdump.manpages renamed to debian/oxitopped.manpages

@@ -77,17 +77,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/oxitopdump.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/oxitopped.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/oxitopdump.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/oxitopped.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/oxitopdump"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/oxitopdump"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/oxitopped"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/oxitopped"
 	@echo "# devhelp"
 
 epub:

Diff for: docs/Makefile

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# oxitopdump documentation build configuration file, created by
+# oxitopped documentation build configuration file, created by
 # sphinx-quickstart on Sun Jan 20 19:40:23 2013.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -20,7 +20,7 @@
 
 import sys, os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
-from oxitopdump import __version__
+from oxitopped import __version__
 
 YEAR = 2013
 AUTHORS = ['Dave Hughes']
@@ -52,7 +52,7 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'oxitopdump'
+project = u'oxitopped'
 copyright = '%d, %s' % (YEAR, ', '.join(AUTHORS))
 
 # The version info for the project you're documenting, acts as replacement for
@@ -176,7 +176,7 @@
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'oxitopdumpdoc'
+htmlhelp_basename = 'oxitoppeddoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -195,7 +195,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'oxitopdump.tex', 'oxitopdump Documentation', AUTHORS[0], 'manual', False),
+  ('index', 'oxitopped.tex', 'oxitopped Documentation', AUTHORS[0], 'manual', False),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -238,7 +238,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'oxitopdump', 'oxitopdump Documentation', AUTHORS[0], 'oxitopdump', 'One line description of project.', 'Miscellaneous'),
+  ('index', 'oxitopped', 'oxitopped Documentation', AUTHORS[0], 'oxitopped', 'One line description of project.', 'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.

Diff for: docs/conf.py

@@ -2,7 +2,7 @@
 Welcome!
 ========
 
-oxitopdump is a small suite of utilies for extracting data from an OxiTop data
+oxitopped is a small suite of utilies for extracting data from an OxiTop data
 logger via a serial (RS-232) port and dumping it to a specified file in various
 formats. Options are provided for controlling the output, and for listing the
 content of the device.

Diff for: docs/index.rst

@@ -2,7 +2,7 @@
 Installation
 ============
 
-oxitopdump is distributed in several formats. The following sections detail
+oxitopped is distributed in several formats. The following sections detail
 installation on a variety of platforms.
 
 
@@ -35,14 +35,14 @@ you are kept up to date as new releases are made)::
 
     $ sudo add-apt-repository ppa://waveform/ppa
     $ sudo apt-get update
-    $ sudo apt-get install oxitopdump
+    $ sudo apt-get install oxitopped
 
 
 Microsoft Windows
 =================
 
 On Windows it is simplest to install from the standalone MSI installation
-package available from the `homepage <http://www.waveform.org.uk/oxitopdump/>`_.
+package available from the `homepage <http://www.waveform.org.uk/oxitopped/>`_.
 Be aware that the installation package requires administrator privileges.
 
 
@@ -55,16 +55,16 @@ XXX To be written
 Other Platforms
 ===============
 
-If your platform is *not* covered by one of the sections above, oxitopdump is
+If your platform is *not* covered by one of the sections above, oxitopped is
 available from PyPI and can therefore be installed with the Python distribute
 ``pip`` tool::
 
-   $ pip install oxitopdump
+   $ pip install oxitopped
 
 Theoretically this should install the mandatory pre-requisites, but optional
 pre-requisites require suffixes like the following::
 
-   $ pip install "oxitopdump[GUI,XLS]"
+   $ pip install "oxitopped[GUI,XLS]"
 
 Please be aware that at this time, the PyQt package does not build "nicely"
 under ``pip``. If it is available from your distro's package manager I strongly
@@ -79,7 +79,7 @@ SIP) under a virtualenv sandbox.
 Development
 ===========
 
-If you wish to develop oxitopdump, you can install the pre-requisites, construct
+If you wish to develop oxitopped, you can install the pre-requisites, construct
 a virtualenv sandbox, and check out the source code from GitHub with the
 following command lines::
 
@@ -92,8 +92,8 @@ following command lines::
    $ source sandbox/bin/activate
 
    # Check out the source code and install it in the sandbox for development and testing
-   $ git clone https://github.com/waveform80/oxitopdump.git
-   $ cd oxitopdump
+   $ git clone https://github.com/waveform80/oxitopped.git
+   $ cd oxitopped
    $ make develop
 
 The above instructions assume you are on Ubuntu Linux. Please feel free to

Diff for: docs/install.rst

@@ -2,17 +2,17 @@
 License
 =======
 
-This file is part of oxitopdump.
+This file is part of oxitopped.
 
-oxitopdump is free software: you can redistribute it and/or modify it under the
+oxitopped is free software: you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-oxitopdump is distributed in the hope that it will be useful, but WITHOUT ANY
+oxitopped is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
-oxitopdump.  If not, see <http://www.gnu.org/licenses/>.
+oxitopped.  If not, see <http://www.gnu.org/licenses/>.
 

Diff for: docs/license.rst

@@ -4,19 +4,19 @@
 
 # Copyright 2012 Dave Hughes.
 #
-# This file is part of oxitopdump.
+# This file is part of oxitopped.
 #
-# oxitopdump is free software: you can redistribute it and/or modify it under
+# oxitopped is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation, either version 3 of the License, or (at your option) any later
 # version.
 #
-# oxitopdump is distributed in the hope that it will be useful, but WITHOUT ANY
+# oxitopped is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# oxitopdump.  If not, see <http://www.gnu.org/licenses/>.
+# oxitopped.  If not, see <http://www.gnu.org/licenses/>.
 
 """The base class for command line oxitop applications"""
 

Diff for: etc/bash_completion.d/oxitopdump renamed to etc/bash_completion.d/oxitopped

@@ -3,27 +3,27 @@
 
 # Copyright 2012 Dave Hughes.
 #
-# This file is part of oxitopdump.
+# This file is part of oxitopped.
 #
-# oxitopdump is free software: you can redistribute it and/or modify it under
+# oxitopped is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation, either version 3 of the License, or (at your option) any later
 # version.
 #
-# oxitopdump is distributed in the hope that it will be useful, but WITHOUT ANY
+# oxitopped is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# oxitopdump.  If not, see <http://www.gnu.org/licenses/>.
+# oxitopped.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Defines the structures and interfaces for gathering data from an OC110
 
 This module defines a couple of data structures which represent gas bottle
 (`Bottle`) and the measuring head(s) of a gas bottle (`BottleHead`). These can
 be constructed manually but more usually will be obtained from an instance of
-`DataLogger` (see the `oxitopdump.logger` module).
+`DataLogger` (see the `oxitopped.logger` module).
 """
 
 from __future__ import (

Diff for: oxitopdump/__init__.py

@@ -3,19 +3,19 @@
 
 # Copyright 2012 Dave Hughes.
 #
-# This file is part of oxitopdump.
+# This file is part of oxitopped.
 #
-# oxitopdump is free software: you can redistribute it and/or modify it under
+# oxitopped is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation, either version 3 of the License, or (at your option) any later
 # version.
 #
-# oxitopdump is distributed in the hope that it will be useful, but WITHOUT ANY
+# oxitopped is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# oxitopdump.  If not, see <http://www.gnu.org/licenses/>.
+# oxitopped.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 This module provides an implementation of PEP3143, the python daemon

Diff for: oxitopdump/bottles.py

@@ -3,19 +3,19 @@
 
 # Copyright 2012 Dave Hughes.
 #
-# This file is part of oxitopdump.
+# This file is part of oxitopped.
 #
-# oxitopdump is free software: you can redistribute it and/or modify it under
+# oxitopped is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation, either version 3 of the License, or (at your option) any later
 # version.
 #
-# oxitopdump is distributed in the hope that it will be useful, but WITHOUT ANY
+# oxitopped is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# oxitopdump.  If not, see <http://www.gnu.org/licenses/>.
+# oxitopped.  If not, see <http://www.gnu.org/licenses/>.
 
 """Module implementing CSV exporters for bottles and bottle readings."""
 
@@ -30,7 +30,7 @@
 import csv
 from itertools import izip_longest
 
-from oxitopdump.bottles import DataAnalyzer
+from oxitopped.bottles import DataAnalyzer
 
 
 class CsvExporter(object):