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 260fd86bca1d93d39bdd7acece72fc1c4b25b5f2 Author: Pablo Lorenzzoni <[email protected]> Date: Sat Mar 29 19:52:16 2014 +0000 "Fixup" all the patches touching .ini files. --- ...standard-debian-location-for-config-files.patch | 144 ++++++++++++++++++++- ...e-option-and-description-in-PrintOptions.patch} | 0 .../0002-Use-IANA-port-for-the-daemon.patch | 21 --- ...h => 0003-Add-DebianBaseDir-at-dgate.cpp.patch} | 0 ...configfiles-with-path-in-dicom.ini.sqlite.patch | 26 ---- ...Add-logfiles-location-to-dicom.ini.sqlite.patch | 20 --- ...nge-port-for-CONQUESTSRV1-in-acrnema.map.patch} | 0 ...5-Fix-mismatched-new-delete-in-dbsql.cpp.patch} | 0 ...006-Fix-mismatched-new-delete-in-rtc.cxx.patch} | 0 ...-Fix-mismatched-new-delete-in-farray.thh.patch} | 0 ...-Fix-mismatched-new-delete-in-device.cpp.patch} | 0 ...-Fix-mismatched-new-delete-in-buffer.cxx.patch} | 0 ...assorted-misspellings-pointed-by-lintian.patch} | 0 ...her-database-backends-configuration-files.patch | 123 ------------------ debian/patches/series | 22 ++-- 15 files changed, 148 insertions(+), 208 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 08c846f..46d7c62 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,14 +3,144 @@ Date: Thu, 5 Jul 2012 00:00:01 +0000 Subject: Use standard debian location for config files --- - dicom.ini.sqlite | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + dicom.ini.dbase | 21 +++++++++++++-------- + dicom.ini.mysql | 19 ++++++++++++------- + dicom.ini.postgres | 15 ++++++++++----- + dicom.ini.sqlite | 17 +++++++++++------ + 4 files changed, 46 insertions(+), 26 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/dicom.ini.sqlite b/dicom.ini.sqlite -index f750bee..ce5d09b 100644 +index f750bee..d8e1f71 100644 --- a/dicom.ini.sqlite +++ b/dicom.ini.sqlite -@@ -19,7 +19,7 @@ SOPClassList = dgatesop.lst +@@ -10,16 +10,17 @@ 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 @@ -19,9 +149,13 @@ index f750bee..ce5d09b 100644 Username = dontcare Password = dontcare PostGres = 0 -@@ -83,4 +83,4 @@ OperatorConsole = 127.0.0.1 +@@ -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/0005-Separate-option-and-description-in-PrintOptions.patch b/debian/patches/0002-Separate-option-and-description-in-PrintOptions.patch similarity index 100% rename from debian/patches/0005-Separate-option-and-description-in-PrintOptions.patch rename to debian/patches/0002-Separate-option-and-description-in-PrintOptions.patch diff --git a/debian/patches/0002-Use-IANA-port-for-the-daemon.patch b/debian/patches/0002-Use-IANA-port-for-the-daemon.patch deleted file mode 100644 index b03faa7..0000000 --- a/debian/patches/0002-Use-IANA-port-for-the-daemon.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Pablo Lorenzzoni <[email protected]> -Date: Sat, 25 Jan 2014 00:00:01 +0000 -Subject: Use IANA port for the daemon - ---- - dicom.ini.sqlite | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dicom.ini.sqlite b/dicom.ini.sqlite -index ce5d09b..896c182 100644 ---- a/dicom.ini.sqlite -+++ b/dicom.ini.sqlite -@@ -10,7 +10,7 @@ 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 diff --git a/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch b/debian/patches/0003-Add-DebianBaseDir-at-dgate.cpp.patch similarity index 100% rename from debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch rename to debian/patches/0003-Add-DebianBaseDir-at-dgate.cpp.patch 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 deleted file mode 100644 index 1cbe4af..0000000 --- a/debian/patches/0003-List-configfiles-with-path-in-dicom.ini.sqlite.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Pablo Lorenzzoni <[email protected]> -Date: Mon, 27 Jan 2014 00:00:01 +0000 -Subject: List configfiles with path in dicom.ini.sqlite - ---- - dicom.ini.sqlite | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/dicom.ini.sqlite b/dicom.ini.sqlite -index 896c182..ae4f7da 100644 ---- a/dicom.ini.sqlite -+++ b/dicom.ini.sqlite -@@ -13,9 +13,10 @@ MyACRNema = CONQUESTSRV1 - 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 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 deleted file mode 100644 index ffabddc..0000000 --- a/debian/patches/0004-Add-logfiles-location-to-dicom.ini.sqlite.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Pablo Lorenzzoni <[email protected]> -Date: Mon, 27 Jan 2014 00:00:01 +0000 -Subject: Add logfiles location to dicom.ini.sqlite - ---- - dicom.ini.sqlite | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/dicom.ini.sqlite b/dicom.ini.sqlite -index ae4f7da..d8e1f71 100644 ---- a/dicom.ini.sqlite -+++ b/dicom.ini.sqlite -@@ -85,3 +85,7 @@ OperatorConsole = 127.0.0.1 - MAGDeviceThreshhold = 0 - MAGDevices = 1 - 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/0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch b/debian/patches/0004-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch similarity index 100% rename from debian/patches/0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch rename to debian/patches/0004-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch diff --git a/debian/patches/0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch b/debian/patches/0005-Fix-mismatched-new-delete-in-dbsql.cpp.patch similarity index 100% rename from debian/patches/0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch rename to debian/patches/0005-Fix-mismatched-new-delete-in-dbsql.cpp.patch diff --git a/debian/patches/0009-Fix-mismatched-new-delete-in-rtc.cxx.patch b/debian/patches/0006-Fix-mismatched-new-delete-in-rtc.cxx.patch similarity index 100% rename from debian/patches/0009-Fix-mismatched-new-delete-in-rtc.cxx.patch rename to debian/patches/0006-Fix-mismatched-new-delete-in-rtc.cxx.patch diff --git a/debian/patches/0010-Fix-mismatched-new-delete-in-farray.thh.patch b/debian/patches/0007-Fix-mismatched-new-delete-in-farray.thh.patch similarity index 100% rename from debian/patches/0010-Fix-mismatched-new-delete-in-farray.thh.patch rename to debian/patches/0007-Fix-mismatched-new-delete-in-farray.thh.patch diff --git a/debian/patches/0011-Fix-mismatched-new-delete-in-device.cpp.patch b/debian/patches/0008-Fix-mismatched-new-delete-in-device.cpp.patch similarity index 100% rename from debian/patches/0011-Fix-mismatched-new-delete-in-device.cpp.patch rename to debian/patches/0008-Fix-mismatched-new-delete-in-device.cpp.patch diff --git a/debian/patches/0012-Fix-mismatched-new-delete-in-buffer.cxx.patch b/debian/patches/0009-Fix-mismatched-new-delete-in-buffer.cxx.patch similarity index 100% rename from debian/patches/0012-Fix-mismatched-new-delete-in-buffer.cxx.patch rename to debian/patches/0009-Fix-mismatched-new-delete-in-buffer.cxx.patch diff --git a/debian/patches/0013-Fixed-assorted-misspellings-pointed-by-lintian.patch b/debian/patches/0010-Fixed-assorted-misspellings-pointed-by-lintian.patch similarity index 100% rename from debian/patches/0013-Fixed-assorted-misspellings-pointed-by-lintian.patch rename to debian/patches/0010-Fixed-assorted-misspellings-pointed-by-lintian.patch diff --git a/debian/patches/0014-Patch-other-database-backends-configuration-files.patch b/debian/patches/0014-Patch-other-database-backends-configuration-files.patch deleted file mode 100644 index 05e89e0..0000000 --- a/debian/patches/0014-Patch-other-database-backends-configuration-files.patch +++ /dev/null @@ -1,123 +0,0 @@ -From: Pablo Lorenzzoni <[email protected]> -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 19068d0..5613f31 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,14 +1,10 @@ 0001-Use-standard-debian-location-for-config-files.patch -0002-Use-IANA-port-for-the-daemon.patch -0003-List-configfiles-with-path-in-dicom.ini.sqlite.patch -0004-Add-logfiles-location-to-dicom.ini.sqlite.patch -0005-Separate-option-and-description-in-PrintOptions.patch -0006-Add-DebianBaseDir-at-dgate.cpp.patch -0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch -0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch -0009-Fix-mismatched-new-delete-in-rtc.cxx.patch -0010-Fix-mismatched-new-delete-in-farray.thh.patch -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 +0002-Separate-option-and-description-in-PrintOptions.patch +0003-Add-DebianBaseDir-at-dgate.cpp.patch +0004-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch +0005-Fix-mismatched-new-delete-in-dbsql.cpp.patch +0006-Fix-mismatched-new-delete-in-rtc.cxx.patch +0007-Fix-mismatched-new-delete-in-farray.thh.patch +0008-Fix-mismatched-new-delete-in-device.cpp.patch +0009-Fix-mismatched-new-delete-in-buffer.cxx.patch +0010-Fixed-assorted-misspellings-pointed-by-lintian.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
