[med-svn] r13596 - in trunk/packages/dcmtk/branches/experimental/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Thu May 16 11:17:32 UTC 2013
Author: malat
Date: 2013-05-16 11:17:32 +0000 (Thu, 16 May 2013)
New Revision: 13596
Added:
trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.docs
Removed:
trunk/packages/dcmtk/branches/experimental/debian/dcmtk.NEWS
trunk/packages/dcmtk/branches/experimental/debian/patches/04_nostrip.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/05_no_www_docs.patch
Modified:
trunk/packages/dcmtk/branches/experimental/debian/changelog
trunk/packages/dcmtk/branches/experimental/debian/dcmtk.README.Debian
trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.lintian-overrides
trunk/packages/dcmtk/branches/experimental/debian/patches/01_fix_perl_script_path.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/02_dcmtk_3.6.0-1.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/prefs.patch
trunk/packages/dcmtk/branches/experimental/debian/rules
Log:
Cleanup install rules
Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-05-16 11:17:32 UTC (rev 13596)
@@ -2,7 +2,7 @@
* Use new dh syntax
* Run w-a-s. Use B-D-I for doxygen
- * Switch to cmake build system (allows parallel builds)
+ * Switch to cmake build system (allows parallel builds). Closes: #701801
* Use system CharLS. Closes: #705923
* Use SOP class uid with option. Closes: #706062
Added: trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.docs
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.docs (rev 0)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.docs 2013-05-16 11:17:32 UTC (rev 13596)
@@ -0,0 +1 @@
+usr/share/doc/dcmtk/*
Deleted: trunk/packages/dcmtk/branches/experimental/debian/dcmtk.NEWS
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk.NEWS 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk.NEWS 2013-05-16 11:17:32 UTC (rev 13596)
@@ -1,89 +0,0 @@
-dcmtk (3.5.4-1) unstable; urgency=low
-
- Version 3.5.4 of the OFFIS DCMTK (DICOM ToolKit) software includes
- the following main changes over the previous version (Version 3.5.3):
-
- * The former "imagectn" tool has been renamed to "dcmqrscp" (Q/R
- SCP) and has been refactored into a simple class structure that
- offers a clean API for exchanging the index file
- back-end. Minimal support for compressed transfer syntaxes has
- been added. The tool can now also be started by root and change
- privileges to a different user and group specified in the config
- file.
-
- * New tool pdf2dcm allows to convert PDF files to DICOM
- Encapsulated PDF Storage SOP instances.
-
- * New lossless JPEG encoder that guarantees "true lossless"
- compression in contrast to the old implementation which could
- cause rounding errors in certain cases.
-
- * StoreSCP now supports multi-process mode both on Posix and Win32
- platforms where a separate client process is forked for each
- incoming association. On Posix platforms, the tool can also be
- started from inetd.
-
- * New schema for include files. All includes files are now
- included as #include "dcmtk/module/file.h", e.g. #include
- "dcmtk/dcmdata/dctk.h". This allows the DCMTK header files to be
- installed in a public directory such as /usr/local/include and
- eliminates the risk of name clashes.
-
- * DcmFileFormat::loadFile can now be prevented from attempting to
- load non-part 10 files as DICOM datasets. Many tools support a
- corresponding command line option "--read-file-only".
-
- * Many tools support a new command line option that ignores the
- transfer syntax specified in the meta header and tries to detect
- the transfer syntax automatically from the dataset.
-
- * Added support for X-Ray Radiation Dose SR and Procedure Log SR
- documents in dcmsr module.
-
- * TLS module now supports AES ciphersuites if compiled with
- OpenSSL 0.9.7 or newer. All TLS-enabled tools now support the
- "AES TLS Secure Transport Connection Profile".
-
- * Added command line options for separate DIMSE and ACSE timeouts
- to many tools
-
- * The dcmdata module now supports an automatic re-conversion of
- defined length UN elements read in an explicit VR transfer
- syntax, if the real VR is defined in the data dictionary. A
- corresponding command line option "--convert-un" is available in
- dcmdump and dcmconv.
-
- * Compilation with OpenSSL 0.9.8, which introduces an incompatible
- API change, is now supported.
-
- * Network tools support transmission and receipt of JPEG 2000
- transfer syntaxes.
-
- * DICOMDIR tools and classes now support Encapsulated Document,
- Real World Value Mapping, Hanging Protocol and Color
- Presentation State objects.
-
- * The toolkit can now read DICOM files in which the meta header
- group length attribute (0002,0000) is absent, based on a
- heuristic that checks for group 0002 attribute tags.
-
- * Added option --read-dataset to dcmdjpeg that allows to
- decompress JPEG compressed DICOM objects that have been stored
- as dataset without meta-header.
-
- * Added support for reading UN elements with undefined length
- according to CP 246. A flag allows to revert to the prior
- behaviour in which UN elements with undefined length were parsed
- like a normal explicit VR SQ element.
-
- * Added support for new Media Storage Application Profiles
- according to DICOM PS 3.12-2004. Removed support for
- non-standard conformant "No profile".
-
- * The DICOM data dictionary has been re-worked based on the latest
- supplements and correction proposals, as usual.
-
- * Many bug fixes and minor improvements as usual - see the
- /usr/share/doc/dcmtk/changelog.gz file for more details.
-
- -- Juergen Salk <jsa at debian.org> Tue, 20 Dec 2005 20:29:15 +0000
Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk.README.Debian
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk.README.Debian 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk.README.Debian 2013-05-16 11:17:32 UTC (rev 13596)
@@ -36,7 +36,7 @@
DCMTK optionally supports Wietse Venema's TCP wrappers library
(libwrap) which is freely available for most Unix platforms and part
of the default installation of most recent Linux distributions. This
-library allows to enforce host-based access control via the
+library allows one to enforce host-based access control via the
"/etc/hosts_deny" and "/etc/hosts_allow" configuration files. The
Debian DCMTK package has been compiled with TCP wrapper support
enabled. See hosts_access(5) man page for details.
@@ -147,56 +147,4 @@
http://forum.dcmtk.org/
-
-Debian specific notes:
-
-The upstream sources are not packaging friendly in terms of the Unix Filesystem
-Hierarchy Standard (see e.g. http://www.pathname.com/fhs/). There is currently no
-straightforward way to install DCMTK in compliance with the FHS without kludging
-the build scripts in some way.
-
-Thus, the Debian DCMTK source package includes a number of patches to change the
-semantics of the --libdir and --datadir configure options in order to
-separate read-only architecture-independent data (e.g. the dicom.dic DICOM
-dictionary) from architecture-dependent object libraries.
-For backward compatibility, the original (i.e. violating FSH) behavior is
-preserved in case ./configure is invoked without --prefix option.
-
-The Debian packages have been configured with the following options:
-
-./configure --prefix=/usr \
- --exec-prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --includedir=/usr/include/dcmtk \
- --libdir=/usr/lib \
- --datadir=/usr/share \
- --sysconfdir=/etc/dcmtk \
- --with-private-tags \
- --with-libtiff \
- --with-zlib \
- --with-libpng \
- --with-libxml \
- --with-libwrap \
- --with-openssl
-
-
-There is currently no official support for shared libraries in DCMTK.
-We had to perfom some magic to have the DCMTK end user utilies
-linked dynamically against shared DCMTK library versions without
-forcing the utilities themselves to be compiled with -fPIC (which
-would impose some performance penalty upon them).
-In a first step we adjust config/Makefile.def to build the shared
-libraries with -fPIC. 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 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
-utilities dynamically against the shared library versions.
-
-
- -- Juergen Salk <juergen.salk at gmx.de> Thu, 22 Dec 2005 22:58:03 +0100
-
-
+ -- Mathieu Malaterre <malat at debian.org> Wed, 15 May 2013 10:34:58 +0200
Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install 2013-05-16 11:17:32 UTC (rev 13596)
@@ -1,7 +1,7 @@
usr/share/man/man1/*.1
#doxygen/manpages/man1/*.1
usr/bin/*
-usr/etc/dcmtk/*
+etc/dcmtk/*
usr/share/dcmtk/*.css
usr/share/dcmtk/*.dump
usr/share/dcmtk/*.lut
@@ -11,4 +11,3 @@
usr/share/dcmtk/dumppat.txt
usr/share/dcmtk/wlistdb
usr/share/dcmtk/wlistqry
-usr/share/doc/dcmtk/*
Modified: trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.lintian-overrides
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.lintian-overrides 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.lintian-overrides 2013-05-16 11:17:32 UTC (rev 13596)
@@ -1,4 +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 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
+libdcmtk3: package-name-doesnt-match-sonames
+libdcmtk3: embedded-library
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-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/01_fix_perl_script_path.patch 2013-05-16 11:17:32 UTC (rev 13596)
@@ -2,6 +2,7 @@
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.
+Forwarded: no
Index: dcmtk-3.6.1_20121102/dcmwlm/perl/changepw.pl
===================================================================
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/02_dcmtk_3.6.0-1.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/02_dcmtk_3.6.0-1.patch 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/02_dcmtk_3.6.0-1.patch 2013-05-16 11:17:32 UTC (rev 13596)
@@ -2,6 +2,7 @@
Description: The original maintainer Jürgen Salk applied
a set of patches to the original code. This file contains
changes to C++ code
+Forwarded: no
Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg
===================================================================
Deleted: trunk/packages/dcmtk/branches/experimental/debian/patches/04_nostrip.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/04_nostrip.patch 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/04_nostrip.patch 2013-05-16 11:17:32 UTC (rev 13596)
@@ -1,171 +0,0 @@
-Remove all hardcoded calls to `strip` command
-
-Index: dcmtk-3.6.1_20120222/config/templates/Makefile.src
-===================================================================
---- dcmtk-3.6.1_20120222.orig/config/templates/Makefile.src 2011-07-06 16:23:01.000000000 +0200
-+++ dcmtk-3.6.1_20120222/config/templates/Makefile.src 2012-03-06 18:56:00.000000000 +0100
-@@ -31,7 +31,7 @@
- install-bin: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmdata/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmdata/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
-+++ dcmtk-3.6.1_20120222/dcmdata/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -77,7 +77,7 @@
- install-bin: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmimage/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmimage/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
-+++ dcmtk-3.6.1_20120222/dcmimage/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -43,7 +43,7 @@
- install: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmimgle/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmimgle/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
-+++ dcmtk-3.6.1_20120222/dcmimgle/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -39,7 +39,7 @@
- install: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmjpeg/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmjpeg/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
-+++ dcmtk-3.6.1_20120222/dcmjpeg/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -73,7 +73,7 @@
- install: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmnet/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmnet/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
-+++ dcmtk-3.6.1_20120222/dcmnet/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -69,7 +69,7 @@
- install: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmpstat/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmpstat/apps/Makefile.in 2012-01-06 12:52:21.000000000 +0100
-+++ dcmtk-3.6.1_20120222/dcmpstat/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -121,7 +121,7 @@
- install: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmqrdb/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmqrdb/apps/Makefile.in 2011-10-27 11:58:46.000000000 +0200
-+++ dcmtk-3.6.1_20120222/dcmqrdb/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -57,7 +57,7 @@
- install: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmsign/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmsign/apps/Makefile.in 2011-10-27 11:58:46.000000000 +0200
-+++ dcmtk-3.6.1_20120222/dcmsign/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -33,7 +33,7 @@
- install: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmsr/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmsr/apps/Makefile.in 2012-01-06 12:52:18.000000000 +0100
-+++ dcmtk-3.6.1_20120222/dcmsr/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -49,7 +49,7 @@
- install-bin: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmwlm/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmwlm/apps/Makefile.in 2011-10-27 11:58:46.000000000 +0200
-+++ dcmtk-3.6.1_20120222/dcmwlm/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -51,7 +51,7 @@
- install: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmwlm/wwwapps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmwlm/wwwapps/Makefile.in 2011-10-27 11:58:46.000000000 +0200
-+++ dcmtk-3.6.1_20120222/dcmwlm/wwwapps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -54,7 +54,7 @@
- install: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
-Index: dcmtk-3.6.1_20120222/dcmjpls/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmjpls/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
-+++ dcmtk-3.6.1_20120222/dcmjpls/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
-@@ -70,7 +70,7 @@
- install: all
- $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for prog in $(progs); do \
-- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- done
-
-
Deleted: trunk/packages/dcmtk/branches/experimental/debian/patches/05_no_www_docs.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/05_no_www_docs.patch 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/05_no_www_docs.patch 2013-05-16 11:17:32 UTC (rev 13596)
@@ -1,27 +0,0 @@
-Index: dcmtk-3.6.1_20120222/dcmwlm/docs/Makefile.in
-===================================================================
---- dcmtk-3.6.1_20120222.orig/dcmwlm/docs/Makefile.in 2007-11-23 17:30:50.000000000 +0100
-+++ dcmtk-3.6.1_20120222/dcmwlm/docs/Makefile.in 2012-03-06 18:56:07.000000000 +0100
-@@ -11,7 +11,8 @@
-
- include $(configdir)/@common_makefile@
-
--files = wwwapp.txt
-+## we use debhelper for this doc which goes to the dcmtk-www package
-+# files = wwwapp.txt
-
-
- all:
-Index: dcmtk-3.6.1_20120222/config/rootconf
-===================================================================
---- dcmtk-3.6.1_20120222.orig/config/rootconf 2011-10-27 11:28:57.000000000 +0200
-+++ dcmtk-3.6.1_20120222/config/rootconf 2012-03-06 18:56:08.000000000 +0100
-@@ -76,7 +76,7 @@
-
- dcmtk-install-doc:
- \$(configdir)/mkinstalldirs \$(DESTDIR)\$(docdir)
-- for file in ANNOUNCE.\$(PACKAGE_VERSION_NUMBER) CHANGES.\$(PACKAGE_VERSION_NUMBER) COPYRIGHT FAQ HISTORY VERSION; do \\
-+ for file in ANNOUNCE.\$(PACKAGE_VERSION_NUMBER) CHANGES.\$(PACKAGE_VERSION_NUMBER) FAQ HISTORY VERSION; do \\
- \$(INSTALL_DATA) \$\$file \$(DESTDIR)\$(docdir) ;\\
- done
-
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch 2013-05-16 11:17:32 UTC (rev 13596)
@@ -1,5 +1,6 @@
Description: Use graphviz and prefer SVG output
Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
Index: dcmtk-3.6.1_20121102/doxygen/htmldocs.cfg
===================================================================
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch 2013-05-16 11:17:32 UTC (rev 13596)
@@ -1,30 +1,10 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- 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)
+Description: Use SOP Class UID print option
Author: Mathieu Malaterre <malat at debian.org>
+Origin: upstream
+Bug-Debian: http://bugs.debian.org/
+Bug-Ubuntu: https://launchpad.net/bugs/706062
+Forwarded: not-needed
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
--- dcmtk-3.6.1~20121102.orig/CMake/3rdparty.cmake
+++ dcmtk-3.6.1~20121102/CMake/3rdparty.cmake
@@ -23,10 +23,11 @@ IF(WIN32)
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/prefs.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/prefs.patch 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/prefs.patch 2013-05-16 11:17:32 UTC (rev 13596)
@@ -2,6 +2,7 @@
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.
+Forwarded: no
Index: dcmtk-3.6.1_20121102/dcmwlm/perl/prefs.ph
===================================================================
Modified: trunk/packages/dcmtk/branches/experimental/debian/rules
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/rules 2013-05-16 10:52:20 UTC (rev 13595)
+++ trunk/packages/dcmtk/branches/experimental/debian/rules 2013-05-16 11:17:32 UTC (rev 13596)
@@ -5,13 +5,13 @@
export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
# deduce documentation option (build-indep target)
-#ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
-# BUILDDOC = OFF
-#else
-# BUILDDOC = ON
-#endif
+ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
+ BUILDDOC = OFF
+else
+ BUILDDOC = ON
+endif
# currently need doxygen to build man page
-BUILDDOC = ON
+#BUILDDOC = ON
%:
dh $@ --parallel --buildsystem=cmake
@@ -35,8 +35,8 @@
dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
override_dh_auto_build-arch:
- # need man page in arch dependendant packages:
- $(MAKE) -C obj-* man
+ # need man page in -arch packages:
+ #$(MAKE) -C obj-* man
dh_auto_build
# Let's be smart with building doc
@@ -47,8 +47,10 @@
override_dh_auto_test-indep:
override_dh_install:
+ dh_install --list-missing
chmod +x debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/*
- dh_install --list-missing
+ # ??
+ mv debian/dcmtk/usr/etc debian/dcmtk/etc
override_dh_strip:
dh_strip --dbg-package=libdcmtk3-dbg
More information about the debian-med-commit
mailing list