rev 17307 - trunk/packages/kdeedu/debian

[Modestas Vainius]

Author: modax
Date: 2010-03-03 23:10:24 +0000 (Wed, 03 Mar 2010)
New Revision: 17307

Modified:
   trunk/packages/kdeedu/debian/cantor-backend-r.install
   trunk/packages/kdeedu/debian/changelog
   trunk/packages/kdeedu/debian/khangman.install
   trunk/packages/kdeedu/debian/not-installed
Log:
Do not ship Domestic_Manners.ttf and Dustismo_Roman.ttf fonts in khangman
package since they are provided by the ttf-dustin package that khangman
depends on.

Modified: trunk/packages/kdeedu/debian/cantor-backend-r.install
===================================================================
--- trunk/packages/kdeedu/debian/cantor-backend-r.install	2010-03-03 22:22:48 UTC (rev 17306)
+++ trunk/packages/kdeedu/debian/cantor-backend-r.install	2010-03-03 23:10:24 UTC (rev 17307)
@@ -1,6 +1,6 @@
 usr/bin/cantor_rserver
 usr/lib/kde4/cantor_rbackend.so
 usr/share/icons/hicolor/48x48/apps/rbackend.png
+usr/share/kde4/config.kcfg/rserver.kcfg
 usr/share/kde4/config/cantor_r.knsrc
-usr/share/kde4/config.kcfg/rserver.kcfg
 usr/share/kde4/services/cantor/rbackend.desktop

Modified: trunk/packages/kdeedu/debian/changelog
===================================================================
--- trunk/packages/kdeedu/debian/changelog	2010-03-03 22:22:48 UTC (rev 17306)
+++ trunk/packages/kdeedu/debian/changelog	2010-03-03 23:10:24 UTC (rev 17307)
@@ -5,12 +5,6 @@
     - fixes crash in Parley when switching between list view and start exercise
       dialog. (Closes: #562955)
 
-  TODO (lintian has a point):
-  * W: khangman: duplicate-font-file
-    usr/share/kde4/apps/khangman/fonts/Domestic_Manners.ttf also in ttf-dustin
-  * W: khangman: duplicate-font-file
-    usr/share/kde4/apps/khangman/fonts/Dustismo_Roman.ttf also in ttf-dustin
-
   [ Modestas Vainius ]
   * Change my email address to modax at debian.org in Uploaders field.
   * Fix Vcs-Browser URL.
@@ -35,6 +29,9 @@
   * Build depend on dpkg-dev 1.15.5.
   * Make dh_makeshlibs not to fail if there are lost symbols.
   * Remove excess ${perl:Depends} from parley Depends.
+  * Do not ship Domestic_Manners.ttf and Dustismo_Roman.ttf fonts in khangman
+    package since they are provided by the ttf-dustin package that khangman
+    depends on.
 
   [ George Kiagiadakis ]
   * Add myself to uploaders.

Modified: trunk/packages/kdeedu/debian/khangman.install
===================================================================
--- trunk/packages/kdeedu/debian/khangman.install	2010-03-03 22:22:48 UTC (rev 17306)
+++ trunk/packages/kdeedu/debian/khangman.install	2010-03-03 23:10:24 UTC (rev 17307)
@@ -8,7 +8,9 @@
 usr/share/icons/hicolor/48x48/apps/khangman.png
 usr/share/icons/hicolor/64x64/apps/khangman.png
 usr/share/icons/hicolor/scalable/apps/khangman.svgz
-usr/share/kde4/apps/khangman/
+usr/share/kde4/apps/khangman/khangmanui.rc
+usr/share/kde4/apps/khangman/pics/
+usr/share/kde4/apps/khangman/sounds/
 usr/share/kde4/config.kcfg/khangman.kcfg
 usr/share/kde4/config/khangman.knsrc
 usr/share/man/man6/khangman.6

Modified: trunk/packages/kdeedu/debian/not-installed
===================================================================
--- trunk/packages/kdeedu/debian/not-installed	2010-03-03 22:22:48 UTC (rev 17306)
+++ trunk/packages/kdeedu/debian/not-installed	2010-03-03 23:10:24 UTC (rev 17307)
@@ -19,3 +19,7 @@
 
 # Shipped in oxygen-icon-theme
 ./usr/share/icons/oxygen/22x22/actions/pointer.png
+
+# Shipped in ttf-dustin
+./usr/share/kde4/apps/khangman/fonts/Domestic_Manners.ttf
+./usr/share/kde4/apps/khangman/fonts/Dustismo_Roman.ttf