PR:

Obtained from:
Submitted by:
Reviewed by:
PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193227 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile b/Makefile
index 27f51a087eb474486677fd54af5489a4048c21b9..1583f37ca08473959da7c8300cd0f46f0d830140 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ distgen:
 
 distorg:
        rm -f $(JARTOC) && \
-       ($(FIND) org -name \*.class -print > $(JARTOC)) && \
+       ($(FIND) src/org -name \*.class -print > $(JARTOC)) && \
        ($(TAR) -cf - -T $(JARTOC) | (cd $(JARTEMP); $(TAR) -xf - ))
 
 $(TARGETS:%=%subs): %subs :

diff --git a/src/org/apache/fop/layout/LineArea.java b/src/org/apache/fop/layout/LineArea.java
index 7ac928800002d10bfca5ffb6316710a0a355a940..ff2b4e2f95287d376627c16f7cd87537675ae8de 100644 (file)
--- a/src/org/apache/fop/layout/LineArea.java
+++ b/src/org/apache/fop/layout/LineArea.java
@@ -270,7 +270,7 @@ public class LineArea extends Area {
 
                char d =
 
-                   org.apache.xml.fop.render.pdf.CodePointMapping.map[c];
+                   org.apache.fop.render.pdf.CodePointMapping.map[c];
 
                if (d != 0) {
 

diff --git a/src/org/apache/fop/pdf/PDFXObject.java b/src/org/apache/fop/pdf/PDFXObject.java
index ab92c5df6dc6f7fafb596f7d652340902641d910..279cb37a5d6b6955fb73425ab5bc704177149d88 100644 (file)
--- a/src/org/apache/fop/pdf/PDFXObject.java
+++ b/src/org/apache/fop/pdf/PDFXObject.java
@@ -64,7 +64,7 @@ import java.io.PrintWriter;
 
 // shouldn't have to do this
 
-import org.apache.xml.fop.image.*;
+import org.apache.fop.image.*;
 
 
 

diff --git a/src/org/apache/fop/render/xml/XMLRenderer.java b/src/org/apache/fop/render/xml/XMLRenderer.java
index 875e6b0754bef22bf95d27e03fe8236b03b0f138..2cfcee908f411a34339e1676256737a176db775e 100644 (file)
--- a/src/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/org/apache/fop/render/xml/XMLRenderer.java
@@ -288,7 +288,7 @@ public class XMLRenderer implements Renderer {
 
        /* use PDF's font setup to get PDF metrics */
 
-       org.apache.xml.fop.render.pdf.FontSetup.setup(fontInfo);
+       org.apache.fop.render.pdf.FontSetup.setup(fontInfo);
 
     }