Author: ludovicc-guest Date: 2010-12-05 14:04:25 +0000 (Sun, 05 Dec 2010) New Revision: 13145
Added: trunk/libjdom1-java/debian/maven.ignoreRules trunk/libjdom1-java/debian/maven.publishedRules trunk/libjdom1-java/debian/source/ trunk/libjdom1-java/debian/source/format Modified: trunk/libjdom1-java/debian/changelog trunk/libjdom1-java/debian/control trunk/libjdom1-java/debian/libjdom1-java.poms trunk/libjdom1-java/debian/rules Log: * Bump Standards-Version to 3.9.1 (no changes needed) * Use source format 3.0 (quilt) * Add --has-package-version to the pom * Replace dh_auto-install with dh $@ --buildsystem=ant --with maven_repo_helper * Install the javadoc jar in the Maven repository Modified: trunk/libjdom1-java/debian/changelog =================================================================== --- trunk/libjdom1-java/debian/changelog 2010-12-05 01:14:24 UTC (rev 13144) +++ trunk/libjdom1-java/debian/changelog 2010-12-05 14:04:25 UTC (rev 13145) @@ -1,8 +1,17 @@ libjdom1-java (1.1.1+dfsg-2) UNRELEASED; urgency=low + [Ludovic Claude] + * Bump Standards-Version to 3.9.1 (no changes needed) + * Use source format 3.0 (quilt) + * Add --has-package-version to the pom + * Replace dh_auto-install with + dh $@ --buildsystem=ant --with maven_repo_helper + * Install the javadoc jar in the Maven repository + + [Damien Raude-Morvan] * Remove Arnaud Vandyck from Uploaders - -- Damien Raude-Morvan <draz...@debian.org> Mon, 07 Dec 2009 19:48:03 +0100 + -- Ludovic Claude <ludovic.cla...@laposte.net> Sun, 05 Dec 2010 00:05:21 +0100 libjdom1-java (1.1.1+dfsg-1) unstable; urgency=low Modified: trunk/libjdom1-java/debian/control =================================================================== --- trunk/libjdom1-java/debian/control 2010-12-05 01:14:24 UTC (rev 13144) +++ trunk/libjdom1-java/debian/control 2010-12-05 14:04:25 UTC (rev 13145) @@ -4,8 +4,8 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Marcus Better <mar...@better.se>, Damien Raude-Morvan <draz...@debian.org> Build-Depends: debhelper (>= 7.0.50~), default-jdk, ant -Build-Depends-Indep: maven-repo-helper, libjaxen-java -Standards-Version: 3.8.3 +Build-Depends-Indep: maven-repo-helper (>= 1.5), libjaxen-java +Standards-Version: 3.9.1 Homepage: http://jdom.org/ Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjdom1-java/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjdom1-java/ @@ -13,7 +13,7 @@ Package: libjdom1-java Architecture: all Depends: ${misc:Depends}, default-jre-headless | java-runtime-headless -Suggests: java-virtual-machine +Suggests: libjdom1-java-doc, java-virtual-machine Description: lightweight and fast library using XML JDOM is, quite simply, a Java representation of an XML document. JDOM provides a way to represent that document for easy and efficient Modified: trunk/libjdom1-java/debian/libjdom1-java.poms =================================================================== --- trunk/libjdom1-java/debian/libjdom1-java.poms 2010-12-05 01:14:24 UTC (rev 13144) +++ trunk/libjdom1-java/debian/libjdom1-java.poms 2010-12-05 14:04:25 UTC (rev 13145) @@ -1 +1,2 @@ -debian/pom.xml --no-parent +debian/pom.xml --no-parent --has-package-version --java-lib --usj-name=jdom1 --artifact=build/jdom.jar +build/jdom.javadoc.pom --no-parent --has-package-version --artifact=build/jdom.javadoc.jar --classifier=javadoc --ignore-pom --package=libjdom1-java-doc Added: trunk/libjdom1-java/debian/maven.ignoreRules =================================================================== --- trunk/libjdom1-java/debian/maven.ignoreRules (rev 0) +++ trunk/libjdom1-java/debian/maven.ignoreRules 2010-12-05 14:04:25 UTC (rev 13145) @@ -0,0 +1,4 @@ +# ignore jdom jaxen and saxpath modules for now. +org.jdom jaxen-core +org.jdom jaxen-jdom +org.jdom saxpath Added: trunk/libjdom1-java/debian/maven.publishedRules =================================================================== --- trunk/libjdom1-java/debian/maven.publishedRules (rev 0) +++ trunk/libjdom1-java/debian/maven.publishedRules 2010-12-05 14:04:25 UTC (rev 13145) @@ -0,0 +1,2 @@ +s/jdom/org.jdom/ jdom jar s/1\..*/debian/ + Modified: trunk/libjdom1-java/debian/rules =================================================================== --- trunk/libjdom1-java/debian/rules 2010-12-05 01:14:24 UTC (rev 13144) +++ trunk/libjdom1-java/debian/rules 2010-12-05 14:04:25 UTC (rev 13145) @@ -1,24 +1,20 @@ #!/usr/bin/make -f +VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d'-' -f1) +UPSTREAM_VERSION := $(shell echo "$(VERSION)" | sed 's/+dfsg//') + JAVA_HOME := /usr/lib/jvm/default-java ANT_ARGS := -propertyfile debian/ant.properties ANT := JAVA_HOME=$(JAVA_HOME) ant $(ANT_ARGS) -PACKAGE := libjdom1-java -VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d'-' -f1) -UPSTREAM_VERSION := $(shell echo "$(VERSION)" | sed 's/+dfsg//') - %: - dh $@ --buildsystem=ant + dh $@ --buildsystem=ant --with maven_repo_helper override_dh_auto_build: $(ANT) package javadoc + jar cvf build/jdom.javadoc.jar -C build/apidocs/ . + cp debian/pom.xml build/jdom.javadoc.pom -override_dh_auto_install: - mh_installpoms -p$(PACKAGE) - mh_installjar -p$(PACKAGE) -l --usj-name=jdom1 debian/pom.xml build/jdom.jar - - get-orig-source: -uscan --download-version $(VERSION) --force-download --rename Added: trunk/libjdom1-java/debian/source/format =================================================================== --- trunk/libjdom1-java/debian/source/format (rev 0) +++ trunk/libjdom1-java/debian/source/format 2010-12-05 14:04:25 UTC (rev 13145) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits