Change in osmo-pcap[master]: debian: Clean up to look like other osmocom projects

2018-11-02 Thread Pau Espin Pedrol 
Pau Espin Pedrol has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11544 )

Change subject: debian: Clean up to look like other osmocom projects
..

debian: Clean up to look like other osmocom projects

Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0
---
D debian/README
M debian/compat
A debian/copyright
D debian/init.d.ex
D debian/osmo-pcap-client.init
D debian/osmo-pcap.default.ex
M debian/rules
7 files changed, 29 insertions(+), 338 deletions(-)

Approvals:
  Jenkins Builder: Verified
  daniel: Looks good to me, approved



diff --git a/debian/README b/debian/README
deleted file mode 100644
index 1719eed..000
--- a/debian/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package osmo-pcap
-
-
-Comments regarding the Package
-
- -- Holger Hans Peter Freyther   Wed, 01 Jun 2011 14:51:32 
+0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..9731a49
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,22 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OsmoPCAP
+Source: http://cgit.osmocom.org/osmo-pcap/
+
+Files: *
+Copyright: 2011 Holger Freyther and On-Waves
+   2018 sysmocom s. f. m. c. GmbH 
+License: AGPL-3+
+
+License: AGPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see .
diff --git a/debian/init.d.ex b/debian/init.d.ex
deleted file mode 100644
index 8cabb58..000
--- a/debian/init.d.ex
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:  osmo-pcap
-# Required-Start:$network $local_fs
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop:  0 1 6
-# Short-Description: 
-# Description:   
-#<...>
-#<...>
-### END INIT INFO
-
-# Author: Holger Hans Peter Freyther 
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC=osmo-pcap # Introduce a short description here
-NAME=osmo-pcap # Introduce the short server's name here
-DAEMON=/usr/sbin/osmo-pcap # Introduce the server's location here
-DAEMON_ARGS="" # Arguments to run the daemon with
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-   # Return
-   #   0 if daemon has been started
-   #   1 if daemon was already running
-   #   2 if daemon could not be started
-   start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON 
--test > /dev/null \
-   || return 1
-   start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-   $DAEMON_ARGS \
-   || return 2
-   # Add code here, if necessary, that waits for the process to be ready
-   # to handle requests from services started subsequently which depend
-   # on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-   # Return
-   #   0 if daemon has been stopped
-   #   1 if daemon was already stopped
-   #   2 if daemon could not be stopped
-   #   other if a failure occurred
-   start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile 
$PIDFILE --name $NAME
-   RETVAL="$?"
-   [ "$RETVAL" = 2 ] && return 2
-   # Wait for children to finish too if this is a daemon that forks
-   # and if the daemon is only ever run from this initscript.
-   # If the above conditions are not satisfied then add some other code
-   # that waits for the process to drop all resources that could be
-   # needed by services started subsequently.  A last resort is to
-   # sleep for some time.
-   start-stop-daemon --stop --quie

Change in osmo-pcap[master]: debian: Clean up to look like other osmocom projects

2018-11-01 Thread daniel 
daniel has posted comments on this change. ( https://gerrit.osmocom.org/11544 )

Change subject: debian: Clean up to look like other osmocom projects
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11544
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0
Gerrit-Change-Number: 11544
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Thu, 01 Nov 2018 19:20:56 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-pcap[master]: debian: Clean up to look like other osmocom projects

2018-11-01 Thread Pau Espin Pedrol 
Hello daniel, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11544

to look at the new patch set (#3).

Change subject: debian: Clean up to look like other osmocom projects
..

debian: Clean up to look like other osmocom projects

Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0
---
D debian/README
M debian/compat
A debian/copyright
D debian/init.d.ex
D debian/osmo-pcap-client.init
D debian/osmo-pcap.default.ex
M debian/rules
7 files changed, 29 insertions(+), 338 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/44/11544/3
--
To view, visit https://gerrit.osmocom.org/11544
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0
Gerrit-Change-Number: 11544
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: daniel

Change in osmo-pcap[master]: debian: Clean up to look like other osmocom projects

2018-10-31 Thread daniel 
daniel has posted comments on this change. ( https://gerrit.osmocom.org/11544 )

Change subject: debian: Clean up to look like other osmocom projects
..


Patch Set 2: Code-Review-1

(3 comments)

https://gerrit.osmocom.org/#/c/11544/2/debian/copyright
File debian/copyright:

https://gerrit.osmocom.org/#/c/11544/2/debian/copyright@2
PS2, Line 2: Upstream-Name: OsmoHLR
c&p issue


https://gerrit.osmocom.org/#/c/11544/2/debian/copyright@3
PS2, Line 3: Source: http://cgit.osmocom.org/osmo-hlr/
Here as well


https://gerrit.osmocom.org/#/c/11544/2/debian/copyright@6
PS2, Line 6: Copyright: 2018 Sysmocom s. f. m. c. GmbH 
The sources all only list Holger and On-Waves as copyright holders...



--
To view, visit https://gerrit.osmocom.org/11544
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0
Gerrit-Change-Number: 11544
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Wed, 31 Oct 2018 17:44:27 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in osmo-pcap[master]: debian: Clean up to look like other osmocom projects

2018-10-31 Thread Pau Espin Pedrol 
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/11544


Change subject: debian: Clean up to look like other osmocom projects
..

debian: Clean up to look like other osmocom projects

Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0
---
D debian/README
M debian/compat
A debian/copyright
D debian/init.d.ex
D debian/osmo-pcap-client.init
D debian/osmo-pcap.default.ex
M debian/rules
7 files changed, 28 insertions(+), 338 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/44/11544/1

diff --git a/debian/README b/debian/README
deleted file mode 100644
index 1719eed..000
--- a/debian/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package osmo-pcap
-
-
-Comments regarding the Package
-
- -- Holger Hans Peter Freyther   Wed, 01 Jun 2011 14:51:32 
+0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..5b7df8b
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,21 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OsmoHLR
+Source: http://cgit.osmocom.org/osmo-hlr/
+
+Files: *
+Copyright: 2018 Sysmocom s. f. m. c. GmbH 
+License: AGPL-3+
+
+License: AGPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see .
diff --git a/debian/init.d.ex b/debian/init.d.ex
deleted file mode 100644
index 8cabb58..000
--- a/debian/init.d.ex
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:  osmo-pcap
-# Required-Start:$network $local_fs
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop:  0 1 6
-# Short-Description: 
-# Description:   
-#<...>
-#<...>
-### END INIT INFO
-
-# Author: Holger Hans Peter Freyther 
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC=osmo-pcap # Introduce a short description here
-NAME=osmo-pcap # Introduce the short server's name here
-DAEMON=/usr/sbin/osmo-pcap # Introduce the server's location here
-DAEMON_ARGS="" # Arguments to run the daemon with
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-   # Return
-   #   0 if daemon has been started
-   #   1 if daemon was already running
-   #   2 if daemon could not be started
-   start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON 
--test > /dev/null \
-   || return 1
-   start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-   $DAEMON_ARGS \
-   || return 2
-   # Add code here, if necessary, that waits for the process to be ready
-   # to handle requests from services started subsequently which depend
-   # on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-   # Return
-   #   0 if daemon has been stopped
-   #   1 if daemon was already stopped
-   #   2 if daemon could not be stopped
-   #   other if a failure occurred
-   start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile 
$PIDFILE --name $NAME
-   RETVAL="$?"
-   [ "$RETVAL" = 2 ] && return 2
-   # Wait for children to finish too if this is a daemon that forks
-   # and if the daemon is only ever run from this initscript.
-   # If the above conditions are not satisfied then add some other code
-   # that waits for the process to drop all resources that could be
-   # needed by services started subsequently.  A last resort is to
-   # sleep for some time.
-   start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec 
$DAEMON
-   [