[med-svn] r19484 - in trunk/packages/orthanc-postgresql/trunk/debian: . configuration patches

Sebastien Jodogne jodogne-guest at moszumanska.debian.org
Fri Jul 3 11:30:37 UTC 2015 

Author: jodogne-guest
Date: 2015-07-03 11:30:36 +0000 (Fri, 03 Jul 2015)
New Revision: 19484

Added:
   trunk/packages/orthanc-postgresql/trunk/debian/configuration/
   trunk/packages/orthanc-postgresql/trunk/debian/configuration/postgresql.json
   trunk/packages/orthanc-postgresql/trunk/debian/install
Modified:
   trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
   trunk/packages/orthanc-postgresql/trunk/debian/changelog
   trunk/packages/orthanc-postgresql/trunk/debian/control
   trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs
   trunk/packages/orthanc-postgresql/trunk/debian/postinst
   trunk/packages/orthanc-postgresql/trunk/debian/watch
Log:
OrthancPostgreSQL 1.1

Modified: trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/README.Debian	2015-07-03 07:42:32 UTC (rev 19483)
+++ trunk/packages/orthanc-postgresql/trunk/debian/README.Debian	2015-07-03 11:30:36 UTC (rev 19484)
@@ -14,9 +14,8 @@
 =============
 
 To enable the plugin, you must specify the parameters of your
-PostgreSQL database by adapting the "PostgreSQL" section of the
-configuration file "/etc/orthanc/orthanc.json". Then, restart the
-Orthanc service:
+PostgreSQL database by adapting the configuration file
+"/etc/orthanc/postgresql.json". Then, restart the Orthanc service:
 
 # sudo /etc/init.d/orthanc restart
 
@@ -26,7 +25,7 @@
 
 (1) Install the database server:
 
-# sudo apt-get postgresql
+# sudo apt-get install postgresql
   
 
 (2) Create an user (whose name is "orthanc_user" with password
@@ -42,7 +41,7 @@
 Hit <Ctrl-D> to exit the PostgreSQL prompt.
 
 
-(3) Edit the configuration file "/etc/orthanc/orthanc.json" and add the
+(3) Edit the configuration file "/etc/orthanc/postgresql.json" and use the
     following entry:
 
   "PostgreSQL" : {

Modified: trunk/packages/orthanc-postgresql/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/changelog	2015-07-03 07:42:32 UTC (rev 19483)
+++ trunk/packages/orthanc-postgresql/trunk/debian/changelog	2015-07-03 11:30:36 UTC (rev 19484)
@@ -1,3 +1,9 @@
+orthanc-postgresql (1.1-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Fri, 03 Jul 2015 11:48:52 +0200
+
 orthanc-postgresql (1.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #779327)

Added: trunk/packages/orthanc-postgresql/trunk/debian/configuration/postgresql.json
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/configuration/postgresql.json	                        (rev 0)
+++ trunk/packages/orthanc-postgresql/trunk/debian/configuration/postgresql.json	2015-07-03 11:30:36 UTC (rev 19484)
@@ -0,0 +1,29 @@
+{
+    /**
+     * Configuration to use PostgreSQL instead of the default SQLite
+     * back-end of Orthanc. You will have to install the
+     * "orthanc-postgresql" package to take advantage of this feature.
+     * Have a look at "/usr/share/doc/orthanc-postgresql/README.Debian"
+     * for a tutorial.
+     **/
+    "PostgreSQL" : {
+	// Enable the use of PostgreSQL to store the Orthanc index?
+	"EnableIndex" : false,
+
+	// Enable the use of PostgreSQL to store the DICOM files?
+	"EnableStorage" : false,
+
+	// Option 1: Specify explicit authentication parameters
+	"Host" : "localhost",
+	"Port" : 5432,
+	"Database" : "orthanc_db",
+	"Username" : "orthanc_user",
+	"Password" : "my_password",
+
+	// Option 2: Authenticate using PostgreSQL connection URI
+	// "ConnectionUri" : "postgresql://orthanc_user:my_password@localhost:5432/orthanc_db",
+
+	// Optional: Disable the locking of the PostgreSQL database
+	"Lock" : false
+    }
+}

Modified: trunk/packages/orthanc-postgresql/trunk/debian/control
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/control	2015-07-03 07:42:32 UTC (rev 19483)
+++ trunk/packages/orthanc-postgresql/trunk/debian/control	2015-07-03 11:30:36 UTC (rev 19484)
@@ -12,16 +12,16 @@
                libgtest-dev (>= 1.6.0),
                libjsoncpp-dev,
 	       libpq-dev,
-               orthanc-dev,
+               orthanc-dev (>= 0.9.1),
 	       postgresql-server-dev-all,
 	       uuid-dev
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-postgresql/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/orthanc-postgresql/trunk/
-Homepage: https://code.google.com/p/orthanc-postgresql/
+Homepage: http://www.orthanc-server.com/static.php?page=postgresql
 
 Package: orthanc-postgresql
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.8.6)
+Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.1)
 Suggests: postgresql
 Description: Plugins to use PostgreSQL as a database back-end to Orthanc
  Orthanc PostgreSQL is a set of two plugins to Orthanc, a lightweight,

Added: trunk/packages/orthanc-postgresql/trunk/debian/install
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/install	                        (rev 0)
+++ trunk/packages/orthanc-postgresql/trunk/debian/install	2015-07-03 11:30:36 UTC (rev 19484)
@@ -0,0 +1 @@
+debian/configuration/postgresql.json etc/orthanc

Modified: trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs	2015-07-03 07:42:32 UTC (rev 19483)
+++ trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs	2015-07-03 11:30:36 UTC (rev 19484)
@@ -2,19 +2,30 @@
 Author: Sebastien Jodogne <s.jodogne at gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancPostgreSQL-1.0/CMakeLists.txt
+Index: OrthancPostgreSQL-1.1/CMakeLists.txt
 ===================================================================
---- OrthancPostgreSQL-1.0.orig/CMakeLists.txt
-+++ OrthancPostgreSQL-1.0/CMakeLists.txt
-@@ -134,3 +134,11 @@ add_executable(UnitTests
-   ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLTests.cpp
-   ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLWrapperTests.cpp
-   )
-+
-+set(VERSION 1.0)
+--- OrthancPostgreSQL-1.1.orig/CMakeLists.txt
++++ OrthancPostgreSQL-1.1/CMakeLists.txt
+@@ -113,16 +113,12 @@ message("Setting the version of the libr
+ 
+ add_definitions(-DORTHANC_POSTGRESQL_VERSION="${ORTHANC_POSTGRESQL_VERSION}")
+ 
+-set_target_properties(OrthancPostgreSQLStorage PROPERTIES 
+-  VERSION ${ORTHANC_POSTGRESQL_VERSION} 
+-  SOVERSION ${ORTHANC_POSTGRESQL_VERSION}
+-  )
+-
+-set_target_properties(OrthancPostgreSQLIndex PROPERTIES 
+-  VERSION ${ORTHANC_POSTGRESQL_VERSION} 
+-  SOVERSION ${ORTHANC_POSTGRESQL_VERSION}
+-  )
+-
 +set_target_properties(OrthancPostgreSQLStorage PROPERTIES
-+  LINK_FLAGS "-Wl,-soname,libOrthancPostgreSQLStorage.so.${VERSION}"
++  LINK_FLAGS "-Wl,-soname,libOrthancPostgreSQLStorage.so.${ORTHANC_POSTGRESQL_VERSION}"
 +  NO_SONAME ON)
 +set_target_properties(OrthancPostgreSQLIndex PROPERTIES
-+  LINK_FLAGS "-Wl,-soname,libOrthancPostgreSQLIndex.so.${VERSION}"
++  LINK_FLAGS "-Wl,-soname,libOrthancPostgreSQLIndex.so.${ORTHANC_POSTGRESQL_VERSION}"
 +  NO_SONAME ON)
+ 
+ add_executable(UnitTests
+   ${CORE_SOURCES}

Modified: trunk/packages/orthanc-postgresql/trunk/debian/postinst
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/postinst	2015-07-03 07:42:32 UTC (rev 19483)
+++ trunk/packages/orthanc-postgresql/trunk/debian/postinst	2015-07-03 11:30:36 UTC (rev 19484)
@@ -4,6 +4,10 @@
 
 case $1 in
     configure)
+        # Configure the permissions of the configuration file
+        chown -R orthanc:orthanc /etc/orthanc/postgresql.json
+        chmod 0664 /etc/orthanc/postgresql.json
+
 	# 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

Modified: trunk/packages/orthanc-postgresql/trunk/debian/watch
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/watch	2015-07-03 07:42:32 UTC (rev 19483)
+++ trunk/packages/orthanc-postgresql/trunk/debian/watch	2015-07-03 11:30:36 UTC (rev 19484)
@@ -1,2 +1,3 @@
 version=3
-https://github.com/jodogne/Orthanc/releases .*/download/[^/]+/OrthancPostgreSQL-(\d\S*)\.tar\.gz
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,downloadurlmangle=s/\/browse\.php\?path=//g" \
+http://www.orthanc-server.com/browse.php?path=/plugin-postgresql downloads/get\.php\?path=/plugin-postgresql/OrthancPostgreSQL-(\d\S*)\.tar\.gz

More information about the debian-med-commit mailing list