Browse Source

Sync debian/ folder with version 2.4.7+20160630+ds-2 (#710)

Changes:
 - Add license of manpages to copyright
 - Change way to handle config file (config.json)
 - Add lintian-overrides
 - Rename/Update docs and install file
pull/725/head
Roger Shimizu 8 years ago
committed by Max Lv
parent
commit
86b3c3a245
8 changed files with 48 additions and 7 deletions
  1. 13
      debian/copyright
  2. 1
      debian/install
  3. 2
      debian/rules
  4. 1
      debian/shadowsocks-libev.docs
  5. 2
      debian/shadowsocks-libev.install
  6. 10
      debian/shadowsocks-libev.postinst
  7. 22
      debian/shadowsocks-libev.postrm
  8. 4
      debian/source.lintian-overrides

13
debian/copyright

@ -46,6 +46,10 @@ License: BSD-3-clause
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Files: man/*
Copyright: 2012-2016, Max Lv <max.c.lv@gmail.com>
License: GFDL-1.1+
Files: src/json.c src/json.h Files: src/json.c src/json.h
Copyright: 2012-2014, James McLaughlin et al. Copyright: 2012-2014, James McLaughlin et al.
License: BSD-2-clause License: BSD-2-clause
@ -104,6 +108,15 @@ License: BSD-2-clause
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE. SUCH DAMAGE.
License: GFDL-1.1+
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or
any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
.
A copy of the license is included in the section entitled
"GNU Free Documentation License".
License: GPL-3+ License: GPL-3+
This package is free software; you can redistribute it and/or modify This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

1
debian/install

@ -1 +0,0 @@
debian/config.json /etc/shadowsocks-libev

2
debian/rules

@ -22,4 +22,4 @@ override_dh_installchangelogs:
dh_installchangelogs -XChanges dh_installchangelogs -XChanges
%: %:
dh $@ --with systemd
dh $@ --with systemd

debian/docs → debian/shadowsocks-libev.docs

@ -1,2 +1,3 @@
AUTHORS
README.md README.md
debian/copyright.original debian/copyright.original

2
debian/shadowsocks-libev.install

@ -1,4 +1,4 @@
usr/bin/ usr/bin/
usr/share/man/ usr/share/man/
debian/config.json etc/shadowsocks-libev
debian/config.json usr/share/shadowsocks-libev
debian/shadowsocks-libev-*.service lib/systemd/system debian/shadowsocks-libev-*.service lib/systemd/system

10
debian/shadowsocks-libev.postinst

@ -4,7 +4,12 @@ set -e
case "$1" in case "$1" in
configure|reconfigure) configure|reconfigure)
# continue
if [ ! -f /etc/shadowsocks-libev/config.json ]; then
passwd=$(apg -n 1 -M ncl)
mkdir -p /etc/shadowsocks-libev
sed "s/barfoo!/$passwd/" /usr/share/shadowsocks-libev/config.json \
> /etc/shadowsocks-libev/config.json
fi
;; ;;
abort-upgrade|abort-remove|abort-deconfigure) abort-upgrade|abort-remove|abort-deconfigure)
exit 0 exit 0
@ -15,9 +20,6 @@ case "$1" in
;; ;;
esac esac
passwd=$(apg -n 1 -M ncl)
sed -i "s/barfoo!/$passwd/" /etc/shadowsocks-libev/config.json
#DEBHELPER# #DEBHELPER#
exit 0 exit 0

22
debian/shadowsocks-libev.postrm

@ -0,0 +1,22 @@
#!/bin/sh
set -e
case "$1" in
purge)
rm -f /etc/shadowsocks-libev/config.json
test -f /etc/shadowsocks-libev/* \
|| rm -r /etc/shadowsocks-libev/
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
exit 0
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 0
;;
esac
#DEBHELPER#
exit 0

4
debian/source.lintian-overrides

@ -0,0 +1,4 @@
# false positive: #505857
shadowsocks-libev source: debian-watch-file-should-mangle-version
# false positive: #765166
shadowsocks-libev source: license-problem-gfdl-invariants
Loading…
Cancel
Save