more package installation changes

AdamLaurie · Oct 4, 2012 · 6f32ce4 · 6f32ce4
1 parent 33e6ec8
commit 6f32ce4
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -238,3 +238,5 @@ add libnfc mifare command support (TODO: error handling)
     they should work as READER_LIBNFC and/or READER_PCSC types. 
 Android support [Nick von Dadelszen]
 
+v1.0e
+move to a package style implementation
diff --git a/rfidiot/RFIDIOtconfig.py → RFIDIOt/RFIDIOtconfig.py b/rfidiot/RFIDIOtconfig.py → RFIDIOt/RFIDIOtconfig.py
diff --git a/rfidiot/RFIDIOt.py → RFIDIOt/__init__.py b/rfidiot/RFIDIOt.py → RFIDIOt/__init__.py
diff --git a/iso3166.py → RFIDIOt/iso3166.py b/iso3166.py → RFIDIOt/iso3166.py
diff --git a/rfidiot/pyandroid.py → RFIDIOt/pyandroid.py b/rfidiot/pyandroid.py → RFIDIOt/pyandroid.py
diff --git a/rfidiot/pynfc.py → RFIDIOt/pynfc.py b/rfidiot/pynfc.py → RFIDIOt/pynfc.py
@@ -31,7 +31,7 @@
 import logging
 import time
 import readline
-import RFIDIOtconfig
+#import RFIDIOtconfig
 
 # nfc_property enumeration
 NP_TIMEOUT_COMMAND		= 0x00

diff --git a/setup.py b/setup.py
@@ -1,17 +1,17 @@
 from distutils.core import setup, Extension
 
-packages= ['rfidiot']
+packages= ['RFIDIOt']
 
 scripts = ['cardselect.py', 'ChAP.py', 'copytag.py', 'demotag.py', 
 	   'eeprom.py', 'fdxbnum.py', 'formatmifare1kvalue.py', 'froschtest.py', 'hidprox.py', 'hitag2brute.py',
-	   'hitag2reset.py', 'iso3166.py', 'isotype.py', 'jcopmifare.py', 'jcopsetatrhist.py', 'jcoptool.py',
+	   'hitag2reset.py', 'isotype.py', 'jcopmifare.py', 'jcopsetatrhist.py', 'jcoptool.py',
 	   'lfxtype.py', 'loginall.py', 'mifarekeys.py', 'mrpkey.py', 'multiselect.py', 'pn532emulate.py', 
 	   'pn532mitm.py', 'pn532.py', 'q5reset.py', 'readlfx.py', 'readmifare1k.py', 
 	   'readmifaresimple.py', 'readmifareultra.py', 'readtag.py', 'send_apdu.py', 'sod.py', 'transit.py',
 	   'unique.py', 'writelfx.py', 'writemifare1k.py', 'testacg.sh', 'testlahf.sh'
 	]
 
-setup  (name        = 'rfidiot',
+setup  (name        = 'RFIDIOt',
         version     = '1.0',
         description = "RFID IO tools",
         author = 'Adam Laurie',