Auto merge of #1974 - str4d:1948-debian-lint, r=ebfull

Fix Debian lintian warnings

Closes #1948.
This commit is contained in:
zkbot 2017-01-18 03:07:07 +00:00
commit da864da5ce
19 changed files with 48 additions and 12 deletions

3
.gitignore vendored
View File

@ -123,3 +123,6 @@ qa/pull-tester/test.*/*
/doc/doxygen/ /doc/doxygen/
libzcashconsensus.pc libzcashconsensus.pc
contrib/debian/files
contrib/debian/substvars

View File

@ -3,17 +3,17 @@ Section: utils
Priority: optional Priority: optional
Maintainer: Zcash Company <team@z.cash> Maintainer: Zcash Company <team@z.cash>
Homepage: https://z.cash Homepage: https://z.cash
Build-Depends: autoconf, automake, bsdmainutils, build-essential Build-Depends: autoconf, automake, bsdmainutils, build-essential,
git, g++-multilib, libc6-dev, libtool git, g++-multilib, libc6-dev, libtool,
m4, ncurses-dev, pkg-config, python m4, ncurses-dev, pkg-config, python,
unzip, wget, zlib1g-dev unzip, wget, zlib1g-dev
Vcs-Git: https://github.com/zcash/zcash.git Vcs-Git: https://github.com/zcash/zcash.git
Vcs-Browser: https://github.com/zcash/zcash Vcs-Browser: https://github.com/zcash/zcash
Package: zcash Package: zcash
Version: 1.0.4
Architecture: amd64 Architecture: amd64
Depends: libgomp1 Depends: ${shlibs:Depends}
Description: An implementation of the "Zerocash" protocol. Description: HTTPS for money.
Based on Bitcoin's code, it intends to offer a far higher standard Based on Bitcoin's code, it intends to offer a far higher standard
of privacy and anonymity through a sophisticiated zero-knowledge of privacy and anonymity through a sophisticiated zero-knowledge
proving scheme which preserves confidentiality of transaction metadata. proving scheme which preserves confidentiality of transaction metadata.

View File

@ -0,0 +1,28 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-FETCH-PARAMS "1" "January 2017" "Zcash - zcash-fetch-params" "User Commands"
.SH NAME
zcash-fetch-params \- Downloads the Zcash network parameters
.SH DESCRIPTION
Zcash \- zcash-fetch\-params
.PP
This script will fetch the Zcash zkSNARK parameters and verify their
integrity with sha256sum.
.PP
If they already exist locally, it will exit now and do nothing else.
.PP
This script will fetch the Zcash zkSNARK parameters and verify their
integrity with sha256sum.
.PP
If they already exist locally, it will exit now and do nothing else.
.SH "SEE ALSO"
The full documentation for
.B Zcash
is maintained as a Texinfo manual. If the
.B info
and
.B Zcash
programs are properly installed at your site, the command
.IP
.B info Zcash
.PP
should give you access to the complete manual.

View File

@ -35,7 +35,6 @@ previous release:
README.md README.md
src/clientversion.h src/clientversion.h
configure.ac configure.ac
contrib/DEBIAN/control
contrib/gitian-descriptors/gitian-linux.yml contrib/gitian-descriptors/gitian-linux.yml
Build and commit to update versions, and then perform the following commands: Build and commit to update versions, and then perform the following commands:

View File

@ -8,7 +8,7 @@ set -x
BUILD_PATH="/tmp/zcbuild" BUILD_PATH="/tmp/zcbuild"
PACKAGE_NAME="zcash" PACKAGE_NAME="zcash"
SRC_PATH=`pwd` SRC_PATH=`pwd`
SRC_DEB=$SRC_PATH/contrib/DEBIAN SRC_DEB=$SRC_PATH/contrib/debian
umask 022 umask 022
@ -16,22 +16,20 @@ if [ ! -d $BUILD_PATH ]; then
mkdir $BUILD_PATH mkdir $BUILD_PATH
fi fi
PACKAGE_VERSION=$(grep Version $SRC_PATH/contrib/DEBIAN/control | cut -d: -f2 | tr -d ' ') PACKAGE_VERSION=$($SRC_PATH/src/zcashd --version | grep version | cut -d' ' -f4 | tr -d v)
BUILD_DIR="$BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-amd64" BUILD_DIR="$BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-amd64"
if [ -d $BUILD_DIR ]; then if [ -d $BUILD_DIR ]; then
rm -R $BUILD_DIR rm -R $BUILD_DIR
fi fi
DEB_CMP=$BUILD_DIR/etc/bash_completion.d
DEB_BIN=$BUILD_DIR/usr/bin DEB_BIN=$BUILD_DIR/usr/bin
DEB_CMP=$BUILD_DIR/usr/share/bash-completion/completions
DEB_DOC=$BUILD_DIR/usr/share/doc/$PACKAGE_NAME DEB_DOC=$BUILD_DIR/usr/share/doc/$PACKAGE_NAME
DEB_MAN=$BUILD_DIR/usr/share/man/man1 DEB_MAN=$BUILD_DIR/usr/share/man/man1
mkdir -p $BUILD_DIR/DEBIAN $DEB_CMP $DEB_BIN $DEB_DOC $DEB_MAN mkdir -p $BUILD_DIR/DEBIAN $DEB_CMP $DEB_BIN $DEB_DOC $DEB_MAN
chmod 0755 -R $BUILD_DIR/* chmod 0755 -R $BUILD_DIR/*
# Copy control file
cp $SRC_DEB/control $BUILD_DIR/DEBIAN
# Package maintainer scripts (currently empty) # Package maintainer scripts (currently empty)
#cp $SRC_DEB/postinst $BUILD_DIR/DEBIAN #cp $SRC_DEB/postinst $BUILD_DIR/DEBIAN
#cp $SRC_DEB/postrm $BUILD_DIR/DEBIAN #cp $SRC_DEB/postrm $BUILD_DIR/DEBIAN
@ -49,6 +47,7 @@ cp -r $SRC_DEB/examples $DEB_DOC
# Copy manpages # Copy manpages
cp $SRC_DEB/manpages/zcashd.1 $DEB_MAN cp $SRC_DEB/manpages/zcashd.1 $DEB_MAN
cp $SRC_DEB/manpages/zcash-cli.1 $DEB_MAN cp $SRC_DEB/manpages/zcash-cli.1 $DEB_MAN
cp $SRC_DEB/manpages/zcash-fetch-params.1 $DEB_MAN
# Copy bash completion files # Copy bash completion files
cp $SRC_PATH/contrib/bitcoind.bash-completion $DEB_CMP/zcashd cp $SRC_PATH/contrib/bitcoind.bash-completion $DEB_CMP/zcashd
cp $SRC_PATH/contrib/bitcoin-cli.bash-completion $DEB_CMP/zcash-cli cp $SRC_PATH/contrib/bitcoin-cli.bash-completion $DEB_CMP/zcash-cli
@ -57,6 +56,13 @@ gzip --best -n $DEB_DOC/changelog
gzip --best -n $DEB_DOC/changelog.Debian gzip --best -n $DEB_DOC/changelog.Debian
gzip --best -n $DEB_MAN/zcashd.1 gzip --best -n $DEB_MAN/zcashd.1
gzip --best -n $DEB_MAN/zcash-cli.1 gzip --best -n $DEB_MAN/zcash-cli.1
gzip --best -n $DEB_MAN/zcash-fetch-params.1
cd $SRC_PATH/contrib
# Create the control file
dpkg-shlibdeps $DEB_BIN/zcashd $DEB_BIN/zcash-cli
dpkg-gencontrol -P$BUILD_DIR
# Create the Debian package # Create the Debian package
fakeroot dpkg-deb --build $BUILD_DIR fakeroot dpkg-deb --build $BUILD_DIR