Author: malat Date: 2013-04-22 08:59:28 +0000 (Mon, 22 Apr 2013) New Revision: 13375
Modified: trunk/packages/dcmtk/branches/experimental/debian/control trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install trunk/packages/dcmtk/branches/experimental/debian/rules Log: Fix installation Modified: trunk/packages/dcmtk/branches/experimental/debian/control =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/control 2013-04-22 08:36:06 UTC (rev 13374) +++ trunk/packages/dcmtk/branches/experimental/debian/control 2013-04-22 08:59:28 UTC (rev 13375) @@ -5,7 +5,7 @@ Uploaders: Juergen Salk <j...@debian.org>, Andreas Tille <ti...@debian.org>, Mathieu Malaterre <ma...@debian.org> -Build-Depends: cmake, +Build-Depends: cmake (>= 2.6.0), debhelper (>= 9), libcharls-dev, libpng-dev, @@ -54,7 +54,7 @@ Package: libdcmtk3-dev Section: libdevel Architecture: any -Depends: libdcmtk2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Depends: libdcmtk3 (= ${binary:Version}), ${misc:Depends} Conflicts: libdcmtk0-dev, libdcmtk1-dev Replaces: libdcmtk0-dev, libdcmtk1-dev Suggests: dcmtk-doc @@ -92,7 +92,7 @@ Section: doc Architecture: all Depends: ${misc:Depends} -Suggests: dcmtk, libdcmtk2-dev +Suggests: dcmtk, libdcmtk3-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, Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install 2013-04-22 08:36:06 UTC (rev 13374) +++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install 2013-04-22 08:59:28 UTC (rev 13375) @@ -2,3 +2,4 @@ usr/etc/dcmtk/* usr/share/dcmtk/* usr/share/doc/dcmtk/* +usr/share/man/man1/*.1 Modified: trunk/packages/dcmtk/branches/experimental/debian/rules =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/rules 2013-04-22 08:36:06 UTC (rev 13374) +++ trunk/packages/dcmtk/branches/experimental/debian/rules 2013-04-22 08:59:28 UTC (rev 13375) @@ -1,6 +1,9 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +# reduce overlinking: +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed + # deduce documentation option (build-indep target) ifeq "" "$(filter %-doc,$(shell dh_listpackages))" BUILDDOC = OFF @@ -11,6 +14,7 @@ %: dh $@ --parallel --buildsystem=cmake +# SKIP_RPATH=OFF to run test suite: CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DDCMTK_WITH_OPENSSL:BOOL=ON \ @@ -21,17 +25,11 @@ -DDCMTK_WITH_ZLIB:BOOL=ON \ -DDCMTK_WITH_ICONV:BOOL=ON \ -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \ - -DCMAKE_SKIP_RPATH:BOOL=ON + -DCMAKE_SKIP_RPATH:BOOL=OFF override_dh_auto_configure: dh_auto_configure -- $(CMAKE_EXTRA_FLAGS) -# remove tests for now -override_dh_auto_test: - -# dcmtk does not support shared libs right now (no SONAME) -override_dh_shlibdeps: - override_dh_install: dh_install --list-missing _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit