Browse Source

dh-systemd dependency should be removed for debhelper >=10

For trusty, debhelper is 9, so need to add the Build-Depends
for the build script.

With a few other fixes for trusty script.
pull/1257/head
Roger Shimizu 8 years ago
committed by Max Lv
parent
commit
0553da0692
2 changed files with 5 additions and 7 deletions
  1. 10
      scripts/deb4trusty.sh
  2. 2
      scripts/deb4xenial.sh

10
scripts/deb4trusty.sh

@ -6,7 +6,7 @@
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
DEPS="git-buildpackage equivs dh-autoreconf"
DEPS="git-buildpackage equivs dh-autoreconf dh-systemd"
sudo apt-get install -y $DEPS
gbp_build() {
@ -52,17 +52,15 @@ dsc_build http://httpredir.debian.org/debian/pool/main/libs/libsodium/libsodium_
sudo dpkg -i libsodium*.deb
# Build shadowsocks-libev
gbp_build https://anonscm.debian.org/git/collab-maint/shadowsocks-libev.git master
gbp clone --pristine-tar https://anonscm.debian.org/git/collab-maint/shadowsocks-libev.git
# Add patch to work with ubuntu trusty (14.04)
cd -
git clean -fdx
git reset --hard
cd shadowsocks-libev
sed -i s/--with\ systemd/--with\ systemd\ --with\ autoreconf/ debian/rules
sed -i s/debhelper\ \(\>=\ 10\)/debhelper\ \(\>=\ 9\)/ debian/control
git add -u
git commit -m "Patch to work with ubuntu trusty (14.04)"
gbp buildpackage -us -uc --git-ignore-branch --git-pristine-tar
cd -
gbp_build https://anonscm.debian.org/git/collab-maint/shadowsocks-libev.git master
sudo dpkg -i shadowsocks-libev_*.deb
sudo apt-get install -fy

2
scripts/deb4xenial.sh

@ -9,7 +9,7 @@
# Please add xenial-backports repo to your apt source list
# Because we use debhelper 10 in that repo
DEPS="git-buildpackage equivs"
DEPS_BPO="debhelper dh-systemd"
DEPS_BPO="debhelper"
BPO=xenial-backports
sudo apt-get install -y $DEPS
sudo apt-get install -y -t $BPO $DEPS_BPO

Loading…
Cancel
Save