[rebrand][packaging/seatbeltunlock] - renamed seatbeltunlock to be appnameagnostic, fix the pkg, make it org.xbmc.kodi-seatbeltunlock use @APP_NAME@

6 files changed, 28 insertions, 23 deletions

diff --git a/tools/darwin/packaging/xbmc-seatbeltunlock/03e48c66a9cae1ff768eb3fe7981c499.patch b/tools/darwin/packaging/seatbeltunlock/03e48c66a9cae1ff768eb3fe7981c499.patch
index b58f5bd838..b58f5bd838 100644
--- a/tools/darwin/packaging/xbmc-seatbeltunlock/03e48c66a9cae1ff768eb3fe7981c499.patch
+++ b/tools/darwin/packaging/seatbeltunlock/03e48c66a9cae1ff768eb3fe7981c499.patch
diff --git a/tools/darwin/packaging/xbmc-seatbeltunlock/12313417e3afeba6531255af58cb5283.patch b/tools/darwin/packaging/seatbeltunlock/12313417e3afeba6531255af58cb5283.patch
index 960edae2d2..960edae2d2 100644
--- a/tools/darwin/packaging/xbmc-seatbeltunlock/12313417e3afeba6531255af58cb5283.patch
+++ b/tools/darwin/packaging/seatbeltunlock/12313417e3afeba6531255af58cb5283.patch
diff --git a/tools/darwin/packaging/xbmc-seatbeltunlock/42d00865f281bb662b6ce447c9815e59.patch b/tools/darwin/packaging/seatbeltunlock/42d00865f281bb662b6ce447c9815e59.patch
index f10a1b3571..f10a1b3571 100644
--- a/tools/darwin/packaging/xbmc-seatbeltunlock/42d00865f281bb662b6ce447c9815e59.patch
+++ b/tools/darwin/packaging/seatbeltunlock/42d00865f281bb662b6ce447c9815e59.patch
diff --git a/tools/darwin/packaging/xbmc-seatbeltunlock/5a28620a15c15d41e1ae836dd1f95f8d.patch b/tools/darwin/packaging/seatbeltunlock/5a28620a15c15d41e1ae836dd1f95f8d.patch
index 12ea6fc9b1..12ea6fc9b1 100644
--- a/tools/darwin/packaging/xbmc-seatbeltunlock/5a28620a15c15d41e1ae836dd1f95f8d.patch
+++ b/tools/darwin/packaging/seatbeltunlock/5a28620a15c15d41e1ae836dd1f95f8d.patch
diff --git a/tools/darwin/packaging/xbmc-seatbeltunlock/f387cee7d7d302ec9e740632f44f1352.patch b/tools/darwin/packaging/seatbeltunlock/f387cee7d7d302ec9e740632f44f1352.patch
index a990cd9f94..a990cd9f94 100644
--- a/tools/darwin/packaging/xbmc-seatbeltunlock/f387cee7d7d302ec9e740632f44f1352.patch
+++ b/tools/darwin/packaging/seatbeltunlock/f387cee7d7d302ec9e740632f44f1352.patch
diff --git a/tools/darwin/packaging/xbmc-seatbeltunlock/mkdeb-xbmc-seatbeltunlock.sh b/tools/darwin/packaging/seatbeltunlock/mkdeb-seatbeltunlock.sh.in
index d9d422a845..8cab2b87ef 100755
--- a/tools/darwin/packaging/xbmc-seatbeltunlock/mkdeb-xbmc-seatbeltunlock.sh
+++ b/tools/darwin/packaging/seatbeltunlock/mkdeb-seatbeltunlock.sh.in
@@ -1,15 +1,20 @@
 #!/bin/sh
+XBMC_DEPENDS_ROOT=@DEPENDS_ROOT_FOR_XCODE@
+DIRNAME=`dirname $0`
 
 if [ -f "/usr/bin/sudo" ]; then
   SUDO="/usr/bin/sudo"
 fi
-if [ -f "../../ios-depends/build/bin/dpkg-deb" ]; then
-  DPKGDEB="../../ios-depends/build/bin/dpkg-deb"
-else
-  DPKGDEB="dpkg-deb"
+
+if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/dpkg-deb" ]; then
+  # make sure we pickup our tar, gnutar will fail when dpkg -i
+  bin_path=$(cd ${XBMC_DEPENDS_ROOT}/buildtools-native/bin; pwd)
+  export PATH=${bin_path}:${PATH}
 fi
 
-PACKAGE=org.xbmc.xbmc-seatbeltunlock
+DPKGDEB="dpkg-deb"
+
+PACKAGE=org.xbmc.kodi-seatbeltunlock
 
 VERSION=1.0
 REVISION=5
@@ -24,13 +29,13 @@ mkdir -p $PACKAGE/DEBIAN
 echo "Package: $PACKAGE"                                >  $PACKAGE/DEBIAN/control
 echo "Priority: Extra"                                  >> $PACKAGE/DEBIAN/control
 echo "Depends: coreutils, bsdiff, gawk"                 >> $PACKAGE/DEBIAN/control
-echo "Name: XBMC seatbelt unlock for AppleTV 2"         >> $PACKAGE/DEBIAN/control
+echo "Name: Kodi seatbelt unlock for AppleTV 2"         >> $PACKAGE/DEBIAN/control
 echo "Version: $VERSION-$REVISION"                      >> $PACKAGE/DEBIAN/control
 echo "Architecture: iphoneos-arm"                       >> $PACKAGE/DEBIAN/control
-echo "Description: XBMC tweeks, removes seatbelt"       >> $PACKAGE/DEBIAN/control
+echo "Description: Kodi tweeks, removes seatbelt"       >> $PACKAGE/DEBIAN/control
 echo "Homepage: http://xbmc.org/"                       >> $PACKAGE/DEBIAN/control
 echo "Maintainer: Scott Davilla"                        >> $PACKAGE/DEBIAN/control
-echo "Author: TeamXBMC"                                 >> $PACKAGE/DEBIAN/control
+echo "Author: Team-Kodi"                                >> $PACKAGE/DEBIAN/control
 echo "Section: Tweaks"                                  >> $PACKAGE/DEBIAN/control
 
 # postinst: find lowtide/appletv, binary patch out seatbelt-profile key,
@@ -47,40 +52,40 @@ echo "fi"                                               >> $PACKAGE/DEBIAN/posti
 echo "case \`md5sum \$BINPATH | awk '{print \$1}'\` in" >> $PACKAGE/DEBIAN/postinst
 echo " 12313417e3afeba6531255af58cb5283 )"              >> $PACKAGE/DEBIAN/postinst
 echo "   echo \"Found 4.1 (8M89):Removing seatbelt profile key from Lowtide\"" >> $PACKAGE/DEBIAN/postinst
-echo "   bspatch /Applications/Lowtide.app/Lowtide /var/tmp/Lowtide-nosb /var/tmp/12313417e3afeba6531255af58cb5283.patch" >> $PACKAGE/DEBIAN/postinst
-echo "   rm /var/tmp/12313417e3afeba6531255af58cb5283.patch" >> $PACKAGE/DEBIAN/postinst
+echo "   bspatch /Applications/Lowtide.app/Lowtide /var/tmp/Lowtide-nosb /var/tmp/k12313417e3afeba6531255af58cb5283.patch" >> $PACKAGE/DEBIAN/postinst
+echo "   rm /var/tmp/k12313417e3afeba6531255af58cb5283.patch" >> $PACKAGE/DEBIAN/postinst
 echo "   chmod 755 /var/tmp/Lowtide-nosb"               >> $PACKAGE/DEBIAN/postinst
 echo "   mv -f /Applications/Lowtide.app/Lowtide /Applications/Lowtide.app/Lowtide_org" >> $PACKAGE/DEBIAN/postinst
 echo "   mv /var/tmp/Lowtide-nosb /Applications/Lowtide.app/Lowtide" >> $PACKAGE/DEBIAN/postinst
 echo "   killall Lowtide ;;"                            >> $PACKAGE/DEBIAN/postinst
 echo " 5a28620a15c15d41e1ae836dd1f95f8d )"              >> $PACKAGE/DEBIAN/postinst
 echo "   echo \"Found 4.2.1 (8C154):Removing seatbelt profile key from AppleTV\"" >> $PACKAGE/DEBIAN/postinst
-echo "   bspatch /Applications/AppleTV.app/AppleTV /var/tmp/AppleTV-nosb /var/tmp/5a28620a15c15d41e1ae836dd1f95f8d.patch" >> $PACKAGE/DEBIAN/postinst
-echo "   rm /var/tmp/5a28620a15c15d41e1ae836dd1f95f8d.patch" >> $PACKAGE/DEBIAN/postinst
+echo "   bspatch /Applications/AppleTV.app/AppleTV /var/tmp/AppleTV-nosb /var/tmp/k5a28620a15c15d41e1ae836dd1f95f8d.patch" >> $PACKAGE/DEBIAN/postinst
+echo "   rm /var/tmp/k5a28620a15c15d41e1ae836dd1f95f8d.patch" >> $PACKAGE/DEBIAN/postinst
 echo "   chmod 755 /var/tmp/AppleTV-nosb"               >> $PACKAGE/DEBIAN/postinst
 echo "   mv -f /Applications/AppleTV.app/AppleTV /Applications/AppleTV.app/AppleTV_org" >> $PACKAGE/DEBIAN/postinst
 echo "   mv /var/tmp/AppleTV-nosb /Applications/AppleTV.app/AppleTV" >> $PACKAGE/DEBIAN/postinst
 echo "   killall AppleTV ;;"                            >> $PACKAGE/DEBIAN/postinst
 echo " 03e48c66a9cae1ff768eb3fe7981c499 )"              >> $PACKAGE/DEBIAN/postinst
 echo "   echo \"Found 4.3 (8F202):Removing seatbelt profile key from AppleTV\"" >> $PACKAGE/DEBIAN/postinst
-echo "   bspatch /Applications/AppleTV.app/AppleTV /var/tmp/AppleTV-nosb /var/tmp/03e48c66a9cae1ff768eb3fe7981c499.patch" >> $PACKAGE/DEBIAN/postinst
-echo "   rm /var/tmp/03e48c66a9cae1ff768eb3fe7981c499.patch" >> $PACKAGE/DEBIAN/postinst
+echo "   bspatch /Applications/AppleTV.app/AppleTV /var/tmp/AppleTV-nosb /var/tmp/k03e48c66a9cae1ff768eb3fe7981c499.patch" >> $PACKAGE/DEBIAN/postinst
+echo "   rm /var/tmp/k03e48c66a9cae1ff768eb3fe7981c499.patch" >> $PACKAGE/DEBIAN/postinst
 echo "   chmod 755 /var/tmp/AppleTV-nosb"               >> $PACKAGE/DEBIAN/postinst
 echo "   mv -f /Applications/AppleTV.app/AppleTV /Applications/AppleTV.app/AppleTV_org" >> $PACKAGE/DEBIAN/postinst
 echo "   mv /var/tmp/AppleTV-nosb /Applications/AppleTV.app/AppleTV" >> $PACKAGE/DEBIAN/postinst
 echo "   killall AppleTV ;;"                            >> $PACKAGE/DEBIAN/postinst
 echo " 42d00865f281bb662b6ce447c9815e59 )"              >> $PACKAGE/DEBIAN/postinst
 echo "   echo \"Found 4.3.2 (8F305):Removing seatbelt profile key from AppleTV\"" >> $PACKAGE/DEBIAN/postinst
-echo "   bspatch /Applications/AppleTV.app/AppleTV /var/tmp/AppleTV-nosb /var/tmp/42d00865f281bb662b6ce447c9815e59.patch" >> $PACKAGE/DEBIAN/postinst
-echo "   rm /var/tmp/42d00865f281bb662b6ce447c9815e59.patch" >> $PACKAGE/DEBIAN/postinst
+echo "   bspatch /Applications/AppleTV.app/AppleTV /var/tmp/AppleTV-nosb /var/tmp/k42d00865f281bb662b6ce447c9815e59.patch" >> $PACKAGE/DEBIAN/postinst
+echo "   rm /var/tmp/k42d00865f281bb662b6ce447c9815e59.patch" >> $PACKAGE/DEBIAN/postinst
 echo "   chmod 755 /var/tmp/AppleTV-nosb"               >> $PACKAGE/DEBIAN/postinst
 echo "   mv -f /Applications/AppleTV.app/AppleTV /Applications/AppleTV.app/AppleTV_org" >> $PACKAGE/DEBIAN/postinst
 echo "   mv /var/tmp/AppleTV-nosb /Applications/AppleTV.app/AppleTV" >> $PACKAGE/DEBIAN/postinst
 echo "   killall AppleTV ;;"                            >> $PACKAGE/DEBIAN/postinst
 echo " f387cee7d7d302ec9e740632f44f1352 )"              >> $PACKAGE/DEBIAN/postinst
 echo "   echo \"Found 6.1 (10B144b):Removing seatbelt profile key from AppleTV\"" >> $PACKAGE/DEBIAN/postinst
-echo "   bspatch /Applications/AppleTV.app/AppleTV /var/tmp/AppleTV-nosb /var/tmp/f387cee7d7d302ec9e740632f44f1352.patch" >> $PACKAGE/DEBIAN/postinst
-echo "   rm /var/tmp/f387cee7d7d302ec9e740632f44f1352.patch" >> $PACKAGE/DEBIAN/postinst
+echo "   bspatch /Applications/AppleTV.app/AppleTV /var/tmp/AppleTV-nosb /var/tmp/kf387cee7d7d302ec9e740632f44f1352.patch" >> $PACKAGE/DEBIAN/postinst
+echo "   rm /var/tmp/kf387cee7d7d302ec9e740632f44f1352.patch" >> $PACKAGE/DEBIAN/postinst
 echo "   chmod 755 /var/tmp/AppleTV-nosb"               >> $PACKAGE/DEBIAN/postinst
 echo "   mv -f /Applications/AppleTV.app/AppleTV /Applications/AppleTV.app/AppleTV_org" >> $PACKAGE/DEBIAN/postinst
 echo "   mv /var/tmp/AppleTV-nosb /Applications/AppleTV.app/AppleTV" >> $PACKAGE/DEBIAN/postinst
@@ -93,11 +98,11 @@ chmod +x $PACKAGE/DEBIAN/postinst
 
 # create the patch directory and copy in patch
 mkdir -p $PACKAGE/var/tmp
-cp 12313417e3afeba6531255af58cb5283.patch               $PACKAGE/var/tmp/
-cp 5a28620a15c15d41e1ae836dd1f95f8d.patch               $PACKAGE/var/tmp/
-cp 03e48c66a9cae1ff768eb3fe7981c499.patch               $PACKAGE/var/tmp/
-cp 42d00865f281bb662b6ce447c9815e59.patch               $PACKAGE/var/tmp/
-cp f387cee7d7d302ec9e740632f44f1352.patch               $PACKAGE/var/tmp/
+cp 12313417e3afeba6531255af58cb5283.patch               $PACKAGE/var/tmp/k12313417e3afeba6531255af58cb5283.patch
+cp 5a28620a15c15d41e1ae836dd1f95f8d.patch               $PACKAGE/var/tmp/k5a28620a15c15d41e1ae836dd1f95f8d.patch
+cp 03e48c66a9cae1ff768eb3fe7981c499.patch               $PACKAGE/var/tmp/k03e48c66a9cae1ff768eb3fe7981c499.patch
+cp 42d00865f281bb662b6ce447c9815e59.patch               $PACKAGE/var/tmp/k42d00865f281bb662b6ce447c9815e59.patch
+cp f387cee7d7d302ec9e740632f44f1352.patch               $PACKAGE/var/tmp/kf387cee7d7d302ec9e740632f44f1352.patch
 
 # set ownership to root:root
 ${SUDO} chown -R 0:0 $PACKAGE