Bug#649772: libdoxia-java: FTBFS in a restrictive chroot

Sat Feb 21 20:58:26 UTC 2015

Hello,

I'm sending an updated patch from Ubuntu as the last change was made by 
Mathieu on 11 Apr 2014.
-------------- next part --------------
diff -Nru doxia-1.1.4/debian/changelog doxia-1.1.4/debian/changelog

--- doxia-1.1.4/debian/changelog	2012-06-07 07:15:36.000000000 +0200
+++ doxia-1.1.4/debian/changelog	2015-02-21 19:59:14.000000000 +0100
@@ -1,3 +1,21 @@
+doxia (1.1.4-2ubuntu1) vivid; urgency=low
+
+  * Merge from Debian unstable. (LP: #1087922)  Remaining changes:
+    - debian/control:
+      + Build-Depends on libjaxen-java and libmaven-install-plugin-java.
+    - debian/maven.properties:
+      + Set maven to offline mode to avoid trying to download
+        file from the web, which would fail the build.
+    - debian/patches/0008-doxia-logging-deps.patch:
+      + Slightly adjust java package dependencies in doxia-modules
+        and doxia-book pom files to include doxia-logging-api.
+    - debian/rules:
+      + Import the jar files we just build back into the temporary
+        maven repository so they're accessible as we try
+        to build docs. (Closes: #649772)
+
+ -- Artur Rona <ari-tczew at ubuntu.com>  Sat, 21 Feb 2015 19:29:29 +0100
+
 doxia (1.1.4-2) unstable; urgency=low
 
   * Team upload.
@@ -9,6 +27,38 @@
 
  -- Miguel Landaeta <miguel at miguel.cc>  Wed, 06 Jun 2012 19:30:32 -0430
 
+doxia (1.1.4-1ubuntu4) trusty; urgency=medium
+
+  * debian/rules: make sure we run in offline mode in the install:install-file
+    step too by forcing maven in offline mode and specifying the local
+    repository path in relation to the debian dir. (LP: #935070)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl at ubuntu.com>  Fri, 11 Apr 2014 22:50:59 -0400
+
+doxia (1.1.4-1ubuntu3) precise; urgency=low
+
+  * debian/patches/0008-doxia-logging-deps.patch: slightly adjust java package
+    dependencies in doxia-modules and doxia-book pom files to include
+    doxia-logging-api.
+  * debian/rules: import the jar files we just build back into the temporary
+    maven repository so they're accessible as we try to build docs.
+  * debian/control: add a Build-Depends on libmaven-install-plugin-java.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl at ubuntu.com>  Wed, 23 Nov 2011 11:44:25 -0500
+
+doxia (1.1.4-1ubuntu2) precise; urgency=low
+
+  * debian/maven.properties: set maven to offline mode to avoid trying to
+    download file from the web, which would fail the build.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl at ubuntu.com>  Tue, 22 Nov 2011 15:00:40 -0500
+
+doxia (1.1.4-1ubuntu1) precise; urgency=low
+
+  * debian/control: add Build-Depends for libjaxen-java.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl at ubuntu.com>  Mon, 21 Nov 2011 10:28:04 -0500
+
 doxia (1.1.4-1) unstable; urgency=low
 
   [Gabriele Giacone]
diff -Nru doxia-1.1.4/debian/control doxia-1.1.4/debian/control
--- doxia-1.1.4/debian/control	2012-06-06 22:57:26.000000000 +0200
+++ doxia-1.1.4/debian/control	2015-02-21 19:29:42.000000000 +0100
@@ -1,7 +1,8 @@
 Source: doxia
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-plugin-tools-java, libmaven-shade-plugin-java,  
@@ -11,7 +12,7 @@
  libplexus-i18n-java, libplexus-utils-java, libxerces2-java, junit, libxerces2-java,  
  default-jdk-doc, libcommons-configuration-java-doc, liblog4j1.2-java-doc,  
  libmaven2-core-java-doc, libplexus-containers-java-doc, libplexus-utils-java-doc,  
- libmaven-javadoc-plugin-java 
+ libmaven-javadoc-plugin-java, libjaxen-java, libmaven-install-plugin-java
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia
diff -Nru doxia-1.1.4/debian/maven.properties doxia-1.1.4/debian/maven.properties
--- doxia-1.1.4/debian/maven.properties	2011-09-10 00:28:03.000000000 +0200
+++ doxia-1.1.4/debian/maven.properties	2014-04-12 06:09:55.000000000 +0200
@@ -2,4 +2,5 @@
 # For example:
 
 maven.test.skip=true
+maven.settings.offline=true
 
diff -Nru doxia-1.1.4/debian/patches/0008-doxia-logging-deps.patch doxia-1.1.4/debian/patches/0008-doxia-logging-deps.patch
--- doxia-1.1.4/debian/patches/0008-doxia-logging-deps.patch	1970-01-01 01:00:00.000000000 +0100
+++ doxia-1.1.4/debian/patches/0008-doxia-logging-deps.patch	2014-04-11 21:37:06.000000000 +0200
@@ -0,0 +1,38 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre at canonical.com>
+Subject: Add doxia-logging-api to dependencies for doxia-modules and doxia-book
+Last-Update: 2011-11-23
+
+It appears to be required at least for building documentation, otherwise the
+build fails as it tries to resolve org.apache.maven.doxia.logging.LogEnabled,
+among other symbols provided by doxia-logging-api.
+
+Index: doxia/doxia-modules/pom.xml
+===================================================================
+--- doxia.orig/doxia-modules/pom.xml	2011-11-21 16:55:11.277656324 -0500
++++ doxia/doxia-modules/pom.xml	2011-11-23 10:58:55.255900098 -0500
+@@ -50,6 +50,10 @@
+   <dependencies>
+     <dependency>
+       <groupId>org.apache.maven.doxia</groupId>
++      <artifactId>doxia-logging-api</artifactId>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.maven.doxia</groupId>
+       <artifactId>doxia-core</artifactId>
+     </dependency>
+     <dependency>
+Index: doxia/doxia-book/pom.xml
+===================================================================
+--- doxia.orig/doxia-book/pom.xml	2011-11-21 16:55:15.685656130 -0500
++++ doxia/doxia-book/pom.xml	2011-11-23 11:03:28.119915934 -0500
+@@ -37,6 +37,10 @@
+     <!-- doxia core -->
+     <dependency>
+       <groupId>org.apache.maven.doxia</groupId>
++      <artifactId>doxia-logging-api</artifactId>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.maven.doxia</groupId>
+       <artifactId>doxia-core</artifactId>
+     </dependency>
+     <dependency>
diff -Nru doxia-1.1.4/debian/patches/series doxia-1.1.4/debian/patches/series
--- doxia-1.1.4/debian/patches/series	2011-09-10 00:28:03.000000000 +0200
+++ doxia-1.1.4/debian/patches/series	2014-04-12 06:09:55.000000000 +0200
@@ -5,3 +5,4 @@
 0005-don-t-build-doxia-maven-plugin.patch
 0006-specificy-source-and-target-version.patch
 0007-disable-plexus-javadoc.patch
+0008-doxia-logging-deps.patch
diff -Nru doxia-1.1.4/debian/rules doxia-1.1.4/debian/rules
--- doxia-1.1.4/debian/rules	2011-09-10 00:28:03.000000000 +0200
+++ doxia-1.1.4/debian/rules	2014-04-12 06:09:55.000000000 +0200
@@ -8,3 +8,23 @@
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
+IMPORT_BINARY_JARS = \
+	for jar in `find $(CURDIR)/doxia-* -name "*.jar" -print`; \
+	do \
+		artifact=$$(basename $$(dirname $$(echo $$jar | sed "s/\/target//"))); \
+		echo "--- $$artifact ---"; \
+		mvn install:install-file -o \
+			-DgroupId=org.apache.maven.doxia \
+			-DartifactId=$$artifact \
+			-Dversion=1.1.4 \
+			-Dmaven.repo.local=$(CURDIR)/debian/maven-repo \
+			-DlocalRepositoryPath=$(CURDIR)/debian/tmp/usr/share/maven-repo \
+			-Dpackaging=jar -Dfile=$$jar; \
+	done;
+
+binary-jars:
+	$(call IMPORT_BINARY_JARS)
+	touch $@
+
+after-mvn-build:: binary-jars
