[libitext5-java] 04/10: Update patches

Andreas Tille tille at debian.org
Tue Sep 30 13:53:48 UTC 2014


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository libitext5-java.

commit 2b620adfc82b6d98cfe3b235747e3dfa0897d3b4
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 30 15:10:48 2014 +0200

    Update patches
---
 debian/patches/remove-javadoc-page-tracking.patch | 8 ++++----
 debian/patches/series                             | 2 ++
 debian/patches/utf8.patch                         | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/patches/remove-javadoc-page-tracking.patch b/debian/patches/remove-javadoc-page-tracking.patch
index 2666a84..1a2c231 100644
--- a/debian/patches/remove-javadoc-page-tracking.patch
+++ b/debian/patches/remove-javadoc-page-tracking.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -190,18 +190,6 @@
+@@ -189,18 +189,6 @@
                              <links>
                                  <link>http://api.itextpdf.com/itext/</link>
                              </links>
@@ -22,9 +22,9 @@ Forwarded: not-needed
                          </configuration>
                      </plugin>
                  </plugins>
-@@ -257,4 +245,4 @@
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-         <checkstyle.header.file>license.txt</checkstyle.header.file>
+@@ -292,4 +280,4 @@
+         <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+         <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
      </properties>
 -</project>
 \ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 12a9653..add0b99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 utf8.patch
 remove-javadoc-page-tracking.patch
+skip_test_requiring_online_connection.patch
+skip_test_requiring_xserver.patch
diff --git a/debian/patches/utf8.patch b/debian/patches/utf8.patch
index a436221..3d2b2a8 100644
--- a/debian/patches/utf8.patch
+++ b/debian/patches/utf8.patch
@@ -2,7 +2,7 @@ Some non UTF-8 characters prevent building.
 
 --- a/src/main/java/com/itextpdf/text/pdf/languages/IndicCompositeCharacterComparator.java
 +++ b/src/main/java/com/itextpdf/text/pdf/languages/IndicCompositeCharacterComparator.java
-@@ -56,15 +56,6 @@
+@@ -56,15 +56,6 @@ import java.util.Comparator;
   * of Characters before the one with lower no. This is necessay to properly display the CompositeCharacters
   * when they occur side by side.
   * </p>

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



More information about the pkg-java-commits mailing list