Control: tags 627263 + patch
[Petter Reinholdtsen]
> Note, the patch isn't quite right. I ran out of time and just wanted
> to share the current status.
Here is an updated patch and tested patch. This one is working, and
after the build I get these lintian warnings:
W: bitcoin-qt: hardening-no-relro usr/bin/bitcoin-qt
W: bitcoin-qt: hardening-no-fortify-functions usr/bin/bitcoin-qt
E: bitcoin-qt: possible-gpl-code-linked-with-openssl
W: bitcoin-qt: binary-without-manpage usr/bin/bitcoin-qt
Please consider it for a future version. I'm not quite sure about the
openssl/gpl issue, while the others seem to be valid objections to the
package. I guess the qmake setup need to be adjusted to use
dpkg-buildflags. I have not investigated how to do that.
--
Happy hacking
Petter Reinholdtsen
diff --git a/debian/control b/debian/control
index 8f15e93..1bb3bbb 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: cdbs,
devscripts,
libboost-system-dev (>> 1.35) | libboost-system1.35-dev,
libdb++-dev | libdb4.6++-dev,
+ qt4-qmake, libqt4-dev, libboost-dev,
libssl-dev,
pkg-config,
libglib2.0-dev,
@@ -41,3 +42,22 @@ Description: peer-to-peer network based digital currency - daemon
.
This package provides bitcoind, a combined daemon and CLI tool to
interact with the daemon.
+
+Package: bitcoin-qt
+Architecture: any-alpha any-amd64 any-arm any-i386 any-ia64 any-mipsel any-sh4
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: ${cdbs:Suggests}
+Description: peer-to-peer network based digital currency - GUI
+ Bitcoin is a free open source peer-to-peer electronic cash system that
+ is completely decentralized, without the need for a central server or
+ trusted parties. Users hold the crypto keys to their own money and
+ transact directly with each other, with the help of a P2P network to
+ check for double-spending.
+ .
+ By default connects to an IRC network to discover other peers.
+ .
+ Full transaction history is stored locally at each client. This
+ requires several GB of space, slowly growing.
+ .
+ This package provides bitcoin-qt, a GUI tool to interact with the
+ bitcoind daemon.
diff --git a/debian/control.in b/debian/control.in
index 82d0fb5..451c74a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -28,3 +28,22 @@ Description: peer-to-peer network based digital currency - daemon
.
This package provides bitcoind, a combined daemon and CLI tool to
interact with the daemon.
+
+Package: bitcoin-qt
+Architecture: any-alpha any-amd64 any-arm any-i386 any-ia64 any-mipsel any-sh4
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: ${cdbs:Suggests}
+Description: peer-to-peer network based digital currency - GUI
+ Bitcoin is a free open source peer-to-peer electronic cash system that
+ is completely decentralized, without the need for a central server or
+ trusted parties. Users hold the crypto keys to their own money and
+ transact directly with each other, with the help of a P2P network to
+ check for double-spending.
+ .
+ By default connects to an IRC network to discover other peers.
+ .
+ Full transaction history is stored locally at each client. This
+ requires several GB of space, slowly growing.
+ .
+ This package provides bitcoin-qt, a GUI tool to interact with the
+ bitcoind daemon.
diff --git a/debian/rules b/debian/rules
index 2b84e55..0151d18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ DEB_MAKE_MAKEFILE = makefile.unix
DEB_MAKE_CHECK_TARGET = test_bitcoin
build/bitcoind::
$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_bitcoin)
+ $(MAKE)
# work around build failure with gcc 4.7
CXXFLAGS += -fpermissive
@@ -70,7 +71,7 @@ CDBS_BUILD_DEPENDS += , $(call boostdep,system), libdb++-dev | libdb4.6++-dev, l
CDBS_BUILD_DEPENDS += , $(call boostdep,filesystem program-options thread test)
# TODO: fix support DEB_QMAKE_BUILDDIR and install binary into -qt package
-#CDBS_BUILD_DEPENDS += , qt4-qmake, libqt4-dev
+CDBS_BUILD_DEPENDS += , qt4-qmake, libqt4-dev, libboost-dev
CDBS_SUGGESTS_bitcoind = db-util, db4.8-util, db4.7-util
@@ -80,12 +81,15 @@ DEB_INSTALL_DOCS_ALL =
pre-build::
mkdir -p src/obj/nogui
mkdir -p debian/home/.bitcoin
+ qmake
clean::
+ [ ! -f Makefile ] || make distclean
find src/obj -type f -not -name .gitignore -delete
rm -f src/bitcoind
rm -rf debian/home
+ rm -f build/build.h
# Ensure wrapper is set executable
binary-post-install/bitcoind::
- chmod +x $(cdbs_curdestdir)usr/bin/bitcoind
+ chmod +x debian/bitcoind/usr/bin/bitcoind
