Author: twerner Date: 2008-12-05 20:34:03 +0000 (Fri, 05 Dec 2008) New Revision: 7533
Added: trunk/maven-plugin-tools/debian/patches/ trunk/maven-plugin-tools/debian/patches/jtidy.diff trunk/maven-plugin-tools/debian/patches/pom.diff trunk/maven-plugin-tools/debian/patches/series Modified: trunk/maven-plugin-tools/debian/ trunk/maven-plugin-tools/debian/changelog trunk/maven-plugin-tools/debian/control trunk/maven-plugin-tools/debian/rules Log: 'debian/rules build' is successful Property changes on: trunk/maven-plugin-tools/debian ___________________________________________________________________ Name: mergeWithUpstream + 1 Modified: trunk/maven-plugin-tools/debian/changelog =================================================================== --- trunk/maven-plugin-tools/debian/changelog 2008-12-05 20:22:02 UTC (rev 7532) +++ trunk/maven-plugin-tools/debian/changelog 2008-12-05 20:34:03 UTC (rev 7533) @@ -1,4 +1,4 @@ -maven-plugin-tools-api (2.4.3-1) unstable; urgency=low +maven-plugin-tools (2.4.3-1) unstable; urgency=low * Initial release. (Closes: #xxxxxx) Modified: trunk/maven-plugin-tools/debian/control =================================================================== --- trunk/maven-plugin-tools/debian/control 2008-12-05 20:22:02 UTC (rev 7532) +++ trunk/maven-plugin-tools/debian/control 2008-12-05 20:34:03 UTC (rev 7533) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Torsten Werner <[EMAIL PROTECTED]> -Build-Depends: ant, debhelper (>= 5), cdbs, default-jdk +Build-Depends: ant, debhelper (>= 5), cdbs, default-jdk, quilt Standards-Version: 3.8.0 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/ Added: trunk/maven-plugin-tools/debian/patches/jtidy.diff =================================================================== --- trunk/maven-plugin-tools/debian/patches/jtidy.diff (rev 0) +++ trunk/maven-plugin-tools/debian/patches/jtidy.diff 2008-12-05 20:34:03 UTC (rev 7533) @@ -0,0 +1,14 @@ +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 ); Added: trunk/maven-plugin-tools/debian/patches/pom.diff =================================================================== --- trunk/maven-plugin-tools/debian/patches/pom.diff (rev 0) +++ trunk/maven-plugin-tools/debian/patches/pom.diff 2008-12-05 20:34:03 UTC (rev 7533) @@ -0,0 +1,145 @@ +Index: maven-plugin-tools-2.4.3/maven-plugin-plugin/pom.xml +=================================================================== +--- maven-plugin-tools-2.4.3.orig/maven-plugin-plugin/pom.xml 2008-12-05 21:27:27.000000000 +0100 ++++ maven-plugin-tools-2.4.3/maven-plugin-plugin/pom.xml 2008-12-05 19:16:27.000000000 +0100 +@@ -20,11 +20,13 @@ + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + ++ <!-- + <parent> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugins</artifactId> + <version>11</version> + </parent> ++ --> + + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +@@ -73,16 +75,19 @@ + <artifactId>maven-plugin-tools-api</artifactId> + <version>${pluginToolsVersion}</version> + </dependency> ++ <!-- + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-model</artifactId> + <version>${pluginToolsVersion}</version> + </dependency> ++ --> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-java</artifactId> + <version>${pluginToolsVersion}</version> + </dependency> ++ <!-- + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-beanshell</artifactId> +@@ -93,18 +98,22 @@ + <artifactId>maven-plugin-descriptor</artifactId> + <version>2.0.6</version> + </dependency> ++ --> + + <!-- plexus --> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> +- <version>1.5.6</version> ++ <version>1.4.8</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/plexus-utils.jar</systemPath> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <!-- doxia --> ++ <!-- + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> +@@ -125,8 +134,10 @@ + </exclusion> + </exclusions> + </dependency> ++ --> + + <!-- maven --> ++ <!-- + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> +@@ -157,10 +168,12 @@ + <artifactId>maven-plugin-registry</artifactId> + <version>2.0.6</version> + </dependency> ++ --> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-api</artifactId> + </dependency> ++ <!-- + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> +@@ -181,6 +194,7 @@ + <artifactId>maven-reporting-api</artifactId> + <version>2.0.4</version> + </dependency> ++ --> + + <!-- Maven runtime --> + <dependency> +@@ -188,11 +202,13 @@ + <artifactId>maven-plugin-tools-java</artifactId> + <scope>runtime</scope> + </dependency> ++ <!-- + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-beanshell</artifactId> + <scope>runtime</scope> + </dependency> ++ --> + + <!-- plexus --> + <dependency> +@@ -208,13 +224,15 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +- <version>2.4.2</version> ++ <version>2.4.3</version> + </plugin> ++ <!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.4</version> +- </plugin> ++ </plugin> ++ --> + </plugins> + </pluginManagement> + <plugins> +@@ -228,8 +246,9 @@ + <goal>helpmojo</goal> + </goals> + </execution> +- </executions> ++ </executions> + </plugin> ++ <!-- + <plugin> + <groupId>org.codehaus.modello</groupId> + <artifactId>modello-maven-plugin</artifactId> +@@ -248,6 +267,7 @@ + </models> + </configuration> + </plugin> ++ --> + </plugins> + </build> + Added: trunk/maven-plugin-tools/debian/patches/series =================================================================== --- trunk/maven-plugin-tools/debian/patches/series (rev 0) +++ trunk/maven-plugin-tools/debian/patches/series 2008-12-05 20:34:03 UTC (rev 7533) @@ -0,0 +1,2 @@ +pom.diff +jtidy.diff Modified: trunk/maven-plugin-tools/debian/rules =================================================================== --- trunk/maven-plugin-tools/debian/rules 2008-12-05 20:22:02 UTC (rev 7532) +++ trunk/maven-plugin-tools/debian/rules 2008-12-05 20:34:03 UTC (rev 7533) @@ -2,6 +2,7 @@ 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 := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/') _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
