[pkg-java] r11981 - trunk/maven2/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-04-01 18:13:58 +0000 (Thu, 01 Apr 2010)
New Revision: 11981

Added:
   trunk/maven2/debian/README.source
Removed:
   trunk/maven2/debian/README.Debian-source
   trunk/maven2/debian/README.source
Modified:
   trunk/maven2/debian/changelog
   trunk/maven2/debian/compat
   trunk/maven2/debian/control
   trunk/maven2/debian/rules
Log:
* Team Upload.
* Rebuild with new libmaven2-core-java 2.2.1-2
  (should fix plugins dependencies version issues)
* Update Standards-Version to 3.8.4: no changes needed
* Bump debhelper to >= 7
* Use 3.0 (quilt) source format:
  - Rework debian/README.source

Deleted: trunk/maven2/debian/README.Debian-source
===================================================================
--- trunk/maven2/debian/README.Debian-source	2010-04-01 18:07:41 UTC (rev 11980)
+++ trunk/maven2/debian/README.Debian-source	2010-04-01 18:13:58 UTC (rev 11981)
@@ -1,11 +0,0 @@
-maven2 package
-
-The source has been downloaded from upstream's svn, and
-may be recreated using the "get-orig-source" rule in debian/rules.
-
-The debian directory contains a number of configuration files in the META-INF
-directory (components.xml, pom.xml etc). These files would normally be generated
-when "bootstrapping" Maven. Bootstrapping is not possible in the Debian
-build because it would download and use some (binary) Jars.
-
- -- Paul Cager <paul-debian at home.paulcager.org>  Fri, 06 Jul 2007 16:37:52 +0100

Deleted: trunk/maven2/debian/README.source
===================================================================
--- trunk/maven2/debian/README.source	2010-04-01 18:07:41 UTC (rev 11980)
+++ trunk/maven2/debian/README.source	2010-04-01 18:13:58 UTC (rev 11981)
@@ -1,9 +0,0 @@
-Patch System
-============
-
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-

Copied: trunk/maven2/debian/README.source (from rev 11978, trunk/maven2/debian/README.Debian-source)
===================================================================
--- trunk/maven2/debian/README.source	                        (rev 0)
+++ trunk/maven2/debian/README.source	2010-04-01 18:13:58 UTC (rev 11981)
@@ -0,0 +1,11 @@
+maven2 package
+
+The source has been downloaded from upstream's svn, and
+may be recreated using the "get-orig-source" rule in debian/rules.
+
+The debian directory contains a number of configuration files in the META-INF
+directory (components.xml, pom.xml etc). These files would normally be generated
+when "bootstrapping" Maven. Bootstrapping is not possible in the Debian
+build because it would download and use some (binary) Jars.
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Fri, 06 Jul 2007 16:37:52 +0100

Modified: trunk/maven2/debian/changelog
===================================================================
--- trunk/maven2/debian/changelog	2010-04-01 18:07:41 UTC (rev 11980)
+++ trunk/maven2/debian/changelog	2010-04-01 18:13:58 UTC (rev 11981)
@@ -1,3 +1,15 @@
+maven2 (2.2.1-3) UNREALEASED; urgency=low
+
+  * Team Upload.
+  * Rebuild with new libmaven2-core-java 2.2.1-2
+    (should fix plugins dependencies version issues)
+  * Update Standards-Version to 3.8.4: no changes needed
+  * Bump debhelper to >= 7
+  * Use 3.0 (quilt) source format:
+    - Rework debian/README.source
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 01 Apr 2010 20:12:12 +0200
+
 maven2 (2.2.1-2) unstable; urgency=low
 
   * Rebuild to update plugin versions (Closes: #552704, #553046).

Modified: trunk/maven2/debian/compat
===================================================================
--- trunk/maven2/debian/compat	2010-04-01 18:07:41 UTC (rev 11980)
+++ trunk/maven2/debian/compat	2010-04-01 18:13:58 UTC (rev 11981)
@@ -1 +1 @@
-6
+7

Modified: trunk/maven2/debian/control
===================================================================
--- trunk/maven2/debian/control	2010-04-01 18:07:41 UTC (rev 11980)
+++ trunk/maven2/debian/control	2010-04-01 18:13:58 UTC (rev 11981)
@@ -7,9 +7,9 @@
 Build-Depends-Indep: maven-repo-helper, ant-optional, junit, libmaven-clean-plugin-java,
   libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java,  
   libmaven-resources-plugin-java, libmaven-shade-plugin-java,
-  libmaven2-core-java, maven-ant-helper
-Build-Depends: debhelper (>= 6), cdbs (>= 0.4.5.3), default-jdk, ant, quilt
-Standards-Version: 3.8.3
+  libmaven2-core-java (>= 2.2.1-2), maven-ant-helper
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk, ant
+Standards-Version: 3.8.4
 Homepage: http://maven.apache.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven2

Modified: trunk/maven2/debian/rules
===================================================================
--- trunk/maven2/debian/rules	2010-04-01 18:07:41 UTC (rev 11980)
+++ trunk/maven2/debian/rules	2010-04-01 18:13:58 UTC (rev 11981)
@@ -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)