Merge pull request 'Update .deb builder and include XMRig functionality by default on Linux' (#53) from dsc/wowlet:update-deb-and-xmrig into master

Reviewed-on: #53

CMakeLists.txt

@@ -30,7 +30,6 @@ include(CheckSymbolExists)
 
 set(WOWNERO_HEAD "f611d5c9e32bc62f1735f6571b0bdb95cc020531")
 set(BUILD_GUI_DEPS ON)
-set(ARCH "x86-64" CACHE STRING "Target architecture")
 set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
 set(INSTALL_VENDORED_LIBUNBOUND ${STATIC})
 set(USE_SINGLE_BUILDDIR ON)

Makefile

@@ -43,6 +43,7 @@ CMAKEFLAGS = \
 	$(CMAKEFLAGS_EXTRA)
 
 release-static: CMAKEFLAGS += -DBUILD_TAG="linux-x64"
+release-static: CMAKEFLAGS += -DXMRIG=ON
 release-static: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF)
 release-static: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release
 release-static: CMAKEFLAGS += -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF)

contrib/debian/build-deb.sh

@@ -22,13 +22,13 @@ mkdir -p "$DEBDIR/usr/share/icons/hicolor/256x256/apps/"
 
 # Copy over assets
 
-cp "$PWD/src/assets/control" "$DEBDIR/DEBIAN/control"
+cp "$PWD/contrib/debian/control" "$DEBDIR/DEBIAN/control"
-cp "$PWD/src/assets/copyright" "$DEBDIR/debian/copyright"
+cp "$PWD/contrib/debian/copyright" "$DEBDIR/debian/copyright"
-cp "$PWD/src/assets/copyright" "$DEBDIR/usr/share/doc/wowlet/copyright"
+cp "$PWD/contrib/debian/copyright" "$DEBDIR/usr/share/doc/wowlet/copyright"
-cp "$PWD/src/assets/changelog.gz" "$DEBDIR/usr/share/doc/wowlet/changelog.gz"
+cp "$PWD/contrib/debian/changelog.gz" "$DEBDIR/usr/share/doc/wowlet/changelog.gz"
 cp "$PWD/src/assets/org.wowlet.wowlet.metainfo.xml" "$DEBDIR/usr/share/metainfo/org.wowlet.wowlet.metainfo.xml"
 cp "$PWD/README.md" "$DEBDIR/usr/share/doc/wowlet/README"
-cp "$PWD/SECURITY.md" "$DEBDIR/usr/share/doc/wowlet/SECURITY"
+cp "$PWD/docs/SECURITY.md" "$DEBDIR/usr/share/doc/wowlet/SECURITY"
 cp "$PWD/build/bin/wowlet" "$DEBDIR/usr/bin/wowlet"
 cp "$PWD/src/assets/org.wowlet.wowlet.desktop" "$DEBDIR/usr/share/applications/org.wowlet.wowlet.desktop"
 cp "$PWD/src/assets/wowlet.1.gz" "$DEBDIR/usr/share/man/man1/wowlet.1.gz"
@@ -43,4 +43,4 @@ cp "$PWD/src/assets/images/appicons/256x256.png" "$DEBDIR/usr/share/icons/hicolo
 # Build deb package
 
 dpkg-deb --build $DEBDIR
-mv wowlet.DebDir.deb wowlet_1.0_amd64.deb
+mv wowlet.DebDir.deb wowlet_2.0_amd64.deb

contrib/debian/control

@@ -1,5 +1,5 @@
 Package: wowlet
-Version: 1.0
+Version: 2.0
 Section: net
 Priority: optional
 Architecture: amd64