[modello-maven-plugin] 06/12: * Fix

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch modello-1.1
in repository modello-maven-plugin.

commit 2ae4203fd4b39759d39dc94222c2007f20ad49e6
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Sat Aug 1 21:41:41 2009 +0000

    * Fix
---
 debian/control                  |  2 +-
 debian/patches/modello1_0.patch | 20 ++++++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  3 ++-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 5d28263..15f0379 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep
+Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep, quilt
 Build-Depends-Indep: maven-debian-helper,
  libplexus-containers-java, libplexus-build-api-java, libmaven2-core-java,  
  libmodello-java, libplexus-utils-java 
diff --git a/debian/patches/modello1_0.patch b/debian/patches/modello1_0.patch
new file mode 100644
index 0000000..8fb845e
--- /dev/null
+++ b/debian/patches/modello1_0.patch
@@ -0,0 +1,20 @@
+--- a/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java
++++ b/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java
+@@ -96,7 +96,7 @@
+     /**
+      * <p>Note: This is passed by Maven and must not be configured by the user.</p>
+      *
+-     * @component
++     * @component role="org.codehaus.modello.core.ModelloCore"
+      */
+     private ModelloCore modelloCore;
+ 
+@@ -123,7 +123,7 @@
+      */
+     private boolean useJava5;
+ 
+-    /** @component */
++    /** @component role="org.sonatype.plexus.build.incremental.BuildContext" */
+     private BuildContext buildContext;
+ 
+     // ----------------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..42038d7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+modello1_0.patch
diff --git a/debian/rules b/debian/rules
index a52f756..dd3501d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,9 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
\ No newline at end of file
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

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