Reorganize source tree and files installation location, cleanup setup.py (Closes: #689409)

27 files changed, 15 insertions, 13 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 3b7ac13..89b344d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include README FORMATS LICENSE mat-cli mat-gui
-recursive-include mat *.py
+include README FORMATS LICENSE mat mat-gui
+recursive-include MAT *.py
 recursive-include test *.py clean.* dirty.*
 recursive-include po *
diff --git a/lib/FORMATS b/MAT/FORMATS
index c497524..c497524 100644
--- a/lib/FORMATS
+++ b/MAT/FORMATS
diff --git a/lib/__init__.py b/MAT/__init__.py
index 8b13789..8b13789 100644
--- a/lib/__init__.py
+++ b/MAT/__init__.py
diff --git a/lib/archive.py b/MAT/archive.py
index a749b29..a749b29 100644
--- a/lib/archive.py
+++ b/MAT/archive.py
diff --git a/lib/audio.py b/MAT/audio.py
index ed849ee..ed849ee 100644
--- a/lib/audio.py
+++ b/MAT/audio.py
diff --git a/lib/bencode/__init__.py b/MAT/bencode/__init__.py
index 8b13789..8b13789 100644
--- a/lib/bencode/__init__.py
+++ b/MAT/bencode/__init__.py
diff --git a/lib/bencode/bencode.py b/MAT/bencode/bencode.py
index 739ffe5..739ffe5 100644
--- a/lib/bencode/bencode.py
+++ b/MAT/bencode/bencode.py
diff --git a/lib/exiftool.py b/MAT/exiftool.py
index 758a094..758a094 100644
--- a/lib/exiftool.py
+++ b/MAT/exiftool.py
diff --git a/lib/hachoir_editor/__init__.py b/MAT/hachoir_editor/__init__.py
index 1835676..1835676 100644
--- a/lib/hachoir_editor/__init__.py
+++ b/MAT/hachoir_editor/__init__.py
diff --git a/lib/hachoir_editor/field.py b/MAT/hachoir_editor/field.py
index 6b1efe3..6b1efe3 100644
--- a/lib/hachoir_editor/field.py
+++ b/MAT/hachoir_editor/field.py
diff --git a/lib/hachoir_editor/fieldset.py b/MAT/hachoir_editor/fieldset.py
index b7c9b07..b7c9b07 100644
--- a/lib/hachoir_editor/fieldset.py
+++ b/MAT/hachoir_editor/fieldset.py
diff --git a/lib/hachoir_editor/typed_field.py b/MAT/hachoir_editor/typed_field.py
index 0f0427b..0f0427b 100644
--- a/lib/hachoir_editor/typed_field.py
+++ b/MAT/hachoir_editor/typed_field.py
diff --git a/lib/images.py b/MAT/images.py
index 236d566..236d566 100644
--- a/lib/images.py
+++ b/MAT/images.py
diff --git a/lib/mat.py b/MAT/mat.py
index 6d9471c..4c12333 100644
--- a/lib/mat.py
+++ b/MAT/mat.py
@@ -41,6 +41,8 @@ def get_sharedir(filename):
         return os.path.join('/usr/local/share/mat/', filename)
     elif os.path.exists(os.path.join('/usr/share/mat/', filename)):
         return os.path.join('/usr/share/mat', filename)
+    elif os.path.exists(os.path.join('/usr/local/share/pixmaps/', filename)):
+        return os.path.join('/usr/local/share/pixmaps/', filename)
 
 
 class XMLParser(xml.sax.handler.ContentHandler):
diff --git a/lib/misc.py b/MAT/misc.py
index d084861..d084861 100644
--- a/lib/misc.py
+++ b/MAT/misc.py
diff --git a/lib/office.py b/MAT/office.py
index d14125b..d14125b 100644
--- a/lib/office.py
+++ b/MAT/office.py
diff --git a/lib/parser.py b/MAT/parser.py
index d2eaf9c..d2eaf9c 100644
--- a/lib/parser.py
+++ b/MAT/parser.py
diff --git a/lib/strippers.py b/MAT/strippers.py
index 61030a7..61030a7 100644
--- a/lib/strippers.py
+++ b/MAT/strippers.py
diff --git a/lib/tarfile/__init__.py b/MAT/tarfile/__init__.py
index 8b13789..8b13789 100644
--- a/lib/tarfile/__init__.py
+++ b/MAT/tarfile/__init__.py
diff --git a/lib/tarfile/tarfile.py b/MAT/tarfile/tarfile.py
index 6978eb1..6978eb1 100644
--- a/lib/tarfile/tarfile.py
+++ b/MAT/tarfile/tarfile.py
diff --git a/RELEASE b/RELEASE
index fa68acc..05cd5af 100644
--- a/RELEASE
+++ b/RELEASE
@@ -6,7 +6,7 @@ update changelog:
     git log -> CHANGELOG
 
 update version number:
-    lib/mat.py -> __version__ = $VERSION
+    mat/mat.py -> __version__ = $VERSION
 
 commit release changes
     git commit CHANGELOG lib/mat.py
diff --git a/mat b/mat
index 93792e3..632da4f 100755
--- a/mat
+++ b/mat
@@ -10,8 +10,8 @@ import os
 
 import hachoir_core
 
-from lib import mat
-from lib import strippers
+from MAT import mat
+from MAT import strippers
 
 
 def parse():
diff --git a/mat-gui b/mat-gui
index 7c43957..cba5c94 100755
--- a/mat-gui
+++ b/mat-gui
@@ -17,8 +17,8 @@ import mimetypes
 import xml.sax
 import urllib2
 
-from lib import mat
-from lib import strippers
+from MAT import mat
+from MAT import strippers
 
 
 logging.basicConfig(level=mat.LOGGING_LEVEL)
diff --git a/mat.1 b/mat.1
index 3e266f9..d1577dc 100644
--- a/mat.1
+++ b/mat.1
@@ -64,11 +64,11 @@ If you want absolute privacy, use plain-text.
 
 
 .SH AUTHOR
-Julien (\fBjvoisin\fR) Voisin <pouicpouicpouic@gmail.com>, during the GSoC 2011
+Julien (\fBjvoisin\fR) Voisin <julien.voisin@dustri.org>, during the GSoC 2011
 
 
 .SH BUGS
-MAT does not handle watermaking/tattoo for now.
+MAT does not handle watermaking/tattoos for now.
 
 
 .SH "SEE ALSO"
diff --git a/setup.py b/setup.py
index 4e0f2a3..1793059 100755
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ import os
 from distutils.core import setup
 from DistUtilsExtra.command import *
 
-from lib import mat
+from MAT import mat
 
 #Remove MANIFEST file, since distutils
 #doesn't properly update it when
@@ -23,7 +23,7 @@ setup(
     platforms         = 'linux',
     license           = 'GPLv2',
     url               = 'https://mat.boum.org',
-    packages          = ['lib', 'lib.hachoir_editor', 'lib.bencode', 'lib.tarfile'],
+    packages          = ['MAT', 'MAT.hachoir_editor', 'MAT.bencode', 'MAT.tarfile'],
     scripts           = ['mat', 'mat-gui'],
     data_files        = [
         ( 'share/applications', ['mat.desktop'] ),
diff --git a/test/clitest.py b/test/clitest.py
index 8fc4072..a818b5d 100644
--- a/test/clitest.py
+++ b/test/clitest.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 
 sys.path.append('..')
-from lib import mat
+from MAT import mat
 import test
 
 
diff --git a/test/libtest.py b/test/libtest.py
index c44387d..9a833f1 100644
--- a/test/libtest.py
+++ b/test/libtest.py
@@ -9,7 +9,7 @@ import unittest
 import test
 import sys
 sys.path.append('..')
-from lib import mat
+from MAT import mat
 
 
 class TestRemovelib(test.MATTest):