[closure-compiler] 01/05: Removed the build dependency on libmaven-ant-tasks-java

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Sep 12 14:21:11 UTC 2017


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository closure-compiler.

commit e6b8d030dc76d853dfc46b4c1829e99a2aa03c3a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 12 16:17:20 2017 +0200

    Removed the build dependency on libmaven-ant-tasks-java
---
 debian/changelog                            |  7 +++++++
 debian/control                              |  1 -
 debian/patches/ignore-maven-ant-tasks.patch | 14 ++++++++++++++
 debian/patches/series                       |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7d5c09a..ab5ff07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+closure-compiler (20130227+dfsg1-10) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed the build dependency on libmaven-ant-tasks-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 12 Sep 2017 16:16:10 +0200
+
 closure-compiler (20130227+dfsg1-9) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 7f2a583..956fdc1 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Build-Depends:
     ant,
     libjarjar-java,
     protobuf-compiler,
-    libmaven-ant-tasks-java,
     python-docutils,
     javahelper (>= 0.25)
 Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java
diff --git a/debian/patches/ignore-maven-ant-tasks.patch b/debian/patches/ignore-maven-ant-tasks.patch
new file mode 100644
index 0000000..9498f40
--- /dev/null
+++ b/debian/patches/ignore-maven-ant-tasks.patch
@@ -0,0 +1,14 @@
+Description: Don't use the Maven Ant Tasks
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -143,8 +143,6 @@
+     <property name="compiler-jarfile-nodeps" value="${build.dir}/closure-${ant.project.name}-v${build.svnVersion}.jar" />
+     <property name="compiler-jarfile-javadoc" value="${build.dir}/closure-${ant.project.name}-v${build.svnVersion}-javadoc.jar" />
+     <property name="compiler-jarfile-sources" value="${build.dir}/closure-${ant.project.name}-v${build.svnVersion}-sources.jar" />
+-
+-    <artifact:pom id="project" file="${build.dir}/pom.xml" />
+   </target>
+ 
+   <target name="mvn-install"
diff --git a/debian/patches/series b/debian/patches/series
index ad820f4..2e9ceb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ build_xml.patch
 remove_tests_depending_on_caja.patch
 guava-compatibility.patch
 ftbfs-commandlinerunner.patch
+ignore-maven-ant-tasks.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/closure-compiler.git



More information about the pkg-java-commits mailing list