Author: tille
Date: 2015-07-19 10:50:03 +0000 (Sun, 19 Jul 2015)
New Revision: 19666

Modified:
   trunk/packages/dicom3tools/trunk/debian/changelog
   trunk/packages/dicom3tools/trunk/debian/rules
Log:
debian/rules: short dh


Modified: trunk/packages/dicom3tools/trunk/debian/changelog
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/changelog   2015-07-18 21:48:40 UTC 
(rev 19665)
+++ trunk/packages/dicom3tools/trunk/debian/changelog   2015-07-19 10:50:03 UTC 
(rev 19666)
@@ -5,6 +5,7 @@
   * Priority: optional
   * cme fix dpkg-control
   * DEP5 copyright
+  * debian/rules: short dh
 
  -- Andreas Tille <[email protected]>  Sat, 18 Jul 2015 18:19:19 +0200
 

Modified: trunk/packages/dicom3tools/trunk/debian/rules
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/rules       2015-07-18 21:48:40 UTC 
(rev 19665)
+++ trunk/packages/dicom3tools/trunk/debian/rules       2015-07-19 10:50:03 UTC 
(rev 19666)
@@ -24,51 +24,22 @@
 DCLIST = -name andump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name 
dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name 
dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name 
dcstats\* -o -name dctable\* -o -name dctopgm8\* -o -name dcposn\* -o -name 
dctopgx\* -o -name dctopnm\* -o -name dcunrgb\*
 endif
 
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-       dh_testdir
+%:
+       dh $@
+
+override_dh_auto_configure:
        # http://www.gnu.org/manual/gawk/html_node/Special-FD.html
        find . -name \*.awk -exec sed -i -e 's@/dev/tty@/dev/stderr@g' {} \;
-       # Add here commands to configure the package.
        sh Configure
        imake -I./config -DTmpPath=/tmp -DOptimizeLevel=-O2 $(IMAKEFLAGS)
-       touch configure-stamp
 
-build: build-stamp
-build-stamp: configure-stamp
-       dh_testdir
-       # Add here commands to compile the package.
+override_dh_auto_build:
        $(MAKE) World C_DEBUGFLAGS="$(CFLAGS)" 
CPLUSPLUS_DEBUGFLAGS="$(CXXFLAGS)" C_EXTRA_LOAD_FLAGS="$(LDFLAGS)" 
CPLUSPLUS_EXTRA_LOAD_FLAGS="$(LDFLAGS)"
-       touch $@
 
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-       [ ! -f Makefile ] || $(MAKE) clean
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       #dh_clean -k 
-       dh_prep
-       dh_installdirs
-
-       # Add here commands to install the package into debian/dicom3tools.
-       # install everything
-       $(MAKE) DESTDIR=$(CURDIR)/debian/dicom3tools install
-       # install man pages:
+override_dh_installman:
        $(MAKE) DESTDIR=$(CURDIR)/debian/dicom3tools install.man
        # remove empty man page
        find $(CURDIR)/debian/dicom3tools -type f -size 0 -print | xargs rm
-       # now that we have removed empty man page, we need to remove associated 
binaries
-       for file in ancp andiff antodc.all binpatch dcanon dcburn dccmp dccomb 
dcdecmpr dcdiff dclutburn \
-                                                       dclutmix dcmvhier.8only 
dcmvhier.all dcortho dcostosr dcpost dcproj dcrmsfx.all \
-                                                       dcsrmrg dcsub dcswab 
dcunjpeg.all dumptiff dumpwhat gentodc.dat.all \
-                                                       jpegsplit pbmswbit 
pgmtobmp pnmpred pqsplit rawarith rawdiff rawmask; do \
-               find $(CURDIR)/debian/dicom3tools -type f -name $$file\* -print 
| xargs rm; \
-       done
        # Move the special .so (groff source file to /usr/share/dicom3tools to 
please lintian
        mkdir -p $(CURDIR)/debian/dicom3tools/usr/share/dicom3tools
        mv $(CURDIR)/debian/dicom3tools/usr/share/man/man1/*.so 
$(CURDIR)/debian/dicom3tools/usr/share/dicom3tools
@@ -85,36 +56,21 @@
        # Remove (except special list from official upstream releases) :
        find $(CURDIR)/debian/dicom3tools/usr/bin -type f -not \( $(DCLIST) \) 
-print | xargs rm;
        find $(CURDIR)/debian/dicom3tools/usr/share/man -type f -not \( 
$(DCLIST) \) -print | xargs rm;
+
+override_dh_install:
+       dh_install
+       # now that we have removed empty man page, we need to remove associated 
binaries
+       for file in ancp andiff antodc.all binpatch dcanon dcburn dccmp dccomb 
dcdecmpr dcdiff dclutburn \
+                                                       dclutmix dcmvhier.8only 
dcmvhier.all dcortho dcostosr dcpost dcproj dcrmsfx.all \
+                                                       dcsrmrg dcsub dcswab 
dcunjpeg.all dumptiff dumpwhat gentodc.dat.all \
+                                                       jpegsplit pbmswbit 
pgmtobmp pnmpred pqsplit rawarith rawdiff rawmask; do \
+               find $(CURDIR)/debian/dicom3tools -type f -name $$file\* -print 
| xargs rm; \
+       done
        # Remove all static lib
        rm -rf $(CURDIR)/debian/dicom3tools/usr/lib
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-build-arch: build
-build-indep: build
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
+override_dh_installchangelogs:
        dh_installchangelogs CHANGES
-       dh_installdocs
-       dh_installexamples
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
 
 get-orig-source:
        uscan --verbose --force-download --rename --destdir ../tarballs
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure


_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to