From 4cb2f1054f845a7313e02a1d19b9981d48cd9b5f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 29 Jul 2012 23:50:09 +0300
Subject: [PATCH 1/6] mkpkg_tvheadend: update github repo url

---
 tools/mkpkg/mkpkg_tvheadend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mkpkg/mkpkg_tvheadend b/tools/mkpkg/mkpkg_tvheadend
index bc02a9e598..b8e14f154c 100755
--- a/tools/mkpkg/mkpkg_tvheadend
+++ b/tools/mkpkg/mkpkg_tvheadend
@@ -21,7 +21,7 @@
 
 echo "getting sources..."
   if [ ! -d hts-tvheadend.git ]; then
-    git clone https://github.com/andoma/tvheadend.git hts-tvheadend.git
+    git clone https://github.com/tvheadend/tvheadend.git hts-tvheadend.git
   fi
 
   cd hts-tvheadend.git

From c35559c8ef59ac2aa493c8f822aa4db1c7b85dc5 Mon Sep 17 00:00:00 2001
From: lrusak <lorusak@gmail.com>
Date: Mon, 30 Jul 2012 09:28:31 -0700
Subject: [PATCH 2/6] Maraschino update

updated to work with the new marashcino
---
 packages/addons/service/web/maraschino/addon                 | 5 -----
 packages/addons/service/web/maraschino/meta                  | 2 +-
 .../service/web/maraschino/source/bin/maraschino.service     | 3 +--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/addons/service/web/maraschino/addon b/packages/addons/service/web/maraschino/addon
index cae99c9b35..a1c4b96d4f 100755
--- a/packages/addons/service/web/maraschino/addon
+++ b/packages/addons/service/web/maraschino/addon
@@ -24,8 +24,3 @@
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
   cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/
-  cp -PR $ADDON_BUILD/$PKG_ADDON_ID/settings_example.py $ADDON_BUILD/$PKG_ADDON_ID/settings.py
-  sed 's/\/path\/to\/maraschino.db/\/storage\/.xbmc\/userdata\/addon_data\/service.web.maraschino\/maraschino.db/' -i $ADDON_BUILD/$PKG_ADDON_ID/settings.py
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
-  cp -R $BUILD/CherryPy*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
\ No newline at end of file
diff --git a/packages/addons/service/web/maraschino/meta b/packages/addons/service/web/maraschino/meta
index e7e8e1d6f6..079fe9f755 100644
--- a/packages/addons/service/web/maraschino/meta
+++ b/packages/addons/service/web/maraschino/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="maraschino"
-PKG_VERSION="707e82c"
+PKG_VERSION="40e2ce0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.service b/packages/addons/service/web/maraschino/source/bin/maraschino.service
index 30054c8099..639c65b6e5 100755
--- a/packages/addons/service/web/maraschino/source/bin/maraschino.service
+++ b/packages/addons/service/web/maraschino/source/bin/maraschino.service
@@ -24,9 +24,8 @@
   ADDON_DIR="$HOME/.xbmc/addons/service.web.maraschino"
   ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.web.maraschino"
 
-  export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib"
 
 ################################################################################
 # start maraschino
 ################################################################################
-  python $ADDON_DIR/maraschino-cherrypy.py -q
+  python $ADDON_DIR/Maraschino.py --log=$ADDON_HOME/maraschino.log

From 95122316523e6cec649b9ea2021c8235bc5e5d46 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 30 Jul 2012 20:13:26 +0300
Subject: [PATCH 3/6] maraschino: set datadir

---
 .../addons/service/web/maraschino/source/bin/maraschino.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.service b/packages/addons/service/web/maraschino/source/bin/maraschino.service
index 639c65b6e5..d88ccccca9 100755
--- a/packages/addons/service/web/maraschino/source/bin/maraschino.service
+++ b/packages/addons/service/web/maraschino/source/bin/maraschino.service
@@ -28,4 +28,4 @@
 ################################################################################
 # start maraschino
 ################################################################################
-  python $ADDON_DIR/Maraschino.py --log=$ADDON_HOME/maraschino.log
+  python $ADDON_DIR/Maraschino.py --log=$ADDON_HOME/maraschino.log --datadir=$ADDON_HOME

From 8d8aba8d6ecfb7b46155af93d72795765800b9e1 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 30 Jul 2012 20:20:13 +0300
Subject: [PATCH 4/6] maraschino: add possibilty to start / stop addon from
 addon manager with enable / disable

---
 .../maraschino/source/bin/maraschino.start    | 31 +++++++++++++++++++
 .../web/maraschino/source/bin/maraschino.stop |  2 ++
 .../service/web/maraschino/source/default.py  | 20 ++++++++++--
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100755 packages/addons/service/web/maraschino/source/bin/maraschino.start
 create mode 100755 packages/addons/service/web/maraschino/source/bin/maraschino.stop

diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.start b/packages/addons/service/web/maraschino/source/bin/maraschino.start
new file mode 100755
index 0000000000..d88ccccca9
--- /dev/null
+++ b/packages/addons/service/web/maraschino/source/bin/maraschino.start
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+# Addon settings
+  ADDON_DIR="$HOME/.xbmc/addons/service.web.maraschino"
+  ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.web.maraschino"
+
+
+################################################################################
+# start maraschino
+################################################################################
+  python $ADDON_DIR/Maraschino.py --log=$ADDON_HOME/maraschino.log --datadir=$ADDON_HOME
diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.stop b/packages/addons/service/web/maraschino/source/bin/maraschino.stop
new file mode 100755
index 0000000000..f290a87971
--- /dev/null
+++ b/packages/addons/service/web/maraschino/source/bin/maraschino.stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+kill -9 `ps | grep -E 'python.*/Maraschino.py' | awk '{print $1}'` 2>/dev/null
diff --git a/packages/addons/service/web/maraschino/source/default.py b/packages/addons/service/web/maraschino/source/default.py
index e8df616e86..e0c362a109 100644
--- a/packages/addons/service/web/maraschino/source/default.py
+++ b/packages/addons/service/web/maraschino/source/default.py
@@ -18,6 +18,22 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-import xbmc, time, os, subprocess
+import xbmc, time, os, subprocess, xbmcaddon
 
-subprocess.Popen("maraschino.service", shell=True, close_fds=True)
+__scriptname__ = "maraschino service"
+__author__ = "OpenELEC"
+__url__ = "http://www.openelec.tv"
+__settings__   = xbmcaddon.Addon(id='service.web.maraschino')
+__cwd__        = __settings__.getAddonInfo('path')
+__start__      = xbmc.translatePath( os.path.join( __cwd__, 'bin', "maraschino.start") )
+__stop__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "maraschino.stop") )
+
+#make binary files executable in addon bin folder
+subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True)
+
+subprocess.Popen(__start__, shell=True, close_fds=True)
+
+while (not xbmc.abortRequested):
+  time.sleep(0.250)
+
+subprocess.Popen(__stop__, shell=True, close_fds=True)

From 72711783420371ac503ca34b765c92f089867a9b Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 30 Jul 2012 20:38:07 +0300
Subject: [PATCH 5/6] maraschino: cleanup

---
 .../maraschino/source/bin/maraschino.service  | 31 -------------------
 .../maraschino/source/bin/maraschino.start    |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100755 packages/addons/service/web/maraschino/source/bin/maraschino.service

diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.service b/packages/addons/service/web/maraschino/source/bin/maraschino.service
deleted file mode 100755
index d88ccccca9..0000000000
--- a/packages/addons/service/web/maraschino/source/bin/maraschino.service
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-# Addon settings
-  ADDON_DIR="$HOME/.xbmc/addons/service.web.maraschino"
-  ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.web.maraschino"
-
-
-################################################################################
-# start maraschino
-################################################################################
-  python $ADDON_DIR/Maraschino.py --log=$ADDON_HOME/maraschino.log --datadir=$ADDON_HOME
diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.start b/packages/addons/service/web/maraschino/source/bin/maraschino.start
index d88ccccca9..729ed0222d 100755
--- a/packages/addons/service/web/maraschino/source/bin/maraschino.start
+++ b/packages/addons/service/web/maraschino/source/bin/maraschino.start
@@ -28,4 +28,4 @@
 ################################################################################
 # start maraschino
 ################################################################################
-  python $ADDON_DIR/Maraschino.py --log=$ADDON_HOME/maraschino.log --datadir=$ADDON_HOME
+  python $ADDON_DIR/Maraschino.py --datadir=$ADDON_HOME

From bfc6dc79530f0bda3dadd3480fe9903f75f20f4f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 30 Jul 2012 20:39:28 +0300
Subject: [PATCH 6/6] maraschino: bump addon version

---
 packages/addons/service/web/maraschino/changelog.txt | 4 ++++
 packages/addons/service/web/maraschino/meta          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/addons/service/web/maraschino/changelog.txt b/packages/addons/service/web/maraschino/changelog.txt
index 188d0c72af..32c823e8ce 100644
--- a/packages/addons/service/web/maraschino/changelog.txt
+++ b/packages/addons/service/web/maraschino/changelog.txt
@@ -1,3 +1,7 @@
+2.1.2
+- update to maraschino-40e2ce0
+- add possibilty to start / stop addon from addon manager with enable / disable
+
 2.1.1
 - update to addon version 2.1
 - update to maraschino-707e82c
diff --git a/packages/addons/service/web/maraschino/meta b/packages/addons/service/web/maraschino/meta
index 079fe9f755..c79433cfcc 100644
--- a/packages/addons/service/web/maraschino/meta
+++ b/packages/addons/service/web/maraschino/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="maraschino"
 PKG_VERSION="40e2ce0"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.maraschinoproject.com/"