FanControl2 Directory renamed for proper IPK name

diff --git a/fancontrol2/CONTROL/control b/fancontrol2/CONTROL/control
index 87affbb..f697c57 100644 (file)
--- a/fancontrol2/CONTROL/control
+++ b/fancontrol2/CONTROL/control
@@ -1,6 +1,6 @@
 Package: enigma2-plugin-extensions-fancontrol2
-Version: 2.4-20110113-r4
-Description: Steuerung Luefter
+Version: 2.4-20110113-r5
+Description: Controlling Fan
 Architecture: mipsel
 Section: extra
 Priority: optional

diff --git a/fancontrol2/po/Makefile.am b/fancontrol2/po/Makefile.am
index bbee6cd..88e88fa 100644 (file)
--- a/fancontrol2/po/Makefile.am
+++ b/fancontrol2/po/Makefile.am
@@ -5,7 +5,7 @@
 # the directory name of the plugin.
 #
 
-DOMAIN=FanControl
+DOMAIN=FanControl2
 installdir = /usr/lib/enigma2/python/Plugins/Extensions/$(DOMAIN)
 #GETTEXT=./pygettext.py
 GETTEXT=xgettext

diff --git a/fancontrol2/src/Makefile.am b/fancontrol2/src/Makefile.am
index bf39af3..d2c4a1a 100644 (file)
--- a/fancontrol2/src/Makefile.am
+++ b/fancontrol2/src/Makefile.am
@@ -1,4 +1,4 @@
-installdir = /usr/lib/enigma2/python/Plugins/Extensions/FanControl
+installdir = /usr/lib/enigma2/python/Plugins/Extensions/FanControl2
 
 SUBDIRS = data
 

diff --git a/fancontrol2/src/__init__.py b/fancontrol2/src/__init__.py
index e233e01..30dc887 100644 (file)
--- a/fancontrol2/src/__init__.py
+++ b/fancontrol2/src/__init__.py
@@ -3,7 +3,7 @@ from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_LANGUAGE
 import os,gettext\r
 \r
 PluginLanguageDomain = "FanControl2"\r
-PluginLanguagePath = "Extensions/FanControl/locale"\r
+PluginLanguagePath = "Extensions/FanControl2/locale"\r
 \r
 def localeInit():\r
     lang = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"\r

diff --git a/fancontrol2/src/data/Makefile.am b/fancontrol2/src/data/Makefile.am
index 8e6a313..da703d8 100644 (file)
--- a/fancontrol2/src/data/Makefile.am
+++ b/fancontrol2/src/data/Makefile.am
@@ -1,3 +1,3 @@
-installdir = /usr/lib/enigma2/python/Plugins/Extensions/FanControl/data/
+installdir = /usr/lib/enigma2/python/Plugins/Extensions/FanControl2/data/
 
 install_DATA = *.png diagram.class.org

diff --git a/fancontrol2/src/globals.py b/fancontrol2/src/globals.py
index 821e0c2..f19c84e 100644 (file)
--- a/fancontrol2/src/globals.py
+++ b/fancontrol2/src/globals.py
@@ -1,4 +1,4 @@
-Version = "V2.4r4"
+Version = "V2.4r5"
 # globale Variablen        
 ZielRPM = 0
 AktVLT = 0

diff --git a/fancontrol2/src/plugin.py b/fancontrol2/src/plugin.py
index 89bb082..74de3d6 100644 (file)
--- a/fancontrol2/src/plugin.py
+++ b/fancontrol2/src/plugin.py
@@ -668,7 +668,7 @@ class FanControl2Plugin(ConfigListScreen,Screen):
                self.session.open(FanControl2Monitor)
 
        def help(self):
-               self.session.open(Console,_("Information"),["cat /usr/lib/enigma2/python/Plugins/Extensions/FanControl/%s" % _("readme.txt")])
+               self.session.open(Console,_("Information"),["cat /usr/lib/enigma2/python/Plugins/Extensions/FanControl2/%s" % _("readme.txt")])
 
        def SetupMenu(self):
                self.session.open(FanControl2SpezialSetup)
@@ -795,8 +795,8 @@ class FanControl2(Screen):
                self.Fan        = "aus"
                self.dontshutdown = False
                FClog("Starting up")
-               if os.path.exists("/usr/lib/enigma2/python/Plugins/Extensions/FanControl/data/diagram.class.org"):
-                       os.rename("/usr/lib/enigma2/python/Plugins/Extensions/FanControl/data/diagram.class.org","/usr/lib/enigma2/python/Plugins/Extensions/FanControl/data/diagram.class")
+               if os.path.exists("/usr/lib/enigma2/python/Plugins/Extensions/FanControl2/data/diagram.class.org"):
+                       os.rename("/usr/lib/enigma2/python/Plugins/Extensions/FanControl2/data/diagram.class.org","/usr/lib/enigma2/python/Plugins/Extensions/FanControl2/data/diagram.class")
                if not isDMMdisabled() and config.plugins.FanControl.DisableDMM.value:
                        disableDMM()
                Box = GetBox()
@@ -1030,7 +1030,7 @@ def autostart(reason, **kwargs):
        from Plugins.Extensions.WebInterface.WebChilds.Toplevel import addExternalChild
        from FC2webSite import FC2web, FC2webLog, FC2webChart
        from twisted.web import static
-       root = static.File("/usr/lib/enigma2/python/Plugins/Extensions/FanControl/data")
+       root = static.File("/usr/lib/enigma2/python/Plugins/Extensions/FanControl2/data")
 #      root = FC2web()
        root.putChild("", FC2web())
        root.putChild("log", FC2webLog())