diff -u xfonts-wqy-0.6.0/debian/dirs xfonts-wqy-0.6.0/debian/dirs
--- xfonts-wqy-0.6.0/debian/dirs
+++ xfonts-wqy-0.6.0/debian/dirs
@@ -1 +1 @@
-usr/X11R6/lib/X11/fonts/misc/
+usr/lib/X11/fonts/misc/
diff -u xfonts-wqy-0.6.0/debian/control xfonts-wqy-0.6.0/debian/control
--- xfonts-wqy-0.6.0/debian/control
+++ xfonts-wqy-0.6.0/debian/control
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>
-Build-Depends-Indep: debhelper (>= 4.1.0), xutils (>> 4.0.3)
+Build-Depends-Indep: debhelper (>= 4.1.0), bdftopcf, xutils (>> 4.0.3)
 Standards-Version: 3.6.2
 
 Package: xfonts-wqy
diff -u xfonts-wqy-0.6.0/debian/rules xfonts-wqy-0.6.0/debian/rules
--- xfonts-wqy-0.6.0/debian/rules
+++ xfonts-wqy-0.6.0/debian/rules
@@ -26,7 +26,7 @@
 
 	gzip -9 $(CURDIR)/*pcf
 
-	install -m0644 $(CURDIR)/*.pcf.gz $(CURDIR)/debian/xfonts-wqy/usr/X11R6/lib/X11/fonts/misc/
+	install -m0644 $(CURDIR)/*.pcf.gz $(CURDIR)/debian/xfonts-wqy/usr/lib/X11/fonts/misc/
 	install -Dm0644 $(CURDIR)/debian/xfonts-wqy.overrides $(CURDIR)/debian/xfonts-wqy/usr/share/lintian/overrides/xfonts-wqy
 
 binary: binary-indep
diff -u xfonts-wqy-0.6.0/debian/changelog xfonts-wqy-0.6.0/debian/changelog
--- xfonts-wqy-0.6.0/debian/changelog
+++ xfonts-wqy-0.6.0/debian/changelog
@@ -1,3 +1,12 @@
+xfonts-wqy (0.6.0-1ubuntu1) dapper; urgency=low
+
+  * Add build-dependency bdftopcf, as it's split out as a separate package in
+    dapper.
+  * Install font files in /usr/lib/X11/ instead of /usr/X11R6/lib/X11/
+    according to the X layout change.
+
+ -- Ming Hua <minghua@rice.edu>  Fri,  9 Dec 2005 00:50:40 -0600
+
 xfonts-wqy (0.6.0-1) unstable; urgency=low
 
   * New upstream release