[med-svn] [conquest-dicom-server] 02/08: Patch other database backend config files.
Pablo Lorenzzoni
spectra at moszumanska.debian.org
Mon Mar 31 18:32:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
spectra pushed a commit to branch master
in repository conquest-dicom-server.
commit e0901a0879560cf5aa43d7ee0615cdc3b53ec9ec
Author: Pablo Lorenzzoni <spectra at debian.org>
Date: Sat Mar 29 19:31:54 2014 +0000
Patch other database backend config files.
---
...standard-debian-location-for-config-files.patch | 2 +-
.../0002-Use-IANA-port-for-the-daemon.patch | 2 +-
...configfiles-with-path-in-dicom.ini.sqlite.patch | 2 +-
...Add-logfiles-location-to-dicom.ini.sqlite.patch | 2 +-
...te-option-and-description-in-PrintOptions.patch | 2 +-
.../0006-Add-DebianBaseDir-at-dgate.cpp.patch | 2 +-
...ange-port-for-CONQUESTSRV1-in-acrnema.map.patch | 2 +-
...08-Fix-mismatched-new-delete-in-dbsql.cpp.patch | 2 +-
...0009-Fix-mismatched-new-delete-in-rtc.cxx.patch | 2 +-
...0-Fix-mismatched-new-delete-in-farray.thh.patch | 2 +-
...1-Fix-mismatched-new-delete-in-device.cpp.patch | 2 +-
...2-Fix-mismatched-new-delete-in-buffer.cxx.patch | 2 +-
...-assorted-misspellings-pointed-by-lintian.patch | 10 +-
...her-database-backends-configuration-files.patch | 123 +++++++++++++++++++++
debian/patches/series | 1 +
15 files changed, 141 insertions(+), 17 deletions(-)
diff --git a/debian/patches/0001-Use-standard-debian-location-for-config-files.patch b/debian/patches/0001-Use-standard-debian-location-for-config-files.patch
index 8aa779d..08c846f 100644
--- a/debian/patches/0001-Use-standard-debian-location-for-config-files.patch
+++ b/debian/patches/0001-Use-standard-debian-location-for-config-files.patch
@@ -3,7 +3,7 @@ Date: Thu, 5 Jul 2012 00:00:01 +0000
Subject: Use standard debian location for config files
---
- dicom.ini.sqlite | 4 ++--
+ dicom.ini.sqlite | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dicom.ini.sqlite b/dicom.ini.sqlite
diff --git a/debian/patches/0002-Use-IANA-port-for-the-daemon.patch b/debian/patches/0002-Use-IANA-port-for-the-daemon.patch
index ecd1786..b03faa7 100644
--- a/debian/patches/0002-Use-IANA-port-for-the-daemon.patch
+++ b/debian/patches/0002-Use-IANA-port-for-the-daemon.patch
@@ -3,7 +3,7 @@ Date: Sat, 25 Jan 2014 00:00:01 +0000
Subject: Use IANA port for the daemon
---
- dicom.ini.sqlite | 2 +-
+ dicom.ini.sqlite | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dicom.ini.sqlite b/dicom.ini.sqlite
diff --git a/debian/patches/0003-List-configfiles-with-path-in-dicom.ini.sqlite.patch b/debian/patches/0003-List-configfiles-with-path-in-dicom.ini.sqlite.patch
index 423b452..1cbe4af 100644
--- a/debian/patches/0003-List-configfiles-with-path-in-dicom.ini.sqlite.patch
+++ b/debian/patches/0003-List-configfiles-with-path-in-dicom.ini.sqlite.patch
@@ -3,7 +3,7 @@ Date: Mon, 27 Jan 2014 00:00:01 +0000
Subject: List configfiles with path in dicom.ini.sqlite
---
- dicom.ini.sqlite | 7 ++++---
+ dicom.ini.sqlite | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dicom.ini.sqlite b/dicom.ini.sqlite
diff --git a/debian/patches/0004-Add-logfiles-location-to-dicom.ini.sqlite.patch b/debian/patches/0004-Add-logfiles-location-to-dicom.ini.sqlite.patch
index 3720fad..ffabddc 100644
--- a/debian/patches/0004-Add-logfiles-location-to-dicom.ini.sqlite.patch
+++ b/debian/patches/0004-Add-logfiles-location-to-dicom.ini.sqlite.patch
@@ -3,7 +3,7 @@ Date: Mon, 27 Jan 2014 00:00:01 +0000
Subject: Add logfiles location to dicom.ini.sqlite
---
- dicom.ini.sqlite | 4 ++++
+ dicom.ini.sqlite | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dicom.ini.sqlite b/dicom.ini.sqlite
diff --git a/debian/patches/0005-Separate-option-and-description-in-PrintOptions.patch b/debian/patches/0005-Separate-option-and-description-in-PrintOptions.patch
index 7548c34..834ae9c 100644
--- a/debian/patches/0005-Separate-option-and-description-in-PrintOptions.patch
+++ b/debian/patches/0005-Separate-option-and-description-in-PrintOptions.patch
@@ -3,7 +3,7 @@ Date: Sat, 1 Feb 2014 15:03:04 +0000
Subject: Separate option and description in PrintOptions
---
- dgate.cpp | 58 +++++++++++++++++++++++++++++-----------------------------
+ dgate.cpp | 58 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/dgate.cpp b/dgate.cpp
diff --git a/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch b/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch
index 2e6d2fe..4ec0d40 100644
--- a/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch
+++ b/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch
@@ -3,7 +3,7 @@ Date: Sat, 1 Feb 2014 18:50:39 +0000
Subject: Add DebianBaseDir at dgate.cpp
---
- dgate.cpp | 16 +++++++---------
+ dgate.cpp | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/dgate.cpp b/dgate.cpp
diff --git a/debian/patches/0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch b/debian/patches/0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch
index 505fa6a..492df43 100644
--- a/debian/patches/0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch
+++ b/debian/patches/0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch
@@ -3,7 +3,7 @@ Date: Sun, 2 Feb 2014 11:21:47 +0000
Subject: Change port for CONQUESTSRV1 in acrnema.map
---
- acrnema.map | 13 +++++++------
+ acrnema.map | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/acrnema.map b/acrnema.map
diff --git a/debian/patches/0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch b/debian/patches/0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch
index 675a2f7..71e6947 100644
--- a/debian/patches/0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch
+++ b/debian/patches/0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch
@@ -3,7 +3,7 @@ Date: Thu, 6 Mar 2014 15:34:35 -0300
Subject: Fix mismatched new/delete in dbsql.cpp
---
- dbsql.cpp | 2 +-
+ dbsql.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dbsql.cpp b/dbsql.cpp
diff --git a/debian/patches/0009-Fix-mismatched-new-delete-in-rtc.cxx.patch b/debian/patches/0009-Fix-mismatched-new-delete-in-rtc.cxx.patch
index 7b76664..9456065 100644
--- a/debian/patches/0009-Fix-mismatched-new-delete-in-rtc.cxx.patch
+++ b/debian/patches/0009-Fix-mismatched-new-delete-in-rtc.cxx.patch
@@ -3,7 +3,7 @@ Date: Thu, 6 Mar 2014 15:36:06 -0300
Subject: Fix mismatched new/delete in rtc.cxx
---
- rtc.cxx | 2 +-
+ rtc.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rtc.cxx b/rtc.cxx
diff --git a/debian/patches/0010-Fix-mismatched-new-delete-in-farray.thh.patch b/debian/patches/0010-Fix-mismatched-new-delete-in-farray.thh.patch
index 8a3a164..7e04b74 100644
--- a/debian/patches/0010-Fix-mismatched-new-delete-in-farray.thh.patch
+++ b/debian/patches/0010-Fix-mismatched-new-delete-in-farray.thh.patch
@@ -3,7 +3,7 @@ Date: Thu, 6 Mar 2014 15:37:26 -0300
Subject: Fix mismatched new/delete in farray.thh
---
- farray.thh | 4 ++--
+ farray.thh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/farray.thh b/farray.thh
diff --git a/debian/patches/0011-Fix-mismatched-new-delete-in-device.cpp.patch b/debian/patches/0011-Fix-mismatched-new-delete-in-device.cpp.patch
index 6b7ee4e..98ec59c 100644
--- a/debian/patches/0011-Fix-mismatched-new-delete-in-device.cpp.patch
+++ b/debian/patches/0011-Fix-mismatched-new-delete-in-device.cpp.patch
@@ -3,7 +3,7 @@ Date: Thu, 6 Mar 2014 15:43:54 -0300
Subject: Fix mismatched new/delete in device.cpp
---
- device.cpp | 20 ++++++++++----------
+ device.cpp | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/device.cpp b/device.cpp
diff --git a/debian/patches/0012-Fix-mismatched-new-delete-in-buffer.cxx.patch b/debian/patches/0012-Fix-mismatched-new-delete-in-buffer.cxx.patch
index 16042bf..e2f2a92 100644
--- a/debian/patches/0012-Fix-mismatched-new-delete-in-buffer.cxx.patch
+++ b/debian/patches/0012-Fix-mismatched-new-delete-in-buffer.cxx.patch
@@ -3,7 +3,7 @@ Date: Thu, 6 Mar 2014 17:02:42 -0300
Subject: Fix mismatched new/delete in buffer.cxx
---
- buffer.cxx | 2 +-
+ buffer.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buffer.cxx b/buffer.cxx
diff --git a/debian/patches/0013-Fixed-assorted-misspellings-pointed-by-lintian.patch b/debian/patches/0013-Fixed-assorted-misspellings-pointed-by-lintian.patch
index c174c46..c5a2fde 100644
--- a/debian/patches/0013-Fixed-assorted-misspellings-pointed-by-lintian.patch
+++ b/debian/patches/0013-Fixed-assorted-misspellings-pointed-by-lintian.patch
@@ -3,11 +3,11 @@ Date: Thu, 20 Mar 2014 16:00:52 -0300
Subject: Fixed assorted misspellings pointed by lintian.
---
- acrnema.map | 4 ++--
- dgate.cpp | 24 ++++++++++++------------
- lua/ChangeReturnIPAddress.lua | 4 ++--
- nkiqrsop.cpp | 2 +-
- socket.cxx | 2 +-
+ acrnema.map | 4 ++--
+ dgate.cpp | 24 ++++++++++++------------
+ lua/ChangeReturnIPAddress.lua | 4 ++--
+ nkiqrsop.cpp | 2 +-
+ socket.cxx | 2 +-
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/acrnema.map b/acrnema.map
diff --git a/debian/patches/0014-Patch-other-database-backends-configuration-files.patch b/debian/patches/0014-Patch-other-database-backends-configuration-files.patch
new file mode 100644
index 0000000..05e89e0
--- /dev/null
+++ b/debian/patches/0014-Patch-other-database-backends-configuration-files.patch
@@ -0,0 +1,123 @@
+From: Pablo Lorenzzoni <spectra at debian.org>
+Date: Sat, 29 Mar 2014 19:29:17 +0000
+Subject: Patch other database backends configuration files.
+
+---
+ dicom.ini.dbase | 21 +++++++++++++--------
+ dicom.ini.mysql | 19 ++++++++++++-------
+ dicom.ini.postgres | 15 ++++++++++-----
+ 3 files changed, 35 insertions(+), 20 deletions(-)
+
+diff --git a/dicom.ini.dbase b/dicom.ini.dbase
+index 44ca5d0..a810fec 100644
+--- a/dicom.ini.dbase
++++ b/dicom.ini.dbase
+@@ -10,18 +10,19 @@ Edition = Personal
+
+ # Network configuration: server name and TCP/IP port#
+ MyACRNema = CONQUESTSRV1
+-TCPPort = 5678
++TCPPort = 11112
+
+ # Reference to other files: known dicom servers; database layout; sops
+-ACRNemaMap = acrnema.map
+-kFactorFile = dicom.sql
+-SOPClassList = dgatesop.lst
++ACRNemaMap = /etc/conquest-dicom-server/acrnema.map
++kFactorFile = /etc/conquest-dicom-server/dicom.sql
++SOPClassList = /etc/conquest-dicom-server/dgatesop.lst
++Dictionary = /etc/conquest-dicom-server/dgate.dic
+
+ # Host for postgres or mysql only, name, username and password for database
+ SQLHost = localhost
+-SQLServer = ./data/dbase/
+-Username = conquest
+-Password = conquest
++SQLServer = /var/lib/conquest-dicom-server/dbase/conquest.dbase
++Username = dontcare
++Password = dontcare
+ PostGres = 0
+ MySQL = 0
+ SQLite = 0
+@@ -83,4 +84,8 @@ OperatorConsole = 127.0.0.1
+ # Configuration of disk(s) to store images
+ MAGDeviceThreshhold = 0
+ MAGDevices = 1
+-MAGDevice0 = ./data/
++MAGDevice0 = /var/lib/conquest-dicom-server/MAG0/
++
++# Logging
++TroubleLog = /var/log/conquest-dicom-server/trouble.log
++UserLog = /var/log/conquest-dicom-server/user.log
+diff --git a/dicom.ini.mysql b/dicom.ini.mysql
+index a3f1f55..2c17f5b 100644
+--- a/dicom.ini.mysql
++++ b/dicom.ini.mysql
+@@ -10,18 +10,19 @@ Edition = Personal
+
+ # Network configuration: server name and TCP/IP port#
+ MyACRNema = CONQUESTSRV1
+-TCPPort = 5678
++TCPPort = 11112
+
+ # Reference to other files: known dicom servers; database layout; sops
+-ACRNemaMap = acrnema.map
+-kFactorFile = dicom.sql
+-SOPClassList = dgatesop.lst
++ACRNemaMap = /etc/conquest-dicom-server/acrnema.map
++kFactorFile = /etc/conquest-dicom-server/dicom.sql
++SOPClassList = /etc/conquest-dicom-server/dgatesop.lst
++Dictionary = /etc/conquest-dicom-server/dgate.dic
+
+ # Host for postgres or mysql only, name, username and password for database
+ SQLHost = localhost
+ SQLServer = conquest
+-Username = root
+-Password = user
++Username = mysql
++Password = mysql
+ PostGres = 0
+ MySQL = 1
+ SQLite = 0
+@@ -83,4 +84,8 @@ OperatorConsole = 127.0.0.1
+ # Configuration of disk(s) to store images
+ MAGDeviceThreshhold = 0
+ MAGDevices = 1
+-MAGDevice0 = ./data/
++MAGDevice0 = /var/lib/conquest-dicom-server/MAG0/
++
++# Logging
++TroubleLog = /var/log/conquest-dicom-server/trouble.log
++UserLog = /var/log/conquest-dicom-server/user.log
+diff --git a/dicom.ini.postgres b/dicom.ini.postgres
+index 4f5925e..afc9e97 100644
+--- a/dicom.ini.postgres
++++ b/dicom.ini.postgres
+@@ -10,12 +10,13 @@ Edition = Personal
+
+ # Network configuration: server name and TCP/IP port#
+ MyACRNema = CONQUESTSRV1
+-TCPPort = 5678
++TCPPort = 11112
+
+ # Reference to other files: known dicom servers; database layout; sops
+-ACRNemaMap = acrnema.map
+-kFactorFile = dicom.sql
+-SOPClassList = dgatesop.lst
++ACRNemaMap = /etc/conquest-dicom-server/acrnema.map
++kFactorFile = /etc/conquest-dicom-server/dicom.sql
++SOPClassList = /etc/conquest-dicom-server/dgatesop.lst
++Dictionary = /etc/conquest-dicom-server/dgate.dic
+
+ # Host for postgres or mysql only, name, username and password for database
+ SQLHost = localhost
+@@ -83,4 +84,8 @@ OperatorConsole = 127.0.0.1
+ # Configuration of disk(s) to store images
+ MAGDeviceThreshhold = 0
+ MAGDevices = 1
+-MAGDevice0 = ./data/
++MAGDevice0 = /var/lib/conquest-dicom-server/MAG0/
++
++# Logging
++TroubleLog = /var/log/conquest-dicom-server/trouble.log
++UserLog = /var/log/conquest-dicom-server/user.log
diff --git a/debian/patches/series b/debian/patches/series
index 2301f0f..19068d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
0011-Fix-mismatched-new-delete-in-device.cpp.patch
0012-Fix-mismatched-new-delete-in-buffer.cxx.patch
0013-Fixed-assorted-misspellings-pointed-by-lintian.patch
+0014-Patch-other-database-backends-configuration-files.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git
More information about the debian-med-commit
mailing list