[eclipse] 01/01: Fixed unresolved commit. Improvements.

[LUCA VERCELLI]

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

luca-vercelli-guest pushed a commit to branch experimental
in repository eclipse.

commit 4934ae3cbf0f194b57c0431529a2dc284c80ec5d
Author: LLuca Vercelli <luca.vercelli.to at gmail.com>
Date:   Thu Jul 14 13:18:48 2016 +0200

    Fixed unresolved commit. Improvements.
---
 debian/control           |  1 +
 debian/maven.ignoreRules | 11 +++--------
 debian/maven.rules       |  4 ++++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 60279a6..cbc7912 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Build-Depends:
 # libtomcat7-java,
  maven (>= 3.0),
  maven-debian-helper,
+ libmaven-enforcer-plugin-java,
  pkg-config,
  rsync,
  sat4j (>= 2.3.5),
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index ce645ea..b95adb5 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -6,19 +6,14 @@ org.codehaus.mojo xml-maven-plugin * * * *
 org.eclipse.cbi.maven.plugins eclipse-cbi-plugin * * * *
 #org.eclipse.tycho target-platform-configuration * * * *
 #org.eclipse.tycho tycho-compiler-plugin * * * *
+org.eclipse.tycho tycho-source-plugin * * * *
 org.eclipse.tycho tycho-p2-director-plugin * * * *
 #org.eclipse.tycho tycho-p2-plugin * * * *
 #org.eclipse.tycho tycho-p2-repository-plugin * * * *
 #org.eclipse.tycho tycho-packaging-plugin * * * *
 org.eclipse.tycho tycho-surefire-plugin * * * *
-org.eclipse.tycho.extras tycho-custom-bundle-plugin * * * *
-org.eclipse.tycho.extras tycho-p2-extras-plugin * * * *
-org.eclipse.tycho.extras tycho-source-feature-plugin * * * *
-<<<<<<< HEAD
-org.eclipse.tycho.extras tycho-bundles-external * * * * *
-=======
-org.eclipse.tycho tycho-bundles-external * * * * *
->>>>>>> 81342ac017c20c39a50f0579e23af59f8caae650
+org.eclipse.tycho.extras * * * * *
+#org.eclipse.tycho tycho-bundles-external * * * * *
 org.mortbay.jetty jetty-jspc-maven-plugin * * * *
 
 #THESE ARE TO SKIP TESTS
diff --git a/debian/maven.rules b/debian/maven.rules
index 890f007..de21fe3 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -480,3 +480,7 @@ org.eclipse.ui org.eclipse.ui.workbench.texteditor.tests eclipse-test-plugin s/.
 org.eclipse.update org.eclipse.update.configurator eclipse-plugin s/.*/debian/ * *
 org.eclipse.update org.eclipse.update.core eclipse-plugin s/.*/debian/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
+
+#there is no debian version here
+org.apache.maven.plugins maven-enforcer-plugin * s/.*/1.0.1/ * *
+

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