[pkg-java] r14798 - in trunk/maven-doxia-tools/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Sat Sep 10 22:42:09 UTC 2011
Author: twerner
Date: 2011-09-10 22:42:08 +0000 (Sat, 10 Sep 2011)
New Revision: 14798
Added:
trunk/maven-doxia-tools/debian/patches/0001-fix-for-plexus-interpolation.patch
trunk/maven-doxia-tools/debian/patches/0002-remove-setLastModified.patch
Removed:
trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff
trunk/maven-doxia-tools/debian/patches/setLastModified.diff
Modified:
trunk/maven-doxia-tools/debian/changelog
trunk/maven-doxia-tools/debian/control
trunk/maven-doxia-tools/debian/patches/series
trunk/maven-doxia-tools/debian/rules
Log:
* Newer but not newest upstream release.
* Refresh patches.
* Update Standards-Version: 3.9.2.
Modified: trunk/maven-doxia-tools/debian/changelog
===================================================================
--- trunk/maven-doxia-tools/debian/changelog 2011-09-10 15:44:56 UTC (rev 14797)
+++ trunk/maven-doxia-tools/debian/changelog 2011-09-10 22:42:08 UTC (rev 14798)
@@ -1,3 +1,11 @@
+maven-doxia-tools (1.2.1-1) unstable; urgency=low
+
+ * Newer but not newest upstream release.
+ * Refresh patches.
+ * Update Standards-Version: 3.9.2.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 11 Sep 2011 00:41:55 +0200
+
maven-doxia-tools (1.2-3) unstable; urgency=low
* Add myself as Uploaders
Modified: trunk/maven-doxia-tools/debian/control
===================================================================
--- trunk/maven-doxia-tools/debian/control 2011-09-10 15:44:56 UTC (rev 14797)
+++ trunk/maven-doxia-tools/debian/control 2011-09-10 22:42:08 UTC (rev 14798)
@@ -7,7 +7,7 @@
Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
junit, libmaven-plugin-tools-java, libplexus-maven-plugin-java, velocity, libplexus-velocity-java,
libdoxia-sitetools-java, libcommons-io-java, libplexus-container-default-java, libmaven2-core-java
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-doxia-tools
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-doxia-tools/
Homepage: http://maven.apache.org/shared/maven-doxia-tools/
Copied: trunk/maven-doxia-tools/debian/patches/0001-fix-for-plexus-interpolation.patch (from rev 14797, trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff)
===================================================================
--- trunk/maven-doxia-tools/debian/patches/0001-fix-for-plexus-interpolation.patch (rev 0)
+++ trunk/maven-doxia-tools/debian/patches/0001-fix-for-plexus-interpolation.patch 2011-09-10 22:42:08 UTC (rev 14798)
@@ -0,0 +1,46 @@
+From: Damien Raude-Morvan <drazzib at debian.org>
+Date: Sun, 11 Sep 2011 00:33:43 +0200
+Subject: fix for plexus-interpolation
+
+---
+ .../apache/maven/doxia/tools/DefaultSiteTool.java | 19 ++++++++++++++-----
+ 1 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+index fb65087..f3fe8c7 100644
+--- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
++++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+@@ -45,10 +45,11 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
+ import org.codehaus.plexus.util.IOUtil;
+ import org.codehaus.plexus.util.ReaderFactory;
+ import org.codehaus.plexus.util.StringUtils;
+-import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
+-import org.codehaus.plexus.util.interpolation.MapBasedValueSource;
+-import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
+-import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
++import org.codehaus.plexus.interpolation.InterpolationException;
++import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
++import org.codehaus.plexus.interpolation.MapBasedValueSource;
++import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
++import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
+ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+ import java.io.File;
+@@ -672,7 +673,15 @@ public class DefaultSiteTool
+
+ interpolator.addValueSource( new MapBasedValueSource( aProject.getProperties() ) );
+
+- siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
++ try
++ {
++ siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
++ }
++ catch ( InterpolationException e )
++ {
++ throw new SiteToolException( "IOException: cannot interpolate siteDescriptorContent: " + e.getMessage(),
++ e );
++ }
+
+ props.put( "inputEncoding", inputEncoding );
+
+--
Copied: trunk/maven-doxia-tools/debian/patches/0002-remove-setLastModified.patch (from rev 14797, trunk/maven-doxia-tools/debian/patches/setLastModified.diff)
===================================================================
--- trunk/maven-doxia-tools/debian/patches/0002-remove-setLastModified.patch (rev 0)
+++ trunk/maven-doxia-tools/debian/patches/0002-remove-setLastModified.patch 2011-09-10 22:42:08 UTC (rev 14798)
@@ -0,0 +1,21 @@
+From: Damien Raude-Morvan <drazzib at debian.org>
+Date: Sun, 11 Sep 2011 00:33:43 +0200
+Subject: remove setLastModified
+
+---
+ .../apache/maven/doxia/tools/DefaultSiteTool.java | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+index f3fe8c7..f027a7e 100644
+--- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
++++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+@@ -1259,7 +1259,6 @@ public class DefaultSiteTool
+ inputEncoding, outputEncoding );
+
+ decoration = readDecorationModel( siteDescriptorContent );
+- decoration.setLastModified( siteDescriptorLastModified );
+ }
+
+ MavenProject parentProject = getParentProject( project, reactorProjects, localRepository );
+--
Deleted: trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff
===================================================================
--- trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff 2011-09-10 15:44:56 UTC (rev 14797)
+++ trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff 2011-09-10 22:42:08 UTC (rev 14798)
@@ -1,35 +0,0 @@
---- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-+++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-@@ -45,10 +45,11 @@
- import org.codehaus.plexus.util.IOUtil;
- import org.codehaus.plexus.util.ReaderFactory;
- import org.codehaus.plexus.util.StringUtils;
--import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
--import org.codehaus.plexus.util.interpolation.MapBasedValueSource;
--import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
--import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
-+import org.codehaus.plexus.interpolation.InterpolationException;
-+import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
-+import org.codehaus.plexus.interpolation.MapBasedValueSource;
-+import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
-+import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
- import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
- import java.io.File;
-@@ -672,7 +673,15 @@
-
- interpolator.addValueSource( new MapBasedValueSource( aProject.getProperties() ) );
-
-- siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
-+ try
-+ {
-+ siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
-+ }
-+ catch ( InterpolationException e )
-+ {
-+ throw new SiteToolException( "IOException: cannot interpolate siteDescriptorContent: " + e.getMessage(),
-+ e );
-+ }
-
- props.put( "inputEncoding", inputEncoding );
-
Modified: trunk/maven-doxia-tools/debian/patches/series
===================================================================
--- trunk/maven-doxia-tools/debian/patches/series 2011-09-10 15:44:56 UTC (rev 14797)
+++ trunk/maven-doxia-tools/debian/patches/series 2011-09-10 22:42:08 UTC (rev 14798)
@@ -1,2 +1,2 @@
-plexus-interpolation.diff
-setLastModified.diff
+0001-fix-for-plexus-interpolation.patch
+0002-remove-setLastModified.patch
Deleted: trunk/maven-doxia-tools/debian/patches/setLastModified.diff
===================================================================
--- trunk/maven-doxia-tools/debian/patches/setLastModified.diff 2011-09-10 15:44:56 UTC (rev 14797)
+++ trunk/maven-doxia-tools/debian/patches/setLastModified.diff 2011-09-10 22:42:08 UTC (rev 14798)
@@ -1,10 +0,0 @@
---- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-+++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-@@ -1245,7 +1245,6 @@
- inputEncoding, outputEncoding );
-
- decoration = readDecorationModel( siteDescriptorContent );
-- decoration.setLastModified( siteDescriptorLastModified );
- }
-
- MavenProject parentProject = getParentProject( project, reactorProjects, localRepository );
Modified: trunk/maven-doxia-tools/debian/rules
===================================================================
--- trunk/maven-doxia-tools/debian/rules 2011-09-10 15:44:56 UTC (rev 14797)
+++ trunk/maven-doxia-tools/debian/rules 2011-09-10 22:42:08 UTC (rev 14798)
@@ -23,4 +23,4 @@
-rm -rf debian/tmp
get-orig-source:
- uscan --force-download --rename
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
More information about the pkg-java-commits
mailing list