Directory structure was changed

23 files changed, 52 insertions, 52 deletions

diff --git a/pebble/MANIFEST.in b/pebble/MANIFEST.in
new file mode 100644
index 0000000..498b433
--- /dev/null
+++ b/pebble/MANIFEST.in
@@ -0,0 +1,16 @@
+#Language Files
+
+include pebble_remote/data/i18n/ca/LC_MESSAGES/pebble-remote.mo
+include pebble_remote/data/i18n/tr/LC_MESSAGES/pebble-remote.mo
+include pebble_remote/data/i18n/es/LC_MESSAGES/pebble-remote.mo
+include pebble_remote/data/i18n/it/LC_MESSAGES/pebble-remote.mo
+
+#Manual page
+
+include pebble_remote/data/man/pebble-remote.1.gz
+
+#Mimetype files
+
+include pebble_remote/data/mimetype/pebble-remote
+include pebble_remote/data/mimetype/pebble-remote.desktop
+include pebble_remote/data/mimetype/pebble-remote.png
diff --git a/pebble/libpebble/pebble/LICENSE b/pebble/libpebble/LICENSE
index 7fc0b12..7fc0b12 100644
--- a/pebble/libpebble/pebble/LICENSE
+++ b/pebble/libpebble/LICENSE
diff --git a/pebble/libpebble/pebble/LightBluePebble.py b/pebble/libpebble/LightBluePebble.py
index db743f5..db743f5 100644
--- a/pebble/libpebble/pebble/LightBluePebble.py
+++ b/pebble/libpebble/LightBluePebble.py
diff --git a/pebble/libpebble/MANIFEST.in b/pebble/libpebble/MANIFEST.in
deleted file mode 100644
index 3953107..0000000
--- a/pebble/libpebble/MANIFEST.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#Language Files
-
-include pebble/data/i18n/ca/LC_MESSAGES/pebble-remote.mo
-include pebble/data/i18n/tr/LC_MESSAGES/pebble-remote.mo
-include pebble/data/i18n/es/LC_MESSAGES/pebble-remote.mo
-include pebble/data/i18n/it/LC_MESSAGES/pebble-remote.mo
-
-#Manual page
-
-include pebble/data/man/pebble-remote.1.gz
-
-#Mimetype files
-
-include pebble/data/mimetype/pebble-remote
-include pebble/data/mimetype/pebble-remote.desktop
-include pebble/data/mimetype/pebble-remote.png
diff --git a/pebble/libpebble/pebble/__init__.py b/pebble/libpebble/__init__.py
index 96a407d..96a407d 100644
--- a/pebble/libpebble/pebble/__init__.py
+++ b/pebble/libpebble/__init__.py
diff --git a/pebble/libpebble/pebble/p.py b/pebble/libpebble/p.py
index da05a9b..328ac11 100755
--- a/pebble/libpebble/pebble/p.py
+++ b/pebble/libpebble/p.py
@@ -6,10 +6,9 @@ import pebble as libpebble
 import time
 import pexpect
 import tkMessageBox
+from pebble_remote import i18n
 
 from Tkinter import *
-from pebble import i18n
-
 _ = i18n.language.gettext
 
 MAX_ATTEMPTS = 5
diff --git a/pebble/libpebble/pebble/pebble.py b/pebble/libpebble/pebble.py
index 2496f6d..2496f6d 100755
--- a/pebble/libpebble/pebble/pebble.py
+++ b/pebble/libpebble/pebble.py
diff --git a/pebble/libpebble/setup.py b/pebble/libpebble/setup.py
deleted file mode 100644
index 51b3767..0000000
--- a/pebble/libpebble/setup.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from setuptools import setup
-
-setup(name='pebble-remote',
-      version='2.0',
-      description='Remote control for LibreOffice Impress with Pebble',
-      url='https://github.com/LibreOffice/impress_remote/tree/master/pebble',
-      author='Gulsah KOSE',
-      author_email='gulsah.1004@gmail.com',
-      license='MPLv2',
-      packages=['pebble'],
-      scripts=[
-          'pebble/p.py',
-          'pebble/data/scripts/pebble-remote',
-          'pebble/data/scripts/exit_click.sh'
-      ],
-      package_data={
-          'data/i18n/ca/LC_MESSAGES': ['pebble-remote.mo'],
-          'data/i18n/tr/LC_MESSAGES': ['pebble-remote.mo'],
-          'data/i18n/es/LC_MESSAGES': ['pebble-remote.mo'],
-          'data/i18n/it/LC_MESSAGES': ['pebble-remote.mo'],
-          'data/mimetype': ['pebble-remote','pebble-remote.png','pebble-remote.desktop']
-      },
-      data_files=[
-          ('/opt/pebble/i18n/ca/LC_MESSAGES', ['pebble/data/i18n/ca/LC_MESSAGES/pebble-remote.mo']),
-          ('/opt/pebble/i18n/tr/LC_MESSAGES', ['pebble/data/i18n/tr/LC_MESSAGES/pebble-remote.mo']),
-          ('/opt/pebble/i18n/es/LC_MESSAGES', ['pebble/data/i18n/es/LC_MESSAGES/pebble-remote.mo']),
-          ('/opt/pebble/i18n/it/LC_MESSAGES', ['pebble/data/i18n/it/LC_MESSAGES/pebble-remote.mo']),
-          ('/usr/share/man/man1', ['pebble/data/man/pebble-remote.1.gz']),
-          ('/usr/share/applications', ['pebble/data/mimetype/pebble-remote.desktop']),
-          ('/usr/share/menu', ['pebble/data/mimetype/pebble-remote']),
-          ('/usr/share/pixmaps', ['pebble/data/mimetype/pebble-remote.png'])
-      ],
-      install_requires = ['setuptools'],
-      zip_safe=False)
diff --git a/pebble/libpebble/pebble/stm32_crc.py b/pebble/libpebble/stm32_crc.py
index cfc5ff7..cfc5ff7 100644
--- a/pebble/libpebble/pebble/stm32_crc.py
+++ b/pebble/libpebble/stm32_crc.py
diff --git a/pebble/libpebble/pebble/data/LICENCE b/pebble/pebble_remote/LICENCE
index 735331f..735331f 100644
--- a/pebble/libpebble/pebble/data/LICENCE
+++ b/pebble/pebble_remote/LICENCE
diff --git a/pebble/pebble_remote/__init__.py b/pebble/pebble_remote/__init__.py
new file mode 100644
index 0000000..314b9fa
--- /dev/null
+++ b/pebble/pebble_remote/__init__.py
@@ -0,0 +1 @@
+#__init__.py
diff --git a/pebble/libpebble/pebble/data/i18n/ca/LC_MESSAGES/pebble-remote.mo b/pebble/pebble_remote/data/i18n/ca/LC_MESSAGES/pebble-remote.mo
index e7ee00a..e7ee00a 100644
--- a/pebble/libpebble/pebble/data/i18n/ca/LC_MESSAGES/pebble-remote.mo
+++ b/pebble/pebble_remote/data/i18n/ca/LC_MESSAGES/pebble-remote.mo
diff --git a/pebble/libpebble/pebble/data/i18n/es/LC_MESSAGES/pebble-remote.mo b/pebble/pebble_remote/data/i18n/es/LC_MESSAGES/pebble-remote.mo
index 0f3a4b1..0f3a4b1 100644
--- a/pebble/libpebble/pebble/data/i18n/es/LC_MESSAGES/pebble-remote.mo
+++ b/pebble/pebble_remote/data/i18n/es/LC_MESSAGES/pebble-remote.mo
diff --git a/pebble/libpebble/pebble/data/i18n/it/LC_MESSAGES/pebble-remote.mo b/pebble/pebble_remote/data/i18n/it/LC_MESSAGES/pebble-remote.mo
index 5139aec..5139aec 100644
--- a/pebble/libpebble/pebble/data/i18n/it/LC_MESSAGES/pebble-remote.mo
+++ b/pebble/pebble_remote/data/i18n/it/LC_MESSAGES/pebble-remote.mo
diff --git a/pebble/libpebble/pebble/data/i18n/tr/LC_MESSAGES/pebble-remote.mo b/pebble/pebble_remote/data/i18n/tr/LC_MESSAGES/pebble-remote.mo
index d2c966b..d2c966b 100644
--- a/pebble/libpebble/pebble/data/i18n/tr/LC_MESSAGES/pebble-remote.mo
+++ b/pebble/pebble_remote/data/i18n/tr/LC_MESSAGES/pebble-remote.mo
diff --git a/pebble/libpebble/pebble/data/man/pebble-remote.1.gz b/pebble/pebble_remote/data/man/pebble-remote.1.gz
index 08bb9a8..08bb9a8 100644
--- a/pebble/libpebble/pebble/data/man/pebble-remote.1.gz
+++ b/pebble/pebble_remote/data/man/pebble-remote.1.gz
diff --git a/pebble/libpebble/pebble/data/mimetype/pebble-remote b/pebble/pebble_remote/data/mimetype/pebble-remote
index fabdc8b..fabdc8b 100644
--- a/pebble/libpebble/pebble/data/mimetype/pebble-remote
+++ b/pebble/pebble_remote/data/mimetype/pebble-remote
diff --git a/pebble/libpebble/pebble/data/mimetype/pebble-remote.desktop b/pebble/pebble_remote/data/mimetype/pebble-remote.desktop
index e3c0335..e3c0335 100644
--- a/pebble/libpebble/pebble/data/mimetype/pebble-remote.desktop
+++ b/pebble/pebble_remote/data/mimetype/pebble-remote.desktop
diff --git a/pebble/libpebble/pebble/data/mimetype/pebble-remote.png b/pebble/pebble_remote/data/mimetype/pebble-remote.png
index 0f2090a..0f2090a 100644
--- a/pebble/libpebble/pebble/data/mimetype/pebble-remote.png
+++ b/pebble/pebble_remote/data/mimetype/pebble-remote.png
diff --git a/pebble/libpebble/pebble/data/scripts/exit_click.sh b/pebble/pebble_remote/data/scripts/exit_click.sh
index bbfb104..bbfb104 100755
--- a/pebble/libpebble/pebble/data/scripts/exit_click.sh
+++ b/pebble/pebble_remote/data/scripts/exit_click.sh
diff --git a/pebble/libpebble/pebble/data/scripts/pebble-remote b/pebble/pebble_remote/data/scripts/pebble-remote
index 83a0599..83a0599 100755
--- a/pebble/libpebble/pebble/data/scripts/pebble-remote
+++ b/pebble/pebble_remote/data/scripts/pebble-remote
diff --git a/pebble/libpebble/pebble/i18n.py b/pebble/pebble_remote/i18n.py
index 272ccbf..272ccbf 100644
--- a/pebble/libpebble/pebble/i18n.py
+++ b/pebble/pebble_remote/i18n.py
diff --git a/pebble/setup.py b/pebble/setup.py
new file mode 100644
index 0000000..c0eca35
--- /dev/null
+++ b/pebble/setup.py
@@ -0,0 +1,34 @@
+from setuptools import setup
+
+setup(name='pebble-remote',
+      version='2.0',
+      description='Remote control for LibreOffice Impress with Pebble',
+      url='https://github.com/LibreOffice/impress_remote/tree/master/pebble',
+      author='Gulsah KOSE',
+      author_email='gulsah.1004@gmail.com',
+      license='MPLv2',
+      packages=['pebble_remote','libpebble'],
+      scripts=[
+          'libpebble/p.py',
+          'pebble_remote/data/scripts/pebble-remote',
+          'pebble_remote/data/scripts/exit_click.sh'
+      ],
+      package_data={
+          'pebble_remote/data/i18n/ca/LC_MESSAGES': ['pebble-remote.mo'],
+          'pebble_remote/data/i18n/tr/LC_MESSAGES': ['pebble-remote.mo'],
+          'pebble_remote/data/i18n/es/LC_MESSAGES': ['pebble-remote.mo'],
+          'pebble_remote/data/i18n/it/LC_MESSAGES': ['pebble-remote.mo'],
+          'pebble_remote/data/mimetype': ['pebble-remote','pebble-remote.png','pebble-remote.desktop']
+      },
+      data_files=[
+          ('/opt/pebble/i18n/ca/LC_MESSAGES', ['pebble_remote/data/i18n/ca/LC_MESSAGES/pebble-remote.mo']),
+          ('/opt/pebble/i18n/tr/LC_MESSAGES', ['pebble_remote/data/i18n/tr/LC_MESSAGES/pebble-remote.mo']),
+          ('/opt/pebble/i18n/es/LC_MESSAGES', ['pebble_remote/data/i18n/es/LC_MESSAGES/pebble-remote.mo']),
+          ('/opt/pebble/i18n/it/LC_MESSAGES', ['pebble_remote/data/i18n/it/LC_MESSAGES/pebble-remote.mo']),
+          ('/usr/share/man/man1', ['pebble_remote/data/man/pebble-remote.1.gz']),
+          ('/usr/share/applications', ['pebble_remote/data/mimetype/pebble-remote.desktop']),
+          ('/usr/share/menu', ['pebble_remote/data/mimetype/pebble-remote']),
+          ('/usr/share/pixmaps', ['pebble_remote/data/mimetype/pebble-remote.png'])
+      ],
+      install_requires = ['setuptools'],
+      zip_safe=False)