[doxia] 04/04: doxia (1.1.1-1) unstable; urgency=low * Build-Depends/Recommends libcommons-httpclient-java (>= 3.1-6). * Build-Depends on debhelper (>= 7). -- Michael Koch <konqueror at gmx.de> Thu, 01 Oct 2009 08:03:40 +0200
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Aug 6 09:40:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to annotated tag debian/1.1.1-1
in repository doxia.
commit 2e664049de3b7b612e76ad72ee96a3e60892b476
Author: Michael Koch <konqueror at gmx.de>
Date: Mon Oct 5 11:03:35 2009 +0000
doxia (1.1.1-1) unstable; urgency=low
* Build-Depends/Recommends libcommons-httpclient-java (>= 3.1-6).
* Build-Depends on debhelper (>= 7).
-- Michael Koch <konqueror at gmx.de> Thu, 01 Oct 2009 08:03:40 +0200
---
debian/changelog | 7 ++--
debian/compat | 2 +-
debian/control | 2 +-
debian/maven.rules | 1 +
debian/patches/dependencies.patch | 14 -------
debian/patches/modello.patch | 87 +++++++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +-
7 files changed, 95 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a74c337..dd296ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <konqueror at gmx.de> Sun, 27 Sep 2009 23:38:50 +0200
+ -- Michael Koch <konqueror at gmx.de> Thu, 01 Oct 2009 08:03:40 +0200
doxia (1.1-3) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 5295926..f0ad6d7 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep: maven-repo-helper (>= 0.7), maven-ant-helper (>> 4), ant-op
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
diff --git a/debian/maven.rules b/debian/maven.rules
index 5863c1d..67cee1d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -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/
diff --git a/debian/patches/dependencies.patch b/debian/patches/dependencies.patch
deleted file mode 100644
index 495acc4..0000000
--- a/debian/patches/dependencies.patch
+++ /dev/null
@@ -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>
diff --git a/debian/patches/modello.patch b/debian/patches/modello.patch
new file mode 100644
index 0000000..a673b44
--- /dev/null
+++ b/debian/patches/modello.patch
@@ -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 );
+
diff --git a/debian/patches/series b/debian/patches/series
index 31beeb2..9e40621 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-dependencies.patch
+modello.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia.git
More information about the pkg-java-commits
mailing list