Author: malat-guest Date: 2011-01-16 18:28:02 +0000 (Sun, 16 Jan 2011) New Revision: 5668
Added: trunk/packages/dcmtk/trunk/debian/patches/png_tiff.patch trunk/packages/dcmtk/trunk/debian/patches/prefs.patch Modified: trunk/packages/dcmtk/trunk/debian/changelog trunk/packages/dcmtk/trunk/debian/control trunk/packages/dcmtk/trunk/debian/dcmqrscp.init trunk/packages/dcmtk/trunk/debian/dcmtk.examples trunk/packages/dcmtk/trunk/debian/libdcmtk1.lintian-overrides trunk/packages/dcmtk/trunk/debian/patches/01_fix_perl_script_path.patch trunk/packages/dcmtk/trunk/debian/patches/series trunk/packages/dcmtk/trunk/debian/rules Log: Preparation for next upload. Some patches still left to update. Modified: trunk/packages/dcmtk/trunk/debian/changelog =================================================================== --- trunk/packages/dcmtk/trunk/debian/changelog 2011-01-16 18:22:30 UTC (rev 5667) +++ trunk/packages/dcmtk/trunk/debian/changelog 2011-01-16 18:28:02 UTC (rev 5668) @@ -1,3 +1,17 @@ +dcmtk (3.6.0-1) experimental; urgency=low + + * New upstream: 3.6.0 + * Fix lintian errors on misc:Depends + * Fix lintian errors on init.d script + * Add a patch to link wth png/tiff libraries + * Update perl path patch + * debian/control: Update standards-version to 3.9.1 + * Fix new naming convention for snapshot + * Add get-orig-source target in rules file + * Fix CHANGES numbering into something more flexible for later revs. + + -- Mathieu Malaterre <[email protected]> Wed, 12 Jan 2011 12:00:29 +0100 + dcmtk (3.5.4-4) unstable; urgency=low [Andreas Tille] Modified: trunk/packages/dcmtk/trunk/debian/control =================================================================== --- trunk/packages/dcmtk/trunk/debian/control 2011-01-16 18:22:30 UTC (rev 5667) +++ trunk/packages/dcmtk/trunk/debian/control 2011-01-16 18:28:02 UTC (rev 5668) @@ -4,17 +4,18 @@ Maintainer: Debian Med Packaging Team <[email protected]> DM-Upload-Allowed: yes Uploaders: Juergen Salk <[email protected]>, - Andreas Tille <[email protected]> + Andreas Tille <[email protected]>, + Mathieu Malaterre <[email protected]> Build-Depends: debhelper (>= 7), autoconf, autotools-dev, zlib1g-dev, libtiff4-dev, libpng12-dev, libxml2-dev, libwrap0-dev, libssl-dev, doxygen, quilt, graphviz -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dcmtk/trunk/?rev=0&sc=0 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/dcmtk/trunk/ Homepage: http://dicom.offis.de/dcmtk Package: dcmtk Architecture: any -Depends: ${shlibs:Depends}, adduser (>=3.34) +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>=3.34) Description: The 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, @@ -28,7 +29,7 @@ Package: libdcmtk1 Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libdcmtk0, libdcmtk0c2 Replaces: libdcmtk0, libdcmtk0c2 Description: The OFFIS DICOM toolkit runtime libraries @@ -45,7 +46,7 @@ Package: libdcmtk1-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, libdcmtk1 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libdcmtk1 (= ${binary:Version}) Conflicts: libdcmtk0-dev Replaces: libdcmtk0-dev Suggests: dcmtk-doc @@ -64,7 +65,7 @@ Package: dcmtk-www Section: web Architecture: any -Depends: ${shlibs:Depends}, dcmtk, apache | httpd, ${perl:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, dcmtk, apache | httpd, ${perl:Depends} Description: The 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, @@ -78,6 +79,7 @@ Package: dcmtk-doc Section: doc Architecture: all +Depends: ${misc:Depends} Suggests: dcmtk, libdcmtk1-dev Description: The OFFIS DICOM toolkit documentation DCMTK includes a collection of libraries and applications for examining, Modified: trunk/packages/dcmtk/trunk/debian/dcmqrscp.init =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmqrscp.init 2011-01-16 18:22:30 UTC (rev 5667) +++ trunk/packages/dcmtk/trunk/debian/dcmqrscp.init 2011-01-16 18:28:02 UTC (rev 5668) @@ -3,13 +3,13 @@ # Start script for dcmqrscp from dcmtk-package # Adapted from skeleton # @(#)skeleton 2.85-23 28-Jul-2004 [email protected] -# by Roland Marcus Rutschmann <[email protected]> +# by Roland Marcus Rutschmann <[email protected]> # and Juergen Salk <[email protected]> # Version 0.2 Sun, 22 Jul 2007 21:32:42 +0200 ### BEGIN INIT INFO # Provides: dcmqrscp # Required-Start: $network $local_fs $remote_fs -# Required-Stop: +# Required-Stop: $network $local_fs $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Init-Script for DCMTK Central Test Node dcmqrscp Modified: trunk/packages/dcmtk/trunk/debian/dcmtk.examples =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk.examples 2011-01-16 18:22:30 UTC (rev 5667) +++ trunk/packages/dcmtk/trunk/debian/dcmtk.examples 2011-01-16 18:28:02 UTC (rev 5668) @@ -1,2 +1,2 @@ -dcmwlm/wlistdb -dcmwlm/wlistqry +dcmwlm/data/wlistdb +dcmwlm/data/wlistqry Modified: trunk/packages/dcmtk/trunk/debian/libdcmtk1.lintian-overrides =================================================================== --- trunk/packages/dcmtk/trunk/debian/libdcmtk1.lintian-overrides 2011-01-16 18:22:30 UTC (rev 5667) +++ trunk/packages/dcmtk/trunk/debian/libdcmtk1.lintian-overrides 2011-01-16 18:28:02 UTC (rev 5668) @@ -1,3 +1,4 @@ # There is more than one library in one package bundles which makes perfectly # sense in this application but does not enable naming the library package apropriately -libdcmtk1: package-name-doesnt-match-sonames libdcmdata1 libdcmdsig1 libdcmimage1 libdcmimgle1 libdcmjpeg1 libdcmnet1 libdcmpstat1 libdcmqrdb1 libdcmsr1 libdcmtls1 libdcmwlm1 libijg12-1 libijg16-1 libijg8-1 libofstd1 +libdcmtk1: package-name-doesnt-match-sonames libcharls1 libdcmdata1 libdcmdsig1 libdcmimage1 libdcmimgle1 libdcmjpeg1 libdcmjpls1 libdcmnet1 libdcmpstat1 libdcmqrdb1 libdcmsr1 libdcmtls1 libdcmwlm1 libi2d1 libijg12-1 libijg16-1 libijg8-1 liboflog1 libofstd1 +libdcmtk1: embedded-libjpeg Modified: trunk/packages/dcmtk/trunk/debian/patches/01_fix_perl_script_path.patch =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/01_fix_perl_script_path.patch 2011-01-16 18:22:30 UTC (rev 5667) +++ trunk/packages/dcmtk/trunk/debian/patches/01_fix_perl_script_path.patch 2011-01-16 18:28:02 UTC (rev 5668) @@ -3,237 +3,220 @@ 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.4.orig/dcmwlm/perl/procedit.pl -+++ dcmtk-3.5.4/dcmwlm/perl/procedit.pl +--- 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/statedit.pl -+++ dcmtk-3.5.4/dcmwlm/perl/statedit.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/worklist.pl -+++ dcmtk-3.5.4/dcmwlm/perl/worklist.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/procedur.pl -+++ dcmtk-3.5.4/dcmwlm/perl/procedur.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/patiedit.pl -+++ dcmtk-3.5.4/dcmwlm/perl/patiedit.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/main.pl -+++ dcmtk-3.5.4/dcmwlm/perl/main.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/procstep.pl -+++ dcmtk-3.5.4/dcmwlm/perl/procstep.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/lock.ph -+++ dcmtk-3.5.4/dcmwlm/perl/lock.ph + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/isocode.ph -+++ dcmtk-3.5.4/dcmwlm/perl/isocode.ph + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/password.ph -+++ dcmtk-3.5.4/dcmwlm/perl/password.ph + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/log.ph -+++ dcmtk-3.5.4/dcmwlm/perl/log.ph + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/prstdel.pl -+++ dcmtk-3.5.4/dcmwlm/perl/prstdel.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/workdel.pl -+++ dcmtk-3.5.4/dcmwlm/perl/workdel.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/procdel.pl -+++ dcmtk-3.5.4/dcmwlm/perl/procdel.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/statdel.pl -+++ dcmtk-3.5.4/dcmwlm/perl/statdel.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/urldecod.ph -+++ dcmtk-3.5.4/dcmwlm/perl/urldecod.ph + # 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 @@ -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.4.orig/dcmwlm/perl/prefs.ph -+++ dcmtk-3.5.4/dcmwlm/perl/prefs.ph + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # -@@ -56,13 +56,13 @@ - # --------------------- WWW Server Configuration --------------------- - - # RELATIVE path to the WWW script directory, as seen by httpd --$prefs{'cgi_path'} = '/cgi-bin/worklist'; -+$prefs{'cgi_path'} = '/cgi-bin/dcmtk_wlm'; - - # RELATIVE path to the WWW html directory, as seen by httpd --$prefs{'html_path'} = '/worklist'; -+$prefs{'html_path'} = '/dcmtk_wlm'; - - # ABSOLUTE path to the data directory --$prefs{'data_path'} = '/home/www/wl-data'; -+$prefs{'data_path'} = '/var/lib/dcmtk/wl-data'; - - # ------------------ Constants - Please do not change! ------------------ - ---- dcmtk-3.5.4.orig/dcmwlm/perl/checkvr.ph -+++ dcmtk-3.5.4/dcmwlm/perl/checkvr.ph + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/prstedit.pl -+++ dcmtk-3.5.4/dcmwlm/perl/prstedit.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/station.pl -+++ dcmtk-3.5.4/dcmwlm/perl/station.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/layout.ph -+++ dcmtk-3.5.4/dcmwlm/perl/layout.ph + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/patidel.pl -+++ dcmtk-3.5.4/dcmwlm/perl/patidel.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/patient.pl -+++ dcmtk-3.5.4/dcmwlm/perl/patient.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/write.ph -+++ dcmtk-3.5.4/dcmwlm/perl/write.ph + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # -@@ -70,7 +70,7 @@ - if (open(outfile, ">@_[0]")) - { - print outfile <<EOF; + # 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 +@@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl - # - # automatically generated by write.pl - do not modify! # ---- dcmtk-3.5.4.orig/dcmwlm/perl/changepw.pl -+++ dcmtk-3.5.4/dcmwlm/perl/changepw.pl + # 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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS - # ---- dcmtk-3.5.4.orig/dcmwlm/perl/workedit.pl -+++ dcmtk-3.5.4/dcmwlm/perl/workedit.pl -@@ -1,4 +1,4 @@ + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +@@ -59,7 +59,7 @@ + if (open(outfile, ">@_[0]")) + { + print outfile <<EOF; -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 1996-2002, OFFIS + # automatically generated by write.pl - do not modify! # Copied: trunk/packages/dcmtk/trunk/debian/patches/png_tiff.patch (from rev 5655, trunk/packages/dcmtk/branches/experimental/debian/patches/png_tiff.patch) =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/png_tiff.patch (rev 0) +++ trunk/packages/dcmtk/trunk/debian/patches/png_tiff.patch 2011-01-16 18:28:02 UTC (rev 5668) @@ -0,0 +1,11 @@ +--- dcmtk-3.5.5_20100504/dcmjpls/apps/Makefile.in 2010-12-09 11:27:05.000000000 +0100 ++++ dcmtk-3.5.5_20100504.old/dcmjpls/apps/Makefile.in 2010-12-09 11:27:44.000000000 +0100 +@@ -50,7 +50,7 @@ + LIBDIRS = -L$(top_srcdir)/libsrc $(dcmjplslibdir) $(libcharlslibdir) $(dcmimagelibdir) \ + $(dcmimglelibdir) $(dcmdatalibdir) $(ofloglibdir) $(ofstdlibdir) + LOCALLIBS = $(dcmjplslib) $(dcmimagelib) $(dcmimglelib) $(dcmdatalib) $(ofloglib) $(ofstdlib) \ +- $(libcharlslib) $(ZLIBLIBS) ++ $(libcharlslib) $(ZLIBLIBS) $(TIFFLIBS) $(PNGLIBS) + PNMLIBS = $(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS) + + objs = dcmdjpls.o dcmcjpls.o dcml2pnm.o Added: trunk/packages/dcmtk/trunk/debian/patches/prefs.patch =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/prefs.patch (rev 0) +++ trunk/packages/dcmtk/trunk/debian/patches/prefs.patch 2011-01-16 18:28:02 UTC (rev 5668) @@ -0,0 +1,25 @@ +Author: Jürgen Salk <[email protected]> +Description: The original maintainer Jürgen Salk applied + 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.4.orig/dcmwlm/perl/prefs.ph ++++ dcmtk-3.5.4/dcmwlm/perl/prefs.ph +@@ -56,13 +56,13 @@ + # --------------------- WWW Server Configuration --------------------- + + # RELATIVE path to the WWW script directory, as seen by httpd +-$prefs{'cgi_path'} = '/cgi-bin/worklist'; ++$prefs{'cgi_path'} = '/cgi-bin/dcmtk_wlm'; + + # RELATIVE path to the WWW html directory, as seen by httpd +-$prefs{'html_path'} = '/worklist'; ++$prefs{'html_path'} = '/dcmtk_wlm'; + + # ABSOLUTE path to the data directory +-$prefs{'data_path'} = '/home/www/wl-data'; ++$prefs{'data_path'} = '/var/lib/dcmtk/wl-data'; + + # ------------------ Constants - Please do not change! ------------------ + + Modified: trunk/packages/dcmtk/trunk/debian/patches/series =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/series 2011-01-16 18:22:30 UTC (rev 5667) +++ trunk/packages/dcmtk/trunk/debian/patches/series 2011-01-16 18:28:02 UTC (rev 5668) @@ -1,7 +1,9 @@ -01_buildsystem_changes.patch +#01_buildsystem_changes.patch 01_fix_perl_script_path.patch -02_dcmtk_3.5.4-3.patch -04_nostrip.patch -05_no_www_docs.patch -06_old_patches_from_diff_gz.patch -07_doxygen.patch +#02_dcmtk_3.5.4-3.patch +#04_nostrip.patch +#05_no_www_docs.patch +#06_old_patches_from_diff_gz.patch +#07_doxygen.patch +png_tiff.patch +prefs.patch Modified: trunk/packages/dcmtk/trunk/debian/rules =================================================================== --- trunk/packages/dcmtk/trunk/debian/rules 2011-01-16 18:22:30 UTC (rev 5667) +++ trunk/packages/dcmtk/trunk/debian/rules 2011-01-16 18:28:02 UTC (rev 5668) @@ -51,7 +51,7 @@ --infodir=\$${prefix}/share/info \ --includedir=\$${prefix}/include \ --libdir=\$${prefix}/lib \ - --datadir=\$${prefix}/share \ + --datadir=\$${prefix}/share/dcmtk \ --sysconfdir=/etc/$(pkg) \ --with-private-tags \ --with-libxml \ @@ -68,17 +68,17 @@ # Add here commands to compile the package. - # We have to perfom some magic here to have the dcmtk utilies - # linked against shared dcmtk libs without forcing the utilities - # themselves to be compiled with -fPIC as well. + # We have to perfom some magic here to have the dcmtk utilies + # linked against shared dcmtk libs without forcing the utilities + # themselves to be compiled with -fPIC as well. # In a first step we adjust config/Makefile.def to # build shared libraries. In a second step we build - # the shared libs only (i.e. without utilities). In a third step we - # restore the original state of config/Makefile.def. In a forth + # the shared libs only (i.e. without utilities). In a third step we + # restore the original state of config/Makefile.def. In a forth # step we run `make clean' on the source tree. (This leaves the - # *.so libs untouched but forces recompilation in the next step.) - # In the last step we run `make all'. This will build both the - # utilities and the static libraries without -fPIC but links the + # *.so libs untouched but forces recompilation in the next step.) + # In the last step we run `make all'. This will build both the + # utilities and the static libraries without -fPIC but links the # utilities dynamically against the shared library versions. # make sure dot wrapper for doxygen executable @@ -92,7 +92,7 @@ $(MAKE) libsrc-all && \ mv config/Makefile.def.static config/Makefile.def && \ $(MAKE) clean && \ - $(MAKE) + $(MAKE) touch build-arch-stamp @@ -128,7 +128,7 @@ cp -f /usr/share/misc/config.guess config/config.guess endif - dh_clean + dh_clean install: install-indep install-arch install-indep: build-indep @@ -166,7 +166,7 @@ binary-indep: build-indep install-indep dh_testdir -i dh_testroot -i - dh_installchangelogs -i CHANGES.354 + dh_installchangelogs -i CHANGES.* dh_installdocs -i dh_installexamples -i dh_installman -i @@ -185,7 +185,7 @@ binary-arch: build-arch install-arch dh_testdir -a dh_testroot -a - dh_installchangelogs -a CHANGES.354 + dh_installchangelogs -a CHANGES.* dh_installdocs -a dh_installexamples -a dh_installinit -a --name=dcmqrscp @@ -205,5 +205,8 @@ dh_md5sums -a dh_builddeb -a +get-orig-source: + uscan --force-download --verbose + binary: binary-indep binary-arch .PHONY: build-indep build-arch build clean binary-indep binary-arch binary install-indep install-arch install _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
