[sikuli] 32/53: Maven rules files tuning

[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 7f67df45baafd6dc1f271657e9c2b79d0678d544
Author: Gilles Filippini <pini at debian.org>
Date:   Mon May 12 18:24:23 2014 +0200

    Maven rules files tuning
---
 debian/maven.rules                       | 7 -------
 debian/{maven.rules => maven.rules.ours} | 7 -------
 debian/rules                             | 7 +++++++
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/maven.rules b/debian/maven.rules
index 0d8b06e..626fb5b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,15 +1,8 @@
-
-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/ * *
 com.jgoodies s/forms/jgoodies-forms/ jar s/.*/debian/ * *
-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/ * *
-s/jboss/javassist/ javassist * s/.*/debian/ * *
diff --git a/debian/maven.rules b/debian/maven.rules.ours
similarity index 62%
copy from debian/maven.rules
copy to debian/maven.rules.ours
index 0d8b06e..626fb5b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules.ours
@@ -1,15 +1,8 @@
-
-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/ * *
 com.jgoodies s/forms/jgoodies-forms/ jar s/.*/debian/ * *
-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/ * *
-s/jboss/javassist/ javassist * s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 218185c..3443b33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
 
+# Force using debian/maven.ignoreRules.full during clean-up
+# Because I've had no success setting up debian/cleanIgnoreRules
+cleanbuilddir:: unpatch-poms
+	cp debian/maven.ignoreRules.full debian/maven.ignoreRules
+
 # CDBS + debian-maven-helper
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
@@ -47,6 +52,8 @@ clean::
 	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
+	# We don't want our maven.rules file changed with broken published rules
+	cp debian/maven.rules.ours debian/maven.rules
 
 # ${maven:Depends} for each package
 # Because '--package=<package>' in debian/*.poms files doesn't work for

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