diff --git a/debian/control b/debian/control index 28f50fa1f..fba856a04 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ Build-Depends: debhelper (>= 7.0.50~), default-jdk, gettext, libgmp3-dev, -## uncomment the next line for PPA builds -## libservice-wrapper-java, +# uncomment the next line for PPA builds +# libservice-wrapper-java, libcommons-logging-java, po-debconf diff --git a/debian/repack.sh b/debian/repack.sh new file mode 100755 index 000000000..ed58b2b1c --- /dev/null +++ b/debian/repack.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +# Strip out binaries from the official upstream I2P source tarballs that are +# not required to build the Debian packages. + +# Script mostly borrowed from Raphael Geissert's dfsg-repack.sh + + +set -e + +if [ ! -f "$3" ] && [ ! -f "$1" ]; then + echo "ERROR: This script must be run via uscan or by manually specifying the input tarball." >&2 + exit 1 +fi + +tarball= + +[ -f "$3" ] && tarball="$3" +[ -z "$tarball" -a -f "$1" ] && tarball="$1" + +fname=$(basename "$tarball" .bz2) +tarball=$(readlink -f "$tarball") + +tdir=$(mktemp -d) +trap '[ ! -d "$tdir" ] || rm -r "$tdir"' EXIT + +cp -f ${tarball} "$tarball.bkp" +echo "Filtering tarball contents..." +bzcat "$tarball" | tar --wildcards --delete '*/installer/lib/*' \ + --delete '*/Slackware/*' \ + --delete '*/debian/*' > "$tdir/${fname}" + +echo "Compressing filtered tarball..." +bzip2 -9 "$tdir/${fname}" + +repackedtarball=$(echo $tarball|sed -e 's/i2psource/i2p/' -e 's/\.orig\.tar\.bz2/+repack.orig.tar.bz2/') +mv "$tdir/${fname}.bz2" "$repackedtarball" +echo "Repacked tarball saved to $repackedtarball." diff --git a/debian/watch b/debian/watch index b33dbd242..c4c1558db 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -http://mirror.i2p2.de/i2psource_(.*)\.tar\.bz2 debian uupdate +http://mirror.i2p2.de/i2psource_(.*)\.tar\.bz2 debian debian/repack.sh