This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven2.
commit f97d86db0eaca2e5a4e9cae367e36a15c3eed5f2 Author: Ludovic Claude <[email protected]> Date: Fri Sep 4 19:52:18 2009 +0000 * 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) --- debian/README.source | 9 +++++++++ debian/bash_completion.d/maven2 | 6 +++++- debian/changelog | 12 ++++++++++++ debian/control | 2 +- debian/orig-tar.exclude | 4 ++++ debian/orig-tar.sh | 8 ++------ debian/patches/pom.patch | 10 +++++----- debian/watch | 2 +- 8 files changed, 39 insertions(+), 14 deletions(-) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..f846ea2 --- /dev/null +++ b/debian/README.source @@ -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. + diff --git a/debian/bash_completion.d/maven2 b/debian/bash_completion.d/maven2 index 874d26b..8efd942 100644 --- a/debian/bash_completion.d/maven2 +++ b/debian/bash_completion.d/maven2 @@ -646,12 +646,15 @@ _mvn () 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 @@ _mvn () *) __mvncomp "$(__mvnlist_projects)" ;; esac + return ;; --settings|--global-settings) COMPREPLY=( $( compgen -f -- $cur ) ) + return ;; --*) COMPREPLY=() ;; esac - return fi if [ -z "$cmd" ]; then diff --git a/debian/changelog b/debian/changelog index 4171ffe..2aa35fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Thu, 03 Sep 2009 20:42:38 +0100 + maven2 (2.2.0-2) unstable; urgency=low * Upload to unstable. diff --git a/debian/control b/debian/control index b022472..b7a1dc6 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends-Indep: maven-repo-helper, ant-optional, junit, libmaven-clean-plug 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 diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude new file mode 100644 index 0000000..ccbc077 --- /dev/null +++ b/debian/orig-tar.exclude @@ -0,0 +1,4 @@ +*.jar +maven-* + + diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 189f232..fd69610 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -5,12 +5,8 @@ TAR=../maven2_$VERSION.orig.tar.gz 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' diff --git a/debian/patches/pom.patch b/debian/patches/pom.patch index 0ea60b9..f70373f 100644 --- a/debian/patches/pom.patch +++ b/debian/patches/pom.patch @@ -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> diff --git a/debian/watch b/debian/watch index 1b8b7dc..44d60c5 100644 --- a/debian/watch +++ b/debian/watch @@ -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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
