KDE_3_1_BRANCH: kdeedu/debian

[Ben Burton <bab@debian.org>]

CVS commit by benb: 

Updates for kiten (recommend Japanese fonts; use debian versions of edict and kanjidic).


  A            kiten.links   1.1.2.1
  M +8 -0      changelog   1.10.2.19
  M +2 -2      control   1.13.2.10
  M +5 -0      rules   1.10.2.6


--- kdeedu/debian/changelog  #1.10.2.18:1.10.2.19
@@ -1,2 +1,10 @@
+kdeedu (4:3.1.4-3) unstable; urgency=low
+
+  * Kiten recommends Japanese fonts (closes: #216440).
+  * Kiten depends on edict and kanjidic instead of supplying its own
+    copies (closes: #217196).
+
+ -- Ben Burton <bab@debian.org>  Sun, 21 Dec 2003 20:03:28 +1100
+
 kdeedu (4:3.1.4-2) unstable; urgency=low
 

--- kdeedu/debian/control  #1.13.2.9:1.13.2.10
@@ -137,6 +137,6 @@
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}
-Recommends: kdeedu-data (>= ${Source-Version})
+Depends: ${shlibs:Depends}, edict, kanjidic
+Recommends: kdeedu-data (>= ${Source-Version}), ttf-kochi-gothic | ttf-kochi-mincho
 Suggests: khelpcenter, kdeedu-doc-html
 Description: Japanese reference/study tool for KDE

--- kdeedu/debian/rules  #1.10.2.5:1.10.2.6
@@ -126,4 +126,9 @@
         $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
+        # Remove kiten's copies of edict and kanjidic since we'll symlink to
+        # the debian versions instead.
+        rm debian/tmp/usr/share/apps/kiten/edict
+        rm debian/tmp/usr/share/apps/kiten/kanjidic
+
         # Generate HTML docs.
         for i in `find debian/tmp -name "index.docbook"`; do \