[med-svn] [Git][med-team/pixelmed][master] 4 commits: Adapt doc location to debhelper 11 decision

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / pixelmed


Commits:
9c36f9c7 by Andreas Tille at 2018-12-20T07:33:11Z
Adapt doc location to debhelper 11 decision

- - - - -
73d9fdb3 by Andreas Tille at 2018-12-20T07:56:54Z
Do not fail if generating docs contains errors

- - - - -
74de47da by Andreas Tille at 2018-12-20T08:36:09Z
Drop custom compression settings

- - - - -
d921fda3 by Andreas Tille at 2018-12-20T08:47:21Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/libpixelmed-java-doc.doc-base
- + debian/patches/ignore_javadoc_errors.patch
- debian/patches/series
- − debian/source/options


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-pixelmed (20150917+git20151209.36f3174+dfsg-1) UNRELEASED; urgency=medium
+pixelmed (20150917+git20151209.36f3174+dfsg-1) unstable; urgency=medium
 
   * New Github commit
     Closes: #893409
@@ -9,6 +9,8 @@ pixelmed (20150917+git20151209.36f3174+dfsg-1) UNRELEASED; urgency=medium
   * Standards-Version: 4.2.1
   * Remove trailing whitespace in debian/rules
   * Build-Depends: libjaxb-api-java
+  * Do not fail if generating docs contains errors
+  * Drop custom compression settings
 
   [ Olivier Sallou ]
   * Update classpath in javadoc to use debian dirs
@@ -17,7 +19,7 @@ pixelmed (20150917+git20151209.36f3174+dfsg-1) UNRELEASED; urgency=medium
     Unsure of impact, upstream should use dedicated library
     (java.lang.ref.Cleaner)
 
- -- Andreas Tille <tille at debian.org>  Wed, 19 Dec 2018 11:25:25 +0100
+ -- Andreas Tille <tille at debian.org>  Thu, 20 Dec 2018 09:36:40 +0100
 
 pixelmed (20150917+dfsg-1) unstable; urgency=medium
 


=====================================
debian/libpixelmed-java-doc.doc-base
=====================================
@@ -5,5 +5,5 @@ Abstract: This the API JavaDoc for pixelmed-java
 Section: Programming/Java
 
 Format: HTML
-Index: /usr/share/doc/libpixelmed-java-doc/index.html
-Files: /usr/share/doc/libpixelmed-java-doc/*.html
+Index: /usr/share/doc/libpixelmed-java/index.html
+Files: /usr/share/doc/libpixelmed-java/*.html


=====================================
debian/patches/ignore_javadoc_errors.patch
=====================================
@@ -0,0 +1,30 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 19 Dec 2018 11:25:25 +0100
+Description: Do not fail if generating docs contains errors
+ The doc generation requires online access which is not possible in
+ Debian build environments:
+  ..
+  Loading source files for package apple.dts.samplecode.osxadapter...
+  Constructing Javadoc information...
+  Creating destination directory: "docs/javadoc/"
+  javadoc: error - Error fetching URL: http://docs.oracle.com/javase/7/docs/api/
+  javadoc: error - Error fetching URL: http://jpedal.org/javadoc/
+  javadoc: error - Error fetching URL: http://www.hsqldb.org/doc/src/
+  Standard Doclet version 11.0.1
+  Building tree for all the packages and classes...
+  Generating docs/javadoc/apple/dts/samplecode/osxadapter/OSXAdapter.html...
+  ...
+ The patch is a lazy workaround to get the package build anyway.
+ Enhancements are welcome!
+
+--- a/Makefile
++++ b/Makefile
+@@ -968,7 +968,7 @@ javadoc:
+ 		-link http://www.hsqldb.org/doc/src/ \
+ 		-protected -d docs/javadoc \
+ 		-encoding "UTF8" \
+-		${SUBPACKAGES}
++		${SUBPACKAGES} || true
+ 
+ doxygen:
+ 	rm -rf docs/doxygen


=====================================
debian/patches/series
=====================================
@@ -17,3 +17,4 @@ imageio.patch
 no_Xdiags_verbose.patch
 do_not_set_bootclasspath.patch
 jaxb-api.patch
+ignore_javadoc_errors.patch


=====================================
debian/source/options deleted
=====================================
@@ -1,2 +0,0 @@
-compression = xz
-compression-level = 9



View it on GitLab: https://salsa.debian.org/med-team/pixelmed/compare/a2d498e55cd3f87db1646449ec562ad72538f90c...d921fda310ab97d31b01bf691038bc89b4927f43

-- 
View it on GitLab: https://salsa.debian.org/med-team/pixelmed/compare/a2d498e55cd3f87db1646449ec562ad72538f90c...d921fda310ab97d31b01bf691038bc89b4927f43
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181220/17989ff6/attachment-0001.html>