[maven-doxia-tools] 13/35: new upstream release 1.2

Fri Jul 28 13:29:09 UTC 2017

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 05200f09e44373b0bd55510276b13ba60412f2f6
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Feb 26 01:19:44 2010 +0000

    new upstream release 1.2
---
 debian/changelog                         | 12 ++++++++++++
 debian/compat                            |  2 +-
 debian/control                           |  4 ++--
 debian/maven.rules                       |  1 -
 debian/patches/plexus-interpolation.diff | 12 ++++--------
 debian/patches/series                    |  1 +
 debian/patches/setLastModified.diff      | 10 ++++++++++
 debian/rules                             |  3 +--
 debian/source/format                     |  1 +
 9 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72c5d98..dbc797c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 7b5b7bb..36761e5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: java
 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/
diff --git a/debian/maven.rules b/debian/maven.rules
index 4bb9a25..afd3957 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -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
-
diff --git a/debian/patches/plexus-interpolation.diff b/debian/patches/plexus-interpolation.diff
index ddb2cec..2ae66f0 100644
--- a/debian/patches/plexus-interpolation.diff
+++ b/debian/patches/plexus-interpolation.diff
@@ -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 @@ Index: maven-doxia-tools-1.0.1/src/main/java/org/apache/maven/doxia/tools/Defaul
  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
diff --git a/debian/patches/series b/debian/patches/series
index 8429b21..c6db7d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 plexus-interpolation.diff
+setLastModified.diff
diff --git a/debian/patches/setLastModified.diff b/debian/patches/setLastModified.diff
new file mode 100644
index 0000000..8be38b2
--- /dev/null
+++ b/debian/patches/setLastModified.diff
@@ -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 );
diff --git a/debian/rules b/debian/rules
index 4287e33..224d60d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ PLEXUS_PLUGIN_VERSION:= 1.0-beta-3.0.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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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

