[med-svn] r14558 - trunk/packages/dcmtk/branches/experimental/debian

[Mathieu Malaterre]

Author: malat
Date: 2013-09-04 07:11:02 +0000 (Wed, 04 Sep 2013)
New Revision: 14558

Modified:
   trunk/packages/dcmtk/branches/experimental/debian/changelog
   trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
   trunk/packages/dcmtk/branches/experimental/debian/rules
Log:
Prepare fix for build-indep rule

Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/changelog	2013-09-04 06:49:02 UTC (rev 14557)
+++ trunk/packages/dcmtk/branches/experimental/debian/changelog	2013-09-04 07:11:02 UTC (rev 14558)
@@ -1,3 +1,9 @@
+dcmtk (3.6.1~20121102-5) experimental; urgency=low
+
+  * Fix jquery.js removal when executing build-indep
+
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 04 Sep 2013 09:08:29 +0200
+
 dcmtk (3.6.1~20121102-4) experimental; urgency=low
 
   * Fix buffer overflow in StudyInstanceUID. Closes: #715011
@@ -4,7 +10,7 @@
   * Fix apache 2.4 transition. Closes: #669740
   * Fix -doc installation. Closes: #717968
 
- -- Mathieu Malaterre <malat at debian.org>  Fri, 05 Jul 2013 17:33:48 +0200
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 02 Sep 2013 11:13:46 +0200
 
 dcmtk (3.6.1~20121102-3) experimental; urgency=low
 

Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install	2013-09-04 06:49:02 UTC (rev 14557)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install	2013-09-04 07:11:02 UTC (rev 14558)
@@ -1,5 +1,4 @@
 usr/share/man/man1/*.1
-#doxygen/manpages/man1/*.1
 usr/bin/*
 etc/dcmtk/*
 usr/share/dcmtk/*.css

Modified: trunk/packages/dcmtk/branches/experimental/debian/rules
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/rules	2013-09-04 06:49:02 UTC (rev 14557)
+++ trunk/packages/dcmtk/branches/experimental/debian/rules	2013-09-04 07:11:02 UTC (rev 14558)
@@ -61,12 +61,13 @@
 override_dh_auto_install-indep:
 	#DESTDIR=debian/tmp $(MAKE) -C obj-*/doxygen install
 	DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install 
+	rm debian/dcmtk/usr/share/man/man1/_tmp_buildd*
 
 override_dh_installdocs:
 	dh_installdocs
 	# do the doxygen / jquery fix:
-	rm debian/dcmtk-doc/usr/share/doc/dcmtk-doc/html/jquery.js
-	dh_link usr/share/javascript/jquery/jquery.js usr/share/doc/dcmtk-doc/html/jquery.js
+	dh_clean -pdcmtk-doc debian/dcmtk-doc/usr/share/doc/dcmtk-doc/html/jquery.js
+	dh_link -pdcmtk-doc usr/share/javascript/jquery/jquery.js usr/share/doc/dcmtk-doc/html/jquery.js
 
 override_dh_install-arch:
 	dh_install --list-missing