Author: twerner Date: 2011-09-10 15:08:27 +0000 (Sat, 10 Sep 2011) New Revision: 14795
Added: trunk/doxia-sitetools/debian/patches/0001-fix-for-lastModified.patch Removed: trunk/doxia-sitetools/debian/patches/00LastModified Modified: trunk/doxia-sitetools/debian/changelog trunk/doxia-sitetools/debian/control trunk/doxia-sitetools/debian/patches/series Log: UNRELEASED (doxia needs to be uploaded first) * Newer but not newest upstream release. * Refresh patch. * Update Standards-Version: 3.9.2. Modified: trunk/doxia-sitetools/debian/changelog =================================================================== --- trunk/doxia-sitetools/debian/changelog 2011-09-10 12:40:15 UTC (rev 14794) +++ trunk/doxia-sitetools/debian/changelog 2011-09-10 15:08:27 UTC (rev 14795) @@ -1,3 +1,12 @@ +doxia-sitetools (1.1.4-1) unstable; urgency=low + + UNRELEASED (doxia needs to be uploaded first) + * Newer but not newest upstream release. + * Refresh patch. + * Update Standards-Version: 3.9.2. + + -- Torsten Werner <[email protected]> Sat, 10 Sep 2011 17:08:09 +0200 + doxia-sitetools (1.1.2-1) unstable; urgency=low * New upstream release. Modified: trunk/doxia-sitetools/debian/control =================================================================== --- trunk/doxia-sitetools/debian/control 2011-09-10 12:40:15 UTC (rev 14794) +++ trunk/doxia-sitetools/debian/control 2011-09-10 15:08:27 UTC (rev 14795) @@ -9,7 +9,7 @@ libplexus-i18n-java, libplexus-utils-java, libitext1-java, libxalan2-java, libplexus-velocity-java, velocity, libcommons-collections-java, fop Build-Depends: debhelper (>= 7), cdbs, default-jdk -Standards-Version: 3.8.4 +Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia-sitetools Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia-sitetools/ Homepage: http://maven.apache.org/doxia/doxia-sitetools/ Copied: trunk/doxia-sitetools/debian/patches/0001-fix-for-lastModified.patch (from rev 14794, trunk/doxia-sitetools/debian/patches/00LastModified) =================================================================== --- trunk/doxia-sitetools/debian/patches/0001-fix-for-lastModified.patch (rev 0) +++ trunk/doxia-sitetools/debian/patches/0001-fix-for-lastModified.patch 2011-09-10 15:08:27 UTC (rev 14795) @@ -0,0 +1,40 @@ +From: Gabriele Giacone <[email protected]> +Date: Sat, 10 Sep 2011 16:50:18 +0200 +Subject: fix for lastModified + +--- + ...DefaultDecorationModelInheritanceAssembler.java | 5 ----- + .../doxia/siterenderer/DefaultSiteRenderer.java | 3 +-- + 2 files changed, 1 insertions(+), 7 deletions(-) + +diff --git a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java b/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java +index e1734f0..cb4d8f3 100644 +--- a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java ++++ b/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java +@@ -83,11 +83,6 @@ public class DefaultDecorationModelInheritanceAssembler implements DecorationMod + + child.setPoweredBy( mergePoweredByLists( child.getPoweredBy(), parent.getPoweredBy(), urlContainer ) ); + +- if ( parent.getLastModified() > child.getLastModified() ) +- { +- child.setLastModified( parent.getLastModified() ); +- } +- + assembleBodyInheritance( name, child, parent, urlContainer ); + + assembleCustomInheritance( child, parent ); +diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java +index a396281..21e7c3b 100644 +--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java ++++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java +@@ -308,8 +308,7 @@ public class DefaultSiteRenderer + + File inputFile = new File( renderingContext.getBasedir(), renderingContext.getInputName() ); + +- boolean modified = !outputFile.exists() || ( inputFile.lastModified() > outputFile.lastModified() ) +- || ( siteRenderingContext.getDecoration().getLastModified() > outputFile.lastModified() ); ++ boolean modified = !outputFile.exists() || ( inputFile.lastModified() > outputFile.lastModified() ); + + if ( modified || docRenderer.isOverwrite() ) + { +-- Deleted: trunk/doxia-sitetools/debian/patches/00LastModified =================================================================== --- trunk/doxia-sitetools/debian/patches/00LastModified 2011-09-10 12:40:15 UTC (rev 14794) +++ trunk/doxia-sitetools/debian/patches/00LastModified 2011-09-10 15:08:27 UTC (rev 14795) @@ -1,27 +0,0 @@ ---- doxia-sitetools~/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java 2009-11-26 20:39:01.000000000 +0100 -+++ doxia-sitetools/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java 2010-02-25 23:45:53.000000000 +0100 -@@ -83,11 +83,6 @@ - - child.setPoweredBy( mergePoweredByLists( child.getPoweredBy(), parent.getPoweredBy(), urlContainer ) ); - -- if ( parent.getLastModified() > child.getLastModified() ) -- { -- child.setLastModified( parent.getLastModified() ); -- } -- - assembleBodyInheritance( name, child, parent, urlContainer ); - - assembleCustomInheritance( child, parent ); -diff -urNad doxia-sitetools~/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java doxia-sitetools/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java ---- doxia-sitetools~/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java 2009-11-25 23:38:25.000000000 +0100 -+++ doxia-sitetools/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java 2010-02-25 23:51:59.000000000 +0100 -@@ -306,8 +306,7 @@ - - File inputFile = new File( renderingContext.getBasedir(), renderingContext.getInputName() ); - -- boolean modified = !outputFile.exists() || ( inputFile.lastModified() > outputFile.lastModified() ) -- || ( siteRenderingContext.getDecoration().getLastModified() > outputFile.lastModified() ); -+ boolean modified = !outputFile.exists() || ( inputFile.lastModified() > outputFile.lastModified() ); - - if ( modified || docRenderer.isOverwrite() ) - { Modified: trunk/doxia-sitetools/debian/patches/series =================================================================== --- trunk/doxia-sitetools/debian/patches/series 2011-09-10 12:40:15 UTC (rev 14794) +++ trunk/doxia-sitetools/debian/patches/series 2011-09-10 15:08:27 UTC (rev 14795) @@ -1 +1 @@ -00LastModified +0001-fix-for-lastModified.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
