Package: openvrml Version: 0.18.9-7 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for openvrml (versioned as 0.18.9-7.1). The diff is attached to this message. Regards. diff -u openvrml-0.18.9/debian/changelog openvrml-0.18.9/debian/changelog --- openvrml-0.18.9/debian/changelog +++ openvrml-0.18.9/debian/changelog @@ -1,3 +1,15 @@ +openvrml (0.18.9-7.1) unstable; urgency=medium + + * Non-maintainer upload. + * Change B-D on libpng12-dev to libpng-dev (Closes: #816115) + * Import patch from BTS by Emmanuel Bourg (Closes: #748045) + * Apply patch from Emmanuel Bourg to fix the ftbfs with OpenJDK 8" + (Closes: #760928) + * instead of installing the non-existing doc/manual/dynsections.js, install + doxygen's jquery.js (using *.js); otherwise it'll FTBFS. + + -- Tobias Frost <[email protected]> Sat, 23 Apr 2016 11:33:48 +0200 + openvrml (0.18.9-7) unstable; urgency=medium * Remove xulrunner-dev from Build-Depends. (Closes: #751561) diff -u openvrml-0.18.9/debian/control openvrml-0.18.9/debian/control --- openvrml-0.18.9/debian/control +++ openvrml-0.18.9/debian/control @@ -5,7 +5,7 @@ Uploaders: Nobuhiro Iwamatsu <[email protected]> Build-Depends: debhelper (>= 9.0), dpkg-dev (>= 1.16.1~), quilt, libgl1-mesa-dev | libgl-dev, - zlib1g-dev, libjpeg-dev, libpng12-dev, libx11-dev, + zlib1g-dev, libjpeg-dev, libpng-dev, libx11-dev, libxext-dev, libfreetype6-dev, libfontconfig1-dev, libsdl1.2-dev, default-jdk, libboost-dev, libboost-test-dev, libboost-thread-dev, libboost-filesystem-dev, libgtk2.0-dev, @@ -39,7 +39,7 @@ Architecture: linux-any Depends: ${misc:Depends}, libopenvrml9 (= ${binary:Version}), libgl1-mesa-dev | libgl-dev, zlib1g-dev, libjpeg-dev, - libpng12-dev, libx11-dev, libxext-dev, libxmu-dev, + libpng-dev, libx11-dev, libxext-dev, libxmu-dev, libfreetype6-dev, libfontconfig1-dev, libboost-dev, default-jdk Conflicts: libopenvrml0-dev, libopenvrml3-dev, libopenvrml4-dev, libopenvrml5-dev diff -u openvrml-0.18.9/debian/libopenvrml-doc.install openvrml-0.18.9/debian/libopenvrml-doc.install --- openvrml-0.18.9/debian/libopenvrml-doc.install +++ openvrml-0.18.9/debian/libopenvrml-doc.install @@ -5,3 +5,3 @@ doc/manual/*.html usr/share/doc/libopenvrml-doc/html -doc/manual/dynsections.js usr/share/doc/libopenvrml-doc/html +doc/manual/*.js usr/share/doc/libopenvrml-doc/html models/* usr/share/doc/libopenvrml-doc/examples diff -u openvrml-0.18.9/debian/patches/series openvrml-0.18.9/debian/patches/series --- openvrml-0.18.9/debian/patches/series +++ openvrml-0.18.9/debian/patches/series @@ -9,0 +10 @@ +fix-java8.patch diff -u openvrml-0.18.9/debian/rules openvrml-0.18.9/debian/rules --- openvrml-0.18.9/debian/rules +++ openvrml-0.18.9/debian/rules @@ -14,8 +14,8 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -cflags = -g -Os -I$(JAVA_HOME)/include $(CFLAGS) -cxxflags = -g -Os -I$(JAVA_HOME)/include $(CXXFLAGS) +cflags = -g -Os -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(CFLAGS) +cxxflags = -g -Os -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(CXXFLAGS) ldflags = $(LDFLAGS) confflags = --prefix=/usr \ only in patch2: unchanged: --- openvrml-0.18.9.orig/debian/patches/fix-java8.patch +++ openvrml-0.18.9/debian/patches/fix-java8.patch @@ -0,0 +1,26 @@ +Description: Fixes the installation of the javadoc generated by Java 8 +Author: Emmanuel Bourg <[email protected]> +Bug-Debian: #748045 +Forwarded: no +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -140,8 +140,6 @@ + $(DESTDIR)$(docdir)/manual + $(INSTALL_DATA) $(JAVADOC_FILES) \ + $(DESTDIR)$(javadocdir) +- $(INSTALL_DATA) $(JAVADOC_RESOURCES_FILES) \ +- $(DESTDIR)$(javadocdir)/resources + $(INSTALL_DATA) $(JAVADOC_VRML_FILES) \ + $(DESTDIR)$(javadocdir)/vrml + $(INSTALL_DATA) $(JAVADOC_VRML_FIELD_FILES) \ +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -569,8 +569,6 @@ + $(DESTDIR)$(docdir)/manual + $(INSTALL_DATA) $(JAVADOC_FILES) \ + $(DESTDIR)$(javadocdir) +- $(INSTALL_DATA) $(JAVADOC_RESOURCES_FILES) \ +- $(DESTDIR)$(javadocdir)/resources + $(INSTALL_DATA) $(JAVADOC_VRML_FILES) \ + $(DESTDIR)$(javadocdir)/vrml + $(INSTALL_DATA) $(JAVADOC_VRML_FIELD_FILES) \
