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

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 :

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) {
 

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.*;
 
 
 

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);
 
     }