Author: tille Date: 2009-01-14 22:03:58 +0000 (Wed, 14 Jan 2009) New Revision: 2985
Added: trunk/packages/dcmtk/trunk/debian/dcmtk-www.docs trunk/packages/dcmtk/trunk/debian/dcmtk-www.install trunk/packages/dcmtk/trunk/debian/dcmtk.docs trunk/packages/dcmtk/trunk/debian/dcmtk.examples trunk/packages/dcmtk/trunk/debian/libdcmtk1.dirs trunk/packages/dcmtk/trunk/debian/patches/05_no_www_docs.patch trunk/packages/dcmtk/trunk/debian/patches/06_old_patches_from_diff_gz.patch Removed: trunk/packages/dcmtk/trunk/debian/dirs trunk/packages/dcmtk/trunk/debian/docs Modified: trunk/packages/dcmtk/trunk/debian/changelog trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS trunk/packages/dcmtk/trunk/debian/dcmtk.preinst trunk/packages/dcmtk/trunk/debian/patches/series trunk/packages/dcmtk/trunk/debian/rules Log: Several changes to simplify installation by using dh_install and fixing some lintian bugs (more to come) Modified: trunk/packages/dcmtk/trunk/debian/changelog =================================================================== --- trunk/packages/dcmtk/trunk/debian/changelog 2009-01-14 17:38:53 UTC (rev 2984) +++ trunk/packages/dcmtk/trunk/debian/changelog 2009-01-14 22:03:58 UTC (rev 2985) @@ -1,4 +1,4 @@ -dcmtk (3.5.4-4) UNRELEASED; urgency=low +dcmtk (3.5.4-4) unstable; urgency=low [Andreas Tille] * Group maintenance according to Debian-Med group policy @@ -7,6 +7,18 @@ * Standards-Version: 3.8.0 (no changes needed) * debhelper >= 5 * Add passive mode to watch file + * make use of dh_install + * debian/patches/05_no_www_docs.patch: Just do not install those + files we do not need in the docs of the package in the first + place instead of removing them later + * Removed some lintian warnings + * debian/patches/06_old_patches_from_diff_gz.patch: Move changes + from diff.gz to quilt patches + * Remove unused config files from previous versions according to + http://wiki.debian.org/DpkgConffileHandling + (The former handling in preinst triggered a lintian error) + * debian/dcmtk.NEWS: Reformating according to developers reference + 6.3.4. Supplementing changelogs with NEWS.Debian files [Mathieu Malaterre] * debian/rules would not honor DEB_BUILD_OPTIONS=nostrip, since Added: trunk/packages/dcmtk/trunk/debian/dcmtk-www.docs =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk-www.docs (rev 0) +++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.docs 2009-01-14 22:03:58 UTC (rev 2985) @@ -0,0 +1 @@ +dcmwlm/docs/wwwapp.txt Added: trunk/packages/dcmtk/trunk/debian/dcmtk-www.install =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk-www.install (rev 0) +++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.install 2009-01-14 22:03:58 UTC (rev 2985) @@ -0,0 +1,6 @@ +dcmwlm/wwwapps/preplock usr/lib/cgi-bin/dcmtk_wlm +dcmwlm/wwwapps/readoviw usr/lib/cgi-bin/dcmtk_wlm +dcmwlm/wwwapps/readwlst usr/lib/cgi-bin/dcmtk_wlm +dcmwlm/wwwapps/writwlst usr/lib/cgi-bin/dcmtk_wlm +dcmwlm/perl/* usr/lib/cgi-bin/dcmtk_wlm +dcmwlm/images/* var/www/dcmtk_wlm Modified: trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS 2009-01-14 17:38:53 UTC (rev 2984) +++ trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS 2009-01-14 22:03:58 UTC (rev 2985) @@ -1,6 +1,7 @@ -Version 3.5.4 of the OFFIS DCMTK (DICOM ToolKit) software includes -the following main changes over the previous version (Version 3.5.3): +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 @@ -85,3 +86,4 @@ * Many bug fixes and minor improvements as usual - see the /usr/share/doc/dcmtk/changelog.gz file for more details. + -- Juergen Salk <[email protected]> Tue, 20 Dec 2005 20:29:15 +0000 Added: trunk/packages/dcmtk/trunk/debian/dcmtk.docs =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk.docs (rev 0) +++ trunk/packages/dcmtk/trunk/debian/dcmtk.docs 2009-01-14 22:03:58 UTC (rev 2985) @@ -0,0 +1,2 @@ +FAQ +README Added: trunk/packages/dcmtk/trunk/debian/dcmtk.examples =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk.examples (rev 0) +++ trunk/packages/dcmtk/trunk/debian/dcmtk.examples 2009-01-14 22:03:58 UTC (rev 2985) @@ -0,0 +1,2 @@ +dcmwlm/wlistdb +dcmwlm/wlistqry Modified: trunk/packages/dcmtk/trunk/debian/dcmtk.preinst =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk.preinst 2009-01-14 17:38:53 UTC (rev 2984) +++ trunk/packages/dcmtk/trunk/debian/dcmtk.preinst 2009-01-14 22:03:58 UTC (rev 2985) @@ -1,17 +1,23 @@ -#!/bin/sh +#!/bin/sh -e - # Prepare to handle imagectn -> dcmqrdb (3.5.3 -> 3.5.4) transition # without triggering a dpkg question -# # Adapted from http://www.dpkg.org/ConffileHandling +# # Adapted from http://wiki.debian.org/DpkgConffileHandling -prep_mv_conffile() { - CONFFILE="$1" +PKGNAME=dcmtk +# Remove a no-longer used conffile +rm_conffile() { + CONFFILE="$2" if [ -e "$CONFFILE" ]; then md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`" - if [ "$md5sum" = "$old_md5sum" ]; then + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." rm -f "$CONFFILE" fi fi Deleted: trunk/packages/dcmtk/trunk/debian/dirs =================================================================== --- trunk/packages/dcmtk/trunk/debian/dirs 2009-01-14 17:38:53 UTC (rev 2984) +++ trunk/packages/dcmtk/trunk/debian/dirs 2009-01-14 22:03:58 UTC (rev 2985) @@ -1,2 +0,0 @@ -usr/bin -usr/sbin Deleted: trunk/packages/dcmtk/trunk/debian/docs =================================================================== --- trunk/packages/dcmtk/trunk/debian/docs 2009-01-14 17:38:53 UTC (rev 2984) +++ trunk/packages/dcmtk/trunk/debian/docs 2009-01-14 22:03:58 UTC (rev 2985) @@ -1,2 +0,0 @@ -FAQ -README Added: trunk/packages/dcmtk/trunk/debian/libdcmtk1.dirs =================================================================== --- trunk/packages/dcmtk/trunk/debian/libdcmtk1.dirs (rev 0) +++ trunk/packages/dcmtk/trunk/debian/libdcmtk1.dirs 2009-01-14 22:03:58 UTC (rev 2985) @@ -0,0 +1 @@ +usr/lib Added: trunk/packages/dcmtk/trunk/debian/patches/05_no_www_docs.patch =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/05_no_www_docs.patch (rev 0) +++ trunk/packages/dcmtk/trunk/debian/patches/05_no_www_docs.patch 2009-01-14 22:03:58 UTC (rev 2985) @@ -0,0 +1,23 @@ +--- dcmtk-3.5.4.orig/dcmwlm/docs/Makefile.in ++++ dcmtk-3.5.4/dcmwlm/docs/Makefile.in +@@ -12,7 +12,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: +--- dcmtk-3.5.4.orig/config/rootconf ++++ dcmtk-3.5.4/config/rootconf +@@ -64,7 +64,7 @@ + + dcmtk-install-doc: + \$(configdir)/mkinstalldirs \$(docdir) +- for file in COPYRIGHT FAQ HISTORY; do \\ ++ for file in FAQ HISTORY; do \\ + \$(INSTALL_DATA) \$\$file \$(docdir) ;\\ + done + Added: trunk/packages/dcmtk/trunk/debian/patches/06_old_patches_from_diff_gz.patch =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/06_old_patches_from_diff_gz.patch (rev 0) +++ trunk/packages/dcmtk/trunk/debian/patches/06_old_patches_from_diff_gz.patch 2009-01-14 22:03:58 UTC (rev 2985) @@ -0,0 +1,12 @@ +--- dcmtk-3.5.4.orig/CHANGES.354 ++++ dcmtk-3.5.4/CHANGES.354 +@@ -1,3 +1,9 @@ ++**** Changes from 2006.01.17 (onken) ++ ++- Fixed "--key" option, which was broken when using the optional assignment ++ ("=") operation inside the option value. ++ Affects: dcmnet/apps/movescu.cc ++ dcmnet/apps/findscu.cc + + Release 3.5.4 (Public Release - 2005-12-20) + Modified: trunk/packages/dcmtk/trunk/debian/patches/series =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/series 2009-01-14 17:38:53 UTC (rev 2984) +++ trunk/packages/dcmtk/trunk/debian/patches/series 2009-01-14 22:03:58 UTC (rev 2985) @@ -3,3 +3,5 @@ # 02_config_cfunix_h.patch #03_dcmdata_libsrc_dcdictbi.patch 04_nostrip.patch +05_no_www_docs.patch +06_old_patches_from_diff_gz.patch Modified: trunk/packages/dcmtk/trunk/debian/rules =================================================================== --- trunk/packages/dcmtk/trunk/debian/rules 2009-01-14 17:38:53 UTC (rev 2984) +++ trunk/packages/dcmtk/trunk/debian/rules 2009-01-14 22:03:58 UTC (rev 2985) @@ -94,7 +94,6 @@ build-indep-stamp: dh_testdir - # Add here commands to compile/build the arch indep package. $(MAKE) html touch build-indep-stamp @@ -107,10 +106,8 @@ dh_testroot rm -f build-arch-stamp build-indep-stamp config/config.status - # Add here commands to clean up after the build process. + [ ! -f config/Makefile.def ] || $(MAKE) distclean - -$(MAKE) distclean - # Do not forget to remove shared libs as well find $(CURDIR) -name '*.so' -exec rm -f \{\} \; @@ -141,13 +138,11 @@ dh_clean -k dh_installdirs -a - # Add here commands to install the 'make install'-able part of the packages ... - $(MAKE) install DESTDIR=$(PKGDIR_DCMTK) && \ $(MAKE) install-lib DESTDIR=$(PKGDIR_DCMTK_DEV) # Do not forget to install the shared libs as well - install -d $(PKGDIR_DCMTK_LIB)/usr/lib && \ + # TODO: make use of d-shlibs (andreas tille) find $(CURDIR) -path $(CURDIR)/debian -prune -o \ -name 'lib*.so' -exec install -s -m 644 \{\} $(PKGDIR_DCMTK_LIB)/usr/lib \; @@ -159,37 +154,7 @@ ln -sf `basename \$$i.1.0.0` $$i.1; \ done - # Remove misplaced files ... - # wwwapp.txt belongs to dcmtk-www package - [ -w "$(PKGDIR_DCMTK)/usr/share/doc/wwwapp.txt" ] && \ - rm -f $(PKGDIR_DCMTK)/usr/share/doc/wwwapp.txt - - # COPYRIGHT file is already included in debian/copyright - [ -w "$(PKGDIR_DCMTK)/usr/share/doc/COPYRIGHT" ] && \ - rm -f $(PKGDIR_DCMTK)/usr/share/doc/COPYRIGHT - - # Add here commands to install the not-'make install'-able part of the packages... - - install -d $(PKGDIR_DCMTK)/var/lib/dcmtk/db/READWRITE && \ - install -d $(PKGDIR_DCMTK)/var/lib/dcmtk/db/READ && \ - install -d $(PKGDIR_DCMTK)/usr/share/doc/dcmtk/examples/wlistdb && \ - install -d $(PKGDIR_DCMTK)/usr/share/doc/dcmtk/examples/wlistqry && \ - install -d $(PKGDIR_DCMTK)/var/lib/dcmtk/wl-data && \ - install -d $(PKGDIR_DCMTK_WWW)/usr/lib/cgi-bin/dcmtk_wlm && \ - install -d $(PKGDIR_DCMTK_WWW)/var/www/dcmtk_wlm && \ - install -d $(PKGDIR_DCMTK_WWW)/usr/share/doc/dcmtk-www && \ - cp -rf dcmwlm/wlistdb/* $(PKGDIR_DCMTK)/usr/share/doc/dcmtk/examples/wlistdb && \ - cp -rf dcmwlm/wlistqry/* $(PKGDIR_DCMTK)/usr/share/doc/dcmtk/examples/wlistqry && \ - install -s -m 755 dcmwlm/wwwapps/preplock $(PKGDIR_DCMTK_WWW)/usr/lib/cgi-bin/dcmtk_wlm && \ - install -s -m 755 dcmwlm/wwwapps/readoviw $(PKGDIR_DCMTK_WWW)/usr/lib/cgi-bin/dcmtk_wlm && \ - install -s -m 755 dcmwlm/wwwapps/readwlst $(PKGDIR_DCMTK_WWW)/usr/lib/cgi-bin/dcmtk_wlm && \ - install -s -m 755 dcmwlm/wwwapps/writwlst $(PKGDIR_DCMTK_WWW)/usr/lib/cgi-bin/dcmtk_wlm && \ - install -m 755 dcmwlm/perl/* $(PKGDIR_DCMTK_WWW)/usr/lib/cgi-bin/dcmtk_wlm && \ - install -m 644 dcmwlm/images/* $(PKGDIR_DCMTK_WWW)/var/www/dcmtk_wlm && \ - install -m 644 dcmwlm/docs/wwwapp.txt $(PKGDIR_DCMTK_WWW)/usr/share/doc/dcmtk-www - - # Build architecture-independent files here. binary-indep: build-indep install-indep dh_testdir -i @@ -198,6 +163,7 @@ dh_installdocs -i dh_installexamples -i dh_installman -i + dh_install -i dh_link -i dh_strip -i dh_compress -i @@ -216,6 +182,7 @@ dh_installexamples -a dh_installinit -a --name=dcmqrscp dh_installman -a + dh_install -a dh_link -a dh_strip -a dh_compress -a _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
