[med-svn] r13373 - in trunk/packages/dcmtk/branches/experimental/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Mon Apr 22 08:35:16 UTC 2013
Author: malat
Date: 2013-04-22 08:35:16 +0000 (Mon, 22 Apr 2013)
New Revision: 13373
Modified:
trunk/packages/dcmtk/branches/experimental/debian/changelog
trunk/packages/dcmtk/branches/experimental/debian/control
trunk/packages/dcmtk/branches/experimental/debian/copyright
trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.install
trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
trunk/packages/dcmtk/branches/experimental/debian/libdcmtk2.install
trunk/packages/dcmtk/branches/experimental/debian/patches/01_fix_perl_script_path.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/prefs.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/series
trunk/packages/dcmtk/branches/experimental/debian/rules
Log:
Update package
Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-04-22 08:35:16 UTC (rev 13373)
@@ -1,6 +1,7 @@
-dcmtk (3.6.1~20120515-1) experimental; urgency=low
+dcmtk (3.6.1~20121102-1) experimental; urgency=low
* Use new dh syntax
+ * Run w-a-s. Use B-D-I for doxygen
* Switch to cmake build system (allows parallel builds)
-- Mathieu Malaterre <malat at debian.org> Sat, 26 May 2012 09:57:22 +0200
Modified: trunk/packages/dcmtk/branches/experimental/debian/control
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/control 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/control 2013-04-22 08:35:16 UTC (rev 13373)
@@ -2,63 +2,70 @@
Section: science
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
Uploaders: Juergen Salk <jsa at debian.org>,
- Andreas Tille <tille at debian.org>,
- Mathieu Malaterre <malat at debian.org>
-Build-Depends: debhelper (>= 7), autoconf, autotools-dev, zlib1g-dev, libtiff4-dev, cmake,
- libpng-dev, libxml2-dev, libwrap0-dev, libssl-dev, doxygen (>= 1.7.4), graphviz, libcharls-dev,
- libsndfile1-dev
-Standards-Version: 3.9.3
+ Andreas Tille <tille at debian.org>,
+ Mathieu Malaterre <malat at debian.org>
+Build-Depends: cmake,
+ debhelper (>= 9),
+ libcharls-dev,
+ libpng-dev,
+ libsndfile1-dev,
+ libssl-dev,
+ libtiff4-dev,
+ libwrap0-dev,
+ libxml2-dev,
+ zlib1g-dev
+Build-Depends-Indep: doxygen (>= 1.7.4), graphviz
+Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dcmtk/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dcmtk/trunk/
Homepage: http://dicom.offis.de/dcmtk
Package: dcmtk
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>=3.34)
+Depends: adduser (>=3.34), ${misc:Depends}, ${shlibs:Depends}
Description: OFFIS DICOM toolkit command line utilities
- DCMTK includes a collection of libraries and applications for examining,
- constructing and converting DICOM image files, handling offline media,
- sending and receiving images over a network connection, as well as
+ DCMTK includes a collection of libraries and applications for examining,
+ constructing and converting DICOM image files, handling offline media,
+ sending and receiving images over a network connection, as well as
demonstrative image storage and worklist servers.
.
This package contains the DCMTK utility applications.
.
Note: This version was compiled with libssl support.
-Package: libdcmtk2
+Package: libdcmtk3
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libdcmtk0, libdcmtk0c2, dcmtk (<< 3.6.0)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: dcmtk (<< 3.6.0), libdcmtk0, libdcmtk0c2
Replaces: libdcmtk0, libdcmtk0c2
Description: OFFIS DICOM toolkit runtime libraries
- DCMTK includes a collection of libraries and applications for examining,
- constructing and converting DICOM image files, handling offline media,
- sending and receiving images over a network connection, as well as
- demonstrative image storage and worklist servers.
+ DCMTK includes a collection of libraries and applications for examining,
+ constructing and converting DICOM image files, handling offline media,
+ sending and receiving images over a network connection, as well as
+ demonstrative image storage and worklist servers.
.
- This package contains the runtime libraries for the DCMTK utility
+ This package contains the runtime libraries for the DCMTK utility
applications.
.
Note: This version was compiled with libssl support.
-Package: libdcmtk2-dev
+Package: libdcmtk3-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libdcmtk2 (= ${binary:Version})
+Depends: libdcmtk2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Conflicts: libdcmtk0-dev, libdcmtk1-dev
Replaces: libdcmtk0-dev, libdcmtk1-dev
Suggests: dcmtk-doc
Description: OFFIS DICOM toolkit development libraries and headers
- DCMTK includes a collection of libraries and applications for examining,
- constructing and converting DICOM image files, handling offline media,
- sending and receiving images over a network connection, as well as
- demonstrative image storage and worklist servers.
+ DCMTK includes a collection of libraries and applications for examining,
+ constructing and converting DICOM image files, handling offline media,
+ sending and receiving images over a network connection, as well as
+ demonstrative image storage and worklist servers.
.
- This package contains development libraries and headers for DCMTK. You
- only need to install this if you are developing programs that use the
+ This package contains development libraries and headers for DCMTK. You
+ only need to install this if you are developing programs that use the
DCMTK libraries.
.
Note: This version was compiled with libssl support.
@@ -66,15 +73,19 @@
Package: dcmtk-www
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, dcmtk, apache2 | httpd, ${perl:Depends}
+Depends: apache2 | httpd,
+ dcmtk,
+ ${misc:Depends},
+ ${perl:Depends},
+ ${shlibs:Depends}
Description: OFFIS DICOM toolkit worklist www server application
- DCMTK includes a collection of libraries and applications for examining,
- constructing and converting DICOM image files, handling offline media,
- sending and receiving images over a network connection, as well as
- demonstrative image storage and worklist servers.
+ DCMTK includes a collection of libraries and applications for examining,
+ constructing and converting DICOM image files, handling offline media,
+ sending and receiving images over a network connection, as well as
+ demonstrative image storage and worklist servers.
.
- This package contains the DICOM basic worklist management web server
- application. You only need to install this if you want to manage worklist
+ This package contains the DICOM basic worklist management web server
+ application. You only need to install this if you want to manage worklist
entries using a web browser.
Package: dcmtk-doc
@@ -83,10 +94,10 @@
Depends: ${misc:Depends}
Suggests: dcmtk, libdcmtk2-dev
Description: OFFIS DICOM toolkit documentation
- DCMTK includes a collection of libraries and applications for examining,
- constructing and converting DICOM image files, handling offline media,
- sending and receiving images over a network connection, as well as
- demonstrative image storage and worklist servers.
+ DCMTK includes a collection of libraries and applications for examining,
+ constructing and converting DICOM image files, handling offline media,
+ sending and receiving images over a network connection, as well as
+ demonstrative image storage and worklist servers.
.
- This package contains the on-line documentation for the DCMTK libraries
+ This package contains the on-line documentation for the DCMTK libraries
and utilities in HTML format.
Modified: trunk/packages/dcmtk/branches/experimental/debian/copyright
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/copyright 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/copyright 2013-04-22 08:35:16 UTC (rev 13373)
@@ -3,7 +3,7 @@
It was downloaded from ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk
-Upstream Author: OFFIS DICOM Team <dicom at offis.de>
+Upstream Author: OFFIS DICOM Team <dicom at offis.de>
Copyright:
@@ -40,33 +40,33 @@
versions of this software with the following copyright, and can be
identifed by the following copyright notice located in each source file:
-/*
+/*
* Copyright (C) 1993/1994, OFFIS, Oldenburg University and CERIUM
- *
+ *
* This software and supporting documentation were
* developed by
- *
+ *
* Institut OFFIS
* Bereich Kommunikationssysteme
* Westerstr. 10-12
* 26121 Oldenburg, Germany
- *
+ *
* Fachbereich Informatik
* Abteilung Prozessinformatik
* Carl von Ossietzky Universitaet Oldenburg
* Ammerlaender Heerstr. 114-118
* 26111 Oldenburg, Germany
- *
+ *
* CERIUM
* Laboratoire SIM
* Faculte de Medecine
* 2 Avenue du Pr. Leon Bernard
* 35043 Rennes Cedex, France
- *
+ *
* for CEN/TC251/WG4 as a contribution to the Radiological
* Society of North America (RSNA) 1993 Digital Imaging and
* Communications in Medicine (DICOM) Demonstration.
- *
+ *
* THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND NEITHER OFFIS,
* OLDENBURG UNIVERSITY NOR CERIUM MAKE ANY WARRANTY REGARDING
* THE SOFTWARE, ITS PERFORMANCE, ITS MERCHANTABILITY OR
@@ -74,7 +74,7 @@
* DISEASES OR ITS CONFORMITY TO ANY SPECIFICATION. THE
* ENTIRE RISK AS TO QUALITY AND PERFORMANCE OF THE SOFTWARE
* IS WITH THE USER.
- *
+ *
* Copyright of the software and supporting documentation
* is, unless otherwise stated, jointly owned by OFFIS,
* Oldenburg University and CERIUM and free access is hereby
@@ -84,8 +84,8 @@
* source code or supporting documentation or derivative
* works (source code and supporting documentation) must
* include the three paragraphs of this copyright notice.
- *
- */
+ *
+ */
Some other parts of this software within the dcmtk/dcmnet
sub-package related to the DICOM Upper Layer Protocol are
@@ -262,19 +262,19 @@
* provided the authors copyright notice remains intact.
*/
-The dcmjp2k sub-package (which is currently not part of the free
-toolkit) includes an adapted version of the JasPer JPEG 2000 toolkit,
-which is contained in dcmjp2k/libjaspr. This toolkit is covered by
+The dcmjp2k sub-package (which is currently not part of the free
+toolkit) includes an adapted version of the JasPer JPEG 2000 toolkit,
+which is contained in dcmjp2k/libjaspr. This toolkit is covered by
the following copyright.
/* JasPer License Version 2.0
- *
+ *
* Copyright (c) 1999-2000 Image Power, Inc.
* Copyright (c) 1999-2000 The University of British Columbia
* Copyright (c) 2001-2003 Michael David Adams
- *
+ *
* All rights reserved.
- *
+ *
* Permission is hereby granted, free of charge, to any person (the
* "User") obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without restriction,
@@ -282,15 +282,15 @@
* publish, distribute, and/or sell copies of the Software, and to permit
* persons to whom the Software is furnished to do so, subject to the
* following conditions:
- *
+ *
* 1. The above copyright notices and this permission notice (which
* includes the disclaimer below) shall be included in all copies or
* substantial portions of the Software.
- *
+ *
* 2. The name of a copyright holder shall not be used to endorse or
* promote products derived from the Software without specific prior
* written permission.
- *
+ *
* THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
* LICENSE. NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
* THIS DISCLAIMER. THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
@@ -317,6 +317,4 @@
* PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
* RISK ACTIVITIES"). THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
* EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- */
-
-
+ */
Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.install
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.install 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.install 2013-04-22 08:35:16 UTC (rev 13373)
@@ -1,3 +1,6 @@
+dcmwlm/images/* usr/share/dcmtk/www
+dcmwlm/perl/* usr/lib/dcmtk/cgi-bin
+debian/apache.conf etc/dcmtk
usr/bin/preplock usr/lib/dcmtk/cgi-bin
usr/bin/readoviw usr/lib/dcmtk/cgi-bin
usr/bin/readwlst usr/lib/dcmtk/cgi-bin
@@ -2,4 +5 @@
usr/bin/writwlst usr/lib/dcmtk/cgi-bin
-dcmwlm/perl/* usr/lib/dcmtk/cgi-bin
-dcmwlm/images/* usr/share/dcmtk/www
-debian/apache.conf etc/dcmtk
Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install 2013-04-22 08:35:16 UTC (rev 13373)
@@ -1,4 +1,4 @@
usr/bin/*
+usr/etc/dcmtk/*
usr/share/dcmtk/*
-usr/etc/dcmtk/*
usr/share/doc/dcmtk/*
Modified: trunk/packages/dcmtk/branches/experimental/debian/libdcmtk2.install
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/libdcmtk2.install 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/libdcmtk2.install 2013-04-22 08:35:16 UTC (rev 13373)
@@ -1,2 +1,2 @@
+usr/include/dcmtk/*
usr/lib/*
-usr/include/dcmtk/*
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/01_fix_perl_script_path.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/01_fix_perl_script_path.patch 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/01_fix_perl_script_path.patch 2013-04-22 08:35:16 UTC (rev 13373)
@@ -3,215 +3,267 @@
a set of patches to the original code. The part which fixes
the path to the perl executable is collected in this patch set.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/changepw.pl 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/changepw.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/changepw.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/changepw.pl 2013-04-22 10:21:06.096738285 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/changepw.pl 2013-04-22 10:31:44.020731102 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/checkvr.ph 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/checkvr.ph 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/checkvr.ph
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/checkvr.ph 2013-04-22 10:21:06.108738284 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/checkvr.ph 2013-04-22 10:31:44.036731102 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/isocode.ph 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/isocode.ph 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/isocode.ph
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/isocode.ph 2013-04-22 10:21:06.132738284 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/isocode.ph 2013-04-22 10:31:44.056731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/layout.ph 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/layout.ph 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/layout.ph
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/layout.ph 2013-04-22 10:21:06.140738284 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/layout.ph 2013-04-22 10:31:44.060731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/lock.ph 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/lock.ph 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/lock.ph
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/lock.ph 2013-04-22 10:21:06.156738284 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/lock.ph 2013-04-22 10:31:44.064731102 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/log.ph 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/log.ph 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/log.ph
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/log.ph 2013-04-22 10:21:06.164738284 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/log.ph 2013-04-22 10:31:44.072731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/main.pl 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/main.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/main.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/main.pl 2013-04-22 10:21:06.180738284 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/main.pl 2013-04-22 10:31:44.076731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/password.ph 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/password.ph 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/password.ph
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/password.ph 2013-04-22 10:21:06.188738283 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/password.ph 2013-04-22 10:31:44.084731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/patidel.pl 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patidel.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/patidel.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/patidel.pl 2013-04-22 10:21:06.200738283 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/patidel.pl 2013-04-22 10:31:44.088731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/patiedit.pl 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patiedit.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/patiedit.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/patiedit.pl 2013-04-22 10:21:06.212738283 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/patiedit.pl 2013-04-22 10:31:44.096731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/patient.pl 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patient.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/patient.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/patient.pl 2013-04-22 10:21:06.224738283 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/patient.pl 2013-04-22 10:31:44.104731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/prefs.ph 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prefs.ph 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/prefs.ph
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/prefs.ph 2013-04-22 10:21:06.232738283 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/prefs.ph 2013-04-22 10:31:44.108731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/procdel.pl 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procdel.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/procdel.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/procdel.pl 2013-04-22 10:21:06.240738283 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/procdel.pl 2013-04-22 10:31:44.112731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/procedit.pl 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procedit.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/procedit.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/procedit.pl 2013-04-22 10:21:06.248738283 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/procedit.pl 2013-04-22 10:31:44.124731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/procedur.pl 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procedur.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/procedur.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/procedur.pl 2013-04-22 10:21:06.264738282 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/procedur.pl 2013-04-22 10:31:44.128731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/procstep.pl 2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procstep.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/procstep.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/procstep.pl 2013-04-22 10:21:06.280738282 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/procstep.pl 2013-04-22 10:31:44.132731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/prstdel.pl 2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prstdel.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/prstdel.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/prstdel.pl 2013-04-22 10:21:06.292738282 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/prstdel.pl 2013-04-22 10:31:44.140731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/prstedit.pl 2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prstedit.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/prstedit.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/prstedit.pl 2013-04-22 10:21:06.300738282 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/prstedit.pl 2013-04-22 10:31:44.144731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/statdel.pl 2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/statdel.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/statdel.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/statdel.pl 2013-04-22 10:21:06.312738282 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/statdel.pl 2013-04-22 10:31:44.148731100 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/statedit.pl 2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/statedit.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/statedit.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/statedit.pl 2013-04-22 10:21:06.316738282 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/statedit.pl 2013-04-22 10:31:44.152731100 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/station.pl 2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/station.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/station.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/station.pl 2013-04-22 10:21:06.324738282 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/station.pl 2013-04-22 10:31:44.156731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/urldecod.ph 2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/urldecod.ph 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/urldecod.ph
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/urldecod.ph 2013-04-22 10:21:06.336738282 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/urldecod.ph 2013-04-22 10:31:44.160731101 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright & Disclaimer.
# This set of routines may be freely distributed, modified and
---- dcmtk-3.5.5_20101130/dcmwlm/perl/workdel.pl 2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/workdel.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/workdel.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/workdel.pl 2013-04-22 10:21:06.344738282 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/workdel.pl 2013-04-22 10:31:44.168731100 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/workedit.pl 2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/workedit.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/workedit.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/workedit.pl 2013-04-22 10:21:06.352738281 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/workedit.pl 2013-04-22 10:31:44.176731100 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/worklist.pl 2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/worklist.pl 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/worklist.pl
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/worklist.pl 2013-04-22 10:21:06.372738281 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/worklist.pl 2013-04-22 10:31:44.180731100 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/write.ph 2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/write.ph 2010-12-09 11:50:35.000000000 +0100
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/write.ph
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/write.ph 2013-04-22 10:21:06.392738281 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/write.ph 2013-04-22 10:31:44.188731100 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 1996-2010, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
-@@ -59,7 +59,7 @@
+@@ -42,7 +42,7 @@
if (open(outfile, ">@_[0]"))
{
print outfile <<EOF;
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch 2013-04-22 08:35:16 UTC (rev 13373)
@@ -1,7 +1,10 @@
-Index: dcmtk-3.6.1_20120222/doxygen/htmldocs.cfg
+Description: Use graphviz and prefer SVG output
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: dcmtk-3.6.1_20121102/doxygen/htmldocs.cfg
===================================================================
---- dcmtk-3.6.1_20120222.orig/doxygen/htmldocs.cfg 2012-02-22 14:24:51.000000000 +0100
-+++ dcmtk-3.6.1_20120222/doxygen/htmldocs.cfg 2012-03-06 18:56:13.000000000 +0100
+--- dcmtk-3.6.1_20121102.orig/doxygen/htmldocs.cfg 2013-04-22 10:21:05.600738290 +0200
++++ dcmtk-3.6.1_20121102/doxygen/htmldocs.cfg 2013-04-22 10:32:35.600730520 +0200
@@ -1582,7 +1582,7 @@
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
@@ -11,3 +14,12 @@
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
# allowed to run in parallel. When set to 0 (the default) doxygen will
+@@ -1690,7 +1690,7 @@
+ # HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+ # visible in IE 9+ (other browsers do not have this requirement).
+
+-DOT_IMAGE_FORMAT = png
++DOT_IMAGE_FORMAT = svg
+
+ # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+ # enable generation of interactive SVG images that allow zooming and panning.
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/prefs.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/prefs.patch 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/prefs.patch 2013-04-22 08:35:16 UTC (rev 13373)
@@ -3,11 +3,11 @@
a set of patches to the original code. The part which fixes
the path to the perl executable is collected in this patch set.
-Index: dcmtk-3.6.0/dcmwlm/perl/prefs.ph
+Index: dcmtk-3.6.1_20121102/dcmwlm/perl/prefs.ph
===================================================================
---- dcmtk-3.6.0.orig/dcmwlm/perl/prefs.ph 2011-01-28 10:10:01.000000000 +0100
-+++ dcmtk-3.6.0/dcmwlm/perl/prefs.ph 2011-01-28 10:10:03.000000000 +0100
-@@ -45,13 +45,13 @@
+--- dcmtk-3.6.1_20121102.orig/dcmwlm/perl/prefs.ph 2013-04-22 10:20:43.000000000 +0200
++++ dcmtk-3.6.1_20121102/dcmwlm/perl/prefs.ph 2013-04-22 10:20:59.172738362 +0200
+@@ -28,13 +28,13 @@
# --------------------- WWW Server Configuration ---------------------
# RELATIVE path to the WWW script directory, as seen by httpd
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/series
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-04-22 08:35:16 UTC (rev 13373)
@@ -1,6 +1,4 @@
01_fix_perl_script_path.patch
02_dcmtk_3.6.0-1.patch
-04_nostrip.patch
-05_no_www_docs.patch
07_doxygen.patch
prefs.patch
Modified: trunk/packages/dcmtk/branches/experimental/debian/rules
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/rules 2013-04-22 08:06:06 UTC (rev 13372)
+++ trunk/packages/dcmtk/branches/experimental/debian/rules 2013-04-22 08:35:16 UTC (rev 13373)
@@ -1,6 +1,13 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
+# deduce documentation option (build-indep target)
+ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
+ BUILDDOC = OFF
+else
+ BUILDDOC = ON
+endif
+
%:
dh $@ --parallel --buildsystem=cmake
@@ -9,7 +16,7 @@
-DDCMTK_WITH_OPENSSL:BOOL=ON \
-DDCMTK_WITH_PRIVATE_TAGS:BOOL=ON \
-DDCMTK_WITH_XML:BOOL=ON \
- -DDCMTK_WITH_DOXYGEN:BOOL=ON \
+ -DDCMTK_WITH_DOXYGEN:BOOL=$(BUILDDOC) \
-DDCMTK_WITH_TIFF:BOOL=ON \
-DDCMTK_WITH_ZLIB:BOOL=ON \
-DDCMTK_WITH_ICONV:BOOL=ON \
More information about the debian-med-commit
mailing list