- merged linkscloud plugin with main packaging script set

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5696 b45a01b8-16f6-495d-af2f-9b41ad6348cc

build_scripts/Ubuntu_src/changelog

@@ -35,7 +35,7 @@ retroshare (0.5.4-0.XXXXXX~YYYYYY) YYYYYY; urgency=low
          * Fixed crash when clicking on the link.
          * Fixed process of https links.
 
- -- Cyril Soler <csoler@users.sourceforge.net>  Sat, 20 Oct. 2012 14:30:00 +0100
+ -- Cyril Soler <csoler@users.sourceforge.net>  Sat, 20 Oct 2012 14:30:00 +0100
 
 retroshare (0.5.4-0.5611~natty) natty; urgency=low
 

build_scripts/Ubuntu_src/linkscloud-plugin/changelog

@@ -1,6 +0,0 @@
-retroshare-linkscloud-plugin (0.5.3-0.XXXXXX~YYYYYY) YYYYYY; urgency=low
-
-  * Improvements
-     - Functional version of LinksCloud plugin.
-     
- -- Cyril Soler <csoler@users.sourceforge.net>  Fri, 24 aug 2012 12:00:00 +0100

build_scripts/Ubuntu_src/linkscloud-plugin/debian_control

@@ -1,16 +0,0 @@
-Source: retroshare-linkscloud-plugin
-Section: devel
-Priority: standard
-Maintainer: Cyril Soler <csoler@users.sourceforge.net>
-Build-Depends: debhelper (>= 7), qt4-dev-tools, libqt4-dev, libssl-dev, libbz2-dev
-Standards-Version: 3.9.1
-Homepage: http://retroshare.sourceforge.net
-
-Package: retroshare-linkscloud-plugin
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
-Description: RetroShare LinksCloud plugin
-	This package provides a plugin for RetroShare, a secured Friend-to-Friend communication 
-	plateform. The plugin adds a collaborative forum for HTTP links.
-
-

build_scripts/Ubuntu_src/linkscloud-plugin/debian_dirs

@@ -1,2 +0,0 @@
-usr/lib/retroshare/extensions/
-usr/sbin

build_scripts/Ubuntu_src/linkscloud-plugin/debian_rules

@@ -1,58 +0,0 @@
-#!/usr/bin/make -f
-
-APPNAME := retroshare-linkscloud-plugin-0.5.4
-builddir:
-	mkdir -p builddir
-
-builddir/Makefile: builddir
-	cd builddir && qmake-qt4 CONFIG=release PREFIX=/usr ../$(APPNAME).pro
-
-build: build-stamp
-
-build-stamp: builddir/Makefile
-	dh_testdir
-	# Add here commands to compile the package.
-	cd builddir && $(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	# Add here commands to clean up after the build process.
-	rm -rf builddir
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	install -D -m 644 builddir/src/plugins/LinksCloud/libLinksCloud.so.1.0.0 $(CURDIR)/debian/retroshare-linkscloud-plugin/usr/lib/retroshare/extensions/rsplugin_LinksCloud.so
-
-# Add here commands to install the package into debian/your_appname
-#    cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-

build_scripts/Ubuntu_src/linkscloud-plugin/plugins.pro

@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += LinksCloud

build_scripts/Ubuntu_src/linkscloud-plugin/src.pro

@@ -1,9 +0,0 @@
-QMAKEVERSION = $$[QMAKE_VERSION]
-ISQT4 = $$find(QMAKEVERSION, ^[2-9])
-isEmpty( ISQT4 ) {
-error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4");
-}
-
-TEMPLATE = subdirs
-SUBDIRS = plugins
-

build_scripts/Ubuntu_src/makeSourcePackage.sh

@@ -61,20 +61,33 @@ echo Checking out latest snapshot in retroshare-nogui...
 cd $workdir/src/retroshare-nogui/
 svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-nogui/src . 2> /dev/null
 cd ../../..
-#
+
+# LinksCloud plugin
+echo Checking out latest snapshot in LinksCloud plugin
+mkdir -p $workdir/src/plugins/LinksCloud
+cd $workdir/src/plugins/LinksCloud
+svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/plugins/LinksCloud . 2> /dev/null
+cd ../../../..
+
+# VOIP plugin
 echo Checking out latest snapshot in VOIP plugin
 mkdir -p $workdir/src/plugins/VOIP
 cd $workdir/src/plugins/VOIP
 svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/plugins/VOIP . 2> /dev/null
-cd ..
+cd ../../../..
+cp $workdir/src/retroshare-gui/gui/chat/PopupChatDialog.ui $workdir/src/plugins/VOIP/gui/PopupChatDialog.ui
+
+# common directory in Plugins
+cd $workdir/src/plugins
 mkdir -p Common
 cd Common
 svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/plugins/Common . 2> /dev/null
 cd ../../../..
-cp $workdir/src/retroshare-gui/gui/chat/PopupChatDialog.ui $workdir/src/plugins/VOIP/gui/PopupChatDialog.ui
 
-echo Copying bdboot.txt file at installation place
+# bdboot.txt file
-cp $workdir/src/libbitdht/bitdht/bdboot.txt
+#echo Copying bdboot.txt file at installation place
+#cp $workdir/src/libbitdht/bitdht/bdboot.txt
+
 echo Setting version numbers...
 
 # setup version numbers
@@ -94,12 +107,13 @@ echo Cleaning...
 find $workdir -name ".svn" -exec rm -rf {} \;		# remove all svn repositories
 
 echo Preparing package
-mv $workdir/src/retroshare-gui/RetroShare.pro $workdir/src/retroshare-gui/retroshare-gui.pro
+#mv $workdir/src/retroshare-gui/RetroShare.pro $workdir/src/retroshare-gui/retroshare-gui.pro
 
 ./cleanProFile.sh $workdir/src/libretroshare/libretroshare.pro
 ./cleanProFile.sh $workdir/src/retroshare-gui/retroshare-gui.pro
 ./cleanProFile.sh $workdir/src/retroshare-nogui/retroshare-nogui.pro
 ./cleanProFile_voip.sh $workdir/src/plugins/VOIP/VOIP.pro
+./cleanProFile_linkscloud.sh $workdir/src/plugins/LinksCloud/LinksCloud.pro
 
 echo "DESTDIR = ../../libretroshare/src/lib/" > /tmp/toto75299
 cat $workdir/src/libretroshare/libretroshare.pro /tmp/toto75299 > /tmp/toto752992