update to current version and add deb.PKGBUILD

4 files changed, 125 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddb18673f877..e6f8a4312fbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = emercoin-bin
 	pkgdesc = Emercoin is a digital currency and blockchain service platform.
-	pkgver = 0.7.10
-	pkgrel = 2
-	url = https://emercoin.com/
+	pkgver = 0.7.11
+	pkgrel = 1
+	url = http://emercoin.com/
 	install = emercoin.install
-	arch = i686
 	arch = x86_64
 	license = GPL3
 	depends = libevent>=2.1.8
@@ -14,17 +13,17 @@ pkgbase = emercoin-bin
 	depends = expat>=2.2.0
 	depends = freetype2>=2.7.1
 	depends = protobuf
-	source_i686 = https://github.com/emercoin/emercoin/releases/download/v0.7.10emc/emercoin-0.7.10-i686-pc-linux-gnu.tar.gz
-	sha256sums_i686 = 993ddbebbd78bb654762d7dd9b0fb69bd365dc270a922d566d1adba0ac002174
-	source_x86_64 = https://github.com/emercoin/emercoin/releases/download/v0.7.10emc/emercoin-0.7.10-x86_64-linux-gnu.tar.gz
-	sha256sums_x86_64 = 6e851f289c652fd1055bd6084abe454ad172cc8df0926efcf05441e58fc14973
-	source = emercoin.install
-	source = emercoind.service
-	source = emc48.png
-	source = com.emercoin.Emercoin.desktop
-	sha256sums = 9ab66d1537081746f5eec016628bc810d216ed393f062368decbeea3756bca35
-	sha256sums = 9e0832225a161a0c2694890e4d1791eedf943f96556db153e3cd5e40906ef5ed
-	sha256sums = 99d13ec06eb0d09662632e9eb6309ee38e03162f09513b23747f189602552132
-        sha256sums = dfa7a4c2f717bbc29ba4273d65f80e0ee5853379e0632e458ae12df1ace72fcf
+	provides = emercoin
+	conflicts = emercoin
+	source_x86_64 = https://github.com/emercoin/emercoin/releases/download/v0.7.11emc/emercoin-0.7.11-x86_64-linux-gnu.tar.bz2
+	source_x86_64 = emercoin.install
+	source_x86_64 = emercoind.service
+	source_x86_64 = emc48.png
+	source_x86_64 = com.emercoin.Emercoin.desktop
+	sha256sums_x86_64 = b2dfbd5016ab20965fcd0e245dc17e502b17a39e9c070fc094607888b8d84313
+	sha256sums_x86_64 = 9ab66d1537081746f5eec016628bc810d216ed393f062368decbeea3756bca35
+	sha256sums_x86_64 = 9e0832225a161a0c2694890e4d1791eedf943f96556db153e3cd5e40906ef5ed
+	sha256sums_x86_64 = 99d13ec06eb0d09662632e9eb6309ee38e03162f09513b23747f189602552132
+	sha256sums_x86_64 = dfa7a4c2f717bbc29ba4273d65f80e0ee5853379e0632e458ae12df1ace72fcf
 
 pkgname = emercoin-bin
diff --git a/PKGBUILD b/PKGBUILD
index a40eb369cf16..a04779dff405 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,43 @@
 pkgname=emercoin-bin
-pkgver=0.7.10
-pkgrel=2
+pkgver=0.7.11
+pkgrel=1
 pkgdesc="Emercoin is a digital currency and blockchain service platform."
-arch=('i686' 'x86_64')    
+arch=('x86_64')
 depends=("libevent>=2.1.8" "qt5-base" "dbus>=1.10.14" "miniupnpc>=2.0.20170509" "expat>=2.2.0" "freetype2>=2.7.1" "protobuf")
+provides=('emercoin')
+conflicts=('emercoin')
 url="http://emercoin.com/"
 license=('GPL3')
 install='emercoin.install'
-source_i686=("https://github.com/emercoin/emercoin/releases/download/v${pkgver}emc/emercoin-${pkgver}-i686-pc-linux-gnu.tar.gz" "emercoin.install" "emercoind.service" "emc48.png" "com.emercoin.Emercoin.desktop")
-source_x86_64=("https://github.com/emercoin/emercoin/releases/download/v${pkgver}emc/emercoin-${pkgver}-x86_64-linux-gnu.tar.gz" "emercoin.install" "emercoind.service" "emc48.png" "com.emercoin.Emercoin.desktop")
-sha256sums_i686=(
-	'993ddbebbd78bb654762d7dd9b0fb69bd365dc270a922d566d1adba0ac002174' 
-	'9ab66d1537081746f5eec016628bc810d216ed393f062368decbeea3756bca35' 
-	'9e0832225a161a0c2694890e4d1791eedf943f96556db153e3cd5e40906ef5ed'
-	'99d13ec06eb0d09662632e9eb6309ee38e03162f09513b23747f189602552132'
-	'dfa7a4c2f717bbc29ba4273d65f80e0ee5853379e0632e458ae12df1ace72fcf')
-sha256sums_x86_64=(
-	'6e851f289c652fd1055bd6084abe454ad172cc8df0926efcf05441e58fc14973' 
-	'9ab66d1537081746f5eec016628bc810d216ed393f062368decbeea3756bca35' 
-	'9e0832225a161a0c2694890e4d1791eedf943f96556db153e3cd5e40906ef5ed'
-	'99d13ec06eb0d09662632e9eb6309ee38e03162f09513b23747f189602552132'
-	'dfa7a4c2f717bbc29ba4273d65f80e0ee5853379e0632e458ae12df1ace72fcf'
-)
+_archive="emercoin-${pkgver}-x86_64-linux-gnu"
+source_x86_64=("https://github.com/emercoin/emercoin/releases/download/v${pkgver}emc/${_archive}.tar.bz2"
+"emercoin.install"
+"emercoind.service"
+"emc48.png"
+"com.emercoin.Emercoin.desktop")
+sha256sums_x86_64=('b2dfbd5016ab20965fcd0e245dc17e502b17a39e9c070fc094607888b8d84313'
+                   '9ab66d1537081746f5eec016628bc810d216ed393f062368decbeea3756bca35'
+                   '9e0832225a161a0c2694890e4d1791eedf943f96556db153e3cd5e40906ef5ed'
+                   '99d13ec06eb0d09662632e9eb6309ee38e03162f09513b23747f189602552132'
+                   'dfa7a4c2f717bbc29ba4273d65f80e0ee5853379e0632e458ae12df1ace72fcf')
 package() {
     install -Dm644 ${srcdir}/emercoind.service ${pkgdir}/usr/lib/systemd/system/emercoind.service
     install -Dm644 "${srcdir}"/com.emercoin.Emercoin.desktop ${pkgdir}/usr/share/applications/com.emercoin.Emercoin.desktop
-     install -Dm644 "${srcdir}"/emc48.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps/emercoin.png
-    cd "emercoin-$pkgver"
-    install -Dm6750 ./bin/emercoind $pkgdir/usr/bin/emercoind
-    install -Dm6750 ./bin/emercoin-qt $pkgdir/usr/bin/emercoin-qt
-    install -Dm6750 ./bin/emercoin-tx $pkgdir/usr/bin/emercoin-tx
-    install -Dm6750  ./bin/emercoin-cli $pkgdir/usr/bin/emercoin-cli
-    install -Dm444  ./include/emercoinconsensus.h $pkgdir/usr/include/emercoinconsensus.h
-    install -D ./lib/libemercoinconsensus.so $pkgdir/usr/lib/libemercoinconsensus.so
-    install -D ./lib/libemercoinconsensus.so.0 $pkgdir/usr/lib/libemercoinconsensus.so.0
-    install -Dm6770  ./lib/libemercoinconsensus.so.0.0.0 $pkgdir/usr/lib/libemercoinconsensus.so.0.0.0
-    install -Dm444  ./share/man/man1/bitcoind.1 $pkgdir/share/man/man1/bitcoind.1 
-    install -Dm444  ./share/man/man1/bitcoin-qt.1 $pkgdir/share/man/man1/bitcoin-qt.1
-    install -Dm444  ./share/man/man1/bitcoin-tx.1 $pkgdir/share/man/man1/bitcoin-tx.1
-    install -Dm444  ./share/man/man1/bitcoin-cli.1 $pkgdir/share/man/man1/bitcoin-cli.1
+    install -Dm644 "${srcdir}"/emc48.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps/emercoin.png
+    cd "${_archive}"
+		install -Dm755 emercoind $pkgdir/usr/bin/emercoind
+		install -Dm755 emercoin-qt $pkgdir/usr/bin/emercoin-qt
+		install -Dm755 emercoin-cli $pkgdir/usr/bin/emercoin-cli
+#    install -Dm6750 emercoind $pkgdir/usr/bin/emercoind
+#    install -Dm6750 emercoin-qt $pkgdir/usr/bin/emercoin-qt
+#    install -Dm6750 emercoin-cli $pkgdir/usr/bin/emercoin-cli
+#    install -Dm444  ./include/emercoinconsensus.h $pkgdir/usr/include/emercoinconsensus.h
+#    install -D ./lib/libemercoinconsensus.so $pkgdir/usr/lib/libemercoinconsensus.so
+#    install -D ./lib/libemercoinconsensus.so.0 $pkgdir/usr/lib/libemercoinconsensus.so.0
+#    install -Dm6770  ./lib/libemercoinconsensus.so.0.0.0 $pkgdir/usr/lib/libemercoinconsensus.so.0.0.0
+    #install -Dm444  ./share/man/man1/bitcoind.1 $pkgdir/share/man/man1/bitcoind.1
+    #install -Dm444  ./share/man/man1/bitcoin-qt.1 $pkgdir/share/man/man1/bitcoin-qt.1
+    #install -Dm444  ./share/man/man1/bitcoin-tx.1 $pkgdir/share/man/man1/bitcoin-tx.1
+    #install -Dm444  ./share/man/man1/bitcoin-cli.1 $pkgdir/share/man/man1/bitcoin-cli.1
 
 }
diff --git a/deb.PKGBUILD b/deb.PKGBUILD
new file mode 100644
index 000000000000..54a533189c60
--- /dev/null
+++ b/deb.PKGBUILD
@@ -0,0 +1,72 @@
+pkgname=emercoin-bin
+_pkgname=emercoin-bin
+pkgver=0.7.11
+_pkgver=${pkgver}
+pkgrel=1
+_pkgrel=${pkgrel}
+pkgdesc="Emercoin is a digital currency and blockchain service platform. Debian package."
+arch=('x86_64')
+_pkgarch=$(dpkg --print-architecture)
+depends=("libevent>=2.1.8" "qt5-base" "dbus>=1.10.14" "miniupnpc>=2.0.20170509" "expat>=2.2.0" "freetype2>=2.7.1" "protobuf")
+_debdeps="libboost-filesystem1.74.0 (>= 1.74.0), libc6 (>= 2.30), libdb5.3++, libevent-2.1-7 (>= 2.1.8-stable), libevent-pthreads-2.1-7 (>= 2.1.8-stable), libgcc-s1 (>= 3.0), libleveldb1d, libminiupnpc17 (>= 1.9.20140610), libqrencode4 (>= 3.2.0), libqt5core5a (>= 5.15.1), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.14.1) | libqt5gui5-gles (>= 5.14.1), libqt5network5 (>= 5.0.2), libqt5widgets5 (>= 5.15.1), libsqlite3-0 (>= 3.7.15), libstdc++6 (>= 9), libzmq5 (>= 4.0.1+dfsg)"
+makedepends=('dpkg')
+provides=('emercoin')
+conflicts=('emercoin')
+url="http://emercoin.com/"
+license=('GPL3')
+install='emercoin.install'
+_archive="emercoin-${pkgver}-x86_64-linux-gnu"
+source_x86_64=("https://github.com/emercoin/emercoin/releases/download/v${pkgver}emc/${_archive}.tar.bz2"
+"emercoin.install"
+"emercoind.service"
+"emc48.png"
+"com.emercoin.Emercoin.desktop")
+sha256sums_x86_64=('b2dfbd5016ab20965fcd0e245dc17e502b17a39e9c070fc094607888b8d84313'
+                   '9ab66d1537081746f5eec016628bc810d216ed393f062368decbeea3756bca35'
+                   '9e0832225a161a0c2694890e4d1791eedf943f96556db153e3cd5e40906ef5ed'
+                   '99d13ec06eb0d09662632e9eb6309ee38e03162f09513b23747f189602552132'
+                   'dfa7a4c2f717bbc29ba4273d65f80e0ee5853379e0632e458ae12df1ace72fcf')
+
+build() {
+	### CONTROL FILES CREATION ###
+	#create control file for the debian package
+	echo "Package: ${_pkgname}" > ${srcdir}/control
+	echo "Version: ${_pkgver}-${_pkgrel}" >> ${srcdir}/control
+	echo "Priority: optional" >> ${srcdir}/control
+	echo "Section: web" >> ${srcdir}/control
+	echo "Architecture: ${_pkgarch}" >> ${srcdir}/control
+	echo "Depends: ${_debdeps}" >> ${srcdir}/control
+	echo "Maintainer: Moses Narrow" >> ${srcdir}/control
+	echo "Description: ${pkgdesc}" >> ${srcdir}/control
+}
+
+package() {
+	_debpkgdir="${_pkgname}-${pkgver}-${_pkgrel}-${_pkgarch}"
+	echo "${_debpkgdir}"
+	_pkgdir="${pkgdir}/${_debpkgdir}"
+	mkdir -p ${_pkgdir}/
+	######
+	install -Dm644 ${srcdir}/emercoind.service ${_pkgdir}/usr/lib/systemd/system/emercoind.service
+	install -Dm644 "${srcdir}"/com.emercoin.Emercoin.desktop ${_pkgdir}/usr/share/applications/com.emercoin.Emercoin.desktop
+	install -Dm644 "${srcdir}"/emc48.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/emercoin.png
+	cd "${_archive}"
+	install -Dm755 emercoind $_pkgdir/usr/bin/emercoind
+	install -Dm755 emercoin-qt $_pkgdir/usr/bin/emercoin-qt
+	install -Dm755 emercoin-cli $_pkgdir/usr/bin/emercoin-cli
+	######
+	_msg2 'installing control file'
+	install -Dm755 ${srcdir}/control ${_pkgdir}/DEBIAN/control
+
+	_msg2 'creating the debian package'
+	cd $pkgdir
+	dpkg-deb --build -z9 ${_debpkgdir}
+	mv *.deb ../../
+	#exit so the arch package doesn't get built
+	exit
+}
+
+_msg2() {
+	(( QUIET )) && return
+	local mesg=$1; shift
+	printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
+}
diff --git a/updates.sh b/updates.sh
new file mode 100755
index 000000000000..1d997d927900
--- /dev/null
+++ b/updates.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+#updpkgsums cc.deb.PKGBUILD
+updpkgsums deb.PKGBUILD
+updpkgsums
+makepkg --printsrcinfo > .SRCINFO
+git add -f deb.PKGBUILD PKGBUILD .SRCINFO