From: jtauber <jtauber@unknown>
Date: Thu, 18 Nov 1999 06:02:27 +0000 (+0000)
Subject: PR:
X-Git-Tag: RELEASE_0_12_0~24
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=625de9525b2ae122e9f2c30fc56aad7c021e4d94;p=xmlgraphics-fop.git

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 27f51a087..1583f37ca 100644
--- 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 7ac928800..ff2b4e2f9 100644
--- 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 ab92c5df6..279cb37a5 100644
--- 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 875e6b075..2cfcee908 100644
--- 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);
 
     }