[maven-doxia-tools] 16/35: * Newer but not newest upstream release. * Refresh patches. * Update Standards-Version: 3.9.2.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-doxia-tools.

commit 6c4aecf49d6c26c5ce8b30e957462fdf11d1afac
Author: Torsten Werner <twerner at debian.org>
Date:   Sat Sep 10 22:42:08 2011 +0000

    * Newer but not newest upstream release.
    * Refresh patches.
    * Update Standards-Version: 3.9.2.
---
 debian/changelog                                          |  8 ++++++++
 debian/control                                            |  2 +-
 ...ation.diff => 0001-fix-for-plexus-interpolation.patch} | 15 +++++++++++++--
 ...astModified.diff => 0002-remove-setLastModified.patch} | 13 ++++++++++++-
 debian/patches/series                                     |  4 ++--
 debian/rules                                              |  2 +-
 6 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8226cb..99dbfbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 8fd96b3..84cce7a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7), cdbs, default-jdk
 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/
diff --git a/debian/patches/plexus-interpolation.diff b/debian/patches/0001-fix-for-plexus-interpolation.patch
similarity index 73%
rename from debian/patches/plexus-interpolation.diff
rename to debian/patches/0001-fix-for-plexus-interpolation.patch
index 66c6009..cea9c6b 100644
--- a/debian/patches/plexus-interpolation.diff
+++ b/debian/patches/0001-fix-for-plexus-interpolation.patch
@@ -1,6 +1,16 @@
+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 @@
+@@ -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;
@@ -16,7 +26,7 @@
  import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
  
  import java.io.File;
-@@ -672,7 +673,15 @@
+@@ -672,7 +673,15 @@ public class DefaultSiteTool
  
          interpolator.addValueSource( new MapBasedValueSource( aProject.getProperties() ) );
  
@@ -33,3 +43,4 @@
  
          props.put( "inputEncoding", inputEncoding );
  
+-- 
diff --git a/debian/patches/setLastModified.diff b/debian/patches/0002-remove-setLastModified.patch
similarity index 52%
rename from debian/patches/setLastModified.diff
rename to debian/patches/0002-remove-setLastModified.patch
index 0b877b8..912ff07 100644
--- a/debian/patches/setLastModified.diff
+++ b/debian/patches/0002-remove-setLastModified.patch
@@ -1,6 +1,16 @@
+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
-@@ -1245,7 +1245,6 @@
+@@ -1259,7 +1259,6 @@ public class DefaultSiteTool
                                                                            inputEncoding, outputEncoding );
  
              decoration = readDecorationModel( siteDescriptorContent );
@@ -8,3 +18,4 @@
          }
  
          MavenProject parentProject = getParentProject( project, reactorProjects, localRepository );
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index c6db7d0..ac7bc80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-plexus-interpolation.diff
-setLastModified.diff
+0001-fix-for-plexus-interpolation.patch
+0002-remove-setLastModified.patch
diff --git a/debian/rules b/debian/rules
index a1bdbfb..fffb509 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,4 +23,4 @@ clean::
 	-rm -rf debian/tmp
 
 get-orig-source:
-	uscan --force-download --rename
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-doxia-tools.git