This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-plugin-tools.
commit 0ad715294142cfafdc08eba536d80495681eb53d Author: Ludovic Claude <[email protected]> Date: Wed Jul 8 22:34:14 2009 +0000 * New version --- debian/build.xml | 38 +++++++++----------------------------- debian/changelog | 2 +- debian/control | 2 +- debian/patches/series | 3 ++- 4 files changed, 13 insertions(+), 32 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 9dabf84..ce8d5b2 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -54,28 +54,19 @@ version="1.0.0"/> </target> - <macrodef name="patchpom"> - <attribute name="dir"/> - <attribute name="args" default="" /> - <sequential> - <java classpath="/usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar" - classname="org.debian.maven.repo.POMCleaner" fork="true" dir="@{dir}" > - <arg value="-plib${package}-java" /> - <arg value="-r${basedir}/debian/maven.rules" /> - <arg line="--keep-pom-version @{args}" /> - <arg value="pom.xml.save" /> - <arg value="pom.xml" /> - <arg value="pom.properties" /> - </java> - </sequential> - </macrodef> - <macrodef name="package-and-local-deploy"> <attribute name="dir"/> + <attribute name="project.dir" default="@{dir}"/> <attribute name="artifactId" default="@{dir}"/> <attribute name="group" default="plugin-tools"/> <sequential> - <packagemodule dir="@{dir}"/> + <ant target="package" antfile="${maven.build}" dir="@{dir}"> + <property name="debian.dir" location="debian" /> + <property name="project.dir" value="@{project.dir}" /> + <property name="package" value="${package}" /> + <property name="use-local-repo" value="true" /> + <property name="keep-cleaned-pom" value="true" /> + </ant> <mkdir dir="debian/tmp/maven-repo/org/apache/maven/@{group}/@{artifactId}/${version}" /> <mkdir dir="debian/tmp/maven-repo/org/apache/maven/@{group}/@{artifactId}/debian" /> <copy file="@{dir}/pom.xml" @@ -95,18 +86,6 @@ <globmapper from="*" to="*.save"/> </copy> - <patchpom dir="." args="--no-parent" /> - <mkdir dir="debian/tmp/maven-repo/org/apache/maven/plugin-tools/maven-plugin-tools/${version}" /> - <copy file="pom.xml" tofile="debian/tmp/maven-repo/org/apache/maven/plugin-tools/maven-plugin-tools/${version}/maven-plugin-tools-${version}.pom" /> - - <patchpom dir="maven-plugin-tools-api" /> - <patchpom dir="maven-plugin-tools-model" /> - <patchpom dir="maven-plugin-tools-ant" /> - <patchpom dir="maven-plugin-tools-beanshell" /> - <patchpom dir="maven-plugin-tools-java" /> - <patchpom dir="maven-plugin-tools-javadoc" /> - <patchpom dir="maven-plugin-plugin" args="--no-parent" /> - <!-- Create a dummy plugin descriptor to help plugin-plugin to bootstrap itself. The real descriptor will be generated by calling mvn plugin:descriptor --> <mkdir dir="maven-plugin-plugin/${build.outputDirectory}/META-INF/maven/" /> @@ -116,6 +95,7 @@ </filterset> </copy> + <package-and-local-deploy dir="." project.dir="" artifactId="maven-plugin-tools" /> <package-and-local-deploy dir="maven-plugin-tools-api" /> <package-and-local-deploy dir="maven-plugin-tools-model" /> <package-and-local-deploy dir="maven-plugin-tools-ant"/> diff --git a/debian/changelog b/debian/changelog index 3c63651..a8fe8e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -maven-plugin-tools (2.5-0ubuntu1~ppa23) jaunty; urgency=low +maven-plugin-tools (2.5-1) unstable; urgency=low * New upstream version, add myself to Uploaders * Change section to java, bump up Standards-Version to 3.8.1 diff --git a/debian/control b/debian/control index d07616e..a16aec4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Ludovic Claude <[email protected]> -Build-Depends: ant, debhelper (>= 5), cdbs, default-jdk, quilt, libjaxp1.3-java +Build-Depends: debhelper (>= 5), cdbs, default-jdk, quilt, libjaxp1.3-java Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, libmodello-java, libclassworlds-java, junit, libplexus-velocity-java, velocity, libmaven-reporting-impl-java, libdoxia-sitetools-java, diff --git a/debian/patches/series b/debian/patches/series index f844853..a3851ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ -pom.diff jtidy.diff +pom.diff + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-plugin-tools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
