This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository xmlgraphics-commons.
commit 53a83e11f264d7b703fa5fa13ff9707ec46aa713 Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 3 01:20:40 2017 +0200 Build with Maven instead of Ant --- debian/changelog | 1 + debian/clean | 1 + debian/control | 16 +++++++-------- debian/libxmlgraphics-commons-java-doc.doc-base | 4 ++-- debian/libxmlgraphics-commons-java-doc.install | 2 +- debian/libxmlgraphics-commons-java-doc.javadoc | 1 - debian/libxmlgraphics-commons-java.jlibs | 1 - debian/libxmlgraphics-commons-java.poms | 1 + debian/maven.ignoreRules | 2 ++ debian/maven.rules | 1 + debian/rules | 26 ++----------------------- 11 files changed, 19 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32f0972..a81013b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xmlgraphics-commons (2.2-1) UNRELEASED; urgency=medium * Team upload. * New upstream release + * Build with Maven instead of Ant * Moved the package to Git * Standards-Version updated to 4.1.1 * Switch to debhelper level 10 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..567609b --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +build/ diff --git a/debian/control b/debian/control index 62f4da1..4f90e34 100644 --- a/debian/control +++ b/debian/control @@ -4,17 +4,17 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Vincent Fourmond <[email protected]>, Mathieu Malaterre <[email protected]> -Build-Depends: debhelper (>= 10), javahelper -Build-Depends-Indep: ant-optional, - default-jdk, +Build-Depends: debhelper (>= 10) +Build-Depends-Indep: default-jdk, default-jdk-doc, gnupg, junit4, libcommons-io-java (>= 1.3.1), libcommons-logging-java, + libmaven-javadoc-plugin-java, libmockito-java, libxml-commons-resolver1.1-java, - maven-repo-helper + maven-debian-helper (>= 2.2) Standards-Version: 4.1.1 Vcs-Git: https://anonscm.debian.org/git/pkg-java/xmlgraphics-commons.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/xmlgraphics-commons.git @@ -22,8 +22,8 @@ Homepage: http://xmlgraphics.apache.org/commons/ Package: libxmlgraphics-commons-java Architecture: all -Depends: libcommons-io-java, libcommons-logging-java, ${misc:Depends} -Suggests: libxmlgraphics-commons-java-doc +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends}, libxmlgraphics-commons-java-doc Description: Reusable components used by Batik and FOP Apache XML Graphics Commons is a library that consists of several reusable components used by Apache Batik and Apache FOP. Many of these @@ -35,8 +35,8 @@ Description: Reusable components used by Batik and FOP Package: libxmlgraphics-commons-java-doc Architecture: all Section: doc -Depends: ${java:Depends}, ${misc:Depends} -Recommends: ${java:Recommends} +Depends: ${maven:DocDepends}, ${misc:Depends} +Recommends: ${maven:DocOptionalDepends} Suggests: libxmlgraphics-commons-java Description: Reusable components used by Batik and FOP (documentation) Apache XML Graphics Commons is a library that consists of several diff --git a/debian/libxmlgraphics-commons-java-doc.doc-base b/debian/libxmlgraphics-commons-java-doc.doc-base index 1ec7394..1d2ab63 100644 --- a/debian/libxmlgraphics-commons-java-doc.doc-base +++ b/debian/libxmlgraphics-commons-java-doc.doc-base @@ -5,5 +5,5 @@ Abstract: This is the API documentation for libxmlgraphics-commons-java Section: Programming/Java Format: HTML -Index: /usr/share/doc/libxmlgraphics-commons-java-doc/api/index.html -Files: /usr/share/doc/libxmlgraphics-commons-java-doc/api/*.html +Index: /usr/share/doc/libxmlgraphics-commons-java/api/index.html +Files: /usr/share/doc/libxmlgraphics-commons-java/api/*.html diff --git a/debian/libxmlgraphics-commons-java-doc.install b/debian/libxmlgraphics-commons-java-doc.install index 36dcda4..788630e 100644 --- a/debian/libxmlgraphics-commons-java-doc.install +++ b/debian/libxmlgraphics-commons-java-doc.install @@ -1 +1 @@ -build/javadocs/* usr/share/doc/libxmlgraphics-commons-java-doc/api +target/apidocs/* usr/share/doc/libxmlgraphics-commons-java/api diff --git a/debian/libxmlgraphics-commons-java-doc.javadoc b/debian/libxmlgraphics-commons-java-doc.javadoc deleted file mode 100644 index 527bcd4..0000000 --- a/debian/libxmlgraphics-commons-java-doc.javadoc +++ /dev/null @@ -1 +0,0 @@ -src/documentation diff --git a/debian/libxmlgraphics-commons-java.jlibs b/debian/libxmlgraphics-commons-java.jlibs deleted file mode 100644 index 94b63ea..0000000 --- a/debian/libxmlgraphics-commons-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/xmlgraphics-commons-2.2.jar diff --git a/debian/libxmlgraphics-commons-java.poms b/debian/libxmlgraphics-commons-java.poms new file mode 100644 index 0000000..433f4e1 --- /dev/null +++ b/debian/libxmlgraphics-commons-java.poms @@ -0,0 +1 @@ +pom.xml --has-package-version --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..9296e8a --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,2 @@ +org.apache.maven.plugins maven-checkstyle-plugin +org.codehaus.mojo findbugs-maven-plugin diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..d6696a1 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1 @@ +junit junit * s/.*/4.x/ * * diff --git a/debian/rules b/debian/rules index 3aa5588..f91cde6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,34 +1,12 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 -JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/junit4.jar:/usr/share/java/mockito-core.jar:/usr/share/java/xml-resolver.jar -PACKAGE = xmlgraphics-commons -VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-) +export JAVA_HOME=/usr/lib/jvm/default-java # unexport DISPLAY for so cowbuilder builds don't fail unexport DISPLAY %: - dh $@ --with javahelper - -# all target, builds package and run test -override_dh_auto_build: - # Link in required deps for testing - ln -sf /usr/share/java/commons-io.jar lib/ - ln -sf /usr/share/java/commons-logging.jar lib/ - dh_auto_build -- -noinput -Dpwd=none all maven-artifacts - -override_dh_auto_clean: - # Drop any linked in deps for testing - mh_clean - rm -f lib/*.jar - dh_auto_clean - rm -f xmlgraphics-commons-*-bundle.jar - -override_dh_auto_install: - mh_installpom -plib$(PACKAGE)-java build/maven/pom.xml - mh_installjar -plib$(PACKAGE)-java -l build/maven/pom.xml build/$(PACKAGE)-$(VERSION).jar + dh $@ --buildsystem=maven get-orig-source: uscan --force-download --verbose --repack --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xmlgraphics-commons.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
