Author: mkoch Date: 2009-10-05 11:03:35 +0000 (Mon, 05 Oct 2009) New Revision: 10769
Added: trunk/doxia/debian/patches/modello.patch Removed: trunk/doxia/debian/patches/dependencies.patch Modified: trunk/doxia/debian/changelog trunk/doxia/debian/compat trunk/doxia/debian/control trunk/doxia/debian/maven.rules trunk/doxia/debian/patches/series Log: doxia (1.1.1-1) unstable; urgency=low * Build-Depends/Recommends libcommons-httpclient-java (>= 3.1-6). * Build-Depends on debhelper (>= 7). -- Michael Koch <[email protected]> Thu, 01 Oct 2009 08:03:40 +0200 Modified: trunk/doxia/debian/changelog =================================================================== --- trunk/doxia/debian/changelog 2009-10-05 10:55:19 UTC (rev 10768) +++ trunk/doxia/debian/changelog 2009-10-05 11:03:35 UTC (rev 10769) @@ -1,10 +1,11 @@ -doxia (1.1.1-1) UNRELEASED; urgency=low +doxia (1.1.1-1) unstable; urgency=low * New upstream release. - * Build-Depends/Recommends libcommons-httpclient-java. + * Build-Depends/Recommends libcommons-httpclient-java (>= 3.1-6). + * Build-Depends on debhelper (>= 7). * Updated to Standards-Version 3.8.3. - -- Michael Koch <[email protected]> Sun, 27 Sep 2009 23:38:50 +0200 + -- Michael Koch <[email protected]> Thu, 01 Oct 2009 08:03:40 +0200 doxia (1.1-3) unstable; urgency=low Modified: trunk/doxia/debian/compat =================================================================== --- trunk/doxia/debian/compat 2009-10-05 10:55:19 UTC (rev 10768) +++ trunk/doxia/debian/compat 2009-10-05 11:03:35 UTC (rev 10769) @@ -1 +1 @@ -5 +7 Modified: trunk/doxia/debian/control =================================================================== --- trunk/doxia/debian/control 2009-10-05 10:55:19 UTC (rev 10768) +++ trunk/doxia/debian/control 2009-10-05 11:03:35 UTC (rev 10769) @@ -9,7 +9,7 @@ libplexus-containers-java, libplexus-utils-java, libplexus-i18n-java, libxerces2-java, libcommons-configuration-java, fop, liblog4j1.2-java, libjaxp1.3-java, libitext1-java, libcommons-httpclient-java -Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk, quilt +Build-Depends: ant, debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk, quilt Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia Modified: trunk/doxia/debian/maven.rules =================================================================== --- trunk/doxia/debian/maven.rules 2009-10-05 10:55:19 UTC (rev 10768) +++ trunk/doxia/debian/maven.rules 2009-10-05 11:03:35 UTC (rev 10769) @@ -1,3 +1,4 @@ com.lowagie itext jar 1.4 junit junit jar s/3\..*/3.x/ log4j log4j jar s/1\.2\..*/1.2.x/ +commons-httpclient commons-httpclient jar s/3\..*/3.x/ Deleted: trunk/doxia/debian/patches/dependencies.patch =================================================================== --- trunk/doxia/debian/patches/dependencies.patch 2009-10-05 10:55:19 UTC (rev 10768) +++ trunk/doxia/debian/patches/dependencies.patch 2009-10-05 11:03:35 UTC (rev 10769) @@ -1,14 +0,0 @@ ---- a/doxia-modules/doxia-module-fo/pom.xml -+++ b/doxia-modules/doxia-module-fo/pom.xml -@@ -71,11 +71,6 @@ - <version>1.0.b2</version> - </dependency> - <dependency> -- <groupId>xml-apis</groupId> -- <artifactId>xmlParserAPIs</artifactId> -- <version>2.0.2</version> -- </dependency> -- <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> Added: trunk/doxia/debian/patches/modello.patch =================================================================== --- trunk/doxia/debian/patches/modello.patch (rev 0) +++ trunk/doxia/debian/patches/modello.patch 2009-10-05 11:03:35 UTC (rev 10769) @@ -0,0 +1,87 @@ +Index: doxia-1.1.1/doxia-core/src/main/mdo/document.mdo +=================================================================== +--- doxia-1.1.1.orig/doxia-core/src/main/mdo/document.mdo 2009-10-01 00:38:16.000000000 +0200 ++++ doxia-1.1.1/doxia-core/src/main/mdo/document.mdo 2009-10-01 00:59:38.000000000 +0200 +@@ -500,7 +500,7 @@ + return ISO_8601_FORMAT.format( getCreationDate() ); + } + +- return this.creationdate; ++ return this.creationDate.toString(); + } + + /** +@@ -518,7 +518,7 @@ + return ISO_8601_FORMAT.format( getDate() ); + } + +- return this.modifydate; ++ return this.date.toString(); + } + + /** +@@ -536,7 +536,7 @@ + return ISO_8601_FORMAT.format( getPrintDate() ); + } + +- return this.printdate; ++ return this.printDate.toString(); + } + ]]> + </code> +@@ -701,10 +701,12 @@ + */ + public String getFullName() + { ++ /* + if ( getName() != null && getName().trim().length() > 0 ) + { + return getName().trim(); + } ++ */ + + return ( getFirstName() != null ? getFirstName().trim() : "null" ) + " " + + ( getLastName() != null ? getLastName().trim() : "null" ); +@@ -783,7 +785,7 @@ + return ISO_8601_FORMAT.format( getDate() ); + } + +- return this.modifydate; ++ return this.date.toString(); + } + ]]> + </code> +@@ -1124,10 +1126,13 @@ + public String getAllAuthorNames() + { + StringBuffer sb = new StringBuffer(); ++ ++ /* + if ( getAuthor() != null && getAuthor().trim().length() > 0 ) + { + return getAuthor().trim(); + } ++ */ + + if ( getAuthors() != null ) + { +@@ -1165,7 +1170,7 @@ + return ISO_8601_FORMAT.format( getCoverDate() ); + } + +- return this.coverdate; ++ return this.coverDate.toString(); + } + ]]> + </code> +--- doxia-1.1.1.orig/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java ++++ doxia-1.1.1/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java +@@ -1128,7 +1128,7 @@ + att.addAttribute( "height", "0.3in" ); + att.addAttribute( "text-align", "left" ); + writeStartTag( BLOCK_TAG, att ); +- write( compName == null ? ( cover.getAuthor() == null ? "" : cover.getAuthor() ) : compName ); ++ write( compName == null ? ( cover.getAllAuthorNames() == null ? "" : cover.getAllAuthorNames() ) : compName ); + writeEndTag( BLOCK_TAG ); + writeEndTag( TABLE_CELL_TAG ); + Modified: trunk/doxia/debian/patches/series =================================================================== --- trunk/doxia/debian/patches/series 2009-10-05 10:55:19 UTC (rev 10768) +++ trunk/doxia/debian/patches/series 2009-10-05 11:03:35 UTC (rev 10769) @@ -1 +1 @@ -dependencies.patch +modello.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
