diff --git a/build_scripts/Ubuntu_src/changelog b/build_scripts/Ubuntu_src/changelog index 799ecc11c..91e4e0342 100644 --- a/build_scripts/Ubuntu_src/changelog +++ b/build_scripts/Ubuntu_src/changelog @@ -1,3 +1,10 @@ +retroshare06 (0.6.0-0.XXXXXX~YYYYYY) YYYYYY; urgency=low + + * Improvements + * But fixes + + -- Cyril Soler Thu, 09 Jan 2014 20:00:00 +0100 + retroshare (0.5.5-0.XXXXXX~YYYYYY) YYYYYY; urgency=low * Improvements diff --git a/build_scripts/Ubuntu_src/clean.sh b/build_scripts/Ubuntu_src/clean.sh index 5c35e7c0a..8eeaf34f4 100755 --- a/build_scripts/Ubuntu_src/clean.sh +++ b/build_scripts/Ubuntu_src/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh rm -f ./libssh-0.5.4.tar.gz.* -rm -f ./retroshare_0.5.5-0.*_source.build -rm -f ./retroshare_0.5.5-0.*_source.changes -rm -f ./retroshare_0.5.5-0.*.tar.gz -rm -f ./retroshare_0.5.5-0.*.diff.gz -rm -f ./retroshare_0.5.5-0.*.dsc +rm -f ./retroshare06_0.6.0-0.*_source.build +rm -f ./retroshare06_0.6.0-0.*_source.changes +rm -f ./retroshare06_0.6.0-0.*.tar.gz +rm -f ./retroshare06_0.6.0-0.*.diff.gz +rm -f ./retroshare06_0.6.0-0.*.dsc rm -f *.upload rm -f *~ diff --git a/build_scripts/Ubuntu_src/debian/control b/build_scripts/Ubuntu_src/debian/control index c8f08a190..0a90e482b 100644 --- a/build_scripts/Ubuntu_src/debian/control +++ b/build_scripts/Ubuntu_src/debian/control @@ -1,47 +1,39 @@ -Source: retroshare +Source: retroshare06 Section: devel Priority: standard Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libqt4-opengl-dev, libqtmultimediakit1, qtmobility-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, libprotobuf-dev, protobuf-compiler, cmake, libcurl4-openssl-dev -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libqt4-opengl-dev, libqtmultimediakit1, qtmobility-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, libprotobuf-dev, protobuf-compiler, cmake, libcurl4-openssl-dev, libcv-dev, libopencv-core-dev, libhighgui-dev, tcl8.5, libsqlite3-dev +Standards-Version: 3.9.3 Homepage: http://retroshare.sourceforge.net -Package: retroshare-voip-plugin +Package: retroshare06-voip-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqtmultimediakit1 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqtmultimediakit1 Description: RetroShare VOIP plugin This package provides a plugin for RetroShare, a secured Friend-to-Friend communication plateform. The plugin adds voice-over-IP functionality to the private chat window. Both friends chatting together need the plugin installed to be able to talk together. -Package: retroshare-linkscloud-plugin +Package: retroshare06-feedreader-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 pool of html links that friends can share, and includes a - voting system to promote links. - -Package: retroshare-feedreader-plugin -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 Description: RetroShare LinksCloud plugin This package provides a plugin for RetroShare, a secured Friend-to-Friend communication plateform. The plugin adds a RSS feed reader tab to retroshare. -Package: retroshare-nogui +Package: retroshare06-nogui Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare +Conflicts: retroshare06 Description: Secure communication with friends This is the command-line client for RetroShare network. This client can be contacted and talked-to using SSL. Clients exist for portable devices running e.g. Android. -Package: retroshare +Package: retroshare06 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui +Conflicts: retroshare06-nogui Description: Secure communication with friends RetroShare is a Open Source cross-platform, private and secure decentralised commmunication platform. It lets you to securely chat and share files with your diff --git a/build_scripts/Ubuntu_src/debian/retroshare-linkscloud-plugin.install b/build_scripts/Ubuntu_src/debian/retroshare-linkscloud-plugin.install deleted file mode 100644 index 2d0560370..000000000 --- a/build_scripts/Ubuntu_src/debian/retroshare-linkscloud-plugin.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/retroshare/extensions/libLinksCloud.so - diff --git a/build_scripts/Ubuntu_src/debian/retroshare-feedreader-plugin.install b/build_scripts/Ubuntu_src/debian/retroshare06-feedreader-plugin.install similarity index 100% rename from build_scripts/Ubuntu_src/debian/retroshare-feedreader-plugin.install rename to build_scripts/Ubuntu_src/debian/retroshare06-feedreader-plugin.install diff --git a/build_scripts/Ubuntu_src/debian/retroshare-nogui.install b/build_scripts/Ubuntu_src/debian/retroshare06-nogui.install similarity index 100% rename from build_scripts/Ubuntu_src/debian/retroshare-nogui.install rename to build_scripts/Ubuntu_src/debian/retroshare06-nogui.install diff --git a/build_scripts/Ubuntu_src/debian/retroshare-voip-plugin.install b/build_scripts/Ubuntu_src/debian/retroshare06-voip-plugin.install similarity index 100% rename from build_scripts/Ubuntu_src/debian/retroshare-voip-plugin.install rename to build_scripts/Ubuntu_src/debian/retroshare06-voip-plugin.install diff --git a/build_scripts/Ubuntu_src/debian/retroshare.install b/build_scripts/Ubuntu_src/debian/retroshare06.install similarity index 100% rename from build_scripts/Ubuntu_src/debian/retroshare.install rename to build_scripts/Ubuntu_src/debian/retroshare06.install diff --git a/build_scripts/Ubuntu_src/debian/rules b/build_scripts/Ubuntu_src/debian/rules index cffddf21a..d783e4028 100755 --- a/build_scripts/Ubuntu_src/debian/rules +++ b/build_scripts/Ubuntu_src/debian/rules @@ -12,8 +12,10 @@ build-stamp: builddir/Makefile dh_testdir # Add here commands to compile the package. cd libssh-0.5.4 && mkdir build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make + cd sqlcipher && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" && make mkdir lib - cp -r libssh-0.5.4 lib + cp -r libssh-0.5.4 lib/ + cp -r sqlcipher lib/ #cd src/rsctrl/src && make cd src && qmake-qt4 CONFIG=release RetroShare.pro && make touch $@ @@ -31,19 +33,18 @@ install: build dh_testroot dh_clean -k dh_installdirs - install -D -m 644 src/data/retroshare.desktop $(CURDIR)/debian/retroshare/usr/share/applications/retroshare.desktop - install -D -m 644 src/data/24x24/retroshare.png $(CURDIR)/debian/retroshare/usr/share/icons/hicolor/24x24/apps/retroshare.png - install -D -m 644 src/data/48x48/retroshare.png $(CURDIR)/debian/retroshare/usr/share/icons/hicolor/48x48/apps/retroshare.png - install -D -m 644 src/data/64x64/retroshare.png $(CURDIR)/debian/retroshare/usr/share/icons/hicolor/64x64/apps/retroshare.png - install -D -m 644 src/data/retroshare.xpm $(CURDIR)/debian/retroshare/usr/share/pixmaps/retroshare.xpm - install -D -m 644 src/plugins/VOIP/libVOIP.so.1.0.0 $(CURDIR)/debian/retroshare-voip-plugin/usr/lib/retroshare/extensions/libVOIP.so - install -D -m 644 src/plugins/LinksCloud/libLinksCloud.so.1.0.0 $(CURDIR)/debian/retroshare-linkscloud-plugin/usr/lib/retroshare/extensions/libLinksCloud.so - install -D -m 644 src/plugins/FeedReader/libFeedReader.so.1.0.0 $(CURDIR)/debian/retroshare-feedreader-plugin/usr/lib/retroshare/extensions/libFeedReader.so - install -D -m 644 src/libbitdht/src/bitdht/bdboot.txt $(CURDIR)/debian/retroshare-nogui/usr/share/RetroShare/bdboot.txt - install -D -m 644 src/libbitdht/src/bitdht/bdboot.txt $(CURDIR)/debian/retroshare/usr/share/RetroShare/bdboot.txt - install -D -m 755 src/retroshare-nogui/src/retroshare-nogui $(CURDIR)/debian/retroshare-nogui/usr/bin/RetroShare-nogui - install -D -m 755 src/retroshare-nogui/src/retroshare-nogui $(CURDIR)/debian/retroshare/usr/bin/RetroShare-nogui - install -D -m 755 src/retroshare-gui/src/RetroShare $(CURDIR)/debian/retroshare/usr/bin/RetroShare + install -D -m 644 src/data/retroshare.desktop $(CURDIR)/debian/retroshare06/usr/share/applications/retroshare06.desktop + install -D -m 644 src/data/24x24/retroshare.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/24x24/apps/retroshare.png + install -D -m 644 src/data/48x48/retroshare.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/48x48/apps/retroshare.png + install -D -m 644 src/data/64x64/retroshare.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/64x64/apps/retroshare.png + install -D -m 644 src/data/retroshare.xpm $(CURDIR)/debian/retroshare06/usr/share/pixmaps/retroshare.xpm + install -D -m 644 src/plugins/VOIP/libVOIP.so.1.0.0 $(CURDIR)/debian/retroshare06-voip-plugin/usr/lib/retroshare06/extensions/libVOIP.so + install -D -m 644 src/plugins/FeedReader/libFeedReader.so.1.0.0 $(CURDIR)/debian/retroshare06-feedreader-plugin/usr/lib/retroshare06/extensions/libFeedReader.so + install -D -m 644 src/libbitdht/src/bitdht/bdboot.txt $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/bdboot.txt + install -D -m 644 src/libbitdht/src/bitdht/bdboot.txt $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/bdboot.txt + install -D -m 755 src/retroshare-nogui/src/retroshare-nogui $(CURDIR)/debian/retroshare06-nogui/usr/bin/RetroShare06-nogui + install -D -m 755 src/retroshare-nogui/src/retroshare-nogui $(CURDIR)/debian/retroshare06/usr/bin/RetroShare06-nogui + install -D -m 755 src/retroshare-gui/src/RetroShare $(CURDIR)/debian/retroshare06/usr/bin/RetroShare06 # Add here commands to install the package into debian/your_appname # cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install diff --git a/build_scripts/Ubuntu_src/makeSourcePackage.sh b/build_scripts/Ubuntu_src/makeSourcePackage.sh index 0470d1fec..5b6426fde 100755 --- a/build_scripts/Ubuntu_src/makeSourcePackage.sh +++ b/build_scripts/Ubuntu_src/makeSourcePackage.sh @@ -1,11 +1,10 @@ #!/bin/sh ###################### PARAMETERS #################### -version="0.5.5" +version="0.6.0" svnpath="svn://csoler@svn.code.sf.net/p/retroshare/code/" -workdir=retroshare-$version -#use_gxs="Y" # comment out to compile without gxs -#bubba3="Y" # comment out to compile for bubba3 +workdir=retroshare06-$version +#bubba3="Y" # comment out to compile for bubba3 ###################################################### echo This script is going to build the debian source package for RetroShare, from the svn. @@ -40,13 +39,8 @@ echo version is $version echo Extracting base archive... mkdir -p $workdir/src - -if test "$use_gxs" = "Y" ; then - cp -r debian.gxs $workdir/debian -else - cp -r debian $workdir/debian -fi cp -r data $workdir/src/ +cp -r debian $workdir/debian echo Checking out latest snapshot in libbitdht... cd $workdir/src/ @@ -63,11 +57,9 @@ cd $workdir tar zxvf ../libssh-0.5.4.tar.gz cd .. -if ! test "$specific" = "" ; then - cd $workdir - git clone https://github.com/sqlcipher/sqlcipher.git - cd .. -fi +cd $workdir +git clone https://github.com/sqlcipher/sqlcipher.git +cd .. # cleaning up protobof generated files @@ -98,11 +90,12 @@ find $workdir -name ".svn" -exec rm -rf {} \; # remove all svn repositories cd $workdir + #for i in wheezy; do #for i in sid ; do -#for i in precise; do +for i in precise; do #for i in lucid precise quantal raring; do -for i in wheezy squeeze lucid precise quantal raring saucy; do +#for i in wheezy squeeze lucid precise quantal raring saucy; do #for i in sid squeeze; do echo copying changelog for $i cat ../changelog | sed -e s/XXXXXX/"$svn"/g | sed -e s/YYYYYY/"$i"/g > debian/changelog