[med-svn] [conquest-dicom-server] 23/30: Some janitoring tasks
Pablo Lorenzzoni
spectra at moszumanska.debian.org
Mon Jan 27 19:49: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 67e51403087e5818f930ccc8ebd5c31f51558e81
Author: Pablo Lorenzzoni <spectra at debian.org>
Date: Fri Jan 24 22:37:59 2014 -0200
Some janitoring tasks
Fix changelog
Add lua dir as examples
Update copyright, control and rules files
Fix get-orig-source
Rewrite README.Debian
Remove unused debian/* files
---
debian/README.Debian | 69 ++++++++++++++++++++++++++++++-----
debian/TODO | 2 +-
debian/changelog | 9 ++++-
debian/conquest-dicom-server.examples | 1 +
debian/conquest-dicom-server.postinst | 5 ---
debian/conquest-dicom-server.prerm | 6 ---
debian/control | 5 +--
debian/copyright | 6 ++-
debian/dgate.conf | 2 -
debian/dgate.load | 0
debian/docs | 2 +
debian/get-orig-source | 14 +++++--
debian/patches/debianlayout.patch | 2 +-
debian/rules | 12 +++---
14 files changed, 96 insertions(+), 39 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 0ea0b4a..11dc067 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,17 +1,68 @@
-After installation you can test the server is working:
+ConQuest DICOM Server
+=====================
+This is the Debian package for ConQuest DICOM Server. It was initially worked
+on by Mathieu Malaterre <malat at debian.org> before I took over.
-echoscu localhost 5678
+A number of modifications and differences from upstream packages were made in
+order to adhere to standards and safekeep the system:
-See output in:
+Running Port
+------------
+Originally ConQuest runs on port 5678. IANA has assigned a number of ports
+for DICOM related services (104 - DICOM over TCP/UDP; 2761 - DICOM using ISCL
+over TCP/UDP; 2762 - DICOM using TLS over TCP/UDP; and 11112 - DICOM over
+TCP/UDP).
-cat /var/log/dgate.log
+The packaged software listen on 11112/TCP by default.
-Send a file:
+Running User
+------------
+The main software runs under an unpriviledged user (dicom) as daemon
+(initscripts were provided)
+
+CGI Interface
+-------------
+The main software can act as a CGI behind a webserver and it's the only
+"friendly" interface provided in GNU/Linux version (Windows version has a
+GUI). It still can be used as such, but you'll have to copy/move the binary
+to the proper place yourself. This package only provides it as a DICOM server
+out-of-the-box.
+
+I recommend against running it as a CGI interface since it is not very
+secure. If anytime in the future I (or upstream) am able to patch the
+obvious vulnerabilities, I will prepare the package to act as a CGI interface
+as well, but that is just not the case righ now.
+
+Other Databases
+---------------
+Originally ConQuest can work with DBIII, SQLite, MySQL or PostgreSQL. This
+package was only compiled to work with SQLite, for now. In the future I
+intend to work on different versions to provide the remaining databases
+connectors.
+
+Modified Shipped Libraries
+--------------------------
+ConQuest ships with liblua, libsqlite, libjasper and libjpeg. The first two
+were unmodified, so this package uses already packaged versions of those. The
+remaining two were modified in ways I don't fully understand (as well as the
+motivations for the modifications). For now, I am linking those modified
+libraries statically since they work. If I can convince upstream to use
+unmodified libraries (or if I end up understanding the motivations behind it)
+this might change.
-storescu localhost 5678 input.dcm
+Testing After Installation
+--------------------------
+After installation you can test the server is working using echoscu from
+dcmtk package:
-Then go online to see it directly:
+bash$ echoscu localhost 11112
+
+See output in:
+
+bash$ cat /var/log/dgate.log
+
+Send a file:
-xdg-open http://localhost/dgate
+bash$ storescu localhost 11112 input.dcm
- -- Mathieu Malaterre <malat at debian.org> Wed, 04 Jul 2012 17:49:00 +0200
+ -- Pablo Lorenzzoni <spectra at debian.org> Wed, 25 Jan 2014 23:08:00 -0200
diff --git a/debian/TODO b/debian/TODO
index d02f6a7..d977f40 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1 +1 @@
-I do not think we can use system jasper since it will load jpeg in our back and symbols will conflicts with the lossless jpeg implementation
+Add support for MySQL, DBIII and PostgreSQL.
diff --git a/debian/changelog b/debian/changelog
index 1f404f3..4174507 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
-conquest-dicom-server (1.14.17c-1) UNRELEASED; urgency=low
+conquest-dicom-server (1.4.17c-1.1) UNRELEASED; urgency=low
+ [ Mathieu Malaterre ]
+ * Debianization
+
+ [ Pablo Lorenzzoni ]
+ * New Maintainer
* Initial release (Closes: #680352)
- -- Mathieu Malaterre <malat at debian.org> Wed, 04 Jul 2012 17:49:00 +0200
+ -- Pablo Lorenzzoni <spectra at debian.org> Fri, 24 Jan 2014 22:34:29 -0200
diff --git a/debian/conquest-dicom-server.examples b/debian/conquest-dicom-server.examples
new file mode 100644
index 0000000..7564981
--- /dev/null
+++ b/debian/conquest-dicom-server.examples
@@ -0,0 +1 @@
+lua/
diff --git a/debian/conquest-dicom-server.postinst b/debian/conquest-dicom-server.postinst
index 0b3b088..5aae17f 100644
--- a/debian/conquest-dicom-server.postinst
+++ b/debian/conquest-dicom-server.postinst
@@ -11,10 +11,5 @@ fi
# DICOM db setup
/usr/lib/conquest-dicom-server/dgate -v -r
-# web access:
-if [ -e /etc/apache2/apache2.conf ]; then
- a2enmod dgate || true
-fi
-
exit 0
diff --git a/debian/conquest-dicom-server.prerm b/debian/conquest-dicom-server.prerm
index f7ddbda..b114674 100644
--- a/debian/conquest-dicom-server.prerm
+++ b/debian/conquest-dicom-server.prerm
@@ -8,11 +8,5 @@ if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
-rm /var/log/dgate.log
-
-if [ -e /etc/apache2/apache2.conf ]; then
- a2dismod dgate || true
-fi
-
exit 0
diff --git a/debian/control b/debian/control
index a72ed60..cdddefa 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: conquest-dicom-server
Section: web
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
-Uploaders: Mathieu Malaterre <malat at debian.org>
+Uploaders: Pablo Lorenzzoni <spectra at debian.org>, Mathieu Malaterre <malat at debian.org>
Priority: extra
Build-Depends: debhelper (>= 9), liblua5.1-dev, libsqlite3-dev, autotools-dev, dh-autoreconf
Standards-Version: 3.9.3
@@ -12,7 +12,7 @@ Homepage: http://ingenium.home.xs4all.nl/dicom.html
Package: conquest-dicom-server
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libapache2-mod-fcgid
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: DICOM Server with storage, verification, query and retrieve
A full featured DICOM server that has been developed based on and heavily
extending the public domain UCDMC DICOM code. Some possible applications of
@@ -26,4 +26,3 @@ Description: DICOM Server with storage, verification, query and retrieve
- Advanced scriptable image modification, filtering, forwarding and
conversion
- DICOM caching and archive merging
- - DICOM web access for viewing and data management (scriptable)
diff --git a/debian/copyright b/debian/copyright
index 4cfe65b..5165d27 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,11 +7,15 @@ Files-Excluded:
sqlite3.*
data/samples
ActiveFormProj1.ocx
- *.pdf
+ windowsmanual.pdf
jasper-1.900.1-6ct/doc/*.pdf
jpeg-6c/jpeg-6c-changesmvh2.zip
vc80.pdb
data/dbase/conquest.db3
+ ZeroBraneStudio*
+ clibs*
+ *.log
+ mak*
Files: *
Copyright: Copyright © 1995, University of California, Davis
diff --git a/debian/dgate.conf b/debian/dgate.conf
deleted file mode 100644
index f7a777e..0000000
--- a/debian/dgate.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Create a directory for the dgate binary
-ScriptAlias /dgate "/usr/lib/conquest-dicom-server/dgate"
diff --git a/debian/dgate.load b/debian/dgate.load
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..16d9d77
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+linuxmanual.pdf
+DicomConformance_FilesLST_Changes.pdf
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 2028762..6b28d82 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -22,9 +22,17 @@ tar xvf ${UPSTREAM} -C ${FOLDER}
# conv copy of libjpeg 6c:
#rm -rf ${FOLDER}/jpeg-6c/
# conv copy of lua 5.1.4
-rm -rf ${FOLDER}/lua_5.1.4/
+rm -rf ${FOLDER}/lua_*
# conv copy of sqlite3
rm ${FOLDER}/sqlite3.*
+# ZeroBraneStudio
+rm -rf ${FOLDER}/ZeroBraneStudio*
+# clibs windows
+rm -rf ${FOLDER}/clibs*
+# logs
+rm -f ${FOLDER}/*.log
+# mak* files
+rm -f ${FOLDER}/mak*
# remove DICOM test files:
rm -rf ${FOLDER}/data/samples/
@@ -32,8 +40,8 @@ rm -rf ${FOLDER}/data/samples/
# scary stuff:
rm ${FOLDER}/ActiveFormProj1.ocx
-# no real source:
-rm ${FOLDER}/*.pdf
+# Unused PDFs
+rm ${FOLDER}/windowsmanual.pdf
rm ${FOLDER}/jasper-1.900.1-6ct/doc/*.pdf
# zip file:
diff --git a/debian/patches/debianlayout.patch b/debian/patches/debianlayout.patch
index 82f1a14..0d5e909 100644
--- a/debian/patches/debianlayout.patch
+++ b/debian/patches/debianlayout.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
# Host for postgres or mysql only, name, username and password for database
SQLHost = localhost
-SQLServer = ./data/dbase/conquest.db3
-+SQLServer = /var/lib/conquest-dicom-server/data/dbase/conquest.db3
++SQLServer = /var/lib/conquest-dicom-server/data/dbase/conquest.sqlite
Username = dontcare
Password = dontcare
PostGres = 0
diff --git a/debian/rules b/debian/rules
index 84c4c2e..035e493 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,15 +32,15 @@ override_dh_install:
dh_install dicom.ini usr/lib/conquest-dicom-server/
dh_install sample.cq usr/lib/conquest-dicom-server/
dh_install acrnema.map usr/lib/conquest-dicom-server/
- # web
- #dh_install conquest.jpg /var/www
- dh_install debian/dgate.conf etc/apache2/mods-available
- dh_install debian/dgate.load etc/apache2/mods-available
+ # lua examples
+ dh_installexamples
+ # docs
+ dh_installdocs
override_dh_auto_clean:
#dh_autoreconf_clean --sourcedirectory=jasper-1.900.1-6ct
- dh_auto_clean --sourcedirectory=jasper-1.900.1-6ct
- dh_auto_clean --sourcedirectory=jpeg-6c
+ (cd jasper-1.900.1-6ct && ($(MAKE) distclean || echo "Already clean"))
+ (cd jpeg-6c && ($(MAKE) distclean || echo "Already clean"))
override_dh_clean:
-rm dgate
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git
More information about the debian-med-commit
mailing list