change from setup to hg_install_remove to conform to python rules

INSTALLATION.txt

@@ -31,7 +31,7 @@ Dependencies (Meaning that you need to install them yourself):
 Installation:
 - Untar the package to some folder (You obviously did that already if you are reading this).
 - Open a terminal and move into the folder where you untarred the pyExifToolGui-x.y.tgz
-- Run the setup script from the command line with "sudo ./setup.py install".
+- Run the setup script from the command line with "sudo ./install_remove.py install".
 - pyExifToolGUI will be installed and you should have an icon.
 - Start and enjoy.
 
@@ -56,7 +56,7 @@ Simple download the dmg containing the bundle and drag the bundle to a suitable
 Installation:
 - Untar the package to some folder (You obviously did that already if you are reading this).
 - Open a terminal and move into the folder where you untarred the pyExifToolGui-x.y.tgz
-- Run the setup script from the command line with "sudo ./setup.py install" (no double-quotes).
+- Run the setup script from the command line with "sudo ./install_remove.py install" (no double-quotes).
 - The script will install a "bare bones" pyExifToolGUI.app in your Applications folder.
   Note that the pyExifToolGUI.app is NOT a complete self contained application. It needs the mentioned dependencies.
 - Start and enjoy.
@@ -85,7 +85,7 @@ Uninstall / Removal
 ===================
 - Open a terminal
 - Move into the folder where you untarred this (You might need to download again if your removed everything).
-- run the setup script from the command line with "sudo ./setup.py remove" (no double quotes).
+- run the setup script from the command line with "sudo ./install_remove.py remove" (no double quotes).
 - On Mac OS X simply remove pyExifToolGUI.app from /Applications
 
 This file: Version 0.3, 2013-01-12, H. van der Wolf

install_remove.py

@@ -2,7 +2,7 @@
 
 # setup.py
 
-# Copyright (c) 2012 Harry van der Wolf. All rights reserved.
+# Copyright (c) 2012-2013 Harry van der Wolf. All rights reserved.
 # This program or module is free software: you can redistribute it and/or
 # modify it under the terms of the GNU General Public Licence as published
 # by the Free Software Foundation, either version 2 of the Licence, or

manual/pyexiftoolgui.html

@@ -273,7 +273,8 @@ <h3 class="section">2.1 Installation on Linux</h3>
 <p>Installation:
 <ul><li>Untar the package to some folder.
 <li>Open a terminal and move into the folder where you untarred the pyExifToolGui-x.y.tgz
-<li>Run the setup script from the command line with <PRE>sudo ./setup.py install</PRE>.
+<li>pyExiftoolGUI <= 0.31: Run the setup script from the command line with <PRE>sudo ./setup.py install</PRE>.
+<li>pyExiftoolGUI >= 0.32: Run the setup script from the command line with <PRE>sudo ./install_remove.py install</PRE>.
 <li>pyExifToolGUI will be installed and you should have an icon in your menu under the Graphics sub menu
  or in your Dash (Ubuntu).
 <li>Start and enjoy.</li></ul>
@@ -305,7 +306,8 @@ <h4 class="subsection">2.2.2 Simple application bundle (install dependencies you
 <p>Installation:
 <ul><li>Untar the package to some folder.
 <li>Open a terminal and move into the folder where you untarred the pyExifToolGui-x.y.tgz
-<li>Run the setup script from the command line with <PRE>sudo ./setup.py install</PRE>.
+<li>pyExiftoolGUI <= 0.31: Run the setup script from the command line with <PRE>sudo ./setup.py install</PRE>.
+<li>pyExiftoolGUI >= 0.32: Run the setup script from the command line with <PRE>sudo ./install_remove.py install</PRE>.
 <li>The script will install a "bare bones" pyExifToolGUI.app in your Applications folder.
   Note that the pyExifToolGUI.app is NOT a complete self contained application. It needs the mentioned dependencies.
 <li>Start and enjoy.</li></ul>
@@ -348,7 +350,8 @@ <h3 class="section">2.4 Run pyexiftoolgui from download folder (No Installation)
 <h3 class="section">Uninstall / Removal</h3>
 <ul><li>Open a terminal
 <li>Move into the folder where you untarred the pyExifToolGUI.<version>.tgz (You might need to download again if your removed everything).
-<li>run the setup script from the command line with <PRE>$ sudo ./setup.py remove</PRE>.
+<li>pyExiftoolGUI <= 0.31: run the setup script from the command line with <PRE>$ sudo ./setup.py remove</PRE>.
+<li>pyExiftoolGUI >= 0.32: run the setup script from the command line with <PRE>$ sudo ./install_remove.py remove</PRE>.
 <li>On Mac OS X simply remove pyExifToolGUI.app from /Applications</li>
 <li>On Windows simply remove the folder containing the pyexiftoolgui.exe application.</ul>
 <p> <br></p>

scripts/petgfunctions.py

@@ -837,6 +837,7 @@ def copygpsfromselected(self,qApp):
            d2dms(self, gpslonvalue, "lon")
 
 def savegpsdata(self, qApp):
+        exiftool_params=""
         # Exif and xmp gps data
         if self.chk_lat_lon_alt.isChecked():
             exiftool_params =  ' -exif:GPSLatitude="' + self.gps_lat_decimal.text() + '" '

setup.py

@@ -2,7 +2,7 @@
 
 # setup.py
 
-# Copyright (c) 2012 Harry van der Wolf. All rights reserved.
+# Copyright (c) 2012-2013 Harry van der Wolf. All rights reserved.
 # This program or module is free software: you can redistribute it and/or
 # modify it under the terms of the GNU General Public Licence as published
 # by the Free Software Foundation, either version 2 of the Licence, or
@@ -21,7 +21,7 @@
 # command line tool exiftool by Phil Harvey, but it's not
 # a complete exiftool gui: not at all.
 
-import os, sys, platform
+import os, sys, platform, glob, subprocess
 from distutils.core import setup
 
 
@@ -48,8 +48,13 @@
 # main distutils setup (command)
 dist = setup(
         scripts     = ['bin/pyexiftoolgui'],
-        packages    = ['scripts', 'scripts.ui'],
-        package_data = { 'scripts.ui': ['*.ui'], 'manual' : ['*'], 'logo' : ['*'], 'xdg' : ['*'],
+        packages    = ['scripts', 'scripts.ui', 'manual', 'logo', 'xdg'],
+        package_data = { 
+                       'scripts': ['*.py'],
+                       'scripts.ui': ['*.py', '*.ui'], 
+                       'manual' : ['*'], 
+                       'logo' : ['*'], 
+                       'xdg' : ['*'],
                        },
         data_files = os_files
     )
@@ -67,3 +72,4 @@
         sys.stdout.write("Run it through the Ubuntu Dash by starting to type pyexiftoolgui or ")
         sys.stdout.write("Run it via the Applications menu.")
         sys.stdout.write("\n-----------------------------------------------\n")
+