fixed gitian builds

contrib/gitian-descriptors/deps-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "darkcoin"
+name: "bitcoin"
 suites:
 - "precise"
 architectures:
@@ -95,4 +95,4 @@ script: |
   done
   #
   cd $STAGING
-  find include lib bin host | sort | zip -X@ $OUTDIR/darkcoin-deps-linux${GBUILD_BITS}-gitian-r8.zip
+  find include lib bin host | sort | zip -X@ $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r8.zip

contrib/gitian-descriptors/deps-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "darkcoin-deps"
+name: "bitcoin-deps"
 suites:
 - "precise"
 architectures:
@@ -73,16 +73,16 @@ script: |
   --- miniupnpc-1.9/Makefile.mingw.orig   2013-09-29 18:52:51.014087958 -1000
   +++ miniupnpc-1.9/Makefile.mingw        2013-09-29 19:09:29.663318691 -1000
   @@ -67,8 +67,8 @@
-
+   
    wingenminiupnpcstrings.o:	wingenminiupnpcstrings.c
-
+   
   -miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings
   -	wingenminiupnpcstrings \$< \$@
-  +miniupnpcstrings.h: miniupnpcstrings.h.in
+  +miniupnpcstrings.h: miniupnpcstrings.h.in 
   +	sed -e 's|OS/version|MSWindows/5.1.2600|' -e 's|MINIUPNPC_VERSION_STRING \"version\"|MINIUPNPC_VERSION_STRING \"VERSIONHERE\"|' \$< > \$@
-
+   
    minixml.o:	minixml.c minixml.h miniupnpcstrings.h
-
+   
   " | sed "s/VERSIONHERE/$(cat VERSION)/" | patch -p1
     mkdir -p dll
     make -f Makefile.mingw CC=$HOST-gcc AR=$HOST-ar libminiupnpc.a
@@ -124,5 +124,5 @@ script: |
     done
     #
     cd $INSTALLPREFIX
-    find include lib | sort | zip -X@ $OUTDIR/darkcoin-deps-win$BITS-gitian-r15.zip
+    find include lib | sort | zip -X@ $OUTDIR/bitcoin-deps-win$BITS-gitian-r15.zip
   done # for BITS in

contrib/gitian-descriptors/gitian-linux.yml

@@ -5,7 +5,7 @@ suites:
 architectures:
 - "i386"
 - "amd64"
-packages:
+packages: 
 - "g++"
 - "git-core"
 - "unzip"
@@ -20,13 +20,13 @@ packages:
 - "libqt4-dbus"
 - "libqt4-network"
 - "libqt4-test"
-reference_datetime: "2013-06-01 00:00:00"
+reference_datetime: "2014-01-10 00:00:00"
 remotes:
 - "url": "https://github.com/darkcoin/darkcoin.git"
   "dir": "darkcoin"
 files:
-- "darkcoin-deps-linux32-gitian-r8.zip"
-- "darkcoin-deps-linux64-gitian-r8.zip"
+- "bitcoin-deps-linux32-gitian-r8.zip"
+- "bitcoin-deps-linux64-gitian-r8.zip"
 - "boost-linux32-1.55.0-gitian-r1.zip"
 - "boost-linux64-1.55.0-gitian-r1.zip"
 - "qt-linux32-4.6.4-gitian-r1.tar.gz"
@@ -43,7 +43,7 @@ script: |
   #
   mkdir -p $STAGING
   cd $STAGING
-  unzip ../build/darkcoin-deps-linux${GBUILD_BITS}-gitian-r8.zip
+  unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r8.zip
   unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip
   tar -zxf ../build/qt-linux${GBUILD_BITS}-4.6.4-gitian-r1.tar.gz
   cd ../build
@@ -73,7 +73,7 @@ script: |
   mkdir -p distsrc
   cd distsrc
   tar --strip-components=1 -xf ../$DISTNAME
-  do_configure --bindir=$BINDIR
+  do_configure --bindir=$BINDIR 
   make $MAKEOPTS
   make $MAKEOPTS install-strip
   make $MAKEOPTS clean

contrib/gitian-descriptors/gitian-osx-bitcoin.yml → contrib/gitian-descriptors/gitian-osx-darkcoin.yml

@@ -12,7 +12,7 @@ packages:
 - "pkg-config"
 - "p7zip-full"
 
-reference_datetime: "2013-06-01 00:00:00"
+reference_datetime: "2014-01-10 00:00:00"
 remotes:
 - "url": "https://github.com/darkcoin/darkcoin.git"
   "dir": "darkcoin"

contrib/gitian-descriptors/gitian-win.yml

@@ -17,7 +17,7 @@ packages:
 - "pkg-config"
 - "bsdmainutils"
 
-reference_datetime: "2013-06-01 00:00:00"
+reference_datetime: "2014-01-10 00:00:00"
 remotes:
 - "url": "https://github.com/darkcoin/darkcoin.git"
   "dir": "darkcoin"
@@ -26,8 +26,8 @@ files:
 - "qt-win64-5.2.0-gitian-r3.zip"
 - "boost-win32-1.55.0-gitian-r6.zip"
 - "boost-win64-1.55.0-gitian-r6.zip"
-- "darkcoin-deps-win32-gitian-r15.zip"
-- "darkcoin-deps-win64-gitian-r15.zip"
+- "bitcoin-deps-win32-gitian-r15.zip"
+- "bitcoin-deps-win64-gitian-r15.zip"
 - "protobuf-win32-2.5.0-gitian-r4.zip"
 - "protobuf-win64-2.5.0-gitian-r4.zip"
 script: |
@@ -61,16 +61,14 @@ script: |
     cd $STAGING
     unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r3.zip
     unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip
-    unzip $INDIR/darkcoin-deps-win${BITS}-gitian-r15.zip
+    unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r15.zip
     unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip
     if [ "$NEEDDIST" == "1" ]; then
       # Make source code archive which is architecture independent so it only needs to be done once
       cd $HOME/build/darkcoin
       ./autogen.sh
-      #./configure --bindir=$OUTDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins  --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=darkcoin ${OPTFLAGS}"
-      #make dist
-      ./configure --bindir=$OUTDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins  --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --with-protoc-bindir=$STAGING/host/bin CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=darkcoin ${OPTFLAGS}"
-      make -j 9
+      ./configure --bindir=$OUTDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins  --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=darkcoin ${OPTFLAGS}"
+      make dist
       DISTNAME=`echo darkcoin-*.tar.gz`
       NEEDDIST=0
     fi
@@ -85,7 +83,7 @@ script: |
     make $MAKEOPTS
     make deploy
     make install-strip
-    #cp -f darkcoin-*setup*.exe $BINDIR/
+    cp -f darkcoin-*setup*.exe $BINDIR/
     unset LD_PRELOAD
     unset FAKETIME
   done # for BITS in

contrib/gitian-descriptors/qt-win.yml

@@ -4,7 +4,7 @@ suites:
 - "precise"
 architectures:
 - "amd64"
-packages:
+packages: 
 - "mingw-w64"
 - "g++-mingw-w64"
 - "zip"
@@ -15,8 +15,8 @@ reference_datetime: "2011-01-30 00:00:00"
 remotes: []
 files:
 - "qt-everywhere-opensource-src-5.2.0.tar.gz"
-- "darkcoin-deps-win32-gitian-r15.zip"
-- "darkcoin-deps-win64-gitian-r15.zip"
+- "bitcoin-deps-win32-gitian-r15.zip"
+- "bitcoin-deps-win64-gitian-r15.zip"
 script: |
   # Defines
   export TZ=UTC
@@ -46,9 +46,9 @@ script: |
     #
     mkdir -p $INSTALLPREFIX $INSTALLPREFIX/host/bin $DEPSDIR $BUILDDIR
     #
-    # Need mingw-compiled openssl from darkcoin-deps:
+    # Need mingw-compiled openssl from bitcoin-deps:
     cd $DEPSDIR
-    unzip $INDIR/darkcoin-deps-win${BITS}-gitian-r15.zip
+    unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r15.zip
     #
     cd $BUILDDIR
     #