From 5bf056c7a472773a53e047e2def1a7953608c16e Mon Sep 17 00:00:00 2001 From: Phenom Date: Mon, 17 Jul 2017 10:44:27 +0200 Subject: [PATCH] Rename retroshare06 to retroshare --- MacOS_X_InstallGuide.md | 2 +- README.md | 6 +++--- Start_RetroShare-Gui_Debug.bat | 4 ++-- build_scripts/Debian+Ubuntu/README.txt | 10 ++++----- build_scripts/Debian+Ubuntu/clean.sh | 10 ++++----- build_scripts/Debian+Ubuntu/control.jessie | 18 ++++++++-------- build_scripts/Debian+Ubuntu/control.precise | 18 ++++++++-------- .../Debian+Ubuntu/control.squeeze_bubba3 | 18 ++++++++-------- build_scripts/Debian+Ubuntu/control.stretch | 18 ++++++++-------- build_scripts/Debian+Ubuntu/control.xenial | 18 ++++++++-------- build_scripts/Debian+Ubuntu/control.yakkety | 18 ++++++++-------- build_scripts/Debian+Ubuntu/control.zesty | 18 ++++++++-------- ...l => retroshare-feedreader-plugin.install} | 0 .../debian/retroshare-nogui.install | 3 +++ ...install => retroshare-voip-plugin.install} | 0 .../Debian+Ubuntu/debian/retroshare.install | 6 ++++++ .../debian/retroshare06-nogui.install | 3 --- .../Debian+Ubuntu/debian/retroshare06.install | 6 ------ .../Debian+Ubuntu/full_packaging_pipeline.sh | 4 ++-- .../Debian+Ubuntu/makeSourcePackage.sh | 2 +- build_scripts/Debian+Ubuntu/ppa_upload.sh | 2 +- .../RedHat+Fedora/data/retroshare.desktop | 6 +++--- build_scripts/RedHat+Fedora/makePackages.sh | 4 ++-- .../{retroshare06.spec => retroshare.spec} | 12 +++++------ build_scripts/Windows/build/pack.bat | 2 +- .../Windows/installer/retroshare-Qt4.nsi | 20 +++++++++--------- .../Windows/installer/retroshare-Qt5.nsi | 20 +++++++++--------- .../apps/{retroshare06.png => retroshare.png} | Bin .../apps/{retroshare06.png => retroshare.png} | Bin .../apps/{retroshare06.png => retroshare.png} | Bin .../apps/{retroshare06.png => retroshare.png} | Bin ...etroshare06.desktop => retroshare.desktop} | 6 +++--- data/{retroshare06.xpm => retroshare.xpm} | 0 libresapi/src/README.md | 2 +- libresapi/src/webui-src/README.md | 2 +- plugins/Common/retroshare_plugin.pri | 2 +- retroshare-gui/src/Info.plist | 4 ++-- .../src/gui/settings/GeneralPage.ui | 2 +- .../src/gui/settings/rsharesettings.cpp | 4 ++-- retroshare-gui/src/lang/retroshare_af.ts | 4 ++-- retroshare-gui/src/lang/retroshare_ar.ts | 4 ++-- retroshare-gui/src/lang/retroshare_bg.ts | 4 ++-- retroshare-gui/src/lang/retroshare_ca_ES.ts | 6 +++--- retroshare-gui/src/lang/retroshare_cs.ts | 4 ++-- retroshare-gui/src/lang/retroshare_cy.ts | 4 ++-- retroshare-gui/src/lang/retroshare_da.ts | 4 ++-- retroshare-gui/src/lang/retroshare_de.ts | 4 ++-- retroshare-gui/src/lang/retroshare_el.ts | 4 ++-- retroshare-gui/src/lang/retroshare_en.ts | 2 +- retroshare-gui/src/lang/retroshare_es.ts | 6 +++--- retroshare-gui/src/lang/retroshare_fi.ts | 4 ++-- retroshare-gui/src/lang/retroshare_fr.ts | 16 +++++++------- retroshare-gui/src/lang/retroshare_hu.ts | 4 ++-- retroshare-gui/src/lang/retroshare_it.ts | 4 ++-- retroshare-gui/src/lang/retroshare_ja_JP.ts | 4 ++-- retroshare-gui/src/lang/retroshare_ko.ts | 4 ++-- retroshare-gui/src/lang/retroshare_nl.ts | 4 ++-- retroshare-gui/src/lang/retroshare_pl.ts | 4 ++-- retroshare-gui/src/lang/retroshare_pt.ts | 4 ++-- retroshare-gui/src/lang/retroshare_ru.ts | 6 +++--- retroshare-gui/src/lang/retroshare_sl.ts | 4 ++-- retroshare-gui/src/lang/retroshare_sr.ts | 4 ++-- retroshare-gui/src/lang/retroshare_sv.ts | 4 ++-- retroshare-gui/src/lang/retroshare_tr.ts | 6 +++--- retroshare-gui/src/lang/retroshare_zh_CN.ts | 4 ++-- retroshare-gui/src/lang/retroshare_zh_TW.ts | 4 ++-- retroshare-gui/src/retroshare-gui.pro | 6 +++--- retroshare-nogui/src/retroshare-nogui.pro | 2 +- .../src/android/AndroidManifest.xml | 2 +- .../res/drawable/retroshare06_128x128.png | 1 - .../res/drawable/retroshare06_48x48.png | 1 - .../res/drawable/retroshare_128x128.png | 1 + .../android/res/drawable/retroshare_48x48.png | 1 + .../RetroShareAndroidNotifyService.java | 2 +- retroshare-qml-app/src/icons/retroshare.png | 1 + retroshare-qml-app/src/icons/retroshare06.png | 1 - retroshare-qml-app/src/main-app.qml | 2 +- retroshare-qml-app/src/qml.qrc | 2 +- retroshare-qml-app/src/retroshare-qml-app.pro | 2 +- retroshare.pri | 4 ++-- 80 files changed, 212 insertions(+), 212 deletions(-) rename build_scripts/Debian+Ubuntu/debian/{retroshare06-feedreader-plugin.install => retroshare-feedreader-plugin.install} (100%) create mode 100644 build_scripts/Debian+Ubuntu/debian/retroshare-nogui.install rename build_scripts/Debian+Ubuntu/debian/{retroshare06-voip-plugin.install => retroshare-voip-plugin.install} (100%) create mode 100644 build_scripts/Debian+Ubuntu/debian/retroshare.install delete mode 100644 build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install delete mode 100644 build_scripts/Debian+Ubuntu/debian/retroshare06.install rename build_scripts/RedHat+Fedora/{retroshare06.spec => retroshare.spec} (95%) rename data/128x128/apps/{retroshare06.png => retroshare.png} (100%) rename data/24x24/apps/{retroshare06.png => retroshare.png} (100%) rename data/48x48/apps/{retroshare06.png => retroshare.png} (100%) rename data/64x64/apps/{retroshare06.png => retroshare.png} (100%) rename data/{retroshare06.desktop => retroshare.desktop} (68%) rename data/{retroshare06.xpm => retroshare.xpm} (100%) delete mode 120000 retroshare-qml-app/src/android/res/drawable/retroshare06_128x128.png delete mode 120000 retroshare-qml-app/src/android/res/drawable/retroshare06_48x48.png create mode 120000 retroshare-qml-app/src/android/res/drawable/retroshare_128x128.png create mode 120000 retroshare-qml-app/src/android/res/drawable/retroshare_48x48.png create mode 120000 retroshare-qml-app/src/icons/retroshare.png delete mode 120000 retroshare-qml-app/src/icons/retroshare06.png diff --git a/MacOS_X_InstallGuide.md b/MacOS_X_InstallGuide.md index 330d2fb4e..2a614c126 100644 --- a/MacOS_X_InstallGuide.md +++ b/MacOS_X_InstallGuide.md @@ -89,4 +89,4 @@ You can now compile RS into Qt Creator or with terminal You can change Target and SDK in *./retroshare.pri:82* changing value of QMAKE_MACOSX_DEPLOYMENT_TARGET and QMAKE_MAC_SDK -You can find compiled application on *./retroshare/retroshare-gui/src/retroshare06.app* +You can find compiled application on *./retroshare/retroshare-gui/src/retroshare.app* diff --git a/README.md b/README.md index d0316dc95..8902b43b8 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,8 @@ Compilation on Linux The executables produced will be: - /usr/bin/retroshare06 - /usr/bin/retroshare06-nogui + /usr/bin/retroshare + /usr/bin/retroshare-nogui 5. Uninstall: ```bash @@ -124,7 +124,7 @@ Using retroshare-nogui & webUI The webUI needs to be enabled as a parameter option in retroshare-nogui: ```bash -./retroshare-nogui --webinterface 9090 --docroot /usr/share/RetroShare06/webui/ +./retroshare-nogui --webinterface 9090 --docroot /usr/share/retroshare/webui/ ``` The webUI is only accessible on localhost:9090. It is advised to keep it that way so that your RS diff --git a/Start_RetroShare-Gui_Debug.bat b/Start_RetroShare-Gui_Debug.bat index 53c57b2a0..38680ccef 100755 --- a/Start_RetroShare-Gui_Debug.bat +++ b/Start_RetroShare-Gui_Debug.bat @@ -4,8 +4,8 @@ set RSPATH=.\retroshare-gui\src\debug set PATH=%QTDIR%\bin;%LIBS%\bin;%PATH% -If not exist %RSPATH%\retroshare06.exe ( +If not exist %RSPATH%\retroshare.exe ( build-all-mingw32make.bat ) -%RSPATH%\retroshare06.exe +%RSPATH%\retroshare.exe diff --git a/build_scripts/Debian+Ubuntu/README.txt b/build_scripts/Debian+Ubuntu/README.txt index 47b3ccbe2..9a301f975 100644 --- a/build_scripts/Debian+Ubuntu/README.txt +++ b/build_scripts/Debian+Ubuntu/README.txt @@ -34,10 +34,10 @@ How do I create a source package? You should get as many source packages as wanted distributions. For each of them you get (example here for wheezy): - retroshare06_0.6.0-0.7829~wheezy.dsc - retroshare06_0.6.0-0.7829~wheezy_source.build - retroshare06_0.6.0-0.7829~wheezy_source.changes - retroshare06_0.6.0-0.7829~wheezy.tar.gz + retroshare_0.6.0-0.7829~wheezy.dsc + retroshare_0.6.0-0.7829~wheezy_source.build + retroshare_0.6.0-0.7829~wheezy_source.changes + retroshare_0.6.0-0.7829~wheezy.tar.gz How do I create a binary package? ================================= @@ -69,7 +69,7 @@ How do I create a binary package? *Package compilation* - > pbuilder-dist wheezy build retroshare06_0.6.0~7856~wheezy.dsc + > pbuilder-dist wheezy build retroshare_0.6.0~7856~wheezy.dsc The generated compiled binary packages (including all package plugins etc) will be in ~/pbuilder/wheezy_result/ diff --git a/build_scripts/Debian+Ubuntu/clean.sh b/build_scripts/Debian+Ubuntu/clean.sh index e52c729d9..3d117407e 100755 --- a/build_scripts/Debian+Ubuntu/clean.sh +++ b/build_scripts/Debian+Ubuntu/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh rm -f ./libssh-0.5.4.tar.gz.* -rm -f ./retroshare06_0.6.2-1.*_source.build -rm -f ./retroshare06_0.6.2-1.*_source.changes -rm -f ./retroshare06_0.6.2-1.*.tar.gz -rm -f ./retroshare06_0.6.2-1.*.diff.gz -rm -f ./retroshare06_0.6.2-1.*.dsc +rm -f ./retroshare_0.6.2-1.*_source.build +rm -f ./retroshare_0.6.2-1.*_source.changes +rm -f ./retroshare_0.6.2-1.*.tar.gz +rm -f ./retroshare_0.6.2-1.*.diff.gz +rm -f ./retroshare_0.6.2-1.*.dsc rm -f *.upload rm -f *~ diff --git a/build_scripts/Debian+Ubuntu/control.jessie b/build_scripts/Debian+Ubuntu/control.jessie index 9b557e3b8..0dc536b9e 100644 --- a/build_scripts/Debian+Ubuntu/control.jessie +++ b/build_scripts/Debian+Ubuntu/control.jessie @@ -1,4 +1,4 @@ -Source: retroshare06 +Source: retroshare Section: devel Priority: standard Maintainer: Cyril Soler @@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxs Standards-Version: 3.9.6 Homepage: http://retroshare.sourceforge.net -Package: retroshare06-voip-plugin +Package: retroshare-voip-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 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: retroshare06-feedreader-plugin +Package: retroshare-feedreader-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare Description: RetroShare FeedReader 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: retroshare06-nogui +Package: retroshare-nogui Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06 +Conflicts: retroshare 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: retroshare06 +Package: retroshare Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06-nogui +Conflicts: retroshare-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/Debian+Ubuntu/control.precise b/build_scripts/Debian+Ubuntu/control.precise index 70d77ea50..ce47d60a0 100644 --- a/build_scripts/Debian+Ubuntu/control.precise +++ b/build_scripts/Debian+Ubuntu/control.precise @@ -1,4 +1,4 @@ -Source: retroshare06 +Source: retroshare Section: devel Priority: standard Maintainer: Cyril Soler @@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, qt4-dev-tools, li Standards-Version: 3.9.3 Homepage: http://retroshare.sourceforge.net -Package: retroshare06-voip-plugin +Package: retroshare-voip-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqtmultimediakit1 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, 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: retroshare06-feedreader-plugin +Package: retroshare-feedreader-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare Description: RetroShare FeedReader 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: retroshare06-nogui +Package: retroshare-nogui Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06 +Conflicts: retroshare 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: retroshare06 +Package: retroshare Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06-nogui +Conflicts: retroshare-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/Debian+Ubuntu/control.squeeze_bubba3 b/build_scripts/Debian+Ubuntu/control.squeeze_bubba3 index c72507d0f..fd99400bf 100644 --- a/build_scripts/Debian+Ubuntu/control.squeeze_bubba3 +++ b/build_scripts/Debian+Ubuntu/control.squeeze_bubba3 @@ -1,4 +1,4 @@ -Source: retroshare06 +Source: retroshare Section: devel Priority: standard Maintainer: Cyril Soler @@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, qt4-dev-tools, li Standards-Version: 3.9.3 Homepage: http://retroshare.sourceforge.net -Package: retroshare06-voip-plugin +Package: retroshare-voip-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqtmultimediakit1 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, 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: retroshare06-feedreader-plugin +Package: retroshare-feedreader-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare Description: RetroShare FeedReader 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: retroshare06-nogui +Package: retroshare-nogui Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06 +Conflicts: retroshare 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: retroshare06 +Package: retroshare Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06-nogui +Conflicts: retroshare-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/Debian+Ubuntu/control.stretch b/build_scripts/Debian+Ubuntu/control.stretch index 6968c9964..16b55c587 100644 --- a/build_scripts/Debian+Ubuntu/control.stretch +++ b/build_scripts/Debian+Ubuntu/control.stretch @@ -1,4 +1,4 @@ -Source: retroshare06 +Source: retroshare Section: devel Priority: standard Maintainer: Cyril Soler @@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxs Standards-Version: 3.9.6 Homepage: http://retroshare.sourceforge.net -Package: retroshare06-voip-plugin +Package: retroshare-voip-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 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: retroshare06-feedreader-plugin +Package: retroshare-feedreader-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare Description: RetroShare FeedReader 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: retroshare06-nogui +Package: retroshare-nogui Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06 +Conflicts: retroshare 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: retroshare06 +Package: retroshare Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06-nogui +Conflicts: retroshare-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/Debian+Ubuntu/control.xenial b/build_scripts/Debian+Ubuntu/control.xenial index 9b557e3b8..0dc536b9e 100644 --- a/build_scripts/Debian+Ubuntu/control.xenial +++ b/build_scripts/Debian+Ubuntu/control.xenial @@ -1,4 +1,4 @@ -Source: retroshare06 +Source: retroshare Section: devel Priority: standard Maintainer: Cyril Soler @@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxs Standards-Version: 3.9.6 Homepage: http://retroshare.sourceforge.net -Package: retroshare06-voip-plugin +Package: retroshare-voip-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 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: retroshare06-feedreader-plugin +Package: retroshare-feedreader-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare Description: RetroShare FeedReader 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: retroshare06-nogui +Package: retroshare-nogui Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06 +Conflicts: retroshare 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: retroshare06 +Package: retroshare Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06-nogui +Conflicts: retroshare-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/Debian+Ubuntu/control.yakkety b/build_scripts/Debian+Ubuntu/control.yakkety index 9b557e3b8..0dc536b9e 100644 --- a/build_scripts/Debian+Ubuntu/control.yakkety +++ b/build_scripts/Debian+Ubuntu/control.yakkety @@ -1,4 +1,4 @@ -Source: retroshare06 +Source: retroshare Section: devel Priority: standard Maintainer: Cyril Soler @@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxs Standards-Version: 3.9.6 Homepage: http://retroshare.sourceforge.net -Package: retroshare06-voip-plugin +Package: retroshare-voip-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 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: retroshare06-feedreader-plugin +Package: retroshare-feedreader-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare Description: RetroShare FeedReader 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: retroshare06-nogui +Package: retroshare-nogui Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06 +Conflicts: retroshare 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: retroshare06 +Package: retroshare Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06-nogui +Conflicts: retroshare-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/Debian+Ubuntu/control.zesty b/build_scripts/Debian+Ubuntu/control.zesty index 9b557e3b8..0dc536b9e 100644 --- a/build_scripts/Debian+Ubuntu/control.zesty +++ b/build_scripts/Debian+Ubuntu/control.zesty @@ -1,4 +1,4 @@ -Source: retroshare06 +Source: retroshare Section: devel Priority: standard Maintainer: Cyril Soler @@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxs Standards-Version: 3.9.6 Homepage: http://retroshare.sourceforge.net -Package: retroshare06-voip-plugin +Package: retroshare-voip-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 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: retroshare06-feedreader-plugin +Package: retroshare-feedreader-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 +Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare Description: RetroShare FeedReader 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: retroshare06-nogui +Package: retroshare-nogui Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06 +Conflicts: retroshare 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: retroshare06 +Package: retroshare Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare06-nogui +Conflicts: retroshare-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/Debian+Ubuntu/debian/retroshare06-feedreader-plugin.install b/build_scripts/Debian+Ubuntu/debian/retroshare-feedreader-plugin.install similarity index 100% rename from build_scripts/Debian+Ubuntu/debian/retroshare06-feedreader-plugin.install rename to build_scripts/Debian+Ubuntu/debian/retroshare-feedreader-plugin.install diff --git a/build_scripts/Debian+Ubuntu/debian/retroshare-nogui.install b/build_scripts/Debian+Ubuntu/debian/retroshare-nogui.install new file mode 100644 index 000000000..5fb7e3c8d --- /dev/null +++ b/build_scripts/Debian+Ubuntu/debian/retroshare-nogui.install @@ -0,0 +1,3 @@ +debian/tmp/usr/bin/retroshare-nogui +debian/tmp/usr/share/retroshare/bdboot.txt +debian/tmp/usr/share/retroshare/webui/* diff --git a/build_scripts/Debian+Ubuntu/debian/retroshare06-voip-plugin.install b/build_scripts/Debian+Ubuntu/debian/retroshare-voip-plugin.install similarity index 100% rename from build_scripts/Debian+Ubuntu/debian/retroshare06-voip-plugin.install rename to build_scripts/Debian+Ubuntu/debian/retroshare-voip-plugin.install diff --git a/build_scripts/Debian+Ubuntu/debian/retroshare.install b/build_scripts/Debian+Ubuntu/debian/retroshare.install new file mode 100644 index 000000000..e8bfb8315 --- /dev/null +++ b/build_scripts/Debian+Ubuntu/debian/retroshare.install @@ -0,0 +1,6 @@ +debian/tmp/usr/bin/retroshare +debian/tmp/usr/bin/retroshare-nogui +debian/tmp/usr/share/applications/retroshare.desktop +debian/tmp/usr/share/icons/hicolor/* +debian/tmp/usr/share/pixmaps/retroshare.xpm +debian/tmp/usr/share/retroshare/* diff --git a/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install b/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install deleted file mode 100644 index 2e58d591d..000000000 --- a/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/bin/retroshare06-nogui -debian/tmp/usr/share/RetroShare06/bdboot.txt -debian/tmp/usr/share/RetroShare06/webui/* diff --git a/build_scripts/Debian+Ubuntu/debian/retroshare06.install b/build_scripts/Debian+Ubuntu/debian/retroshare06.install deleted file mode 100644 index 4e0582f2f..000000000 --- a/build_scripts/Debian+Ubuntu/debian/retroshare06.install +++ /dev/null @@ -1,6 +0,0 @@ -debian/tmp/usr/bin/retroshare06 -debian/tmp/usr/bin/retroshare06-nogui -debian/tmp/usr/share/applications/retroshare06.desktop -debian/tmp/usr/share/icons/hicolor/* -debian/tmp/usr/share/pixmaps/retroshare06.xpm -debian/tmp/usr/share/RetroShare06/* diff --git a/build_scripts/Debian+Ubuntu/full_packaging_pipeline.sh b/build_scripts/Debian+Ubuntu/full_packaging_pipeline.sh index 6cd176aca..dd8cccf9a 100755 --- a/build_scripts/Debian+Ubuntu/full_packaging_pipeline.sh +++ b/build_scripts/Debian+Ubuntu/full_packaging_pipeline.sh @@ -10,12 +10,12 @@ archis="armhf amd64 i386" ######################################################## ./clean.sh -rm -rf retroshare06-0.6.2 +rm -rf retroshare-0.6.2 ./makeSourcePackage.sh -distribution "$distribs" for dist in $distribs; do for arch in $archis; do - pbuilder-dist $dist $arch build retroshare06_0.6.2-1.???????.????????~"$dist".dsc + pbuilder-dist $dist $arch build retroshare.6.2-1.???????.????????~"$dist".dsc done done diff --git a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh index dfc026158..c14a99bc9 100755 --- a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh +++ b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh @@ -3,7 +3,7 @@ ###################### PARAMETERS #################### version="0.6.2" gitpath="https://github.com/RetroShare/RetroShare.git" -workdir=retroshare06-${version} +workdir=retroshare-${version} branch="master" #bubba3="Y" # comment out to compile for bubba3 ###################################################### diff --git a/build_scripts/Debian+Ubuntu/ppa_upload.sh b/build_scripts/Debian+Ubuntu/ppa_upload.sh index dd802d882..09fd015e8 100644 --- a/build_scripts/Debian+Ubuntu/ppa_upload.sh +++ b/build_scripts/Debian+Ubuntu/ppa_upload.sh @@ -1,4 +1,4 @@ #!/bin/sh -for i in `ls retroshare06_0.6.2-1.*.changes` ; do +for i in `ls retroshare.6.2-1.*.changes` ; do dput ppa:retroshare/unstable $i done diff --git a/build_scripts/RedHat+Fedora/data/retroshare.desktop b/build_scripts/RedHat+Fedora/data/retroshare.desktop index 49ce10116..7b93b4fa5 100644 --- a/build_scripts/RedHat+Fedora/data/retroshare.desktop +++ b/build_scripts/RedHat+Fedora/data/retroshare.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Version=1.0 -Name=RetroShare06 +Name=RetroShare Comment=Securely share files with your friends -Exec=/usr/bin/retroshare06 %U -Icon=/usr/share/pixmaps/retroshare06.xpm +Exec=/usr/bin/retroshare %U +Icon=/usr/share/pixmaps/retroshare.xpm Terminal=false Type=Application Categories=Network;P2P; diff --git a/build_scripts/RedHat+Fedora/makePackages.sh b/build_scripts/RedHat+Fedora/makePackages.sh index 805209895..3a1d9aa95 100755 --- a/build_scripts/RedHat+Fedora/makePackages.sh +++ b/build_scripts/RedHat+Fedora/makePackages.sh @@ -34,7 +34,7 @@ echo "Using revision: ${REV}" echo "Hit ENTER if this is correct. Otherwise hit Ctrl+C" read tmp -WORKDIR="retroshare06-${FULL_VERSION}" +WORKDIR="retroshare-${FULL_VERSION}" if [[ -d ${WORKDIR} ]] then @@ -80,6 +80,6 @@ do done popd >/dev/null tar -zcf rpm-build/rpm/SOURCES/${WORKDIR}.tar.gz ${WORKDIR} -rpmbuild --define="%rev ${REV}" --define="%_usrsrc $PWD/rpm-build" --define="%_topdir %{_usrsrc}/rpm" -ba retroshare06.spec +rpmbuild --define="%rev ${REV}" --define="%_usrsrc $PWD/rpm-build" --define="%_topdir %{_usrsrc}/rpm" -ba retroshare.spec rm -rf ${WORKDIR} exit 0 diff --git a/build_scripts/RedHat+Fedora/retroshare06.spec b/build_scripts/RedHat+Fedora/retroshare.spec similarity index 95% rename from build_scripts/RedHat+Fedora/retroshare06.spec rename to build_scripts/RedHat+Fedora/retroshare.spec index 45bc74742..a2e56a35c 100644 --- a/build_scripts/RedHat+Fedora/retroshare06.spec +++ b/build_scripts/RedHat+Fedora/retroshare.spec @@ -1,5 +1,5 @@ Summary: Secure communication with friends -Name: retroshare06 +Name: retroshare Version: 0.6.0.%{rev} Release: 1%{?dist} License: GPLv3 @@ -65,25 +65,25 @@ rm -rf $RPM_BUILD_ROOT cd src make INSTALL_ROOT=$RPM_BUILD_ROOT install #menu -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/retroshare06.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/retroshare.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_bindir}/retroshare06 +%{_bindir}/retroshare %defattr(644, root, root) %{_datadir}/pixmaps/%{name}.xpm %{_datadir}/icons/hicolor %{_datadir}/applications/%{name}.desktop -%{_datadir}/RetroShare06 +%{_datadir}/retroshare %files nogui %defattr(-, root, root) -%{_bindir}/retroshare06-nogui +%{_bindir}/retroshare-nogui %defattr(644, root, root) -%{_datadir}/RetroShare06 +%{_datadir}/retroshare %files voip-plugin %defattr(-, root, root) diff --git a/build_scripts/Windows/build/pack.bat b/build_scripts/Windows/build/pack.bat index b466cefc5..d52377d9f 100644 --- a/build_scripts/Windows/build/pack.bat +++ b/build_scripts/Windows/build/pack.bat @@ -116,7 +116,7 @@ echo copy external binaries copy "%RootPath%\libs\bin\*.dll" "%RsDeployPath%" %Quite% echo copy dependencies -call :copy_dependencies "%RsDeployPath%\retroshare06.exe" "%RsDeployPath%" +call :copy_dependencies "%RsDeployPath%\retroshare.exe" "%RsDeployPath%" echo copy Qt DLL's copy "%QtPath%\Qt%QtMainVersion1%Svg%QtMainVersion2%.dll" "%RsDeployPath%" %Quite% diff --git a/build_scripts/Windows/installer/retroshare-Qt4.nsi b/build_scripts/Windows/installer/retroshare-Qt4.nsi index 5be261f69..0d7b9c6aa 100644 --- a/build_scripts/Windows/installer/retroshare-Qt4.nsi +++ b/build_scripts/Windows/installer/retroshare-Qt4.nsi @@ -41,7 +41,7 @@ !define SOURCEDIR "..\..\.." # Get version from executable -!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\retroshare06.exe" VERSION_ +!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe" VERSION_ !define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD} ;!define REVISION ${VERSION_4} @@ -107,7 +107,7 @@ Var StyleSheetDir !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support" !define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/" -!define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare06.exe" +!define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare.exe" !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt !define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED @@ -180,8 +180,8 @@ Section $(Section_Main) Section_Main ; Main binaries SetOutPath "$INSTDIR" - File /oname=retroshare06.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare06.exe" - File /oname=retroshare06-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\retroshare06-nogui.exe" + File /oname=retroshare.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe" + File /oname=retroshare-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\retroshare-nogui.exe" ; Qt binaries File "${QTDIR}\bin\QtCore4.dll" @@ -270,7 +270,7 @@ SectionEnd ; WriteRegStr HKCR retroshare "" "PQI File" ; WriteRegBin HKCR retroshare EditFlags 00000100 ; WriteRegStr HKCR "retroshare\shell" "" open -; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare06.exe" "%1"` +; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare.exe" "%1"` ;SectionEnd # Shortcuts @@ -279,15 +279,15 @@ Section $(Section_StartMenu) Section_StartMenu SetOutPath "$INSTDIR" CreateDirectory "$SMPROGRAMS\${APPNAME}" CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0 + CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 SectionEnd Section $(Section_Desktop) Section_Desktop - CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0 + CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 SectionEnd Section $(Section_QuickLaunch) Section_QuickLaunch - CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0 + CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 SectionEnd SectionGroupEnd @@ -296,7 +296,7 @@ Section $(Section_AutoStart) Section_AutoStart SectionEnd ;Section $(Section_AutoStart) Section_AutoStart -; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe -m" 0 +; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe -m" 0 ;SectionEnd Section -FinishSection @@ -305,7 +305,7 @@ Section -FinishSection WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare06.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1" diff --git a/build_scripts/Windows/installer/retroshare-Qt5.nsi b/build_scripts/Windows/installer/retroshare-Qt5.nsi index f982bad13..bb2ede5b4 100644 --- a/build_scripts/Windows/installer/retroshare-Qt5.nsi +++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi @@ -41,7 +41,7 @@ !define SOURCEDIR "..\..\.." # Get version from executable -!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\retroshare06.exe" VERSION_ +!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe" VERSION_ !define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD} ;!define REVISION ${VERSION_4} @@ -107,7 +107,7 @@ Var StyleSheetDir !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support" !define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/" -!define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare06.exe" +!define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare.exe" !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt !define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED @@ -180,8 +180,8 @@ Section $(Section_Main) Section_Main ; Main binaries SetOutPath "$INSTDIR" - File /oname=retroshare06.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare06.exe" - File /oname=retroshare06-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\retroshare06-nogui.exe" + File /oname=retroshare.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe" + File /oname=retroshare-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\retroshare-nogui.exe" ; Qt binaries File "${QTDIR}\bin\Qt5Core.dll" @@ -288,7 +288,7 @@ SectionEnd ; WriteRegStr HKCR retroshare "" "PQI File" ; WriteRegBin HKCR retroshare EditFlags 00000100 ; WriteRegStr HKCR "retroshare\shell" "" open -; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare06.exe" "%1"` +; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare.exe" "%1"` ;SectionEnd # Shortcuts @@ -297,15 +297,15 @@ Section $(Section_StartMenu) Section_StartMenu SetOutPath "$INSTDIR" CreateDirectory "$SMPROGRAMS\${APPNAME}" CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0 + CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 SectionEnd Section $(Section_Desktop) Section_Desktop - CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0 + CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 SectionEnd Section $(Section_QuickLaunch) Section_QuickLaunch - CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0 + CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 SectionEnd SectionGroupEnd @@ -314,7 +314,7 @@ Section $(Section_AutoStart) Section_AutoStart SectionEnd ;Section $(Section_AutoStart) Section_AutoStart -; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe -m" 0 +; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe -m" 0 ;SectionEnd Section -FinishSection @@ -323,7 +323,7 @@ Section -FinishSection WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare06.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1" diff --git a/data/128x128/apps/retroshare06.png b/data/128x128/apps/retroshare.png similarity index 100% rename from data/128x128/apps/retroshare06.png rename to data/128x128/apps/retroshare.png diff --git a/data/24x24/apps/retroshare06.png b/data/24x24/apps/retroshare.png similarity index 100% rename from data/24x24/apps/retroshare06.png rename to data/24x24/apps/retroshare.png diff --git a/data/48x48/apps/retroshare06.png b/data/48x48/apps/retroshare.png similarity index 100% rename from data/48x48/apps/retroshare06.png rename to data/48x48/apps/retroshare.png diff --git a/data/64x64/apps/retroshare06.png b/data/64x64/apps/retroshare.png similarity index 100% rename from data/64x64/apps/retroshare06.png rename to data/64x64/apps/retroshare.png diff --git a/data/retroshare06.desktop b/data/retroshare.desktop similarity index 68% rename from data/retroshare06.desktop rename to data/retroshare.desktop index 6cbf3a9b5..724b86953 100644 --- a/data/retroshare06.desktop +++ b/data/retroshare.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 Version=1.0 -Name=RetroShare06 +Name=RetroShare Comment=Securely share files with your friends -Exec=/usr/bin/retroshare06 %U -Icon=/usr/share/pixmaps/retroshare06.xpm +Exec=/usr/bin/retroshare %U +Icon=/usr/share/pixmaps/retroshare.xpm Terminal=false Type=Application Categories=Application;Network; diff --git a/data/retroshare06.xpm b/data/retroshare.xpm similarity index 100% rename from data/retroshare06.xpm rename to data/retroshare.xpm diff --git a/libresapi/src/README.md b/libresapi/src/README.md index b5aaa4760..ee8cf5671 100644 --- a/libresapi/src/README.md +++ b/libresapi/src/README.md @@ -10,5 +10,5 @@ Quickinfo for builders and packagers * copy the files in ./webui to * ./webui (Windows) -* /usr/share/RetroShare06/webui (Linux) +* /usr/share/retroshare/webui (Linux) * other OS: see RsAccountsDetail::PathDataDirectory() diff --git a/libresapi/src/webui-src/README.md b/libresapi/src/webui-src/README.md index 26a52a2c5..148068918 100644 --- a/libresapi/src/webui-src/README.md +++ b/libresapi/src/webui-src/README.md @@ -19,7 +19,7 @@ BUILD / DEVELOPMENT - the build process watches files for changes, and rebuilds and reloads the page. Build output is in ./public - use the --webinterface 9090 command line parameter to enable webui in retroshare-nogui - set the --docroot parameter of retroshare-nogui to point to the "libresapi/src/webui-src/public" directory - (or symlink from /usr/share/RetroShare06/webui on Linux, ./webui on Windows) + (or symlink from /usr/share/retroshare/webui on Linux, ./webui on Windows) - retroshare-gui does not have a --docroot parameter. Use symlinks then. CONTRIBUTE diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri index d60d7a94a..c6124862c 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -80,7 +80,7 @@ macx { #https://developer.apple.com/library/mac/documentation/Porting/Conceptual/PortingUnix/compiling/compiling.html QMAKE_LFLAGS_PLUGIN -= -dynamiclib QMAKE_LFLAGS_PLUGIN += -bundle - QMAKE_LFLAGS_PLUGIN += -bundle_loader "../../retroshare-gui/src/retroshare06.app/Contents/MacOS/retroshare06" + QMAKE_LFLAGS_PLUGIN += -bundle_loader "../../retroshare-gui/src/retroshare.app/Contents/MacOS/retroshare" OBJECTS_DIR = temp/obj MOC_DIR = temp/moc diff --git a/retroshare-gui/src/Info.plist b/retroshare-gui/src/Info.plist index 556074271..1dfea76cf 100755 --- a/retroshare-gui/src/Info.plist +++ b/retroshare-gui/src/Info.plist @@ -13,9 +13,9 @@ CFBundleSignature ???? CFBundleExecutable - retroshare06 + retroshare CFBundleIdentifier - com.retroshare06 + com.retroshare NSHighResolutionCapable CFBundleDocumentTypes diff --git a/retroshare-gui/src/gui/settings/GeneralPage.ui b/retroshare-gui/src/gui/settings/GeneralPage.ui index f5be1e386..ab2863f1c 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.ui +++ b/retroshare-gui/src/gui/settings/GeneralPage.ui @@ -165,7 +165,7 @@ - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> !!!The RetroShare's desktop file is missing or wrong!!! diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index 1ad2a76d3..5955cd421 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -799,9 +799,9 @@ bool RshareSettings::getRetroShareProtocol() } } #elif defined(Q_OS_LINUX) - QFile desktop("/usr/share/applications/retroshare06.desktop"); + QFile desktop("/usr/share/applications/retroshare.desktop"); if (!desktop.exists()) { - desktop.setFileName("/usr/share/applications/RetroShare06.desktop"); + desktop.setFileName("/usr/share/applications/retroshare.desktop"); } if (desktop.exists()) { desktop.open(QIODevice::ReadOnly | QIODevice::Text); diff --git a/retroshare-gui/src/lang/retroshare_af.ts b/retroshare-gui/src/lang/retroshare_af.ts index f5e081925..8b4f0964c 100644 --- a/retroshare-gui/src/lang/retroshare_af.ts +++ b/retroshare-gui/src/lang/retroshare_af.ts @@ -6628,7 +6628,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20976,4 +20976,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_ar.ts b/retroshare-gui/src/lang/retroshare_ar.ts index bc4e7aa1a..b639d544e 100644 --- a/retroshare-gui/src/lang/retroshare_ar.ts +++ b/retroshare-gui/src/lang/retroshare_ar.ts @@ -6628,7 +6628,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20977,4 +20977,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_bg.ts b/retroshare-gui/src/lang/retroshare_bg.ts index bd6fb382f..2595b123c 100644 --- a/retroshare-gui/src/lang/retroshare_bg.ts +++ b/retroshare-gui/src/lang/retroshare_bg.ts @@ -6628,7 +6628,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20976,4 +20976,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_ca_ES.ts b/retroshare-gui/src/lang/retroshare_ca_ES.ts index 1c311e788..74fc2b29c 100644 --- a/retroshare-gui/src/lang/retroshare_ca_ES.ts +++ b/retroshare-gui/src/lang/retroshare_ca_ES.ts @@ -6678,8 +6678,8 @@ i utilitzar el botó d'importació per carregar-lo - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> - <html><head/><body><p>Instal·la RetroShare amb un instal·lador de paquets per obtindre</p><p>/usr/share/applications/retroshare06.desktop + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> + <html><head/><body><p>Instal·la RetroShare amb un instal·lador de paquets per obtindre</p><p>/usr/share/applications/retroshare.desktop @@ -21276,4 +21276,4 @@ Tingues paciència! Imatges (*.png *.jpeg *.xpm *.jpg *.tiff *.gif) - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_cs.ts b/retroshare-gui/src/lang/retroshare_cs.ts index 445780234..44e719dff 100644 --- a/retroshare-gui/src/lang/retroshare_cs.ts +++ b/retroshare-gui/src/lang/retroshare_cs.ts @@ -6678,7 +6678,7 @@ a vytvořit nový node využívající stejný profil. - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21063,4 +21063,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_cy.ts b/retroshare-gui/src/lang/retroshare_cy.ts index d574f7903..2be68946b 100644 --- a/retroshare-gui/src/lang/retroshare_cy.ts +++ b/retroshare-gui/src/lang/retroshare_cy.ts @@ -6628,7 +6628,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20976,4 +20976,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_da.ts b/retroshare-gui/src/lang/retroshare_da.ts index 669d958e9..dd38b00fd 100644 --- a/retroshare-gui/src/lang/retroshare_da.ts +++ b/retroshare-gui/src/lang/retroshare_da.ts @@ -6628,7 +6628,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20976,4 +20976,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index b1f2cc5df..d8fbe8ba9 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -6674,7 +6674,7 @@ und den Import zum Laden verwenden - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21184,4 +21184,4 @@ Bitte habe etwas Geduld! Bilder (*.png *.jpeg *.xpm *.jpg *.tiff *.gif) - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_el.ts b/retroshare-gui/src/lang/retroshare_el.ts index 86f328650..ecb4e52b2 100644 --- a/retroshare-gui/src/lang/retroshare_el.ts +++ b/retroshare-gui/src/lang/retroshare_el.ts @@ -6654,7 +6654,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21103,4 +21103,4 @@ Try to be patient! Εικόνες (*.png *.jpeg *.xpm *.jpg *.tiff *.gif) - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index 407c0139f..e64aea80d 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -6630,7 +6630,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> diff --git a/retroshare-gui/src/lang/retroshare_es.ts b/retroshare-gui/src/lang/retroshare_es.ts index b4b0c53cc..0ac94a59c 100644 --- a/retroshare-gui/src/lang/retroshare_es.ts +++ b/retroshare-gui/src/lang/retroshare_es.ts @@ -6683,8 +6683,8 @@ y usar el botón Importar para cargarlo - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> - <html><head/><body><p>Instale RetroShare con un paquete instalador para obtener</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> + <html><head/><body><p>Instale RetroShare con un paquete instalador para obtener</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21257,4 +21257,4 @@ bloques defectuosos y los descargará de nuevo. Imágenes (*.png *.jpeg *.xpm *.jpg *.tiff *.gif) - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_fi.ts b/retroshare-gui/src/lang/retroshare_fi.ts index a9c00fedc..8bacd56bc 100644 --- a/retroshare-gui/src/lang/retroshare_fi.ts +++ b/retroshare-gui/src/lang/retroshare_fi.ts @@ -6662,7 +6662,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21143,4 +21143,4 @@ Kärsivällisyyttä! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_fr.ts b/retroshare-gui/src/lang/retroshare_fr.ts index 0990d4802..371e7b68c 100644 --- a/retroshare-gui/src/lang/retroshare_fr.ts +++ b/retroshare-gui/src/lang/retroshare_fr.ts @@ -1777,14 +1777,14 @@ Double-cliquez sur un salon pour entrer et discuter. Style: - Style : + Style : Variant: - Variante : + Variante : @@ -2577,7 +2577,7 @@ après la conversion en HTML. Name: - Nom : + Nom : @@ -6697,8 +6697,8 @@ et l'utiliser au moyen du bouton d'importation afin de le charger - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> - <html><head/><body><p>Installer RetroShare avec un gestionnaire de paquets afin d'obtenir </p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> + <html><head/><body><p>Installer RetroShare avec un gestionnaire de paquets afin d'obtenir </p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -7746,7 +7746,7 @@ Les publications sont conservés pendant %1 jours et synchronisés au cours des New Comment: - Nouveau commentaire : + Nouveau commentaire : @@ -15231,7 +15231,7 @@ comportements malveillants des extensions. New Comment: - Nouveau commentaire : + Nouveau commentaire : @@ -21350,4 +21350,4 @@ Essayez d'être patient ! Images (*.png *.jpeg *.xpm *.jpg *.tiff *.gif) - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_hu.ts b/retroshare-gui/src/lang/retroshare_hu.ts index a91506cd8..f50325360 100644 --- a/retroshare-gui/src/lang/retroshare_hu.ts +++ b/retroshare-gui/src/lang/retroshare_hu.ts @@ -6651,7 +6651,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21123,4 +21123,4 @@ Kérlek, légy türelmes! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_it.ts b/retroshare-gui/src/lang/retroshare_it.ts index 4620050a6..51d9c1fe9 100644 --- a/retroshare-gui/src/lang/retroshare_it.ts +++ b/retroshare-gui/src/lang/retroshare_it.ts @@ -6678,7 +6678,7 @@ il bottone IMPORT per caricarlo - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21177,4 +21177,4 @@ Sii paziente! Immagini (*.png *.jpeg *.xpm *.jpg *.tiff *.gif) - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_ja_JP.ts b/retroshare-gui/src/lang/retroshare_ja_JP.ts index 507666255..299819395 100644 --- a/retroshare-gui/src/lang/retroshare_ja_JP.ts +++ b/retroshare-gui/src/lang/retroshare_ja_JP.ts @@ -6629,7 +6629,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20977,4 +20977,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_ko.ts b/retroshare-gui/src/lang/retroshare_ko.ts index 6228b8f8a..f2cd3f758 100644 --- a/retroshare-gui/src/lang/retroshare_ko.ts +++ b/retroshare-gui/src/lang/retroshare_ko.ts @@ -6637,7 +6637,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20991,4 +20991,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_nl.ts b/retroshare-gui/src/lang/retroshare_nl.ts index 896f40ff0..647f57118 100644 --- a/retroshare-gui/src/lang/retroshare_nl.ts +++ b/retroshare-gui/src/lang/retroshare_nl.ts @@ -6654,7 +6654,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21129,4 +21129,4 @@ Even geduld a.u.b.! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_pl.ts b/retroshare-gui/src/lang/retroshare_pl.ts index 7749ab75e..086976d06 100644 --- a/retroshare-gui/src/lang/retroshare_pl.ts +++ b/retroshare-gui/src/lang/retroshare_pl.ts @@ -6637,7 +6637,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21018,4 +21018,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_pt.ts b/retroshare-gui/src/lang/retroshare_pt.ts index 569bb4802..ed1cf9950 100644 --- a/retroshare-gui/src/lang/retroshare_pt.ts +++ b/retroshare-gui/src/lang/retroshare_pt.ts @@ -6628,7 +6628,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20976,4 +20976,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_ru.ts b/retroshare-gui/src/lang/retroshare_ru.ts index f5e61bb92..d4cb3f551 100644 --- a/retroshare-gui/src/lang/retroshare_ru.ts +++ b/retroshare-gui/src/lang/retroshare_ru.ts @@ -6685,8 +6685,8 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> - <html><head/><body><p>Установить RetroShare с помощью установщика пакетов, чтобы создать</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> + <html><head/><body><p>Установить RetroShare с помощью установщика пакетов, чтобы создать</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21269,4 +21269,4 @@ Try to be patient! Изображения (*.png *.jpeg *.xpm *.jpg *.tiff *.gif) - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_sl.ts b/retroshare-gui/src/lang/retroshare_sl.ts index 1f0aa7763..79bba80aa 100644 --- a/retroshare-gui/src/lang/retroshare_sl.ts +++ b/retroshare-gui/src/lang/retroshare_sl.ts @@ -6628,7 +6628,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20976,4 +20976,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_sr.ts b/retroshare-gui/src/lang/retroshare_sr.ts index 629b85395..e06dd4e2a 100644 --- a/retroshare-gui/src/lang/retroshare_sr.ts +++ b/retroshare-gui/src/lang/retroshare_sr.ts @@ -6629,7 +6629,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20977,4 +20977,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_sv.ts b/retroshare-gui/src/lang/retroshare_sv.ts index b5a936589..27cce9789 100644 --- a/retroshare-gui/src/lang/retroshare_sv.ts +++ b/retroshare-gui/src/lang/retroshare_sv.ts @@ -6660,7 +6660,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21139,4 +21139,4 @@ Försök ha tålamod! - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_tr.ts b/retroshare-gui/src/lang/retroshare_tr.ts index 52ff6681e..30aeca2c5 100644 --- a/retroshare-gui/src/lang/retroshare_tr.ts +++ b/retroshare-gui/src/lang/retroshare_tr.ts @@ -6680,8 +6680,8 @@ ve Al düğmesini kullanarak yükleyebilirsiniz - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> - <html><head/><body><p>Bir paket yükleyici ile RetroShare yüklemek için</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> + <html><head/><body><p>Bir paket yükleyici ile RetroShare yüklemek için</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21260,4 +21260,4 @@ Lütfen sabırla bekleyin! Görseller (*.png *.jpeg *.xpm *.jpg *.tiff *.gif) - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_zh_CN.ts b/retroshare-gui/src/lang/retroshare_zh_CN.ts index 6da6f223b..05d47665b 100644 --- a/retroshare-gui/src/lang/retroshare_zh_CN.ts +++ b/retroshare-gui/src/lang/retroshare_zh_CN.ts @@ -6653,7 +6653,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -21134,4 +21134,4 @@ RetroShare 将向数据源请求详细的校验 图片 (*.png *.xpm *.jpg *.tiff *.gif *.jpeg) - \ No newline at end of file + diff --git a/retroshare-gui/src/lang/retroshare_zh_TW.ts b/retroshare-gui/src/lang/retroshare_zh_TW.ts index 0b06ab116..c855e7be4 100644 --- a/retroshare-gui/src/lang/retroshare_zh_TW.ts +++ b/retroshare-gui/src/lang/retroshare_zh_TW.ts @@ -6628,7 +6628,7 @@ and use the import button to load it - <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare06.desktop</p></body></html> + <html><head/><body><p>Install RetroShare with a package installer to get</p><p>/usr/share/applications/retroshare.desktop</p></body></html> @@ -20976,4 +20976,4 @@ Try to be patient! - \ No newline at end of file + diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 661bcd954..57533898f 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -4,7 +4,7 @@ TEMPLATE = app QT += network xml CONFIG += qt gui uic qrc resources idle bitdht CONFIG += link_prl -TARGET = retroshare06 +TARGET = retroshare DEFINES += TARGET=\\\"$${TARGET}\\\" # Plz never commit the .pro with these flags enabled. @@ -101,11 +101,11 @@ unix { INSTALLS += icon_files desktop_files.path = "$${PREFIX}/share/applications" - desktop_files.files = ../../data/retroshare06.desktop + desktop_files.files = ../../data/retroshare.desktop INSTALLS += desktop_files pixmap_files.path = "$${PREFIX}/share/pixmaps" - pixmap_files.files = ../../data/retroshare06.xpm + pixmap_files.files = ../../data/retroshare.xpm INSTALLS += pixmap_files } diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index a55caf7de..1fdb27b71 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -1,7 +1,7 @@ !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = app -TARGET = retroshare06-nogui +TARGET = retroshare-nogui CONFIG += bitdht #CONFIG += introserver CONFIG -= qt xml gui diff --git a/retroshare-qml-app/src/android/AndroidManifest.xml b/retroshare-qml-app/src/android/AndroidManifest.xml index f7bb601cb..129e73ac1 100644 --- a/retroshare-qml-app/src/android/AndroidManifest.xml +++ b/retroshare-qml-app/src/android/AndroidManifest.xml @@ -6,7 +6,7 @@ + android:icon="@drawable/retroshare_128x128"> RsLoginPassView.qml TrustedNodesView.qml ChatView.qml - icons/retroshare06.png + icons/retroshare.png icons/state-offline.png icons/state-ok.png GxsIdentityDelegate.qml diff --git a/retroshare-qml-app/src/retroshare-qml-app.pro b/retroshare-qml-app/src/retroshare-qml-app.pro index cba108575..8b09fc77c 100644 --- a/retroshare-qml-app/src/retroshare-qml-app.pro +++ b/retroshare-qml-app/src/retroshare-qml-app.pro @@ -41,7 +41,7 @@ DISTFILES += \ android/build.gradle \ android/gradle/wrapper/gradle-wrapper.properties \ android/gradlew.bat \ - icons/retroshare06.png + icons/retroshare.png ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android diff --git a/retroshare.pri b/retroshare.pri index 07a736b01..df435aa78 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -87,9 +87,9 @@ rs_async_chat:CONFIG -= no_rs_async_chat unix { isEmpty(PREFIX) { PREFIX = "/usr" } isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" } - isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare06" } + isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare" } isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" } - isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" } + isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/retroshare" } isEmpty(PLUGIN_DIR) { PLUGIN_DIR = "$${LIB_DIR}/retroshare/extensions6" } rs_autologin {