[pkg-java] r11979 - in trunk/maven2-core/debian: . patches source

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-04-01 18:06:40 +0000 (Thu, 01 Apr 2010)
New Revision: 11979

Added:
   trunk/maven2-core/debian/source/
   trunk/maven2-core/debian/source/format
Modified:
   trunk/maven2-core/debian/changelog
   trunk/maven2-core/debian/compat
   trunk/maven2-core/debian/control
   trunk/maven2-core/debian/patches/plugin-versions.patch
   trunk/maven2-core/debian/rules
Log:
* 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

Modified: trunk/maven2-core/debian/changelog
===================================================================
--- trunk/maven2-core/debian/changelog	2010-03-31 00:33:35 UTC (rev 11978)
+++ trunk/maven2-core/debian/changelog	2010-04-01 18:06:40 UTC (rev 11979)
@@ -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 ]

Modified: trunk/maven2-core/debian/compat
===================================================================
--- trunk/maven2-core/debian/compat	2010-03-31 00:33:35 UTC (rev 11978)
+++ trunk/maven2-core/debian/compat	2010-04-01 18:06:40 UTC (rev 11979)
@@ -1 +1 @@
-6
+7

Modified: trunk/maven2-core/debian/control
===================================================================
--- trunk/maven2-core/debian/control	2010-03-31 00:33:35 UTC (rev 11978)
+++ trunk/maven2-core/debian/control	2010-04-01 18:06:40 UTC (rev 11979)
@@ -4,7 +4,7 @@
 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 @@
   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

Modified: trunk/maven2-core/debian/patches/plugin-versions.patch
===================================================================
--- trunk/maven2-core/debian/patches/plugin-versions.patch	2010-03-31 00:33:35 UTC (rev 11978)
+++ trunk/maven2-core/debian/patches/plugin-versions.patch	2010-04-01 18:06:40 UTC (rev 11979)
@@ -42,9 +42,14 @@
           </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>
 -           <version>2.4.3</version>
 +           <version>2.5</version>
@@ -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>

Modified: trunk/maven2-core/debian/rules
===================================================================
--- trunk/maven2-core/debian/rules	2010-03-31 00:33:35 UTC (rev 11978)
+++ trunk/maven2-core/debian/rules	2010-04-01 18:06:40 UTC (rev 11979)
@@ -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)

Added: trunk/maven2-core/debian/source/format
===================================================================
--- trunk/maven2-core/debian/source/format	                        (rev 0)
+++ trunk/maven2-core/debian/source/format	2010-04-01 18:06:40 UTC (rev 11979)
@@ -0,0 +1 @@
+3.0 (quilt)