[pkg-java] r11716 - in trunk/doxia-sitetools/debian: . patches source

[Gabriele Giacone]

Author: gg0-guest
Date: 2010-02-26 01:18:41 +0000 (Fri, 26 Feb 2010)
New Revision: 11716

Added:
   trunk/doxia-sitetools/debian/patches/
   trunk/doxia-sitetools/debian/patches/00LastModified
   trunk/doxia-sitetools/debian/patches/series
   trunk/doxia-sitetools/debian/source/
   trunk/doxia-sitetools/debian/source/format
Modified:
   trunk/doxia-sitetools/debian/changelog
   trunk/doxia-sitetools/debian/control
Log:
new upstream release 1.1.2

Modified: trunk/doxia-sitetools/debian/changelog
===================================================================
--- trunk/doxia-sitetools/debian/changelog	2010-02-26 01:17:44 UTC (rev 11715)
+++ trunk/doxia-sitetools/debian/changelog	2010-02-26 01:18:41 UTC (rev 11716)
@@ -1,3 +1,11 @@
+doxia-sitetools (1.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Standards-Version to 3.8.4.
+  * Source format 3.0 (quilt).
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Fri, 26 Feb 2010 01:08:30 +0100
+
 doxia-sitetools (1.1.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/doxia-sitetools/debian/control
===================================================================
--- trunk/doxia-sitetools/debian/control	2010-02-26 01:17:44 UTC (rev 11715)
+++ trunk/doxia-sitetools/debian/control	2010-02-26 01:18:41 UTC (rev 11716)
@@ -2,22 +2,24 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
- libmodello-java, 
- libdoxia-java (>= 1.1.1), libplexus-containers-java, libplexus-i18n-java, libplexus-utils-java, 
- libitext1-java, libxalan2-java, libplexus-velocity-java, velocity, libcommons-collections-java,
- fop
+Uploaders: Torsten Werner <twerner at debian.org>,
+ Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant,
+ ant-optional, libmodello-java, libdoxia-java (>= 1.1.1), libplexus-containers-java,
+ 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.3
+Standards-Version: 3.8.4
 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/
 
 Package: libdoxia-sitetools-java
 Architecture: all
-Depends: ${misc:Depends}, libdoxia-java, libplexus-containers-java, libplexus-i18n-java, libplexus-utils-java
-Recommends: libitext1-java, libxalan2-java, libplexus-velocity-java, velocity, libcommons-collections-java
+Depends: ${misc:Depends}, libdoxia-java, libplexus-containers-java,
+ libplexus-i18n-java, libplexus-utils-java
+Recommends: libitext1-java, libxalan2-java, libplexus-velocity-java, velocity,
+ libcommons-collections-java
 Conflicts: libdoxia-java (<= 1.0-alpha-7-1)
 Description: Extension package of the content generation framework Doxia
  Doxia Sitetools generates sites, consisting of static and dynamic content that

Added: trunk/doxia-sitetools/debian/patches/00LastModified
===================================================================
--- trunk/doxia-sitetools/debian/patches/00LastModified	                        (rev 0)
+++ trunk/doxia-sitetools/debian/patches/00LastModified	2010-02-26 01:18:41 UTC (rev 11716)
@@ -0,0 +1,27 @@
+--- 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() )
+             {

Added: trunk/doxia-sitetools/debian/patches/series
===================================================================
--- trunk/doxia-sitetools/debian/patches/series	                        (rev 0)
+++ trunk/doxia-sitetools/debian/patches/series	2010-02-26 01:18:41 UTC (rev 11716)
@@ -0,0 +1 @@
+00LastModified

Added: trunk/doxia-sitetools/debian/source/format
===================================================================
--- trunk/doxia-sitetools/debian/source/format	                        (rev 0)
+++ trunk/doxia-sitetools/debian/source/format	2010-02-26 01:18:41 UTC (rev 11716)
@@ -0,0 +1 @@
+3.0 (quilt)