[pkg-java-scripts] 02/02: Don't remove --buildsystem=maven if the pom.xml files isn't at the root of the package

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Nov 11 22:37:47 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 382f508f9d89bc5303aa2718c439738135b6dacf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 11 23:36:51 2016 +0100

    Don't remove --buildsystem=maven if the pom.xml files isn't at the root of the package
---
 dh10.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dh10.sh b/dh10.sh
index 53114f7..30acd50 100755
--- a/dh10.sh
+++ b/dh10.sh
@@ -23,7 +23,7 @@ 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)
-if [ ! -f "build.xml" ]; then
+if [ ! -f "build.xml" ] && [ -f "pom.xml" ]; then
    sed -i "s/ --buildsystem=maven//g" debian/rules
 fi
 

-- 
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