[pkg-java-scripts] 01/01: Don't remove the --buildsystem=maven parameter if an Ant build exist

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Nov 4 15:33:08 UTC 2016


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

ebourg-guest pushed a commit to branch master
in repository pkg-java-scripts.

commit 36d80582fe3bdc726a53023a996a4436c1e0c2b4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 4 16:31:58 2016 +0100

    Don't remove the --buildsystem=maven parameter if an Ant build exist
---
 dh10.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dh10.sh b/dh10.sh
index df2a805..0289168 100755
--- a/dh10.sh
+++ b/dh10.sh
@@ -16,7 +16,9 @@ sed -i -e "s/debhelper[^,]*/debhelper (>= $DH_LEVEL)/g" debian/control
 
 # Remove the --buildsystem option from debian/rules
 # (Maven builds are detected automaticaly by DH >= 10)
-sed -i "s/ --buildsystem=maven//g" debian/rules
+if [ ! -f "build.xml" ]; then
+   sed -i "s/ --buildsystem=maven//g" debian/rules
+fi
 
 #  --parallel is now implicit
 sed -i "s/ --parallel//g" debian/rules

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



More information about the pkg-java-commits mailing list