Author: ebourg-guest Date: 2013-11-21 17:02:41 +0000 (Thu, 21 Nov 2013) New Revision: 17486
Modified: trunk/maven2/debian/changelog trunk/maven2/debian/control trunk/maven2/debian/patches/build.patch Log: Rebuild with libmaven2-core-java 2.2.1-14 (Updates maven-compiler-plugin) Modified: trunk/maven2/debian/changelog =================================================================== --- trunk/maven2/debian/changelog 2013-11-21 16:59:13 UTC (rev 17485) +++ trunk/maven2/debian/changelog 2013-11-21 17:02:41 UTC (rev 17486) @@ -1,3 +1,10 @@ +maven2 (2.2.1-18) unstable; urgency=low + + * Team upload + * Rebuild with libmaven2-core-java 2.2.1-14 (Updates maven-compiler-plugin) + + -- Emmanuel Bourg <[email protected]> Thu, 21 Nov 2013 18:01:39 +0100 + maven2 (2.2.1-17) unstable; urgency=low * Team upload. Modified: trunk/maven2/debian/control =================================================================== --- trunk/maven2/debian/control 2013-11-21 16:59:13 UTC (rev 17485) +++ trunk/maven2/debian/control 2013-11-21 17:02:41 UTC (rev 17486) @@ -7,12 +7,12 @@ Build-Depends-Indep: ant-optional, junit, libmaven-clean-plugin-java, - libmaven-compiler-plugin-java, + libmaven-compiler-plugin-java (>= 2.5.1), libmaven-install-plugin-java (>= 2.4), libmaven-jar-plugin-java, libmaven-resources-plugin-java, libmaven-shade-plugin-java, - libmaven2-core-java (>= 2.2.1-13~), + libmaven2-core-java (>= 2.2.1-14~), maven-ant-helper, maven-repo-helper Build-Depends: ant, cdbs (>= 0.4.5.3), debhelper (>= 9), default-jdk Modified: trunk/maven2/debian/patches/build.patch =================================================================== --- trunk/maven2/debian/patches/build.patch 2013-11-21 16:59:13 UTC (rev 17485) +++ trunk/maven2/debian/patches/build.patch 2013-11-21 17:02:41 UTC (rev 17486) @@ -120,7 +120,7 @@ <path id="sources"> <dirset dir="."> <include name="bootstrap/target/generated-sources"/> -@@ -170,16 +122,48 @@ +@@ -170,16 +122,49 @@ <src refid="sources"/> <classpath refid="pom.pathid"/> </javac> @@ -160,6 +160,7 @@ + <include name="org/apache/maven/maven-project/debian/maven-project-debian.jar"/> + <include name="org/apache/maven/maven-repository-metadata/debian/maven-repository-metadata-debian.jar"/> + <include name="org/apache/maven/maven-settings/debian/maven-settings-debian.jar"/> ++ <include name="org/apache/maven/maven-toolchain/debian/maven-toolchain-debian.jar"/> + <include name="org/apache/maven/reporting/maven-reporting-api/debian/maven-reporting-api-debian.jar"/> + <include name="org/apache/maven/wagon/wagon-provider-api/debian/wagon-provider-api-debian.jar"/> + <include name="org/apache/maven/wagon/wagon-ssh-common/debian/wagon-ssh-common-debian.jar"/> @@ -174,7 +175,7 @@ </path> </target> -@@ -193,6 +177,7 @@ +@@ -193,6 +178,7 @@ <jvmarg value="-Djava.compiler=NONE"/> --> <classpath refid="maven.classpath"/> @@ -182,7 +183,7 @@ <arg value="-e"/> <arg value="-B"/> <arg value="clean"/> -@@ -314,9 +299,4 @@ +@@ -314,9 +300,4 @@ <target name="with-its" depends="all,run-its"/> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
