[maven-plugin-tools] 02/31: 'debian/rules build' is successful
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Mar 16 14:39:48 UTC 2015
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 252b204493aef4bec8692073724bcaab5096580f
Author: Torsten Werner <twerner at debian.org>
Date: Fri Dec 5 20:34:03 2008 +0000
'debian/rules build' is successful
---
debian/changelog | 2 +-
debian/control | 2 +-
debian/patches/jtidy.diff | 14 +++++
debian/patches/pom.diff | 145 ++++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 1 +
6 files changed, 164 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 13eba6e..5554e7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/control b/debian/control
index fec3de7..f43554e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-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/
diff --git a/debian/patches/jtidy.diff b/debian/patches/jtidy.diff
new file mode 100644
index 0000000..c2854cd
--- /dev/null
+++ b/debian/patches/jtidy.diff
@@ -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 );
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
new file mode 100644
index 0000000..677cf3a
--- /dev/null
+++ b/debian/patches/pom.diff
@@ -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>
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f844853
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+pom.diff
+jtidy.diff
diff --git a/debian/rules b/debian/rules
index 62242e8..6f64e28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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/')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-plugin-tools.git
More information about the pkg-java-commits
mailing list