[sikuli] 30/53: Back to two diffrerents maven.ignoreRules files

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository sikuli.

commit 4c507ddd13b2a9e99745df91053ec6b120e18bb2
Author: Gilles Filippini <pini at debian.org>
Date:   Mon May 12 11:52:33 2014 +0200

    Back to two diffrerents maven.ignoreRules files
    
    The previous fix doesn't work as expected. The whole thing is due
    to #638001 and #723919.
---
 debian/maven.ignoreRules                             | 3 ---
 debian/{maven.ignoreRules => maven.ignoreRules.full} | 2 +-
 debian/maven.rules                                   | 2 ++
 debian/rules                                         | 6 ++++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 9b6bc84..a1f76db 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -2,6 +2,3 @@
 com.melloware jintellitype jar * * *
 com.nativelibs4java bridj jar * * *
 net.java.dev.jai-imageio jai-imageio-core-standalone jar * * *
-org.python jython-standalone jar debian * *
-org.sikuli * jar debian * *
-com.explodingpixels mac_widgets jar debian * *
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules.full
similarity index 89%
copy from debian/maven.ignoreRules
copy to debian/maven.ignoreRules.full
index 9b6bc84..4de209a 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules.full
@@ -2,6 +2,6 @@
 com.melloware jintellitype jar * * *
 com.nativelibs4java bridj jar * * *
 net.java.dev.jai-imageio jai-imageio-core-standalone jar * * *
+org.sikuli * jar * * *
 org.python jython-standalone jar debian * *
-org.sikuli * jar debian * *
 com.explodingpixels mac_widgets jar debian * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 67f46a8..0d8b06e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,5 @@
 
+com.explodingpixels mac_widgets jar s/.*/debian/ * *
 com.fasterxml.jackson.core jackson-core jar s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind jar s/2\..*/2.x/ * *
 com.jgoodies s/common/jgoodies-common/ jar s/1\..*/1.x/ * *
@@ -7,6 +8,7 @@ com.jgoodies jgoodies-common jar s/1\..*/1.x/ * *
 junit junit jar s/4\\..*/4.x/ * *
 s/org\.javassist/javassist/ javassist jar s/.*/debian/ * *
 org.jruby s/jruby-complete/jruby/ jar s/.*/debian/ * *
+org.python jython-standalone jar s/.*/debian/ * *
 org.swinglabs swingx-core jar s/1\..*/1.x/ * *
 s/org\.swinglabs\.swingx/org.swinglabs/ swingx-core jar s/1\..*/1.x/ * *
 org.testng testng jar s/6\..*/6.x/ * *
diff --git a/debian/rules b/debian/rules
index 49352f5..218185c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,12 +45,18 @@ configure/libsikuli-script-jni::
 clean::
 	-cd Natives/src/main/native/Vision && chmod a+x runConfigure
 	rm -f debian/libsikuli-script-jni.install
+	# This ugly part because of #638001 and #723919
+	grep -vwE '(debian|^org\.sikuli)' debian/maven.ignoreRules.full >debian/maven.ignoreRules
 
 # ${maven:Depends} for each package
+# Because '--package=<package>' in debian/*.poms files doesn't work for
+# .substvars files.
 install/sikuli-ide::
+	cp debian/maven.ignoreRules.full debian/maven.ignoreRules
 	mh_resolve_dependencies --non-interactive --offline -psikuli-ide  --base-directory=$(CURDIR) --non-explore
 
 install/libsikuli-script-java::
+	cp debian/maven.ignoreRules.full debian/maven.ignoreRules
 	mh_resolve_dependencies --non-interactive --offline -plibsikuli-script-java --base-directory=$(CURDIR) --non-explore
 
 # Fix perms after dh_install

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