[med-svn] r18908 - in trunk/packages/orthanc/trunk/debian: . docs
Sebastien Jodogne
jodogne-guest at moszumanska.debian.org
Wed Mar 4 16:31:11 UTC 2015
Author: jodogne-guest
Date: 2015-03-04 16:31:10 +0000 (Wed, 04 Mar 2015)
New Revision: 18908
Added:
trunk/packages/orthanc/trunk/debian/install
trunk/packages/orthanc/trunk/debian/postinst
trunk/packages/orthanc/trunk/debian/postrm
Removed:
trunk/packages/orthanc/trunk/debian/orthanc-sqlite.install
trunk/packages/orthanc/trunk/debian/orthanc-sqlite.postrm
Modified:
trunk/packages/orthanc/trunk/debian/docs/index.html
trunk/packages/orthanc/trunk/debian/orthanc-doc.install
trunk/packages/orthanc/trunk/debian/orthanc-sqlite.postinst
trunk/packages/orthanc/trunk/debian/rules
Log:
refactoring of orthanc continued
Modified: trunk/packages/orthanc/trunk/debian/docs/index.html
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/index.html 2015-03-04 15:56:37 UTC (rev 18907)
+++ trunk/packages/orthanc/trunk/debian/docs/index.html 2015-03-04 16:31:10 UTC (rev 18908)
@@ -4,7 +4,9 @@
<h1>Index of the Orthanc documentation</h1>
<ul>
+ <li><a href="Samples/">Samples for Orthanc</a>.</li>
<li><a href="OrthancPlugin/index.html">Plugin SDK</a> to develop plugins for Orthanc.</li>
+ <li><a href="OrthancPluginSamples/">Sample plugins</a>.</li>
</ul>
</body>
</html>
Copied: trunk/packages/orthanc/trunk/debian/install (from rev 18904, trunk/packages/orthanc/trunk/debian/orthanc-sqlite.install)
===================================================================
--- trunk/packages/orthanc/trunk/debian/install (rev 0)
+++ trunk/packages/orthanc/trunk/debian/install 2015-03-04 16:31:10 UTC (rev 18908)
@@ -0,0 +1 @@
+debian/configuration/orthanc.json etc/orthanc
Modified: trunk/packages/orthanc/trunk/debian/orthanc-doc.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc-doc.install 2015-03-04 15:56:37 UTC (rev 18907)
+++ trunk/packages/orthanc/trunk/debian/orthanc-doc.install 2015-03-04 16:31:10 UTC (rev 18908)
@@ -1,2 +1,4 @@
+usr/share/doc/orthanc/OrthancPlugin/*
+usr/share/doc/orthanc/OrthancPluginSamples/*
+usr/share/doc/orthanc/Samples/*
usr/share/doc/orthanc/index.html
-usr/share/doc/orthanc/OrthancPlugin/*
Deleted: trunk/packages/orthanc/trunk/debian/orthanc-sqlite.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc-sqlite.install 2015-03-04 15:56:37 UTC (rev 18907)
+++ trunk/packages/orthanc/trunk/debian/orthanc-sqlite.install 2015-03-04 16:31:10 UTC (rev 18908)
@@ -1 +0,0 @@
-debian/configuration/orthanc.json etc/orthanc
Modified: trunk/packages/orthanc/trunk/debian/orthanc-sqlite.postinst
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc-sqlite.postinst 2015-03-04 15:56:37 UTC (rev 18907)
+++ trunk/packages/orthanc/trunk/debian/orthanc-sqlite.postinst 2015-03-04 16:31:10 UTC (rev 18908)
@@ -4,28 +4,9 @@
case $1 in
configure)
- # Add the "orthanc" user
- if ! getent passwd orthanc > /dev/null; then
- adduser --system --quiet \
- --home /var/lib/orthanc --no-create-home \
- --shell /bin/bash --group --gecos "Orthanc Administrator" orthanc
- fi
- if test "`id -u orthanc`" -eq 0; then
- echo "The orthanc administrative user must not be root." >&2
- false
- fi
- if test "`id -g orthanc`" -eq 0; then
- echo "The orthanc administrative group must not be root." >&2
- false
- fi
-
- # Create the required directories
- chown -R orthanc:orthanc /etc/orthanc
+ # Configure the permissions of the required directories
chown -R orthanc:orthanc /var/lib/orthanc
- chmod 0775 /etc/orthanc
chmod 0775 /var/lib/orthanc
-
- chmod 0664 /etc/orthanc/orthanc.json
;;
esac
Deleted: trunk/packages/orthanc/trunk/debian/orthanc-sqlite.postrm
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc-sqlite.postrm 2015-03-04 15:56:37 UTC (rev 18907)
+++ trunk/packages/orthanc/trunk/debian/orthanc-sqlite.postrm 2015-03-04 16:31:10 UTC (rev 18908)
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-VERSION=%VERSION%
-
-case $1 in
- purge)
- if test -d "/etc/orthanc"; then
- rmdir --ignore-fail-on-non-empty "/etc/orthanc" || true
- fi
-
- # Remove the "orthanc" user
- if getent passwd orthanc >/dev/null; then
- if [ -x /usr/sbin/deluser ]; then
- deluser --system orthanc
- fi
- fi
- if getent group orthanc >/dev/null; then
- if [ -x /usr/sbin/delgroup ]; then
- delgroup --system orthanc
- fi
- fi
-esac
-
-#DEBHELPER#
Added: trunk/packages/orthanc/trunk/debian/postinst
===================================================================
--- trunk/packages/orthanc/trunk/debian/postinst (rev 0)
+++ trunk/packages/orthanc/trunk/debian/postinst 2015-03-04 16:31:10 UTC (rev 18908)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+ configure)
+ # Add the "orthanc" user
+ if ! getent passwd orthanc > /dev/null; then
+ adduser --system --quiet \
+ --home /var/lib/orthanc --no-create-home \
+ --shell /bin/bash --group --gecos "Orthanc Administrator" orthanc
+ fi
+ if test "`id -u orthanc`" -eq 0; then
+ echo "The orthanc administrative user must not be root." >&2
+ false
+ fi
+ if test "`id -g orthanc`" -eq 0; then
+ echo "The orthanc administrative group must not be root." >&2
+ false
+ fi
+
+ # Configure the permissions of the required directories
+ chown -R orthanc:orthanc /etc/orthanc
+ chmod 0775 /etc/orthanc
+ chmod 0664 /etc/orthanc/orthanc.json
+ ;;
+esac
+
+#DEBHELPER#
Added: trunk/packages/orthanc/trunk/debian/postrm
===================================================================
--- trunk/packages/orthanc/trunk/debian/postrm (rev 0)
+++ trunk/packages/orthanc/trunk/debian/postrm 2015-03-04 16:31:10 UTC (rev 18908)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+VERSION=%VERSION%
+
+case $1 in
+ purge)
+ if test -d "/etc/orthanc"; then
+ rmdir --ignore-fail-on-non-empty "/etc/orthanc" || true
+ fi
+
+ # Remove the "orthanc" user
+ if getent passwd orthanc >/dev/null; then
+ if [ -x /usr/sbin/deluser ]; then
+ deluser --system orthanc
+ fi
+ fi
+ if getent group orthanc >/dev/null; then
+ if [ -x /usr/sbin/delgroup ]; then
+ delgroup --system orthanc
+ fi
+ fi
+esac
+
+#DEBHELPER#
Property changes on: trunk/packages/orthanc/trunk/debian/postrm
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules 2015-03-04 15:56:37 UTC (rev 18907)
+++ trunk/packages/orthanc/trunk/debian/rules 2015-03-04 16:31:10 UTC (rev 18908)
@@ -2,7 +2,6 @@
export DESTDIR := $(CURDIR)/debian/tmp
export DOC_DIR := $(DESTDIR)/usr/share/doc/orthanc
-export CLIENT_SAMPLES_DIR := $(DOC_DIR)/OrthancClientSamples
%:
dh $@ --parallel --builddirectory=Build
@@ -48,14 +47,17 @@
dh_clean
override_dh_auto_install:
- # Move the Debian documentation
+ # Move the index of the "orthanc-doc" package from Debian
mkdir -p $(DOC_DIR)
cp debian/docs/index.html $(DOC_DIR)
- # Move the samples of the Orthanc Client
- mkdir -p $(CLIENT_SAMPLES_DIR)
- cp -r Resources/Samples/OrthancClient/* $(CLIENT_SAMPLES_DIR)
+ # Populate the content of the "orthanc-doc" package
+ cp -r Resources/Samples $(DOC_DIR)/Samples
+ cp -r Plugins/Samples $(DOC_DIR)/OrthancPluginSamples
+ # Populate the content of the "liborthancclient-doc" package
+ mv $(DOC_DIR)/Samples/OrthancClient/ $(DOC_DIR)/OrthancClientSamples
+
dh_auto_install
# Move the Orthanc binaries to "/usr/sbin"
More information about the debian-med-commit
mailing list