Author: jodogne-guest
Date: 2015-03-06 11:51:29 +0000 (Fri, 06 Mar 2015)
New Revision: 18916
Added:
trunk/packages/orthanc-postgresql/trunk/debian/postinst
trunk/packages/orthanc-postgresql/trunk/debian/postrm
Removed:
trunk/packages/orthanc-postgresql/trunk/debian/configuration/
trunk/packages/orthanc-postgresql/trunk/debian/install
trunk/packages/orthanc-postgresql/trunk/debian/orthanc-postgresql.orthanc.init
Modified:
trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
trunk/packages/orthanc-postgresql/trunk/debian/control
trunk/packages/orthanc-postgresql/trunk/debian/copyright
trunk/packages/orthanc-postgresql/trunk/debian/rules
Log:
simplification of the package
Modified: trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
2015-03-06 11:51:20 UTC (rev 18915)
+++ trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
2015-03-06 11:51:29 UTC (rev 18916)
@@ -14,10 +14,9 @@
=============
To enable the plugin, you must specify the parameters of your
-PostgreSQL database by modifying the configuration file
-"/etc/orthanc/orthanc.json", following the instructions in
-"/etc/orthanc/orthanc-postgresql.json". Then, restart the Orthanc
-service:
+PostgreSQL database by adapting the "PostgreSQL" section of the
+configuration file "/etc/orthanc/orthanc.json". Then, restart the
+Orthanc service:
# sudo /etc/init.d/orthanc restart
Modified: trunk/packages/orthanc-postgresql/trunk/debian/control
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/control 2015-03-06
11:51:20 UTC (rev 18915)
+++ trunk/packages/orthanc-postgresql/trunk/debian/control 2015-03-06
11:51:29 UTC (rev 18916)
@@ -12,7 +12,7 @@
libgtest-dev (>= 1.6.0),
libjsoncpp-dev,
libpq-dev,
- orthanc-dev | liborthancclient-dev (= 0.8.6),
+ orthanc-dev,
postgresql-server-dev-all,
uuid-dev
Vcs-Browser:
http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-postgresql/trunk/
@@ -22,10 +22,9 @@
Package: orthanc-postgresql
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.8.6)
-Conflicts: orthanc-sqlite
Suggests: postgresql
Description: Plugins to use PostgreSQL as a database back-end to Orthanc
- Orthanc PostgreSQL is a set of 2 plugins to Orthanc, a lightweight,
+ Orthanc PostgreSQL is a set of two plugins to Orthanc, a lightweight,
RESTful Vendor Neutral Archive for medical imaging. These plugins
override the default SQLite engine of Orthanc with a PostgreSQL
back-end. They bring scalability to Orthanc, making it
Modified: trunk/packages/orthanc-postgresql/trunk/debian/copyright
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/copyright 2015-03-06
11:51:20 UTC (rev 18915)
+++ trunk/packages/orthanc-postgresql/trunk/debian/copyright 2015-03-06
11:51:29 UTC (rev 18916)
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: OrthancWebViewer
+Upstream-Name: OrthancPostgreSQL
Upstream-Contact: Sebastien Jodogne <s.jodo...@gmail.com>
-Source: https://code.google.com/p/orthanc-webviewer/
+Source: https://code.google.com/p/orthanc-postgresql/
Files: *
Copyright: 2012-2015 Sebastien Jodogne <s.jodo...@gmail.com>, University
Hospital of Liege, Belgium
Deleted: trunk/packages/orthanc-postgresql/trunk/debian/install
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/install 2015-03-06
11:51:20 UTC (rev 18915)
+++ trunk/packages/orthanc-postgresql/trunk/debian/install 2015-03-06
11:51:29 UTC (rev 18916)
@@ -1 +0,0 @@
-debian/configuration/orthanc-postgresql.json etc/orthanc
Deleted:
trunk/packages/orthanc-postgresql/trunk/debian/orthanc-postgresql.orthanc.init
===================================================================
---
trunk/packages/orthanc-postgresql/trunk/debian/orthanc-postgresql.orthanc.init
2015-03-06 11:51:20 UTC (rev 18915)
+++
trunk/packages/orthanc-postgresql/trunk/debian/orthanc-postgresql.orthanc.init
2015-03-06 11:51:29 UTC (rev 18916)
@@ -1,163 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: orthanc
-# Required-Start: $local_fs $remote_fs $network $syslog
-# Required-Stop: $local_fs $remote_fs $network $syslog
-# Should-Start: postgresql
-# Should-Stop: postgresql
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Orthanc init script
-# Description: Orthanc, a lightweight, RESTful DICOM server
-### END INIT INFO
-
-# Author: Sebastien Jodogne <s.jodo...@gmail.com>
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-# You can modify the variables below
-DESC="Orthanc"
-NAME=Orthanc
-
-# Constants
-DAEMON=/usr/sbin/Orthanc
-LOGDIR=/var/log/orthanc
-DAEMON_ARGS="--logdir=${LOGDIR} /etc/orthanc/orthanc-postgresql.json"
-PIDFILE=/run/orthanc.pid
-SCRIPTNAME=/etc/init.d/orthanc
-ORTHANC_USER=orthanc:orthanc
-
-# 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()
-{
- # Prepare a directory to store the Orthanc logs
- mkdir -p $LOGDIR
- chown $ORTHANC_USER $LOGDIR
-
- # 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 --chuid $ORTHANC_USER
--background --exec $DAEMON --test > /dev/null \
- || return 1
-
- start-stop-daemon --start --quiet --make-pidfile --pidfile $PIDFILE
--chuid $ORTHANC_USER --background --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
--chuid $ORTHANC_USER --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/1/KILL/5 --chuid
$ORTHANC_USER --exec $DAEMON
- [ "$?" = 2 ] && return 2
- # Many daemons don't delete their pidfiles when they exit.
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
- #
- # If the daemon can reload its configuration without
- # restarting (for example, when it is sent a SIGHUP),
- # then implement that here.
- #
- start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --chuid
$ORTHANC_USER --name $NAME
- return 0
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
Added: trunk/packages/orthanc-postgresql/trunk/debian/postinst
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/postinst
(rev 0)
+++ trunk/packages/orthanc-postgresql/trunk/debian/postinst 2015-03-06
11:51:29 UTC (rev 18916)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+ configure)
+ # Restart the Orthanc service
+ # https://www.debian.org/doc/debian-policy/ch-opersys.html#s9.3.3.2
+ if [ -x /etc/init.d/orthanc ]; then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d orthanc restart
+ else
+ /etc/init.d/orthanc restart
+ fi
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
Property changes on: trunk/packages/orthanc-postgresql/trunk/debian/postinst
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/packages/orthanc-postgresql/trunk/debian/postrm
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/postrm
(rev 0)
+++ trunk/packages/orthanc-postgresql/trunk/debian/postrm 2015-03-06
11:51:29 UTC (rev 18916)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+ purge|remove|upgrade)
+ # Restart the Orthanc service
+ # https://www.debian.org/doc/debian-policy/ch-opersys.html#s9.3.3.2
+ if [ -x /etc/init.d/orthanc ]; then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d orthanc restart
+ else
+ /etc/init.d/orthanc restart
+ fi
+ fi
+ ;;
+
+ failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
Property changes on: trunk/packages/orthanc-postgresql/trunk/debian/postrm
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/packages/orthanc-postgresql/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/rules 2015-03-06
11:51:20 UTC (rev 18915)
+++ trunk/packages/orthanc-postgresql/trunk/debian/rules 2015-03-06
11:51:29 UTC (rev 18916)
@@ -32,12 +32,5 @@
override_dh_installchangelogs:
dh_installchangelogs -k NEWS
-override_dh_installinit:
- # Install "debian/orthanc-postgresql.orthanc.init" as
- # "/etc/init.d/orthanc.init", but do not start/stop the
- # "orthanc" service from the orthanc-postgresql package. It is
- # stopped/started from prerm/postinst in the orthanc package.
- dh_installinit --name=orthanc --no-start
-
get-orig-source:
uscan --verbose --force-download --repack --compression xz
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
