diff --git a/build_scripts/Debian+Ubuntu/debian/dirs b/build_scripts/Debian+Ubuntu/debian/dirs deleted file mode 100644 index bac28ebe3..000000000 --- a/build_scripts/Debian+Ubuntu/debian/dirs +++ /dev/null @@ -1,10 +0,0 @@ -usr/bin -usr/sbin -usr/share/pixmaps -usr/share/applications/ -usr/share/RetroShare06/ -usr/share/RetroShare06/webui/ -usr/share/RetroShare06/sounds/ -usr/share/icons/hicolor/24x24/apps/ -usr/share/icons/hicolor/48x48/apps/ -usr/share/icons/hicolor/64x64/apps/ diff --git a/build_scripts/Debian+Ubuntu/debian/retroshare06-feedreader-plugin.install b/build_scripts/Debian+Ubuntu/debian/retroshare06-feedreader-plugin.install index e97cbc926..5fc9c6571 100644 --- a/build_scripts/Debian+Ubuntu/debian/retroshare06-feedreader-plugin.install +++ b/build_scripts/Debian+Ubuntu/debian/retroshare06-feedreader-plugin.install @@ -1,2 +1 @@ -usr/lib/retroshare/extensions6/libFeedReader.so - +debian/tmp/usr/lib/retroshare/extensions6/libFeedReader.so* diff --git a/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install b/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install index 552f3b781..c60111bf3 100644 --- a/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install +++ b/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install @@ -1,6 +1,3 @@ -usr/bin -usr/bin/RetroShare-nogui -usr/share -usr/share/RetroShare -usr/share/RetroShare/bdboot.txt - +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-voip-plugin.install b/build_scripts/Debian+Ubuntu/debian/retroshare06-voip-plugin.install index e7bfcd259..48f8bdbab 100644 --- a/build_scripts/Debian+Ubuntu/debian/retroshare06-voip-plugin.install +++ b/build_scripts/Debian+Ubuntu/debian/retroshare06-voip-plugin.install @@ -1,2 +1 @@ -usr/lib/retroshare/extensions6/libVOIP.so - +debian/tmp/usr/lib/retroshare/extensions6/libVOIP.so* diff --git a/build_scripts/Debian+Ubuntu/debian/retroshare06.install b/build_scripts/Debian+Ubuntu/debian/retroshare06.install index 992a44333..089770666 100644 --- a/build_scripts/Debian+Ubuntu/debian/retroshare06.install +++ b/build_scripts/Debian+Ubuntu/debian/retroshare06.install @@ -1,10 +1,6 @@ -usr/share/applications/retroshare.desktop -usr/share/pixmaps/retroshare.xpm -usr/share/RetroShare/bdboot.txt -usr/share/icons/hicolor/48x48/apps/retroshare.png -usr/share/icons/hicolor/24x24/apps/retroshare.png -usr/share/icons/hicolor/64x64/apps/retroshare.png -usr/bin -usr/bin/RetroShare -usr/bin/RetroShare-nogui - +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/debian/rules b/build_scripts/Debian+Ubuntu/debian/rules index 07e102117..a0d66eb32 100755 --- a/build_scripts/Debian+Ubuntu/debian/rules +++ b/build_scripts/Debian+Ubuntu/debian/rules @@ -1,14 +1,14 @@ #!/usr/bin/make -f -builddir: - mkdir -p builddir - -builddir/Makefile: builddir +configure: configure-stamp +configure-stamp: + dh_testdir + cd src && qmake-qt4 CONFIG=release PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro touch $@ -build: build-stamp -build-stamp: builddir/Makefile +build: build-stamp +build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. # cd libssh-0.6.4 && mkdir -p build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make @@ -17,68 +17,24 @@ build-stamp: builddir/Makefile # cp -r libssh-0.6.4 lib/ #cp -r sqlcipher lib/ #cd src/rsctrl/src && make - cd src && qmake-qt4 CONFIG=release RetroShare.pro && make + cd src && $(MAKE) touch $@ clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f configure-stamp build-stamp # Add here commands to clean up after the build process. - rm -rf builddir + [ ! -f src/Makefile ] || (cd src && $(MAKE) distclean) dh_clean install: build dh_testdir dh_testroot dh_clean -k - dh_installdirs - install -D -m 644 src/data/retroshare06.desktop $(CURDIR)/debian/retroshare06/usr/share/applications/retroshare06.desktop - install -D -m 644 src/data/24x24/apps/retroshare06.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/24x24/apps/retroshare06.png - install -D -m 644 src/data/48x48/apps/retroshare06.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/48x48/apps/retroshare06.png - install -D -m 644 src/data/64x64/apps/retroshare06.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/64x64/apps/retroshare06.png - install -D -m 644 src/data/retroshare06.xpm $(CURDIR)/debian/retroshare06/usr/share/pixmaps/retroshare06.xpm - install -D -m 644 src/plugins/VOIP/libVOIP.so.1.0.0 $(CURDIR)/debian/retroshare06-voip-plugin/usr/lib/retroshare/extensions6/libVOIP.so - install -D -m 644 src/plugins/FeedReader/libFeedReader.so.1.0.0 $(CURDIR)/debian/retroshare06-feedreader-plugin/usr/lib/retroshare/extensions6/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/RetroShare06-nogui $(CURDIR)/debian/retroshare06-nogui/usr/bin/RetroShare06-nogui - install -D -m 755 src/retroshare-nogui/src/RetroShare06-nogui $(CURDIR)/debian/retroshare06/usr/bin/RetroShare06-nogui - install -D -m 755 src/retroshare-gui/src/RetroShare06 $(CURDIR)/debian/retroshare06/usr/bin/RetroShare06 - install -D -m 644 src/libresapi/src/webfiles/JSXTransformer.js $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/JSXTransformer.js - install -D -m 644 src/libresapi/src/webfiles/RsApi.js $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/RsApi.js - install -D -m 644 src/libresapi/src/webfiles/RsXHRConnection.js $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/RsXHRConnection.js - install -D -m 644 src/libresapi/src/webfiles/green-black.css $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/green-black.css - install -D -m 644 src/libresapi/src/webfiles/gui.jsx $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/gui.jsx - install -D -m 644 src/libresapi/src/webfiles/index.html $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/index.html - install -D -m 644 src/libresapi/src/webfiles/react.js $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/react.js - install -D -m 644 src/retroshare-gui/src/gui/images/logo/logo_splash.png $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/img/logo_splash.png - install -D -m 644 src/libresapi/src/webfiles/JSXTransformer.js $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/JSXTransformer.js - install -D -m 644 src/libresapi/src/webfiles/RsApi.js $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/RsApi.js - install -D -m 644 src/libresapi/src/webfiles/RsXHRConnection.js $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/RsXHRConnection.js - install -D -m 644 src/libresapi/src/webfiles/green-black.css $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/green-black.css - install -D -m 644 src/libresapi/src/webfiles/gui.jsx $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/gui.jsx - install -D -m 644 src/libresapi/src/webfiles/index.html $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/index.html - install -D -m 644 src/libresapi/src/webfiles/react.js $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/react.js - install -D -m 644 src/retroshare-gui/src/gui/images/logo/logo_splash.png $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/img/logo_splash.png - install -D -m 644 src/retroshare-gui/src/sounds/alert.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/alert.wav - install -D -m 644 src/retroshare-gui/src/sounds/chat1.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/chat1.wav - install -D -m 644 src/retroshare-gui/src/sounds/chat2.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/chat2.wav - install -D -m 644 src/retroshare-gui/src/sounds/file.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/file.wav - install -D -m 644 src/retroshare-gui/src/sounds/ft_complete.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/ft_complete.wav - install -D -m 644 src/retroshare-gui/src/sounds/ft_incoming.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/ft_incoming.wav - install -D -m 644 src/retroshare-gui/src/sounds/incomingchat.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/incomingchat.wav - install -D -m 644 src/retroshare-gui/src/sounds/notify.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/notify.wav - install -D -m 644 src/retroshare-gui/src/sounds/offline.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/offline.wav - install -D -m 644 src/retroshare-gui/src/sounds/online1.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/online1.wav - install -D -m 644 src/retroshare-gui/src/sounds/online2.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/online2.wav - install -D -m 644 src/retroshare-gui/src/sounds/receive.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/receive.wav - install -D -m 644 src/retroshare-gui/src/sounds/send1.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/send1.wav - install -D -m 644 src/retroshare-gui/src/sounds/send2.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/send2.wav - install -D -m 644 src/retroshare-gui/src/sounds/startup.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/startup.wav + #dh_installdirs + cd src && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install -# 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. @@ -87,9 +43,10 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_installdocs - dh_installexamples - dh_installman + dh_install --list-missing + #dh_installdocs + #dh_installexamples + #dh_installman dh_link dh_strip dh_compress @@ -102,4 +59,3 @@ binary-arch: build install binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure -