diff -Nru doxia-1.1.4/debian/changelog doxia-1.1.4/debian/changelog --- doxia-1.1.4/debian/changelog 2011-11-22 20:01:14.000000000 +0000 +++ doxia-1.1.4/debian/changelog 2011-11-23 16:57:20.000000000 +0000 @@ -1,3 +1,14 @@ +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 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 diff -Nru doxia-1.1.4/debian/control doxia-1.1.4/debian/control --- doxia-1.1.4/debian/control 2011-11-21 21:55:15.000000000 +0000 +++ doxia-1.1.4/debian/control 2011-11-23 16:56:29.000000000 +0000 @@ -12,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, libjaxen-java + libmaven-javadoc-plugin-java, libjaxen-java, libmaven-install-plugin-java Standards-Version: 3.9.2 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/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 00:00:00.000000000 +0000 +++ doxia-1.1.4/debian/patches/0008-doxia-logging-deps.patch 2011-11-23 17:11:25.000000000 +0000 @@ -0,0 +1,38 @@ +From: Mathieu Trudel-Lapierre +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 @@ + + + org.apache.maven.doxia ++ doxia-logging-api ++ ++ ++ org.apache.maven.doxia + doxia-core + + +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 @@ + + + org.apache.maven.doxia ++ doxia-logging-api ++ ++ ++ org.apache.maven.doxia + doxia-core + + diff -Nru doxia-1.1.4/debian/patches/series doxia-1.1.4/debian/patches/series --- doxia-1.1.4/debian/patches/series 2011-11-21 21:55:15.000000000 +0000 +++ doxia-1.1.4/debian/patches/series 2011-11-23 16:45:01.000000000 +0000 @@ -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-11-21 21:55:15.000000000 +0000 +++ doxia-1.1.4/debian/rules 2011-11-23 16:48:56.000000000 +0000 @@ -8,3 +8,22 @@ 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 \ + -DgroupId=org.apache.maven.doxia \ + -DartifactId=$$artifact \ + -Dversion=1.1.4 \ + -Dmaven.repo.local=$(CURDIR)/debian/maven-repo \ + -Dpackaging=jar -Dfile=$$jar; \ + done; + +binary-jars: + $(call IMPORT_BINARY_JARS) + touch $@ + +after-mvn-build:: binary-jars