Author: malat
Date: 2013-05-16 12:31:48 +0000 (Thu, 16 May 2013)
New Revision: 13597
Modified:
trunk/packages/dcmtk/branches/experimental/debian/control
trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.doc-base
trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.docs
trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
trunk/packages/dcmtk/branches/experimental/debian/rules
Log:
Fix indep rules
Modified: trunk/packages/dcmtk/branches/experimental/debian/control
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/control 2013-05-16
11:17:32 UTC (rev 13596)
+++ trunk/packages/dcmtk/branches/experimental/debian/control 2013-05-16
12:31:48 UTC (rev 13597)
@@ -14,8 +14,8 @@
libtiff4-dev,
libwrap0-dev,
libxml2-dev,
- zlib1g-dev, doxygen (>= 1.7.4), graphviz
-#Build-Depends-Indep: doxygen (>= 1.7.4), graphviz
+ zlib1g-dev
+Build-Depends-Indep: doxygen (>= 1.7.4), graphviz
Standards-Version: 3.9.4
Vcs-Browser:
http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dcmtk/branches/experimental
Vcs-Svn:
svn://svn.debian.org/debian-med/trunk/packages/dcmtk/branches/experimental
Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.doc-base
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.doc-base
2013-05-16 11:17:32 UTC (rev 13596)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.doc-base
2013-05-16 12:31:48 UTC (rev 13597)
@@ -8,5 +8,5 @@
Section: Science/Medicine
Format: HTML
-Index: /usr/share/doc/dcmtk/html/index.html
-Files: /usr/share/doc/dcmtk/html/*
+Index: /usr/share/doc/dcmtk-doc/html/index.html
+Files: /usr/share/doc/dcmtk-doc/html/*
Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.docs
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.docs
2013-05-16 11:17:32 UTC (rev 13596)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.docs
2013-05-16 12:31:48 UTC (rev 13597)
@@ -1 +1 @@
-usr/share/doc/dcmtk/*
+debian/tmp/usr/share/doc/dcmtk/html
Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
2013-05-16 11:17:32 UTC (rev 13596)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
2013-05-16 12:31:48 UTC (rev 13597)
@@ -11,3 +11,4 @@
usr/share/dcmtk/dumppat.txt
usr/share/dcmtk/wlistdb
usr/share/dcmtk/wlistqry
+usr/share/doc/dcmtk/*
Modified: trunk/packages/dcmtk/branches/experimental/debian/rules
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/rules 2013-05-16
11:17:32 UTC (rev 13596)
+++ trunk/packages/dcmtk/branches/experimental/debian/rules 2013-05-16
12:31:48 UTC (rev 13597)
@@ -10,9 +10,11 @@
else
BUILDDOC = ON
endif
-# currently need doxygen to build man page
-#BUILDDOC = ON
+# when BUILDDOC==OFF, convenient copies of doxygen man pages are used
+# when BUILDDOC==ON, doxygen man pages are being regenerated, this may leads to
+# improper md5sum...
+
%:
dh $@ --parallel --buildsystem=cmake
@@ -27,10 +29,11 @@
-DDCMTK_WITH_ZLIB:BOOL=ON \
-DDCMTK_WITH_ICONV:BOOL=ON \
-DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_SKIP_RPATH:BOOL=OFF
+# -DCMAKE_INSTALL_PREFIX=/usr \
+
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
@@ -46,11 +49,18 @@
# No tests needed for docs
override_dh_auto_test-indep:
-override_dh_install:
+override_dh_auto_install-arch:
+ dh_auto_install
+ # ??
+ mv debian/tmp/usr/etc debian/tmp/
+
+override_dh_auto_install-indep:
+ #DESTDIR=debian/tmp $(MAKE) -C obj-*/doxygen install
+ DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install
+
+override_dh_install-arch:
dh_install --list-missing
chmod +x debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/*
- # ??
- mv debian/dcmtk/usr/etc debian/dcmtk/etc
override_dh_strip:
dh_strip --dbg-package=libdcmtk3-dbg
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
