[pkg-java] r9648 - in trunk/maven-debian-helper: . debian maven-debian-helper maven-debian-plugin maven-packager-utils maven-packager-utils/src/main/java/org/debian/maven/packager maven-packager-utils/src/main/resources share/cdbs/1/class
Ludovic Claude
ludovicc-guest at alioth.debian.org
Wed Aug 5 20:10:39 UTC 2009
Author: ludovicc-guest
Date: 2009-08-05 20:10:39 +0000 (Wed, 05 Aug 2009)
New Revision: 9648
Added:
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.doc-base.api.vm
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.install.vm
Removed:
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.doc-base.vm
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.docs.vm
Modified:
trunk/maven-debian-helper/debian/changelog
trunk/maven-debian-helper/debian/control
trunk/maven-debian-helper/maven-debian-helper/pom.xml
trunk/maven-debian-helper/maven-debian-plugin/pom.xml
trunk/maven-debian-helper/maven-packager-utils/pom.xml
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.properties.ant.vm
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm
trunk/maven-debian-helper/pom.xml
trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
trunk/maven-debian-helper/share/cdbs/1/class/maven.mk
Log:
* Update Standards-Version to 3.8.2
* Follow the new convention for Javadoc:
javadoc in /usr/share/doc/package/api even if it's in package-doc
Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/debian/changelog 2009-08-05 20:10:39 UTC (rev 9648)
@@ -1,3 +1,11 @@
+maven-debian-helper (0.5) experimental; urgency=low
+
+ * Update Standards-Version to 3.8.2
+ * Follow the new convention for Javadoc:
+ javadoc in /usr/share/doc/package/api even if it's in package-doc
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Sun, 02 Aug 2009 11:42:31 +0100
+
maven-debian-helper (0.4) experimental; urgency=low
[Ludovic Claude]
Modified: trunk/maven-debian-helper/debian/control
===================================================================
--- trunk/maven-debian-helper/debian/control 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/debian/control 2009-08-05 20:10:39 UTC (rev 9648)
@@ -7,7 +7,7 @@
Build-Depends-Indep: maven-repo-helper (>> 0.5),
junit, testng, libmaven-plugin-tools-java, libplexus-velocity-java, velocity,
libmaven2-core-java
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-debian-helper
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-debian-helper/
Homepage: http://wiki.debian.org/Java/MavenBuilder
Modified: trunk/maven-debian-helper/maven-debian-helper/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-helper/pom.xml 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/maven-debian-helper/pom.xml 2009-08-05 20:10:39 UTC (rev 9648)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>0.4</version>
+ <version>0.5</version>
</parent>
<artifactId>maven-debian-helper</artifactId>
Modified: trunk/maven-debian-helper/maven-debian-plugin/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/pom.xml 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/maven-debian-plugin/pom.xml 2009-08-05 20:10:39 UTC (rev 9648)
@@ -5,7 +5,7 @@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>0.4</version>
+ <version>0.5</version>
</parent>
<artifactId>maven-debian-plugin</artifactId>
Modified: trunk/maven-debian-helper/maven-packager-utils/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/pom.xml 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/maven-packager-utils/pom.xml 2009-08-05 20:10:39 UTC (rev 9648)
@@ -5,7 +5,7 @@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>0.4</version>
+ <version>0.5</version>
</parent>
<artifactId>maven-packager-utils</artifactId>
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java 2009-08-05 20:10:39 UTC (rev 9648)
@@ -136,7 +136,6 @@
String controlTemplate = "control.vm";
String rulesTemplate = "rules.vm";
- String javadocsTemplate = "java-doc.docs.vm";
if ("ant".equals(packageType)) {
controlTemplate = "control.ant.vm";
rulesTemplate = "rules.ant.vm";
@@ -351,13 +350,13 @@
out.close();
if (generateJavadoc) {
- out = new FileWriter(new File(outputDirectory, binPackageName + "-doc.doc-base"));
- Velocity.mergeTemplate("java-doc.doc-base.vm", "UTF8", context, out);
+ out = new FileWriter(new File(outputDirectory, binPackageName + "-doc.doc-base.api"));
+ Velocity.mergeTemplate("java-doc.doc-base.api.vm", "UTF8", context, out);
out.flush();
out.close();
- out = new FileWriter(new File(outputDirectory, binPackageName + "-doc.docs"));
- Velocity.mergeTemplate(javadocsTemplate, "UTF8", context, out);
+ out = new FileWriter(new File(outputDirectory, binPackageName + "-doc.install"));
+ Velocity.mergeTemplate("java-doc.install.vm", "UTF8", context, out);
out.flush();
out.close();
}
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.properties.ant.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.properties.ant.vm 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.properties.ant.vm 2009-08-05 20:10:39 UTC (rev 9648)
@@ -1,5 +1,5 @@
build.directory=target
-javadoc.dir=target/docs/api
+javadoc.dir=target/apidocs
#if(!$runTests)
maven.test.skip=true
#end
Added: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.doc-base.api.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.doc-base.api.vm (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.doc-base.api.vm 2009-08-05 20:10:39 UTC (rev 9648)
@@ -0,0 +1,10 @@
+Document: ${binPackage}
+Title: API Javadoc for ${project.Name}
+Author: ${project.Organization.Name} developers
+Abstract: This is the API Javadoc provided for the
+ ${binPackage} library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/${binPackage}/api/index.html
+Files: /usr/share/doc/${binPackage}/api/*
Deleted: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.doc-base.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.doc-base.vm 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.doc-base.vm 2009-08-05 20:10:39 UTC (rev 9648)
@@ -1,10 +0,0 @@
-Document: ${binPackage}
-Title: API Javadoc for ${project.Name}
-Author: ${project.Organization.Name} developers
-Abstract: This is the API Javadoc provided for the
- ${binPackage} library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/${binPackage}/api/index.html
-Files: /usr/share/doc/${binPackage}/api/*
Deleted: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.docs.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.docs.vm 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.docs.vm 2009-08-05 20:10:39 UTC (rev 9648)
@@ -1 +0,0 @@
-target/docs/api
Added: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.install.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.install.vm (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.install.vm 2009-08-05 20:10:39 UTC (rev 9648)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/${binPackage}/api
+
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm 2009-08-05 20:10:39 UTC (rev 9648)
@@ -22,6 +22,9 @@
#printJars($buildJars)
DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+#if ($generateJavadoc)
+API_DOCS := target/docs/api
+#end
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
@@ -33,5 +36,10 @@
mh_installjar -plib$(PACKAGE)-java -l ${dir}pom.xml ${dir}target/$(PACKAGE)-$(VERSION).jar
#end
+#if ($generateJavadoc)
+binary-post-install/lib$(PACKAGE)-java-doc::
+ dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
+
+#end
clean::
-rm -rf debian/tmp
Modified: trunk/maven-debian-helper/pom.xml
===================================================================
--- trunk/maven-debian-helper/pom.xml 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/pom.xml 2009-08-05 20:10:39 UTC (rev 9648)
@@ -4,7 +4,7 @@
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>0.4</version>
+ <version>0.5</version>
<packaging>pom</packaging>
<name>helper tools for using Maven to build Debian packages</name>
Modified: trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk 2009-08-05 20:10:39 UTC (rev 9648)
@@ -34,7 +34,7 @@
# nonstandard Maven installations.
MAVEN_HOME = /usr/share/maven2
-MAVEN_DEBIAN_VERSION = 0.4
+MAVEN_DEBIAN_VERSION = 0.5
# The home directory of the Java Runtime Environment (JRE) or Java Development
# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set
Modified: trunk/maven-debian-helper/share/cdbs/1/class/maven.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven.mk 2009-08-05 14:03:38 UTC (rev 9647)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven.mk 2009-08-05 20:10:39 UTC (rev 9648)
@@ -64,7 +64,7 @@
unpatch-poms: debian/$(DEB_JAR_PACKAGE).poms
mh_unpatchpoms -p$(DEB_JAR_PACKAGE)
- rm -f debian/stamp-poms-patched
+ $(RM) -f debian/stamp-poms-patched
debian/maven-repo:
/usr/share/maven-debian-helper/copy-repo.sh $(CURDIR)/debian
@@ -83,6 +83,7 @@
$(RM) -r $(DEB_MAVEN_REPO) debian/stamp-maven-build
$(if $(cdbs_new_poms_file), $(RM) debian/$(DEB_JAR_PACKAGE).poms)
$(if $(cdbs_new_maven_rules_file), $(RM) debian/maven.rules)
+ $(if $(cdbs_use_maven_substvars), $(RM) debian/*.substvars)
# extra arguments for the installation step
PLUGIN_ARGS = -Ddebian.dir=$(CURDIR)/debian -Ddebian.package=$(DEB_JAR_PACKAGE)
@@ -107,13 +108,15 @@
debian/stamp-maven-doc: debian/stamp-maven-build
$(if $(DEB_MAVEN_DOC_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_DOC_TARGET), at echo "DEB_MAVEN_DOC_TARGET unset, not generating documentation")
$(if $(DEB_MAVEN_DOC_TARGET),touch $@)
- cd target && mkdir docs && mv apidocs docs/api
# extra arguments for the installation step
PLUGIN_DOC_ARGS = -Ddebian.dir=$(CURDIR)/debian -Ddebian.package=$(DEB_DOC_PACKAGE)
common-install-impl::
$(if $(DEB_MAVEN_INSTALL_DOC_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_DOC_ARGS) $(DEB_MAVEN_INSTALL_DOC_TARGET), at echo "DEB_MAVEN_INSTALL_DOC_TARGET unset, skipping documentation maven.mk common-install target")
+ $(if $(cdbs_use_maven_substvars), cp debian/$(DEB_JAR_PACKAGE).substvars debian/$(DEB_DOC_PACKAGE).substvars)
+ # cleanup generated docs
+ $(RM) -f target/apidocs/*.sh target/apidocs/options
clean::
$(if $(DEB_MAVEN_DOC_TARGET),$(RM) debian/stamp-maven-doc)
More information about the pkg-java-commits
mailing list