This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit 05dbb437b0e5ad53a042488210508f6248597557 Author: Gilles Filippini <[email protected]> Date: Mon May 12 03:10:10 2014 +0200 Found a way to avoid maven.ignoreRules.resolv The missing rules are added to maven.ignoreRules with matching version set to 'debian'. --- debian/maven.ignoreRules | 3 +++ debian/maven.ignoreRules.real | 4 ---- debian/maven.ignoreRules.resolv | 6 ------ debian/rules | 8 +------- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index a1f76db..9b6bc84 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -2,3 +2,6 @@ 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.real b/debian/maven.ignoreRules.real deleted file mode 100644 index a1f76db..0000000 --- a/debian/maven.ignoreRules.real +++ /dev/null @@ -1,4 +0,0 @@ - -com.melloware jintellitype jar * * * -com.nativelibs4java bridj jar * * * -net.java.dev.jai-imageio jai-imageio-core-standalone jar * * * diff --git a/debian/maven.ignoreRules.resolv b/debian/maven.ignoreRules.resolv deleted file mode 100644 index 0837687..0000000 --- a/debian/maven.ignoreRules.resolv +++ /dev/null @@ -1,6 +0,0 @@ -com.melloware jintellitype jar * * * -com.nativelibs4java bridj jar * * * -net.java.dev.jai-imageio jai-imageio-core-standalone jar * * * -org.sikuli * jar * * * -com.explodingpixels mac_widgets jar * * * -org.python jython-standalone jar * * * diff --git a/debian/rules b/debian/rules index 0ec6e3c..49352f5 100755 --- a/debian/rules +++ b/debian/rules @@ -45,19 +45,13 @@ configure/libsikuli-script-jni:: clean:: -cd Natives/src/main/native/Vision && chmod a+x runConfigure rm -f debian/libsikuli-script-jni.install - cp debian/maven.ignoreRules.real debian/maven.ignoreRules # ${maven:Depends} for each package -# Unsing specific maven.ignoreRules to avoid a failure at the first unresolved dependency install/sikuli-ide:: - cp debian/maven.ignoreRules.resolv debian/maven.ignoreRules mh_resolve_dependencies --non-interactive --offline -psikuli-ide --base-directory=$(CURDIR) --non-explore - cp debian/maven.ignoreRules.real debian/maven.ignoreRules install/libsikuli-script-java:: - cp debian/maven.ignoreRules.resolv debian/maven.ignoreRules - mh_resolve_dependencies --non-interactive --offline -plibsikuli-script-java --javadoc --base-directory=$(CURDIR) --non-explore - cp debian/maven.ignoreRules.real debian/maven.ignoreRules + mh_resolve_dependencies --non-interactive --offline -plibsikuli-script-java --base-directory=$(CURDIR) --non-explore # Fix perms after dh_install binary-install/libsikuli-script-java:: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
