[PC-BSD Commits] r2989 - in pbibuild/modules/deluge: . kmenu-dir overlay-dir overlay-dir/bin overlay-dir/lib/python2.5

svn at pcbsd.org svn at pcbsd.org
Tue Nov 25 09:21:36 PST 2008 

Author: kris
Date: 2008-11-25 09:21:36 -0800 (Tue, 25 Nov 2008)
New Revision: 2989

Added:
   pbibuild/modules/deluge/overlay-dir/bin/deluge.sh
Removed:
   pbibuild/modules/deluge/overlay-dir/lib/python2.5/site-packages/
Modified:
   pbibuild/modules/deluge/build.sh
   pbibuild/modules/deluge/copy-files
   pbibuild/modules/deluge/kmenu-dir/deluge
   pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/deluge/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/deluge/pbi.conf
Log:

Updated the deluge PBI module, to include all the python files, and created a wrapper script, which sets
the PYTHONPATH variable before running deluge



Modified: pbibuild/modules/deluge/build.sh
===================================================================
--- pbibuild/modules/deluge/build.sh	2008-11-25 00:47:26 UTC (rev 2988)
+++ pbibuild/modules/deluge/build.sh	2008-11-25 17:21:36 UTC (rev 2989)
@@ -9,15 +9,21 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
+# Save the right version number in the deluge.sh
+sed -e "s,CHANGEME,Deluge${PORTVER},g" ${PBIDIR}/bin/deluge.sh > /tmp/deluge.sh
+mv /tmp/deluge.sh ${PBIDIR}/bin/deluge.sh
+chmod 755 ${PBIDIR}/bin/deluge.sh
+
 cd /usr/local/share/icons/hicolor/
-  for i in `ls`
-    do
-mkdir ${PBIDIR}/share/icons/hicolor/${i}
-cp -fR /usr/local/share/icons/hicolor/${i}/apps/deluge.png ${PBIDIR}/share/icons/hicolor/${i}/apps/deluge.png
-    done
+for i in `ls`
+do
+  mkdir ${PBIDIR}/share/icons/hicolor/${i}
+  cp -fR /usr/local/share/icons/hicolor/${i}/apps/deluge.png ${PBIDIR}/share/icons/hicolor/${i}/apps/deluge.png
+done
+
 cd /usr/local/share/locale/
 for l in `ls`
 do
-mkdir ${PBIDIR}/share/locale/${l}
-cp -fR /usr/local/share/locale/${l}/LC_MESSAGES/deluge.mo ${PBIDIR}/share/locale/${l}/LC_MESSAGES/deluge.mo
-    done
\ No newline at end of file
+  mkdir ${PBIDIR}/share/locale/${l}
+  cp -fR /usr/local/share/locale/${l}/LC_MESSAGES/deluge.mo ${PBIDIR}/share/locale/${l}/LC_MESSAGES/deluge.mo
+done

Modified: pbibuild/modules/deluge/copy-files
===================================================================
--- pbibuild/modules/deluge/copy-files	2008-11-25 00:47:26 UTC (rev 2988)
+++ pbibuild/modules/deluge/copy-files	2008-11-25 17:21:36 UTC (rev 2989)
@@ -1,5 +1,4 @@
 /usr/local/bin/deluge bin/
 /usr/local/share/deluge share/
-/usr/local/lib/python2.5/site-packages/deluge lib/python2.5/site-packages/
-/usr/local/lib/python2.5/site-packages/deluge-0.5.9.3-py2.5.egg-info lib/python2.5/site-packages/
+/usr/local/lib/python2.5/site-packages lib/python2.5/
 /usr/local/share/doc/deluge share/doc/

Modified: pbibuild/modules/deluge/kmenu-dir/deluge
===================================================================
--- pbibuild/modules/deluge/kmenu-dir/deluge	2008-11-25 00:47:26 UTC (rev 2988)
+++ pbibuild/modules/deluge/kmenu-dir/deluge	2008-11-25 17:21:36 UTC (rev 2989)
@@ -1,4 +1,4 @@
-ExePath: bin/deluge
+ExePath: bin/deluge.sh
 ExeIcon: share/pixmaps/deluge.png
 ExeDescr: Deluge
 ExeNoDesktop: 0

Modified: pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh	2008-11-25 00:47:26 UTC (rev 2988)
+++ pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh	2008-11-25 17:21:36 UTC (rev 2989)
@@ -8,9 +8,7 @@
 #########################################
 rm -fR /usr/local/bin/deluge
 rm -fR /usr/local/share/deluge
-rm -fR /usr/local/lib/python2.5/site-packages/deluge
-rm -fR /usr/local/lib/python2.5/site-packages/deluge-0.5.9.3-py2.5.egg-info
 rm -fR /usr/local/share/doc/deluge
 rm -fR /usr/local/share/icons/hicolor/*/apps/deluge.png
 rm -fR /usr/local/share/locale/*/LC_MESSAGES/deluge.mo
-rm -fR /usr/local/share/pixmaps/deluge.png
\ No newline at end of file
+rm -fR /usr/local/share/pixmaps/deluge.png

Modified: pbibuild/modules/deluge/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/deluge/overlay-dir/PBI.SetupScript.sh	2008-11-25 00:47:26 UTC (rev 2988)
+++ pbibuild/modules/deluge/overlay-dir/PBI.SetupScript.sh	2008-11-25 17:21:36 UTC (rev 2989)
@@ -14,21 +14,21 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/deluge /usr/local/bin/deluge
+ln -s /Programs/${PROGDIR}/.sbin/deluge.sh /usr/local/bin/deluge
 ln -s /Programs/${PROGDIR}/share/deluge /usr/local/share/deluge
 ln -s /Programs/${PROGDIR}/share/pixmaps/deluge.png /usr/local/share/pixmaps/deluge.png
-ln -s /Programs/${PROGDIR}/lib/python2.5/site-packages/deluge /usr/local/lib/python2.5/site-packages/deluge
-ln -s /Programs/${PROGDIR}/lib/python2.5/site-packages/deluge-0.5.9.3-py2.5.egg-info /usr/local/lib/python2.5/site-packages/deluge-0.5.9.3-py2.5.egg-info
 ln -s /Programs/${PROGDIR}/share/doc/deluge /usr/local/share/doc/deluge
+
 cd /Programs/${PROGDIR}/share/icons/hicolor/
-  for i in `ls`
-    do
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/${i}/apps/deluge.png /usr/local/share/icons/hicolor/${i}/apps/deluge.png
-    done
+for i in `ls`
+do
+   ln -s /Programs/${PROGDIR}/share/icons/hicolor/${i}/apps/deluge.png /usr/local/share/icons/hicolor/${i}/apps/deluge.png
+done
+
 cd /Programs/${PROGDIR}/share/locale/
 for l in `ls`
 do
-ln -s /Programs/${PROGDIR}/share/locale/${l}/LC_MESSAGES/deluge.mo /usr/local/share/locale/${l}/LC_MESSAGES/deluge.mo
-    done
+  ln -s /Programs/${PROGDIR}/share/locale/${l}/LC_MESSAGES/deluge.mo /usr/local/share/locale/${l}/LC_MESSAGES/deluge.mo
+done
 
 echo "LAUNCHCLOSE: /usr/local/bin/deluge"


Property changes on: pbibuild/modules/deluge/overlay-dir/bin/deluge.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: pbibuild/modules/deluge/pbi.conf
===================================================================
--- pbibuild/modules/deluge/pbi.conf	2008-11-25 00:47:26 UTC (rev 2988)
+++ pbibuild/modules/deluge/pbi.conf	2008-11-25 17:21:36 UTC (rev 2989)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

More information about the Commits mailing list