[pkg-java] r10266 - in trunk/maven2/debian: . bash_completion.d patches

Ludovic Claude ludovicc-guest at alioth.debian.org
Fri Sep 4 19:52:18 UTC 2009 

Author: ludovicc-guest
Date: 2009-09-04 19:52:18 +0000 (Fri, 04 Sep 2009)
New Revision: 10266

Added:
   trunk/maven2/debian/README.source
   trunk/maven2/debian/orig-tar.exclude
Modified:
   trunk/maven2/debian/bash_completion.d/maven2
   trunk/maven2/debian/changelog
   trunk/maven2/debian/control
   trunk/maven2/debian/orig-tar.sh
   trunk/maven2/debian/patches/pom.patch
   trunk/maven2/debian/watch
Log:
* New upstream release (Closes: #542546)
* Update download url for debian/watch and debian/orig-tar.sh
* Update Standards-Version to 3.8.3
   - add debian/README.source
* Fix bash completion to keep working after single options such
  as --offline or -Dmaven.test.skip=true
* Ensure that all classes are compiled for Java 1.5 (Closes: #542162)

Added: trunk/maven2/debian/README.source
===================================================================
--- trunk/maven2/debian/README.source	                        (rev 0)
+++ trunk/maven2/debian/README.source	2009-09-04 19:52:18 UTC (rev 10266)
@@ -0,0 +1,9 @@
+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.
+

Modified: trunk/maven2/debian/bash_completion.d/maven2
===================================================================
--- trunk/maven2/debian/bash_completion.d/maven2	2009-09-04 19:50:04 UTC (rev 10265)
+++ trunk/maven2/debian/bash_completion.d/maven2	2009-09-04 19:52:18 UTC (rev 10266)
@@ -646,12 +646,15 @@
 		case "$option" in
 		--file)
 			__mvncomp "$(__mvnlist_poms)"
+			return
 			;;
 		--define)
 			__mvncomp "maven.test.skip=true"
+			return
 			;;
 		--resume-from)
 			__mvncomp "$(__mvnlist_projects)"
+			return
 			;;
 		--projects)
 			local cur="${COMP_WORDS[COMP_CWORD]}"
@@ -662,15 +665,16 @@
 			*)	__mvncomp "$(__mvnlist_projects)"
 				;;
 			esac
+			return
 			;;
 		--settings|--global-settings)
 			COMPREPLY=( $( compgen -f -- $cur ) )
+			return
 			;;
 		--*) 
 			COMPREPLY=() 
 			;;
 		esac
-		return
 	fi
 
 	if [ -z "$cmd" ]; then

Modified: trunk/maven2/debian/changelog
===================================================================
--- trunk/maven2/debian/changelog	2009-09-04 19:50:04 UTC (rev 10265)
+++ trunk/maven2/debian/changelog	2009-09-04 19:52:18 UTC (rev 10266)
@@ -1,3 +1,15 @@
+maven2 (2.2.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #542546)
+  * Update download url for debian/watch and debian/orig-tar.sh
+  * Update Standards-Version to 3.8.3
+     - add debian/README.source
+  * Fix bash completion to keep working after single options such
+    as --offline or -Dmaven.test.skip=true
+  * Ensure that all classes are compiled for Java 1.5 (Closes: #542162)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 03 Sep 2009 20:42:38 +0100
+
 maven2 (2.2.0-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/maven2/debian/control
===================================================================
--- trunk/maven2/debian/control	2009-09-04 19:50:04 UTC (rev 10265)
+++ trunk/maven2/debian/control	2009-09-04 19:52:18 UTC (rev 10266)
@@ -9,7 +9,7 @@
   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.1
+Standards-Version: 3.8.3
 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

Added: trunk/maven2/debian/orig-tar.exclude
===================================================================
--- trunk/maven2/debian/orig-tar.exclude	                        (rev 0)
+++ trunk/maven2/debian/orig-tar.exclude	2009-09-04 19:52:18 UTC (rev 10266)
@@ -0,0 +1,4 @@
+*.jar
+maven-*
+
+

Modified: trunk/maven2/debian/orig-tar.sh
===================================================================
--- trunk/maven2/debian/orig-tar.sh	2009-09-04 19:50:04 UTC (rev 10265)
+++ trunk/maven2/debian/orig-tar.sh	2009-09-04 19:52:18 UTC (rev 10266)
@@ -5,12 +5,8 @@
 DIR=maven2-$VERSION
 TAG=$(echo maven-$2 | sed s/~RC/-RC/ )
 
-svn export http://svn.apache.org/repos/asf/maven/components/tags/$TAG $DIR
-# remove the jar as Debian requires everything to be built from source, it will be rebuild from source
-rm $DIR/maven-ant-tasks*.jar
-# remove the maven- code as it is built in the package maven2-core
-rm -r $DIR/maven-*
-tar -c -z -f $TAR $DIR
+svn export http://svn.apache.org/repos/asf/maven/maven-2/tags/$TAG $DIR
+GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $DIR ../$TAG
 
 # move to directory 'tarballs'

Modified: trunk/maven2/debian/patches/pom.patch
===================================================================
--- trunk/maven2/debian/patches/pom.patch	2009-09-04 19:50:04 UTC (rev 10265)
+++ trunk/maven2/debian/patches/pom.patch	2009-09-04 19:52:18 UTC (rev 10266)
@@ -13,10 +13,10 @@
 -
 +  <groupId>org.apache.maven</groupId>
    <artifactId>maven</artifactId>
-   <version>2.2.0</version>
+   <version>2.2.1</version>
    <packaging>pom</packaging>
 @@ -121,6 +115,7 @@
-     <url>http://svn.apache.org/viewvc/maven/components/tags/maven-2.2.0</url>
+     <url>http://svn.apache.org/viewvc/maven/maven-2/tags/maven-2.2.1</url>
    </scm>
  
 +<!-- disable build section -
@@ -28,10 +28,10 @@
            <version>2.2.1</version>
            <configuration>
 -            <!-- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -->
-+            <- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT ->
-             <comparisonVersion>2.1.0</comparisonVersion>
++            <- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -
+             <comparisonVersion>2.2.0</comparisonVersion>
              <excludes>
-               <exclude>org/apache/maven/project/artifact/ArtifactWithProject*</exclude>
+               <exclude>org/apache/maven/artifact/manager/WagonManager*</exclude>
 @@ -248,8 +243,10 @@
        </plugin>
      </plugins>

Modified: trunk/maven2/debian/watch
===================================================================
--- trunk/maven2/debian/watch	2009-09-04 19:50:04 UTC (rev 10265)
+++ trunk/maven2/debian/watch	2009-09-04 19:52:18 UTC (rev 10266)
@@ -1,4 +1,4 @@
 version=3
 opts=uversionmangle=s/-RC/~RC/ \
-  http://svn.apache.org/repos/asf/maven/components/tags/ \
+  http://svn.apache.org/repos/asf/maven/maven-2/tags/ \
   maven-(2.*)/ debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list