simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #299 from a-detiste/master

Browse source 
Refresh debian packaging
This commit is contained in:
Luka Krajger 2015-05-12 18:18:34 +02:00
commit 597890ed33
11 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -6,9 +6,12 @@
.deps .deps
.dirstamp .dirstamp
autom4te.cache autom4te.cache
config.guess
config.h config.h
config.log config.log
config.status config.status
config.sub
configure
demo/demo.js demo/demo.js
demo/keyboard.png demo/keyboard.png
demo/vt100.js demo/vt100.js

6
debian/README.source vendored
View file

@ -1,3 +1,3 @@
The upstream source for shellinabox is archived in googlecode GIT The upstream source for shellinabox is archived in GitHub GIT
repository, <http://code.google.com/p/shellinabox/>. The package is repository, <https://github.com/shellinabox/shellinabox/>.
being maintained as a native Debian package. The package is being maintained as a native Debian package.

10
debian/changelog vendored
View file

@ -1,3 +1,13 @@
shellinabox (2.15-1) UNRELEASED; urgency=medium
* Non-maintainer upload.
* Bump std version to 3.9.6, no change needed
* Bump debhelper compat to 9
* move lintian exception in d/shellinabox.lintian
* change urls to new GitHub repos
-- Alexandre Detiste <alexandre.detiste@gmail.com> Tue, 12 May 2015 14:06:55 +0200
shellinabox (2.14-1) unstable; urgency=low shellinabox (2.14-1) unstable; urgency=low
* Revised install target of debian/rules. * Revised install target of debian/rules.

2
debian/compat vendored
View file

@ -1 +1 @@
8 9

8
debian/control vendored
View file

@ -2,12 +2,12 @@ Source: shellinabox
Section: web Section: web
Priority: optional Priority: optional
Maintainer: Marc Singer <elf@debian.org> Maintainer: Marc Singer <elf@debian.org>
Build-Depends: debhelper (>= 8.0.0), autotools-dev, binutils, Build-Depends: debhelper (>= 9), autotools-dev, binutils,
libssl-dev, libpam0g-dev, zlib1g-dev libssl-dev, libpam0g-dev, zlib1g-dev
Standards-Version: 3.9.3 Standards-Version: 3.9.6
Homepage: http://shellinabox.com Homepage: http://shellinabox.com
Vcs-Git: https://code.google.com/p/shellinabox/ Vcs-Git: https://github.com/shellinabox/shellinabox/
Vcs-Browser: https://code.google.com/p/shellinabox/source/browse/ Vcs-Browser: https://github.com/shellinabox/shellinabox/
Package: shellinabox Package: shellinabox
Architecture: any Architecture: any

8
debian/copyright vendored
View file

@ -1,9 +1,13 @@
Format: http://dep.debian.net/deps/dep5 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: shellinabox Upstream-Name: shellinabox
Source: <https://code.google.com/p/shellinabox/> Source: <https://github.com/shellinabox/shellinabox/>
Files: * Files: *
Copyright: Copyright 2008-2012, Markus Gutschke All rights reserved. Copyright: Copyright 2008-2012, Markus Gutschke All rights reserved.
2012, Marc Singer
2015, Luka Krajger, Philip Hughes, Daniel Gröber,
Ezra Buehler, Anders Kaseorg,
Jonathan Rennison, Guillaume Martres
Upstream-Author: markus@shellinabox.com Upstream-Author: markus@shellinabox.com
License: GPL-2+ License: GPL-2+
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify

7
debian/rules vendored
View file

@ -53,12 +53,5 @@ override_dh_install:
"$(DESTDIR)/etc/shellinabox/options-enabled/README" "$(DESTDIR)/etc/shellinabox/options-enabled/README"
# Shellinabox home directory # Shellinabox home directory
# mkdir -p "$(DESTDIR)/var/lib/shellinabox" # mkdir -p "$(DESTDIR)/var/lib/shellinabox"
# Add Lintian override. ShellInABox has an explicit exemption allowing
# the linking its GPLv2 code with OpenSSL.
mkdir -p "$(DESTDIR)/usr/share/lintian/overrides/"
{ echo '# ShellInABox has an explicit exemption allowing the linking';\
echo '# of its GPLv2 code with OpenSSL'; \
echo 'shellinabox binary: possible-gpl-code-linked-with-openssl'; } \
>"$(DESTDIR)/usr/share/lintian/overrides/shellinabox"
# Now perform the normal debhelper install. # Now perform the normal debhelper install.
dh_install dh_install

1
debian/shellinabox.install vendored
View file

@ -1,5 +1,4 @@
etc/shellinabox/options-available etc/shellinabox/options-available
etc/shellinabox/options-enabled etc/shellinabox/options-enabled
usr/bin usr/bin
usr/share/lintian/overrides
usr/share/man/man1 usr/share/man/man1

3
debian/shellinabox.lintian-overrides vendored Normal file
View file

@ -0,0 +1,3 @@
# ShellInABox has an explicit exemption allowing the linking
# of its GPLv2 code with OpenSSL
shellinabox binary: possible-gpl-code-linked-with-openssl

2
debian/watch vendored
View file

@ -1,2 +1,2 @@
version=3 version=3
https://code.google.com/p/shellinabox/downloads/detail?name=shellinabox-(.+).tar.gz https://github.com/shellinabox/shellinabox/tags .*/v?(\d\S*)\.tar\.gz

2
shellinabox/shellinaboxd.man.in
View file

@ -511,7 +511,7 @@ choice can be removed from the context menu. The user can still make this
choice by directly going to the appropriate URL. choice by directly going to the appropriate URL.
.TP .TP
\fB-q\fP\ |\ \fB--quiet\fP \fB-q\fP\ |\ \fB--quiet\fP
Surpresses all messages to Suppresses all messages to
.IR stderr . .IR stderr .
This option is mutually exclusive with This option is mutually exclusive with
.B --debug .B --debug