Author: malat Date: 2013-05-29 12:39:32 +0000 (Wed, 29 May 2013) New Revision: 13745
Removed: trunk/packages/dcmtk/trunk/debian/libdcmtk-data.dirs trunk/packages/dcmtk/trunk/debian/libdcmtk-data.install Modified: trunk/packages/dcmtk/trunk/debian/changelog trunk/packages/dcmtk/trunk/debian/control trunk/packages/dcmtk/trunk/debian/libdcmtk2.dirs trunk/packages/dcmtk/trunk/debian/rules Log: Re-upload dcmtk. Closes: #709123 Modified: trunk/packages/dcmtk/trunk/debian/changelog =================================================================== --- trunk/packages/dcmtk/trunk/debian/changelog 2013-05-29 10:30:47 UTC (rev 13744) +++ trunk/packages/dcmtk/trunk/debian/changelog 2013-05-29 12:39:32 UTC (rev 13745) @@ -1,12 +1,12 @@ dcmtk (3.6.0-14) unstable; urgency=low - * Provide a libdcmtk-data, as per policy, section §8.2. Closes: #709123 + * Install *.dic within libdcmtk2/ as per policy, section §8.2. Closes: #709123 * Import patches from upstream: + d/p/fixnull.patch + d/p/noleak.patch + d/p/nothrow.patch - -- Mathieu Malaterre <ma...@debian.org> Tue, 28 May 2013 15:14:58 +0200 + -- Mathieu Malaterre <ma...@debian.org> Wed, 29 May 2013 14:38:44 +0200 dcmtk (3.6.0-13) unstable; urgency=low Modified: trunk/packages/dcmtk/trunk/debian/control =================================================================== --- trunk/packages/dcmtk/trunk/debian/control 2013-05-29 10:30:47 UTC (rev 13744) +++ trunk/packages/dcmtk/trunk/debian/control 2013-05-29 12:39:32 UTC (rev 13745) @@ -25,23 +25,10 @@ . Note: This version was compiled with libssl support. -Package: libdcmtk-data -Architecture: all -Depends: ${misc:Depends} -Replaces: libdcmtk2 (<= 3.6.0-13) -Breaks: libdcmtk2 (<= 3.6.0-13) -Description: OFFIS DICOM toolkit data dictionaries - 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 data dictionares for DCMTK. - Package: libdcmtk2 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libdcmtk-data (= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: dcmtk (<< 3.6.0) Description: OFFIS DICOM toolkit runtime libraries DCMTK includes a collection of libraries and applications for examining, Deleted: trunk/packages/dcmtk/trunk/debian/libdcmtk-data.dirs =================================================================== --- trunk/packages/dcmtk/trunk/debian/libdcmtk-data.dirs 2013-05-29 10:30:47 UTC (rev 13744) +++ trunk/packages/dcmtk/trunk/debian/libdcmtk-data.dirs 2013-05-29 12:39:32 UTC (rev 13745) @@ -1 +0,0 @@ -usr/share/dcmtk Deleted: trunk/packages/dcmtk/trunk/debian/libdcmtk-data.install =================================================================== --- trunk/packages/dcmtk/trunk/debian/libdcmtk-data.install 2013-05-29 10:30:47 UTC (rev 13744) +++ trunk/packages/dcmtk/trunk/debian/libdcmtk-data.install 2013-05-29 12:39:32 UTC (rev 13745) @@ -1 +0,0 @@ -dcmdata/data/*.dic usr/share/dcmtk Modified: trunk/packages/dcmtk/trunk/debian/libdcmtk2.dirs =================================================================== --- trunk/packages/dcmtk/trunk/debian/libdcmtk2.dirs 2013-05-29 10:30:47 UTC (rev 13744) +++ trunk/packages/dcmtk/trunk/debian/libdcmtk2.dirs 2013-05-29 12:39:32 UTC (rev 13745) @@ -1 +1,2 @@ usr/lib +usr/share/libdcmtk2 Modified: trunk/packages/dcmtk/trunk/debian/rules =================================================================== --- trunk/packages/dcmtk/trunk/debian/rules 2013-05-29 10:30:47 UTC (rev 13744) +++ trunk/packages/dcmtk/trunk/debian/rules 2013-05-29 12:39:32 UTC (rev 13745) @@ -12,7 +12,6 @@ # Package installation directories pkg=dcmtk PKGDIR_DCMTK=$(CURDIR)/debian/$(pkg) -PKGDIR_DCMTK_DATA=$(CURDIR)/debian/libdcmtk-data PKGDIR_DCMTK_LIB=$(CURDIR)/debian/libdcmtk2 PKGDIR_DCMTK_DEV=$(CURDIR)/debian/libdcmtk2-dev PKGDIR_DCMTK_DOC=$(CURDIR)/debian/$(pkg)-doc @@ -52,7 +51,7 @@ --infodir=\$${prefix}/share/info \ --includedir=\$${prefix}/include \ --libdir=\$${prefix}/lib \ - --datadir=\$${prefix}/share/dcmtk \ + --datadir=\$${prefix}/share/libdcmtk2 \ --sysconfdir=/etc/$(pkg) \ --with-private-tags \ --with-libxml \ @@ -187,6 +186,7 @@ dh_installman -a dh_install -a chmod 755 $(PKGDIR_DCMTK_WWW)/usr/lib/dcmtk/cgi-bin/*.p[lh] + mv $(PKGDIR_DCMTK)/usr/share/libdcmtk2/*.dic $(PKGDIR_DCMTK_LIB)/usr/share/libdcmtk2/ dh_link -a dh_lintian -a dh_strip --dbg-package=libdcmtk2-dbg -a _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit