This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jarjar.
commit 0a40710c0a4ba57ae952b4a1a21bec6ca79597c3 Author: Emmanuel Bourg <[email protected]> Date: Tue Sep 12 16:37:25 2017 +0200 Removed the build dependency on libmaven2-core-java --- debian/changelog | 7 +++++++ debian/control | 1 - debian/patches/0007-ignore-maven-plugin.patch | 13 +++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d4098ee..f880a24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +jarjar (1.4+svn142-8) unstable; urgency=medium + + * Team upload. + * Removed the build dependency on libmaven2-core-java + + -- Emmanuel Bourg <[email protected]> Tue, 12 Sep 2017 16:44:16 +0200 + jarjar (1.4+svn142-7) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index a6b7157..5e2bf91 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: ant, debhelper (>= 10~), default-jdk, libasm4-java, - libmaven2-core-java, maven-repo-helper Standards-Version: 4.1.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jarjar.git diff --git a/debian/patches/0007-ignore-maven-plugin.patch b/debian/patches/0007-ignore-maven-plugin.patch new file mode 100644 index 0000000..e372709 --- /dev/null +++ b/debian/patches/0007-ignore-maven-plugin.patch @@ -0,0 +1,13 @@ +Description: Don't compile the Maven plugin (already provided by jarjar-maven-plugin) +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -72,6 +72,7 @@ + debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}"> + <classpath refid="@{refid}"/> + <compilerarg value="-Xlint"/> ++ <exclude name="**/*Mojo*"/> + </javac> + </sequential> + </macrodef> diff --git a/debian/patches/series b/debian/patches/series index 0c063f8..05f026f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ add_ClassReader_EXPAND_FRAMES.diff 0005-fix-javadocs.patch 0006-asm-compatibility.patch +0007-ignore-maven-plugin.patch diff --git a/debian/rules b/debian/rules index 5680368..92d9221 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export CLASSPATH := /usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar:/usr/share/java/maven-plugin-api.jar +export CLASSPATH := /usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar # Variable for the Built-Using field in the control file ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm4-java) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jarjar.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
