[libsejda-java] 08/09: Drop no-optional-fonts.patch

[Markus Koschany]

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

apo pushed a commit to branch master
in repository libsejda-java.

commit 4f5d612f6a8132390a86945dcb314a5ad8929339
Author: Markus Koschany <apo at debian.org>
Date:   Thu Sep 14 23:23:46 2017 +0200

    Drop no-optional-fonts.patch
---
 debian/changelog                         |  1 +
 debian/patches/no-optional-fonts.patch   | 12 ++++++------
 debian/patches/series                    |  2 +-
 debian/patches/xmlgraphics-commons.patch | 10 +++++-----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6685fb2..039212c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libsejda-java (3.2.2-1) unstable; urgency=medium
   * Declare compliance with Debian Policy 4.1.0.
   * Tighten build-dependency on libsambox-java to >= 1.1.16.
   * libsejda-java.poms: Remove --has-package-version.
+  * Refresh no-optional-fonts.patch.
 
  -- Markus Koschany <apo at debian.org>  Thu, 14 Sep 2017 23:22:13 +0200
 
diff --git a/debian/patches/no-optional-fonts.patch b/debian/patches/no-optional-fonts.patch
index f0c079a..ccc7b45 100644
--- a/debian/patches/no-optional-fonts.patch
+++ b/debian/patches/no-optional-fonts.patch
@@ -1,5 +1,5 @@
 From: Markus Koschany <apo at debian.org>
-Date: Thu, 6 Jul 2017 21:15:35 +0200
+Date: Thu, 14 Sep 2017 23:39:04 +0200
 Subject: no optional fonts
 
 The optional fonts waste quite some disk space. I believe the normal fonts
@@ -11,18 +11,18 @@ Forwarded: not-needed
  1 file changed, 3 deletions(-)
 
 diff --git a/sejda-sambox/src/main/java/org/sejda/impl/sambox/util/FontUtils.java b/sejda-sambox/src/main/java/org/sejda/impl/sambox/util/FontUtils.java
-index 61739d4..16b3100 100644
+index 2a61f9a..2d8c2b9 100644
 --- a/sejda-sambox/src/main/java/org/sejda/impl/sambox/util/FontUtils.java
 +++ b/sejda-sambox/src/main/java/org/sejda/impl/sambox/util/FontUtils.java
-@@ -33,7 +33,6 @@ import java.util.function.Supplier;
+@@ -33,7 +33,6 @@ import java.util.regex.Pattern;
  import org.apache.commons.io.IOUtils;
  import org.apache.commons.lang3.StringUtils;
  import org.apache.fontbox.ttf.TrueTypeFont;
 -import org.sejda.fonts.OptionalUnicodeType0Font;
  import org.sejda.fonts.UnicodeType0Font;
- import org.sejda.model.pdf.FontResource;
- import org.sejda.model.pdf.StandardType1Font;
-@@ -162,8 +161,6 @@ public final class FontUtils {
+ import org.sejda.impl.sambox.component.TextWithFont;
+ import org.sejda.model.exception.TaskIOException;
+@@ -167,8 +166,6 @@ public final class FontUtils {
              if (nonNull(found)) {
                  return found;
              }
diff --git a/debian/patches/series b/debian/patches/series
index 3cf87a9..3a7f69e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-no-optional-fonts.patch
 xmlgraphics-commons.patch
+no-optional-fonts.patch
diff --git a/debian/patches/xmlgraphics-commons.patch b/debian/patches/xmlgraphics-commons.patch
index b2c4b11..dcf547f 100644
--- a/debian/patches/xmlgraphics-commons.patch
+++ b/debian/patches/xmlgraphics-commons.patch
@@ -7,17 +7,17 @@ Subject: xmlgraphics-commons
  1 file changed, 4 insertions(+)
 
 diff --git a/sejda-sambox/pom.xml b/sejda-sambox/pom.xml
-index c05d363..2d3de01 100644
+index 8778ca9..75b681c 100644
 --- a/sejda-sambox/pom.xml
 +++ b/sejda-sambox/pom.xml
-@@ -62,6 +62,10 @@
+@@ -61,6 +61,10 @@
+ 			<artifactId>sejda-image-writers</artifactId>
  			<version>${project.version}</version>
  		</dependency>
- 		<dependency>
++		<dependency>
 +			<groupId>org.apache.xmlgraphics</groupId>
 +			<artifactId>xmlgraphics-commons</artifactId>
 +		</dependency>
-+		<dependency>
+ 		<dependency>
  			<groupId>org.bouncycastle</groupId>
  			<artifactId>bcmail-jdk15on</artifactId>
- 			<version>${bouncycastle.version}</version>

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