[med-svn] r13410 - in trunk/packages/pixelmed/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2013-04-25 08:42:49 +0000 (Thu, 25 Apr 2013)
New Revision: 13410

Added:
   trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.doc-base
   trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.docs
   trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.javadoc
Modified:
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/control
   trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch
   trunk/packages/pixelmed/trunk/debian/rules
Log:
Prepare next upload

Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2013-04-25 08:21:39 UTC (rev 13409)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2013-04-25 08:42:49 UTC (rev 13410)
@@ -1,8 +1,9 @@
-pixelmed (20130220-1) UNRELEASED; urgency=low
+pixelmed (20130220-1) unstable; urgency=low
 
   * New upstream
+  * Add -doc package for documentation
 
- -- Mathieu Malaterre <malat at debian.org>  Wed, 24 Apr 2013 15:20:43 +0200
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 25 Apr 2013 10:41:55 +0200
 
 pixelmed (20120508-1) unstable; urgency=low
 

Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control	2013-04-25 08:21:39 UTC (rev 13409)
+++ trunk/packages/pixelmed/trunk/debian/control	2013-04-25 08:42:49 UTC (rev 13410)
@@ -12,8 +12,8 @@
 Homepage: http://www.pixelmed.com
 
 Package: pixelmed-java
+Architecture: all
 Section: java
-Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Suggests: libjai-imageio-core-java
 Description: DICOM implementation containing Image Viewer and a ECG Viewer
@@ -21,3 +21,16 @@
  and creating DICOM data, DICOM network and file support, a database of
  DICOM objects, support for display of directories, images, reports and
  spectra, and DICOM object validation.
+
+Package: pixelmed-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: pixelmed-java
+Description: DICOM implementation containing Image Viewer and a ECG Viewer - doc
+ This is a stand-alone DICOM toolkit that implements code for reading
+ and creating DICOM data, DICOM network and file support, a database of
+ DICOM objects, support for display of directories, images, reports and
+ spectra, and DICOM object validation.
+ .
+ This is the documentation package for pixelmed-java

Modified: trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch	2013-04-25 08:21:39 UTC (rev 13409)
+++ trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch	2013-04-25 08:42:49 UTC (rev 13410)
@@ -40,7 +40,7 @@
  SERVERADDITIONALJARS = ${VIEWERADDITIONALJARS}
  
 -JAVAVERSIONTARGET=1.5
-+JAVAVERSIONTARGET=1.7
++JAVAVERSIONTARGET=1.5
  
  JAVACTARGETOPTIONS=-target ${JAVAVERSIONTARGET} -source ${JAVAVERSIONTARGET}
  

Added: trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.doc-base
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.doc-base	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.doc-base	2013-04-25 08:42:49 UTC (rev 13410)
@@ -0,0 +1,9 @@
+Document: pixelmed-java-doc
+Title: API JavaDoc for pixelmed-java
+Author: David Clunie
+Abstract: This the API JavaDoc for pixelmed-java
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/pixelmed-java-doc/index.html
+Files: /usr/share/doc/pixelmed-java-doc/*.html

Added: trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.docs
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.docs	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.docs	2013-04-25 08:42:49 UTC (rev 13410)
@@ -0,0 +1 @@
+docs/javadoc/*

Added: trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.javadoc
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.javadoc	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.javadoc	2013-04-25 08:42:49 UTC (rev 13410)
@@ -0,0 +1 @@
+com.pixelmed

Modified: trunk/packages/pixelmed/trunk/debian/rules
===================================================================
--- trunk/packages/pixelmed/trunk/debian/rules	2013-04-25 08:21:39 UTC (rev 13409)
+++ trunk/packages/pixelmed/trunk/debian/rules	2013-04-25 08:42:49 UTC (rev 13410)
@@ -6,6 +6,12 @@
 %:
 	dh $@ --with javahelper
 
+override_dh_auto_build-indep:
+	$(MAKE) javadoc
+
+# No tests needed for docs
+override_dh_auto_test-indep:
+
 override_dh_auto_test:
 	cd com/pixelmed/test/ && $(MAKE) alltests
 
@@ -20,6 +26,9 @@
 	dh_clean com/pixelmed/test/tmp/TestCleanerReceiveAndClean/1.3.6.1.4.1.5962.99.1.4198289672.2040812585.1361407987975.4.0
 	dh_clean BUILDDATE
 	dh_clean manifest.txt
+	dh_clean .com.pixelmed.display.DicomImageViewer.properties
+	# doc package:
+	rm -rf docs
 
 get-orig-source:
 	./debian/get-orig-source