[maven2-core] 12/38: * Team upload. * Fix dependencies (maven-site-plugin and maven-javadoc-plugin versions) * Update Standards-Version to 3.8.4: no changes needed * Bump debhelper to >= 7 * Use 3.0 (quilt) source format

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven2-core.

commit 4b1fde162d273aed43854399436df98b61dcbdcf
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Thu Apr 1 18:06:40 2010 +0000

    * Team upload.
    * Fix dependencies (maven-site-plugin and maven-javadoc-plugin versions)
    * Update Standards-Version to 3.8.4: no changes needed
    * Bump debhelper to >= 7
    * Use 3.0 (quilt) source format
---
 debian/changelog                     | 10 ++++++++++
 debian/compat                        |  2 +-
 debian/control                       |  4 ++--
 debian/patches/plugin-versions.patch |  9 +++++++--
 debian/rules                         |  1 -
 debian/source/format                 |  1 +
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7f814a..6c4908d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+maven2-core (2.2.1-1.1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Fix dependencies (maven-site-plugin and maven-javadoc-plugin versions)
+  * Update Standards-Version to 3.8.4: no changes needed
+  * Bump debhelper to >= 7
+  * Use 3.0 (quilt) source format
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 01 Apr 2010 20:05:33 +0200
+
 maven2-core (2.2.1-1) unstable; urgency=low
 
   [ Ludovic Claude ]
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 6083af4..7572056 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
  Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 6), cdbs (>= 0.4.5.3), quilt, default-jdk
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
 Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
   junit, 
   libcommons-cli-java (>= 1.1), libslf4j-java (>= 1.5.6), libclassworlds-java (>= 1.1),
@@ -13,7 +13,7 @@ Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-option
   libplexus-archiver-java, libplexus-sec-dispatcher-java (>= 1.3),
   libplexus-interactivity-api-java (>=1.0-alpha-6), libplexus-interpolation-java (>= 1.11), 
   libplexus-utils-java (>=1:1.5.15), libwagon-java, libbackport-util-concurrent-java (>= 3.1)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://maven.apache.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven2-core
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven2-core
diff --git a/debian/patches/plugin-versions.patch b/debian/patches/plugin-versions.patch
index aefcb3b..704095a 100644
--- a/debian/patches/plugin-versions.patch
+++ b/debian/patches/plugin-versions.patch
@@ -42,7 +42,12 @@
           </plugin>
           <plugin>
             <artifactId>maven-jar-plugin</artifactId>
-@@ -116,7 +116,7 @@
+@@ -112,11 +112,11 @@
+          </plugin>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+-           <version>2.5</version>
++           <version>2.6.1</version>
           </plugin>
           <plugin>
             <artifactId>maven-plugin-plugin</artifactId>
@@ -56,7 +61,7 @@
           <plugin>
             <artifactId>maven-site-plugin</artifactId>
 -           <version>2.0-beta-7</version>
-+           <version>2.0</version>
++           <version>2.1</version>
           </plugin>
           <plugin>
             <artifactId>maven-source-plugin</artifactId>
diff --git a/debian/rules b/debian/rules
index 2b58766..fac7b80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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