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 fedbe36f7baa01ae5143f0e86bef1eb01b079efc Author: Miguel Landaeta <[email protected]> Date: Sun Aug 14 22:01:37 2011 +0000 * Team upload. * New upstream release. * Switch to source format 3.0 (quilt). * Bump Standards-Version to 3.9.2. No changes were required. * Remove unnecessary Build-Depends on quilt. * Drop unnecessary patches already applied by upstream. --- debian/build.properties | 1 + debian/changelog | 11 +++++++++++ debian/control | 4 ++-- debian/patches/jtidy.diff | 16 ---------------- debian/patches/pom.diff | 28 ---------------------------- debian/patches/series | 3 --- debian/rules | 1 - debian/source/format | 1 + 8 files changed, 15 insertions(+), 50 deletions(-) diff --git a/debian/build.properties b/debian/build.properties index 0dc3017..b61c796 100644 --- a/debian/build.properties +++ b/debian/build.properties @@ -28,3 +28,4 @@ classpath.compile = \ /usr/share/java/plexus-utils.jar:\ /usr/share/java/plexus-classworlds.jar:\ /usr/share/java/plexus-container-default-alpha.jar +build.javaVersion=1.5 diff --git a/debian/changelog b/debian/changelog index 8296609..f36c31b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +maven-plugin-tools (2.8-1) UNRELEASED; urgency=low + + * Team upload. + * New upstream release. + * Switch to source format 3.0 (quilt). + * Bump Standards-Version to 3.9.2. No changes were required. + * Remove unnecessary Build-Depends on quilt. + * Drop unnecessary patches already applied by upstream. + + -- Miguel Landaeta <[email protected]> Sun, 14 Aug 2011 13:16:31 -0430 + maven-plugin-tools (2.5-2) unstable; urgency=low * Upload to unstable. diff --git a/debian/control b/debian/control index 1582f44..233da94 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Ludovic Claude <[email protected]> -Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt, libjaxp1.3-java +Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, 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, libplexus-container-default-java, libgoogle-collections-java, libxbean-java, libqdox-java, bsh, libjtidy-java, libmaven2-core-java -Standards-Version: 3.8.1 +Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-plugin-tools Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-plugin-tools/ Homepage: http://maven.apache.org diff --git a/debian/patches/jtidy.diff b/debian/patches/jtidy.diff deleted file mode 100644 index bc14d8e..0000000 --- a/debian/patches/jtidy.diff +++ /dev/null @@ -1,16 +0,0 @@ -make maven-plugin-tools compatible with newer cvs versions of jtidy - -Index: maven-plugin-tools-2.4.3/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java -=================================================================== ---- maven-plugin-tools-2.4.3.orig/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java 2008-12-05 21:30:17.000000000 +0100 -+++ maven-plugin-tools-2.4.3/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java 2008-12-05 13:53:19.000000000 +0100 -@@ -264,7 +264,8 @@ - tidy.setDocType( "loose" ); - tidy.setXHTML( true ); - tidy.setXmlOut( true ); -- tidy.setCharEncoding( Configuration.UTF8 ); -+ tidy.setInputEncoding( "UTF8" ); -+ tidy.setOutputEncoding( "UTF8" ); - tidy.setMakeClean( true ); - tidy.setNumEntities( true ); - tidy.setQuoteNbsp( false ); diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff deleted file mode 100644 index ac95b45..0000000 --- a/debian/patches/pom.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- a/maven-plugin-tools-api/pom.xml -+++ b/maven-plugin-tools-api/pom.xml -@@ -88,25 +88,6 @@ - <version>4aug2000r7-dev</version> - </dependency> - -- <!-- test --> -- <dependency> -- <groupId>org.apache.maven.reporting</groupId> -- <artifactId>maven-reporting-impl</artifactId> -- <version>2.0.4.1</version> -- <scope>test</scope> -- <exclusions> -- <!-- Using org.codehaus.plexus:plexus-utils instead of --> -- <exclusion> -- <groupId>plexus</groupId> -- <artifactId>plexus-utils</artifactId> -- </exclusion> -- </exclusions> -- </dependency> -- <dependency> -- <groupId>org.apache.maven.plugin-testing</groupId> -- <artifactId>maven-plugin-testing-harness</artifactId> -- <scope>test</scope> -- </dependency> - </dependencies> - - <profiles> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index a3851ad..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -jtidy.diff -pom.diff - diff --git a/debian/rules b/debian/rules index bfd3942..0788adb 100755 --- a/debian/rules +++ b/debian/rules @@ -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) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 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
