[med-svn] r3877 - trunk/packages/dicomscope/trunk/debian

Mathieu Malaterre malat-guest at alioth.debian.org
Fri Sep 4 10:33:37 UTC 2009


Author: malat-guest
Date: 2009-09-04 10:33:35 +0000 (Fri, 04 Sep 2009)
New Revision: 3877

Added:
   trunk/packages/dicomscope/trunk/debian/dicomscope.1
   trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides
Removed:
   trunk/packages/dicomscope/trunk/debian/get-orig-source
Modified:
   trunk/packages/dicomscope/trunk/debian/control
   trunk/packages/dicomscope/trunk/debian/rules
Log:
Add doc + fix some lintian errors

Modified: trunk/packages/dicomscope/trunk/debian/control
===================================================================
--- trunk/packages/dicomscope/trunk/debian/control	2009-09-04 06:47:46 UTC (rev 3876)
+++ trunk/packages/dicomscope/trunk/debian/control	2009-09-04 10:33:35 UTC (rev 3877)
@@ -4,7 +4,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Priority: extra
-Build-Depends: debhelper (>= 5), cmake, libdcmtk1-dev, default-jdk,
+Build-Depends: debhelper (>= 5), cmake, libdcmtk1-dev (>= 3.5.4), default-jdk, unzip,
  libssl-dev, libxml2-dev, tofrodos, quilt
 Standards-Version: 3.8.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dicomscope/trunk/?rev=0&sc=0
@@ -13,7 +13,7 @@
 
 Package: dicomscope
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.3 | tk8.4, libdcmtk1, libssl0.9.8,
+Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.3 | tk8.4, libdcmtk1 (>= 3.5.4), libssl0.9.8,
  libxml2, java-gcj-compat | java1-runtime | java2-runtime
 Description: The OFFIS DICOM Viewer
  DICOMscope is a free DICOM viewer which can display uncompressed,

Added: trunk/packages/dicomscope/trunk/debian/dicomscope.1
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.1	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.1	2009-09-04 10:33:35 UTC (rev 3877)
@@ -0,0 +1,32 @@
+.TH DICOMSCOPE 1 "20 Aug 2009" "Version 3.6.0" "OFFIS DCMTK"
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+dicomscope \- DICOM Viewer
+.SH SYNOPSIS
+.B dicomscope
+.I DICOMFile.dcm
+
+.SH "DESCRIPTION"
+This manual page documents briefly the
+.B dicomscope
+command.
+
+.PP
+DICOMscope is a free DICOM viewer which can display uncompressed, monochrome DICOM images from all modalities and which supports monitor calibration according to DICOM part 14 as well as presentation states. DICOMscope offers a print client (DICOM Basic Grayscale Print Management) which also implements the optional Presentation LUT SOP Class. The development of this prototype was commissioned by the "Committee for the Advancement of DICOM" and demonstrated at the European Congress of Radiology ECR 1999. An enhanced version was developed for the "DICOM Display Consistency Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has been demonstrated at ECR 2001 and contains numerous extensions, including a print server, support for encrypted DICOM communication, digital signatures and structured reporting.
+
+DICOMscope is not meant as a competition for commercial DICOM viewers. The application is rather a feasibility study for DICOM presentation states. The program is not appropriate to be used in a clinical environment, e.g. for reporting.
+
+.SH "DISCLAIMER"
+This software is made available, as is, and OFFIS, the Institute for Microtherapy / VISUS-TT and OTech make no warranty regarding the software, its performance, its merchantability or fitness for any particular use, freedom from any computer diseases or its conformity to any specification. The entire risk as to quality and performance of the software is with the user. This software is intended for investigational use only. It has not been tested or approved for clinical application or production environments.
+
+.SH SEE ALSO
+See the project homepage
+.B http://dicom.offis.de/dscope.php.en
+for more information.
+
+.SH "COPYRIGHT"
+Copyright (C) 1994-2005 by Kuratorium OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+This manual page was written by Mathieu Malaterre
+<mathieu.malaterre at gmail.com> for the Debian GNU/Linux system (but may be used by others).

Added: trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides	2009-09-04 10:33:35 UTC (rev 3877)
@@ -0,0 +1,4 @@
+# W: dicomscope: package-name-doesnt-match-sonames libjInterface
+dicomscope: package-name-doesnt-match-sonames
+# W: dicomscope: shlib-without-versioned-soname usr/lib/libjInterface.so libjInterface.so
+dicomscope: shlib-without-versioned-soname

Deleted: trunk/packages/dicomscope/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/dicomscope/trunk/debian/get-orig-source	2009-09-04 06:47:46 UTC (rev 3876)
+++ trunk/packages/dicomscope/trunk/debian/get-orig-source	2009-09-04 10:33:35 UTC (rev 3877)
@@ -1,45 +0,0 @@
-#!/bin/sh -e
-set -e
-#set -x
-
-UVERSION=360
-# ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope351/dsgui351.zip
-URL=ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope${UVERSION}/
-UNAME=dsgui
-UPSTREAMDIR="$UNAME""$UVERSION"
-NAME=dicomscope
-VERSION=3.6.0
-UPSTREAMZIP="$UPSTREAMDIR".zip
-
-if ! which dos2unix > /dev/null ; then
-    echo "Please install package tofrodos to enable conversion of source files."
-    exit
-fi
-
-TMPDIR=../
-mkdir -p "$TMPDIR"
-cd "$TMPDIR"
-
-if [ -e ${UPSTREAMZIP} ] ; then
-    echo "Using existing tarball ${UPSTREAMZIP}"
-else
-    wget --quiet ${URL}/${UPSTREAMZIP}
-fi
-
-DISTDIR=${NAME}-${VERSION}
-# Previously dscope 3.5.1 zip would contains a toplevel directoy, since 3.6.0
-# everything is contained with no toplevel directory, unzip directlty
-# into target directory
-unzip -q "$UPSTREAMZIP" -d "$DISTDIR"
-#mv "$UPSTREAMDIR" "$DISTDIR"
-
-find "$DISTDIR" -name *.java -exec dos2unix {} \;
-find "$DISTDIR" -name *.html -exec dos2unix {} \;
-find "$DISTDIR" -name *.h -exec dos2unix {} \;
-find "$DISTDIR" -name *.cpp -exec dos2unix {} \;
-find "$DISTDIR" -name *.txt -exec dos2unix {} \;
-find "$DISTDIR" -name *.MF -exec dos2unix {} \;
-
-GZIP=-9 tar -czf "$NAME"_"$VERSION".orig.tar.gz "$DISTDIR"
-
-rm -rf "$NAME"-"$VERSION"

Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules	2009-09-04 06:47:46 UTC (rev 3876)
+++ trunk/packages/dicomscope/trunk/debian/rules	2009-09-04 10:33:35 UTC (rev 3877)
@@ -15,6 +15,20 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+VER_MAJOR = 3
+VER_MINOR = 6
+VER_PATCH = 0
+VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
+VER_FULL_UPSTREAM = $(VER_MAJOR)$(VER_MINOR)$(VER_PATCH)
+
+UPSTREAM_SRC = dsgui$(VER_FULL_UPSTREAM)
+DEBIAN_SRC_DIR = dicomscope-$(VER_FULL)
+DEBIAN_SRC_TAR = dicomscope_$(VER_FULL).orig.tar.gz
+
+# set the number of build jobs
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+        JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
 # 
 export JAVA_HOME=/usr/lib/jvm/default-java
 
@@ -61,7 +75,7 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE) -C debian/build
+	$(MAKE) $(JOBS) -C debian/build
 
 	touch $@
 
@@ -88,13 +102,9 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
-	$(MAKE) -C debian/build DESTDIR=$(TARGET) install
+	$(MAKE) $(JOBS) -C debian/build DESTDIR=$(TARGET) install
 	chmod 755 $(TARGET)/usr/share/dicomscope/tcl/*
 
-
-get-orig-source:
-	. debian/get-orig-source
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -107,7 +117,8 @@
 	dh_installdocs
 	dh_installexamples
 	dh_install ## --sourcedir=$(TARGET) --fail-missing
-	dh_installman
+	dh_installman debian/dicomscope.1
+	dh_lintian
 	dh_link
 	dh_strip
 	dh_compress --exclude=.pdf
@@ -119,5 +130,22 @@
 	dh_md5sums
 	dh_builddeb
 
+$(UPSTREAM_SRC).zip:
+	#uscan --force-download --verbose --repack
+	wget -c ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope$(VER_FULL_UPSTREAM)/$@
+	# ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope360/dsgui360.zip
+
+get-orig-source: $(UPSTREAM_SRC).zip
+	unzip -q $(UPSTREAM_SRC).zip -d $(DEBIAN_SRC_DIR)
+	find $(DEBIAN_SRC_DIR) -name *.java -exec dos2unix {} \;
+	find $(DEBIAN_SRC_DIR) -name *.html -exec dos2unix {} \;
+	find $(DEBIAN_SRC_DIR) -name *.h -exec dos2unix {} \;
+	find $(DEBIAN_SRC_DIR) -name *.cpp -exec dos2unix {} \;
+	find $(DEBIAN_SRC_DIR) -name *.txt -exec dos2unix {} \;
+	find $(DEBIAN_SRC_DIR) -name *.MF -exec dos2unix {} \;
+	GZIP=-9 tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
+	rm -rf $(DEBIAN_SRC_DIR)
+	#rm -f $(UPSTREAM_SRC).zip
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure




More information about the debian-med-commit mailing list