[Pkg-voip-commits] [janus] 01/01: Initial cleanup for debian
Victor Seva
vseva at moszumanska.debian.org
Thu Dec 29 18:21:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
vseva pushed a commit to branch master
in repository janus.
commit 58ce71a122d03e471ffed84a057ba1b43a14329a
Author: Victor Seva <vseva at debian.org>
Date: Thu Dec 22 12:45:54 2016 +0100
Initial cleanup for debian
---
debian/TODO | 7 +++
debian/changelog | 20 ++------
debian/control | 87 +++++++++++++++++----------------
debian/copyright | 32 ++++++------
debian/gbp.conf | 2 +
debian/janus-demos.install | 1 -
debian/janus-demos.lintian-overrides | 1 -
debian/janus-doc.install | 1 -
debian/janus-doc.lintian-overrides | 1 -
debian/janus.init | 24 +++++----
debian/janus.install | 8 +--
debian/janus.lintian-overrides | 2 -
debian/janus.service | 2 +-
debian/patches/0001-disable-demos.patch | 34 +++++++++++++
debian/patches/0002-fix-typo.patch | 26 ++++++++++
debian/patches/series | 2 +
debian/rules | 13 ++---
debian/source.lintian-overrides | 1 -
debian/source/format | 2 +-
debian/watch | 3 ++
20 files changed, 158 insertions(+), 111 deletions(-)
diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..2e9a49c
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,7 @@
+* help with srtp
+* package usrsctp ? https://github.com/sctplab/usrsctp
+
++++ lintian output +++
+W: janus: binary-without-manpage usr/bin/janus
+-> https://github.com/meetecho/janus-gateway/issues/723
+W: janus: package-has-unnecessary-activation-of-ldconfig-trigger
diff --git a/debian/changelog b/debian/changelog
index f04341a..1fc24af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,5 @@
-janus (0.1.1+git20160615.3507b9a.1jessie) jessie; urgency=medium
+janus (0.2.1+dfsg-1) UNRELEASED; urgency=medium
- * New release based on revision 3507b9a (0.1.1 tag)
- * Enable data channels
- * Enable rabbitmq transport
+ * Initial package (closes: #849059)
- -- Saul Ibarra <saul at ag-projects.com> Wed, 15 Jun 2016 18:53:46 +0200
-
-janus (0.1.1+git20160614.a4a3862.1jessie) jessie; urgency=medium
-
- * New release based on revision a4a3862
-
- -- Saul Ibarra <saul at ag-projects.com> Tue, 14 Jun 2016 12:49:51 +0100
-
-janus (0.1.0+git20160311.a7c5674.1jessie) jessie; urgency=medium
-
- * New release based on revision a7c5674
-
- -- Saul Ibarra <saul at ag-projects.com> Fri, 11 Mar 2016 12:45:44 +0100
+ -- Victor Seva <vseva at debian.org> Thu, 22 Dec 2016 12:34:49 +0100
diff --git a/debian/control b/debian/control
index a92527a..4cecde9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,58 +1,59 @@
Source: janus
Section: comm
Priority: optional
-Maintainer: Saul Ibarra Corretge <saul at ag-projects.com>
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
- dh-systemd,
- autotools-dev,
- pkg-config,
- gengetopt,
- doxygen,
- graphviz,
- libmicrohttpd-dev,
- libjansson-dev,
- libnice-dev,
- libssl-dev,
- libsrtp-dev,
- libsofia-sip-ua-dev,
- libglib2.0-dev,
- libcollection-dev,
- libwebsockets-dev (>> 1.3),
- libsrtp-dev (>= 1.5),
- libusrsctp-dev,
- librabbitmq-dev
-Standards-Version: 3.9.6
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Victor Seva <vseva at debian.org>,
+ Saul Ibarra Corretge <saul at ag-projects.com>,
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 9),
+ dh-autoreconf,
+ dh-systemd,
+ dpkg-dev (>= 1.16.1.1),
+ gengetopt,
+ libcollection-dev,
+ libglib2.0-dev,
+ libjansson-dev,
+ libmicrohttpd-dev,
+ libnice-dev,
+ librabbitmq-dev,
+ libsofia-sip-ua-dev,
+ libsrtp-dev (>= 1.5),
+ libssl-dev,
+ libwebsockets-dev (>> 1.3),
+ pkg-config,
+Standards-Version: 3.9.8
Homepage: http://janus.conf.meetecho.com
Package: janus
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ lsb-base (>= 3.0-6),
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: Open Source, general purpose, WebRTC gateway
+ The Janus WebRTC Gateway has been conceived as a general purpose gateway
designed and developed by Meetecho.
+ .
+ As such, it doesn't provide any functionality per se other than implementing
+ the means to set up a WebRTC media communication with a browser,
+ exchanging JSON messages with it, and relaying RTP/RTCP and messages between
+ browsers and the server-side application logic they're attached to.
+ Any specific feature/application needs to be implemented in server side
+ plugins, that browsers can then contact via the gateway to take advantage of
+ the functionality they provide.
+ .
+ Example of such plugins can be implementations of applications like echo
+ tests, conference bridges, media recorders, SIP gateways and the like.
Package: janus-dev
Architecture: any
-Depends: janus (=${binary:Version}), ${misc:Depends}
-Description: Open Source, general purpose, WebRTC gateway
+Depends:
+ janus (=${binary:Version}),
+ ${misc:Depends},
+Description: Open Source, general purpose, WebRTC gateway - development files
+ The Janus WebRTC Gateway has been conceived as a general purpose gateway
designed and developed by Meetecho.
.
This package contains headers for plugin development.
-
-Package: janus-demos
-Architecture: all
-Depends: janus, ${misc:Depends}
-Description: Open Source, general purpose, WebRTC gateway
- designed and developed by Meetecho.
- .
- This package contains some demo applications.
-
-Package: janus-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Open Source, general purpose, WebRTC gateway
- designed and developed by Meetecho.
- .
- This package contains documentation.
-
diff --git a/debian/copyright b/debian/copyright
index 9184315..48b34d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,26 +3,22 @@ Upstream-Name: janus
Source: https://github.com/meetecho/janus-gateway
Files: *
-Copyright: 2014-present Meetecho
-License: GPL-3
+Copyright: 2014,2015,2016 Meetecho
+License: GPL-3 with OpenSSL exception
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ .
+ If you modify this Program, or any covered work, by linking or combining
+ it with OpenSSL (or a modified version of that library), containing
+ parts covered by the terms of OpenSSL License, the licensors of this
+ Program grant you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination shall
+ include the source code for the parts of openssl used as well as that of
+ the covered work.
Files: debian/*
-Copyright: 2015 Saúl Ibarra Corretgé <saul at ag-projects.com>
-License: GPL-2+
- 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
+Copyright: 2016 Victor Seva <vseva at debian.org>
+ 2015 Saúl Ibarra Corretgé <saul at ag-projects.com>
+License: GPL-3
On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..f47bb7b
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[import-orig]
+filter = [ 'html' ]
diff --git a/debian/janus-demos.install b/debian/janus-demos.install
deleted file mode 100644
index 670c95e..0000000
--- a/debian/janus-demos.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/janus/demos
diff --git a/debian/janus-demos.lintian-overrides b/debian/janus-demos.lintian-overrides
deleted file mode 100644
index f5888ca..0000000
--- a/debian/janus-demos.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-janus-demos: embedded-javascript-library
diff --git a/debian/janus-doc.install b/debian/janus-doc.install
deleted file mode 100644
index 8979b76..0000000
--- a/debian/janus-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/janus-gateway
diff --git a/debian/janus-doc.lintian-overrides b/debian/janus-doc.lintian-overrides
deleted file mode 100644
index 01c45ae..0000000
--- a/debian/janus-doc.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-janus-doc: embedded-javascript-library
diff --git a/debian/janus.init b/debian/janus.init
index f7c55f7..f5f0879 100644
--- a/debian/janus.init
+++ b/debian/janus.init
@@ -1,7 +1,7 @@
#!/bin/sh
### BEGIN INIT INFO
-# Provides: Janus
+# Provides: janus
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
@@ -10,24 +10,28 @@
# Description: Janus WebRTC gateway
### END INIT INFO
+DEFAULTS=/etc/default/janus
+DESC=janus
DAEMON=/usr/bin/janus
DAEMON_NAME=janus
-
-# Add any command line options for your daemon here
-DAEMON_OPTS="-D -o"
-
-# This next line determines what user the script runs as.
-# Root generally not recommended but necessary if you are using the Raspberry Pi GPIO from Python.
DAEMON_USER=root
+PIDFILE="/var/run/$DAEMON_NAME.pid"
+LOGFILE="/var/log/$DAEMON_NAME.log"
+
+test -r $DEFAULTS && . $DEFAULTS
-# The process ID of the script when it runs is stored here:
-PIDFILE=/var/run/$DAEMON_NAME.pid
+if [ "$START_JANUS" != "yes" ]; then
+ log_failure_msg "$DESC not yet configured. Edit $DEFAULTS first."
+ exit 0
+fi
. /lib/lsb/init-functions
do_start () {
log_daemon_msg "Starting system $DAEMON_NAME daemon"
- start-stop-daemon --start --background --no-close --pidfile $PIDFILE --make-pidfile --user $DAEMON_USER --chuid $DAEMON_USER --startas $DAEMON -- $DAEMON_OPTS >> /var/log/$DAEMON_NAME.log 2>&1
+ start-stop-daemon --start --background --no-close --pidfile $PIDFILE \
+ --make-pidfile --user $DAEMON_USER --chuid $DAEMON_USER \
+ --startas $DAEMON -- $DAEMON_OPTS >> $LOGFILE 2>&1
log_end_msg $?
}
do_stop () {
diff --git a/debian/janus.install b/debian/janus.install
index 984ceee..0e22d1d 100644
--- a/debian/janus.install
+++ b/debian/janus.install
@@ -1,7 +1,7 @@
etc/janus
usr/bin
-usr/lib/janus/plugins/libjanus_*.so
-usr/lib/janus/plugins/libjanus_*.so.*
-usr/lib/janus/transports/libjanus_*.so
-usr/lib/janus/transports/libjanus_*.so.*
+usr/lib/*/janus/plugins/libjanus_*.so
+usr/lib/*/janus/plugins/libjanus_*.so.*
+usr/lib/*/janus/transports/libjanus_*.so
+usr/lib/*/janus/transports/libjanus_*.so.*
usr/share/janus/certs
diff --git a/debian/janus.lintian-overrides b/debian/janus.lintian-overrides
deleted file mode 100644
index 6836841..0000000
--- a/debian/janus.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-janus: possible-gpl-code-linked-with-openssl
-janus: binary-without-manpage
diff --git a/debian/janus.service b/debian/janus.service
index ee80d13..43c3618 100644
--- a/debian/janus.service
+++ b/debian/janus.service
@@ -1,6 +1,7 @@
[Unit]
Description=Janus WebRTC gateway
After=network.target
+Documentation=https://janus.conf.meetecho.com/docs/index.html
[Service]
Type=simple
@@ -10,4 +11,3 @@ LimitNOFILE=65536
[Install]
WantedBy=multi-user.target
-
diff --git a/debian/patches/0001-disable-demos.patch b/debian/patches/0001-disable-demos.patch
new file mode 100644
index 0000000..513b423
--- /dev/null
+++ b/debian/patches/0001-disable-demos.patch
@@ -0,0 +1,34 @@
+From: Victor Seva <vseva at sipwise.com>
+Date: Thu, 29 Dec 2016 11:13:10 +0100
+Subject: disable demos
+
+---
+ Makefile.am | 2 +-
+ configure.ac | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d4cd0e5..3ec5db1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,7 +44,7 @@ plugin_LTLIBRARIES = $(NULL)
+ transportdir = $(libdir)/janus/transports
+ transport_LTLIBRARIES = $(NULL)
+
+-SUBDIRS = html
++SUBDIRS =
+ html_DATA = README.md
+
+ streamdir = $(datadir)/janus/streams
+diff --git a/configure.ac b/configure.ac
+index 3a1771b..3e14dc4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -486,7 +486,6 @@ AM_CONDITIONAL([ENABLE_POST_PROCESSING], [test "x$enable_post_processing" = "xye
+
+ AC_CONFIG_FILES([
+ Makefile
+- html/Makefile
+ docs/Makefile
+ ])
+
diff --git a/debian/patches/0002-fix-typo.patch b/debian/patches/0002-fix-typo.patch
new file mode 100644
index 0000000..ffacbe8
--- /dev/null
+++ b/debian/patches/0002-fix-typo.patch
@@ -0,0 +1,26 @@
+From f121d8723503def9e80d8e8650b481bf1f8d3794 Mon Sep 17 00:00:00 2001
+From: Victor Seva <linuxmaniac at torreviejawireless.org>
+Date: Thu, 29 Dec 2016 11:26:50 +0100
+Subject: [PATCH] fix typo thanks to lintian
+
+> I: janus: spelling-error-in-binary usr/bin/janus Recieved Received
+---
+ ice.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ice.c b/ice.c
+index e4f3e1f..36b809b 100644
+--- a/ice.c
++++ b/ice.c
+@@ -2002,7 +2002,7 @@ void janus_ice_cb_nice_recv(NiceAgent *agent, guint stream_id, guint component_i
+ for (;;) {
+ last_seqs_len++;
+ if(cur_seq->seq == new_seqn) {
+- JANUS_LOG(LOG_HUGE, "[%"SCNu64"] Recieved missed sequence number %"SCNu16"\n", handle->handle_id, cur_seq->seq);
++ JANUS_LOG(LOG_HUGE, "[%"SCNu64"] Received missed sequence number %"SCNu16"\n", handle->handle_id, cur_seq->seq);
+ cur_seq->state = SEQ_RECVED;
+ } else if(cur_seq->state == SEQ_MISSING && now - cur_seq->ts > SEQ_MISSING_WAIT) {
+ JANUS_LOG(LOG_HUGE, "[%"SCNu64"] Missed sequence number %"SCNu16", sending 1st NACK\n", handle->handle_id, cur_seq->seq);
+--
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b1058d8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-disable-demos.patch
+0002-fix-typo.patch
diff --git a/debian/rules b/debian/rules
index 5f2cd8d..21bca3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,11 @@
#!/usr/bin/make -f
# output every command that modifies files on the build system.
-DH_VERBOSE = 1
+#DH_VERBOSE = 1
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
+include /usr/share/dpkg/buildflags.mk
%:
dh $@ --with autoreconf --with systemd
-
-override_dh_autoreconf:
- dh_autoreconf ./autogen.sh
-
-override_dh_auto_configure:
- dh_auto_configure -- --libdir=/usr/lib
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index c508429..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-janus source: source-is-missing
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..354fc89
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/janus_$1\.tar\.gz/,dversionmangle=s/\.dfsg//" \
+ https://github.com/meetecho/janus-gateway/tags .*/v?(\d\S*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git
More information about the Pkg-voip-commits
mailing list