[pkg-java] r11718 - in trunk/maven-doxia-tools/debian: . patches source
Gabriele Giacone
gg0-guest at alioth.debian.org
Fri Feb 26 01:19:45 UTC 2010
Author: gg0-guest
Date: 2010-02-26 01:19:44 +0000 (Fri, 26 Feb 2010)
New Revision: 11718
Added:
trunk/maven-doxia-tools/debian/patches/setLastModified.diff
trunk/maven-doxia-tools/debian/source/
trunk/maven-doxia-tools/debian/source/format
Modified:
trunk/maven-doxia-tools/debian/changelog
trunk/maven-doxia-tools/debian/compat
trunk/maven-doxia-tools/debian/control
trunk/maven-doxia-tools/debian/maven.rules
trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff
trunk/maven-doxia-tools/debian/patches/series
trunk/maven-doxia-tools/debian/rules
Log:
new upstream release 1.2
Modified: trunk/maven-doxia-tools/debian/changelog
===================================================================
--- trunk/maven-doxia-tools/debian/changelog 2010-02-26 01:19:02 UTC (rev 11717)
+++ trunk/maven-doxia-tools/debian/changelog 2010-02-26 01:19:44 UTC (rev 11718)
@@ -1,3 +1,15 @@
+maven-doxia-tools (1.2-1) unstable; urgency=low
+
+ * New upstream version
+ * Standards-Version to 3.8.4
+ * debhelper compat to 7
+ * Source format 3.0 (quilt)
+ - removed quilt as build dependency
+ * Updated plexus patch
+ * Added patch to remove setLastModified call
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com> Fri, 26 Feb 2010 01:58:46 +0100
+
maven-doxia-tools (1.0.2-2) unstable; urgency=low
* Fix groupId for maven-plugin-testing-harness dependency
Modified: trunk/maven-doxia-tools/debian/compat
===================================================================
--- trunk/maven-doxia-tools/debian/compat 2010-02-26 01:19:02 UTC (rev 11717)
+++ trunk/maven-doxia-tools/debian/compat 2010-02-26 01:19:44 UTC (rev 11718)
@@ -1 +1 @@
-6
+7
Modified: trunk/maven-doxia-tools/debian/control
===================================================================
--- trunk/maven-doxia-tools/debian/control 2010-02-26 01:19:02 UTC (rev 11717)
+++ trunk/maven-doxia-tools/debian/control 2010-02-26 01:19:44 UTC (rev 11718)
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 6), cdbs, default-jdk, quilt
+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-component-metadata-java (>= 1.0~beta3.0.7),
libdoxia-sitetools-java, libcommons-io-java,
libplexus-container-default-java, libmaven2-core-java
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
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/
Modified: trunk/maven-doxia-tools/debian/maven.rules
===================================================================
--- trunk/maven-doxia-tools/debian/maven.rules 2010-02-26 01:19:02 UTC (rev 11717)
+++ trunk/maven-doxia-tools/debian/maven.rules 2010-02-26 01:19:44 UTC (rev 11718)
@@ -1,3 +1,2 @@
org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/
s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness
-
Modified: trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff
===================================================================
--- trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff 2010-02-26 01:19:02 UTC (rev 11717)
+++ trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff 2010-02-26 01:19:44 UTC (rev 11718)
@@ -1,9 +1,5 @@
-see http://jira.codehaus.org/browse/DOXIA-271
-
-Index: maven-doxia-tools-1.0.1/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-===================================================================
---- maven-doxia-tools-1.0.1.orig/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java 2008-06-07 12:18:58.000000000 +0200
-+++ maven-doxia-tools-1.0.1/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java 2008-12-17 15:54:28.000000000 +0100
+--- maven-doxia-tools.orig/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java 2008-06-07 12:18:58.000000000 +0200
++++ maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java 2008-12-17 15:54:28.000000000 +0100
@@ -45,10 +45,11 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
@@ -20,9 +16,9 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
-@@ -664,7 +665,15 @@
+@@ -672,7 +673,15 @@
- interpolator.addValueSource( new MapBasedValueSource( project.getProperties() ) );
+ interpolator.addValueSource( new MapBasedValueSource( aProject.getProperties() ) );
- siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
+ try
Modified: trunk/maven-doxia-tools/debian/patches/series
===================================================================
--- trunk/maven-doxia-tools/debian/patches/series 2010-02-26 01:19:02 UTC (rev 11717)
+++ trunk/maven-doxia-tools/debian/patches/series 2010-02-26 01:19:44 UTC (rev 11718)
@@ -1 +1,2 @@
plexus-interpolation.diff
+setLastModified.diff
Added: trunk/maven-doxia-tools/debian/patches/setLastModified.diff
===================================================================
--- trunk/maven-doxia-tools/debian/patches/setLastModified.diff (rev 0)
+++ trunk/maven-doxia-tools/debian/patches/setLastModified.diff 2010-02-26 01:19:44 UTC (rev 11718)
@@ -0,0 +1,10 @@
+--- maven-doxia-tools~/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java 2010-02-07 22:24:33.000000000 +0100
++++ maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java 2010-02-25 22:47:12.000000000 +0100
+@@ -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 2010-02-26 01:19:02 UTC (rev 11717)
+++ trunk/maven-doxia-tools/debian/rules 2010-02-26 01:19:44 UTC (rev 11718)
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
@@ -11,7 +10,7 @@
JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := ant-nodeps doxia-core doxia-logging-api doxia-sink-api doxia-decoration-model.jar doxia-doc-renderer \
doxia-site-renderer commons-io plexus-i18n plexus-container-default-alpha plexus-utils plexus-interpolation \
- maven-core maven-project maven-artifact maven-artifact-manager maven-model maven-reporting-api
+ maven-core maven-project maven-artifact maven-artifact-manager maven-model maven-reporting-api maven-plugin-api
DEB_ANT_BUILD_TARGET := package
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
Added: trunk/maven-doxia-tools/debian/source/format
===================================================================
--- trunk/maven-doxia-tools/debian/source/format (rev 0)
+++ trunk/maven-doxia-tools/debian/source/format 2010-02-26 01:19:44 UTC (rev 11718)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list