[SCM] jedit - Java plugin-based editor for programmers branch, master, updated. debian/4.4.2+dfsg-1-23-g998e08e

Gabriele Giacone 1o5g4r8o at gmail.com
Sat Jun 16 02:37:00 UTC 2012


The following commit has been merged in the master branch:
commit 0cc00ba2b1f1d54429cd8adad5d374d1720d5c3b
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Jun 15 17:11:35 2012 +0000

    Remove ivy from B-D, pass ivy.done=true to ant.

diff --git a/debian/control b/debian/control
index 2218343..59924d3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.24), ant, ant-optional,
  docbook-xsl, xsltproc, imagemagick, quilt (>= 0.46-7~), bsh-src (>= 2.0b4-11),
- docbook-xml, ivy, ant-contrib, bsh, docbook-xsl-saxon
+ docbook-xml, ant-contrib, bsh, docbook-xsl-saxon
 Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
diff --git a/debian/rules b/debian/rules
index 598b933..251662c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,8 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	# build
-	ant -propertyfile $(PROPERTIES) build
-	ant -propertyfile $(PROPERTIES) docs-html
+	ant -Divy.done=true -propertyfile $(PROPERTIES) build
+	ant -Divy.done=true -propertyfile $(PROPERTIES) docs-html
 	# upstream changelog
 	cp build/doc/CHANGES.txt build/doc/changelog
 

-- 
jedit - Java plugin-based editor for programmers



More information about the pkg-java-commits mailing list