rev 4109 - people/jriddell/KDE/3.5/kdeedu/debian

Jonathan Riddell jriddell-guest at costa.debian.org
Thu Jul 13 08:44:49 UTC 2006


Author: jriddell-guest
Date: 2006-07-13 08:44:45 +0000 (Thu, 13 Jul 2006)
New Revision: 4109

Modified:
   people/jriddell/KDE/3.5/kdeedu/debian/blinken.docs
   people/jriddell/KDE/3.5/kdeedu/debian/blinken.install
   people/jriddell/KDE/3.5/kdeedu/debian/changelog
   people/jriddell/KDE/3.5/kdeedu/debian/control
   people/jriddell/KDE/3.5/kdeedu/debian/copyright
   people/jriddell/KDE/3.5/kdeedu/debian/kalzium.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kalzium.install
   people/jriddell/KDE/3.5/kdeedu/debian/kalzium.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.install
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kbruch.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kbruch.install
   people/jriddell/KDE/3.5/kdeedu/debian/kbruch.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-data.install
   people/jriddell/KDE/3.5/kdeedu/debian/keduca.docs
   people/jriddell/KDE/3.5/kdeedu/debian/keduca.install
   people/jriddell/KDE/3.5/kdeedu/debian/keduca.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kgeography.install
   people/jriddell/KDE/3.5/kdeedu/debian/khangman.docs
   people/jriddell/KDE/3.5/kdeedu/debian/khangman.install
   people/jriddell/KDE/3.5/kdeedu/debian/khangman.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kig.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kig.install
   people/jriddell/KDE/3.5/kdeedu/debian/kig.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kiten.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kiten.install
   people/jriddell/KDE/3.5/kdeedu/debian/kiten.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/klatin.docs
   people/jriddell/KDE/3.5/kdeedu/debian/klatin.install
   people/jriddell/KDE/3.5/kdeedu/debian/klatin.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/klettres-data.docs
   people/jriddell/KDE/3.5/kdeedu/debian/klettres.docs
   people/jriddell/KDE/3.5/kdeedu/debian/klettres.install
   people/jriddell/KDE/3.5/kdeedu/debian/klettres.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kmplot.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kmplot.install
   people/jriddell/KDE/3.5/kdeedu/debian/kmplot.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.install
   people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kstars.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kstars.install
   people/jriddell/KDE/3.5/kdeedu/debian/kstars.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/ktouch.docs
   people/jriddell/KDE/3.5/kdeedu/debian/ktouch.install
   people/jriddell/KDE/3.5/kdeedu/debian/ktouch.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kturtle.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kturtle.install
   people/jriddell/KDE/3.5/kdeedu/debian/kturtle.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kverbos.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kverbos.install
   people/jriddell/KDE/3.5/kdeedu/debian/kverbos.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.install
   people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.install
   people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.docs
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.install
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.docs
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.override
   people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.install
   people/jriddell/KDE/3.5/kdeedu/debian/rules
Log:
Edubuntu Ogra did kdeedu.  No ocaml :(


Modified: people/jriddell/KDE/3.5/kdeedu/debian/blinken.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/blinken.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/blinken.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1,2 @@
-blinken/README.packagers
+build-tree/kdeedu-*/blinken/AUTHORS
+build-tree/kdeedu-*/blinken/README.packagers

Modified: people/jriddell/KDE/3.5/kdeedu/debian/blinken.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/blinken.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/blinken.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,48 +1,14 @@
 usr/bin/blinken
 usr/share/applications/kde/blinken.desktop
-usr/share/apps/blinken/images/blinken.png
-usr/share/apps/blinken/images/blueh.png
-usr/share/apps/blinken/images/greenh.png
-usr/share/apps/blinken/images/highscore.png
-usr/share/apps/blinken/images/highscore_hover.png
-usr/share/apps/blinken/images/mark.png
-usr/share/apps/blinken/images/menu.png
-usr/share/apps/blinken/images/menu_hover.png
-usr/share/apps/blinken/images/quit.png
-usr/share/apps/blinken/images/quit_hover.png
-usr/share/apps/blinken/images/redh.png
-usr/share/apps/blinken/images/yellowh.png
-usr/share/apps/blinken/sounds/1.wav
-usr/share/apps/blinken/sounds/2.wav
-usr/share/apps/blinken/sounds/3.wav
-usr/share/apps/blinken/sounds/4.wav
-usr/share/apps/blinken/sounds/lose.wav
+usr/share/apps/blinken/images
+usr/share/apps/blinken/sounds
 usr/share/config.kcfg/blinken.kcfg
-usr/share/doc/kde/HTML/en/blinken/accessibility.html
-usr/share/doc/kde/HTML/en/blinken/blinken1.png
-usr/share/doc/kde/HTML/en/blinken/blinken2.png
-usr/share/doc/kde/HTML/en/blinken/blinken_accesskeys.png
-usr/share/doc/kde/HTML/en/blinken/blinken_helpbutton.png
-usr/share/doc/kde/HTML/en/blinken/blinken_highscoresbutton.png
-usr/share/doc/kde/HTML/en/blinken/blinken_nickprompt.png
-usr/share/doc/kde/HTML/en/blinken/blinken_quitbutton.png
-usr/share/doc/kde/HTML/en/blinken/common
-usr/share/doc/kde/HTML/en/blinken/compilation.html
-usr/share/doc/kde/HTML/en/blinken/credits.html
-usr/share/doc/kde/HTML/en/blinken/enter-highscore.html
-usr/share/doc/kde/HTML/en/blinken/index.cache.bz2
-usr/share/doc/kde/HTML/en/blinken/index.docbook
-usr/share/doc/kde/HTML/en/blinken/index.html
-usr/share/doc/kde/HTML/en/blinken/installation.html
-usr/share/doc/kde/HTML/en/blinken/introduction.html
-usr/share/doc/kde/HTML/en/blinken/playing-tips.html
-usr/share/doc/kde/HTML/en/blinken/using-blinken.html
-usr/share/icons/hicolor/128x128/apps/blinken.png
+usr/share/doc/kde/HTML/en/blinken
 usr/share/icons/hicolor/16x16/apps/blinken.png
 usr/share/icons/hicolor/22x22/apps/blinken.png
 usr/share/icons/hicolor/32x32/apps/blinken.png
 usr/share/icons/hicolor/48x48/apps/blinken.png
 usr/share/icons/hicolor/64x64/apps/blinken.png
+usr/share/icons/hicolor/128x128/apps/blinken.png
 usr/share/icons/hicolor/scalable/apps/blinken.svgz
-
-usr/share/apps/blinken/fonts/steve.ttf /usr/share/fonts/truetype/ttf-kdeedu/
+../icons/blinken.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/changelog	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/changelog	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,3 +1,89 @@
+kdeedu (4:3.5.3-0ubuntu1) edgy; urgency=low
+
+  * New upstream release
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Mon, 03 Jul 2006 19:57:21 +0100
+
+kdeedu (4:3.5.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add blinken to kdeedu dependencies.
+  * Remove copy of steve.ttf from blinken, and instead depend on
+    the new ttf-sjfonts package.  Closes: #344377.
+  * Do the same for khangman: remove the copies of Domestic_Manners.ttf
+    and Dustismo_Roman.ttf, and instead depend on ttf-dustin.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed, 29 Mar 2006 21:31:41 +0200
+
+kdeedu (4:3.5.2-0ubuntu9) dapper; urgency=low
+
+  * debian/rules:
+    - added dh_iconcache.
+
+ -- Daniel Holbach <daniel.holbach at ubuntu.com>  Thu, 18 May 2006 15:16:34 +0200
+
+kdeedu (4:3.5.2-0ubuntu8) dapper; urgency=low
+
+  * Add EXTRACTATTR to .pot generation rule
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  9 May 2006 18:31:07 +0300
+
+kdeedu (4:3.5.2-0ubuntu7) dapper; urgency=low
+
+  * Add build-dep on gawk so that kstars.pot gets generated
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  9 May 2006 17:42:58 +0300
+
+kdeedu (4:3.5.2-0ubuntu6) dapper; urgency=low
+
+  * Remove html docs in kanagram, they are in kdeedu-doc-html.
+  * Move kgeography html docs to kdeedu-doc-html. 
+
+ -- Frode M. Doeving <frode at lnix.net>  Tue,  2 May 2006 18:41:09 +0200
+
+kdeedu (4:3.5.2-0ubuntu5) dapper; urgency=low
+
+  * Make kgeorgraphy Replaces kgeography-data, closes Malone #42192
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon,  1 May 2006 17:20:59 +0100
+
+kdeedu (4:3.5.2-0ubuntu4) dapper; urgency=low
+
+  * Remove references in debian/kdeedu-doc-html* to KMessedwords,
+    now Kanagram, Closes Malone #30732
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 28 Apr 2006 16:25:37 +0100
+
+kdeedu (4:3.5.2-0ubuntu3) dapper; urgency=low
+
+  * Updated debian/rules to install docs for the correct list of packages
+
+ -- Frode M. Doeving <frode at lnix.net>  Wed, 26 Apr 2006 19:11:21 +0200
+
+kdeedu (4:3.5.2-0ubuntu2) dapper; urgency=low
+
+  * Edit debian/rules to mark .po files as UTF-8
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 21 Apr 2006 19:11:11 +0100
+
+kdeedu (4:3.5.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 20 Mar 2006 12:06:28 +0000
+
+kdeedu (4:3.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Adjust dependencies on *-data to be binNMU-safe.
+    Closes: #348644, #348687, #348690, #348692.
+  * New patch 10_lib_link.diff: Link libkvoctrain.so against -lkio to
+    resolve as many undefined symbols as possible.  Unfortunately, that
+    library still needs a couple symbols from the kvoctrain binary itself.
+  * Remove obsolete kmessedwords doc-base file.  Closes: #350297.
+
+ -- Daniel Schepler <schepler at debian.org>  Thu,  2 Feb 2006 09:49:13 +0100
+
 kdeedu (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
@@ -4,6 +90,42 @@
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
+kdeedu (4:3.5.0-4) unstable; urgency=low
+
+  * New package: kdeedu-dbg, to make debugging symbols available.
+  * Include uuencoded tar file of binary files changed on branch.
+  * Rebuild against boost 1.33.1.
+
+ -- Daniel Schepler <schepler at debian.org>  Tue, 17 Jan 2006 09:44:35 +0100
+
+kdeedu (4:3.5.0-3) unstable; urgency=low
+
+  * Upload to unstable.
+  * No longer build with g++-3.4 on any architecture, since g++-4.0
+    should be fixed.
+  * Update to SVN branches/KDE/3.5, up to revision 496050.
+  * Tighten versioning of Build-Depends on kdelibs4-dev.  Closes: #344765.
+
+ -- Daniel Schepler <schepler at debian.org>  Mon,  9 Jan 2006 22:39:22 +0100
+
+kdeedu (4:3.5.0-2) experimental; urgency=low
+
+  * Upload to experimental.
+
+ -- Daniel Schepler <schepler at debian.org>  Tue, 20 Dec 2005 10:47:44 +0100
+
+kdeedu (4:3.5.0-1) alioth; urgency=low
+
+  * New upstream release.
+  * Rename package kmessedwords to kanagram.
+  * Rename libkdeedu1 to libkdeedu3 due to SONAME change of libkdeeduui.
+  * New packages: blinken, kgeography, kgeography-data.
+  * New split-off data package: kalzium-data.
+  * Regenerate all Debian menu icons, since several of the upstream icons
+    were improved.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed, 14 Dec 2005 00:31:49 +0100
+
 kdeedu (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * rebuild for new libboost 
@@ -34,6 +156,25 @@
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 13 Nov 2005 20:53:20 +0000
 
+kdeedu (4:3.4.3-2) unstable; urgency=low
+
+  * New maintainer: I'll be the primary maintainer although I'm listing
+    the Debian QT/KDE group as the official maintainer.  Thanks to
+    Ben Burton for maintaining the package up until now.
+  * Switch to CDBS.
+  * Update Build-Depends to ensure getting c2a-transitioned versions of
+    kdelibs and boost-python.
+
+ -- Daniel Schepler <schepler at debian.org>  Mon,  5 Dec 2005 21:25:51 +0100
+
+kdeedu (4:3.4.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Changed Maintainer to Debian Qt/KDE Maintainers
+  * Acknowledge NMU (Closes: #334986). 
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat,  3 Dec 2005 16:17:55 +0100
+
 kdeedu (4:3.4.2-2.1) unstable; urgency=low
 
   * NMU
@@ -426,3 +567,4 @@
 Local variables:
 mode: debian-changelog
 End:
+

Modified: people/jriddell/KDE/3.5/kdeedu/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/control	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/control	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,81 +1,141 @@
 Source: kdeedu
 Section: kde
 Priority: optional
-Maintainer: Ben Burton <bab at debian.org>
-Build-Depends: automake1.7, debhelper (>> 4.0.0), kdelibs4-dev (>= 4:3.5.1), libboost-python-dev (>= 1.32.0)
-Build-Conflicts: autoconf2.13
+Maintainer: Debian QT/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Ben Burton <bab at debian.org>, Isaac Clerencia <isaac at debian.org>, Daniel Schepler <schepler at debian.org>, Luk Claes <luk at debian.org>
+Build-Depends: automake1.9, bzip2, cdbs (>= 0.4.37), debhelper (>> 5.0.0), kdelibs4-dev (>= 4:3.5.2), libboost-python-dev (>= 1.33.1), libtool, libusb-dev, sharutils
 Standards-Version: 3.6.2.1
 
 Package: kdeedu
 Architecture: all
 Section: kde
-Depends: kalzium (>= ${Source-Version}), kbruch (>= ${Source-Version}), kdeedu-data (>= ${Source-Version}), keduca (>= ${Source-Version}), khangman (>= ${Source-Version}), kig (>= ${Source-Version}), kiten (>= ${Source-Version}), klatin (>= ${Source-Version}), klettres (>= ${Source-Version}), kanagram (>= ${Source-Version}), kmplot (>= ${Source-Version}), kpercentage (>= ${Source-Version}), kstars (>= ${Source-Version}), ktouch (>= ${Source-Version}), kturtle (>= ${Source-Version}), kverbos (>= ${Source-Version}), kvoctrain (>= ${Source-Version}), kwordquiz (>= ${Source-Version})
+Depends: blinken (>= ${Source-Version}), kalzium (>= ${Source-Version}), kanagram (>= ${Source-Version}), kbruch (>= ${Source-Version}), kdeedu-data (>= ${Source-Version}), keduca (>= ${Source-Version}), khangman (>= ${Source-Version}), kig (>= ${Source-Version}), kiten (>= ${Source-Version}), klatin (>= ${Source-Version}), klettres (>= ${Source-Version}), kmplot (>= ${Source-Version}), kpercentage (>= ${Source-Version}), kstars (>= ${Source-Version}), ktouch (>= ${Source-Version}), kturtle (>= ${Source-Version}), kverbos (>= ${Source-Version}), kvoctrain (>= ${Source-Version}), kwordquiz (>= ${Source-Version})
 Suggests: kdeedu-doc-html
 Description: educational apps from the official KDE release
- This is a collection of educational applications provided with the official
- release of KDE (the K Desktop Environment).
+ This is a collection of educational applications provided with the
+ official release of KDE (the K Desktop Environment).
 
 Package: kdeedu-data
 Architecture: all
 Section: kde
 Suggests: kdeedu
 Description: shared data for KDE educational applications
- This package contains shared data necessary for running the educational
- applications provided with KDE (the K Desktop Environment).
+ This package contains shared data necessary for running the
+ educational applications provided with KDE (the K Desktop
+ Environment).
  .
  This package is part of the official KDE edutainment module.
 
+Package: kdeedu-dbg
+Architecture: any
+Priority: extra
+Section: libdevel
+Description: debugging symbols for kdeedu
+ This package contains the debugging symbols associated with kdeedu.
+ They will automatically be used by gdb for debugging kdeedu-related
+ issues.
+
 Package: kdeedu-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, kdeedu
 Description: KDE edutainment documentation in HTML format
- By default the educational applications provided with KDE (the K Desktop
- Environment) only provide their documentation in KDE docbook format,
- which can only be read by Konqueror or KHelpCenter.  This package
- provides all of the KDE edutainment documentation converted to HTML
- format so it can be read with any web browser.
+ By default the educational applications provided with KDE (the K
+ Desktop Environment) only provide their documentation in KDE docbook
+ format, which can only be read by Konqueror or KHelpCenter.  This
+ package provides all of the KDE edutainment documentation converted
+ to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kalzium/.  Documentation is provided for most
- KDE edutainment packages.
+ /usr/share/doc/kde/HTML/en/kalzium/.  Documentation is provided for
+ most KDE edutainment packages.
  .
  This package is part of the official KDE edutainment module.
 
+Package: blinken
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}, ttf-sjfonts
+Recommends: kcontrol, kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: KDE version of the Simon Says electronic memory game
+ Blinken is based on an electronic game released in 1978, which
+ challenges players to remember sequences of increasing length.  On
+ the face of the device, there are 4 different color buttons, each
+ with its own distinctive sound.  These buttons light up randomly,
+ creating the sequence that the player must then recall.  If the
+ player is successful in remembering the sequence of lights in the
+ correct order, they advance to the next stage, where an identical
+ sequence with one extra step is presented.
+ .
+ The package recommends kcontrol, which contains a plugin needed to
+ install a custom font used by the game the first time a user runs it.
+ If you do not install kcontrol, you will need to manually copy the
+ font steve.ttf from /usr/share/apps/blinken/fonts to a user directory
+ or to a system directory from where it will be accessible.
+ .
+ This package is part of the official KDE edutainment module.
+
 Package: kalzium
 Architecture: any
 Section: science
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, kalzium-data (>> ${KDE-Version3}), kalzium-data (<< ${KDE-Next-Version3})
 Recommends: kdeedu-data (>= ${Source-Version})
 Suggests: khelpcenter, kdeedu-doc-html
 Description: chemistry teaching tool for KDE
- Kalzium is a program which shows you the Periodic System of Elements (PSE).
- You can use Kalzium to search for information about the elements or to
- learn facts about the PSE.
+ Kalzium is a program which shows you the Periodic System of Elements
+ (PSE).  You can use Kalzium to search for information about the
+ elements or to learn facts about the PSE.
  .
- Kalzium provides you with all kinds of information about the PSE.  You
- can look up lots of information about the elements and also use
+ Kalzium provides you with all kinds of information about the PSE.
+ You can look up lots of information about the elements and also use
  visualisations to show them.
  .
- You can visualise the Periodic Table of the Elements by blocks, groups,
- acidic behavior or different states of matter.  You can also plot data for
- a range of elements (weight, mean weight, density, IE1, IE2,
- electronegativity), and you can go back in time to see what elements were
- known at a given date.
+ You can visualise the Periodic Table of the Elements by blocks,
+ groups, acidic behavior or different states of matter.  You can also
+ plot data for a range of elements (weight, mean weight, density, IE1,
+ IE2, electronegativity), and you can go back in time to see what
+ elements were known at a given date.  In addition, on platforms where
+ OCaml supports native code generation, Kalzium includes a chemical
+ equation solver.
  .
  This package is part of the official KDE edutainment module.
 
-Package: blinken
+Package: kalzium-data
+Architecture: all
+Section: science
+Recommends: kalzium
+Replaces: kalzium (<< 4:3.5.0)
+Description: data files for Kalzium
+ This package contains architecture-independent data files for
+ Kalzium, the KDE periodic table application.  This includes pictures
+ of various chemical equipment and of samples of several elements, in
+ addition to the actual chemical data.
+ .
+ See the kalzium package for further information.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kanagram
 Architecture: any
-Section: science
+Section: games
 Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
 Suggests: khelpcenter, kdeedu-doc-html
-Description: the well-known game Simon Says for KDE
- Follow the pattern of sounds and lights as long as you can! Press the
- start game button to begin. Watch the computer and copy the pattern it
- makes. Complete the sequence in the right order to win.
+Description: letter order game for KDE
+ KAnagram is a game that is based on the word/letter puzzles that the
+ author played as a child.  A word is picked at random and displayed
+ with its letters in a messed order, with difficulty dependent on the
+ chosen level.  You have an unlimited number of attempts, and scores
+ are kept.
  .
+ It is a very simply constructed game, with 3 difficulty levels of
+ play.  It is fully customizable, allowing you to write in your own
+ words and set your own 'look and feel' of the game.  It is aimed for
+ children aged 10+ because of the difficulty, but of course everyone
+ is welcome to try.
+ .
  This package is part of the official KDE edutainment module.
 
 Package: kbruch
@@ -86,8 +146,8 @@
 Suggests: khelpcenter, kdeedu-doc-html
 Description: fraction calculation teaching tool for KDE
  KBruch is a small program to practice calculating with fractions.
- Different exercises are provided for this purpose.  The program checks
- the user's input and gives feedback.
+ Different exercises are provided for this purpose.  The program
+ checks the user's input and gives feedback.
  .
  This package is part of the official KDE edutainment module.
 
@@ -103,10 +163,37 @@
  .
  This package is part of the official KDE edutainment module.
 
+Package: kgeography
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kgeography-data (>> ${KDE-Version3}), kgeography-data (<< ${KDE-Next-Version3})
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: Geography learning tool for KDE
+ KGeography contains maps allowing you to learn various countries or
+ the political divisions of several countries.  It has several modes,
+ including a map browser and games involving the names, capitals, or
+ flags of the map divisions.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kgeography-data
+Architecture: all
+Section: kde
+Recommends: kgeography
+Description: data files for KGeography
+ This package contains architecture-independent data files for
+ KGeography, the geography learning tool for KDE.  This includes map
+ and flag images.
+ .
+ See the kgeography package for further information.
+ .
+ This package is part of the official KDE edutainment module.
+
 Package: khangman
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ttf-dustin
 Recommends: kdeedu-data (>= ${Source-Version})
 Suggests: khelpcenter, kdeedu-doc-html
 Description: the classical hangman game for KDE
@@ -114,10 +201,10 @@
  for children aged 6 and above.  It has four levels of difficulty:
  Animals (animals words), Easy, Medium and Hard.
  .
- A word is picked at random and the letters are hidden.  You must guess
- the word by trying one letter after another.  Each time you guess a wrong
- letter, a picture of a hangman is drawn.  You must guess the word before
- getting hanged!  You have 10 tries.
+ A word is picked at random and the letters are hidden.  You must
+ guess the word by trying one letter after another.  Each time you
+ guess a wrong letter, a picture of a hangman is drawn.  You must
+ guess the word before getting hanged!  You have 10 tries.
  .
  This package is part of the official KDE edutainment module.
 
@@ -128,22 +215,22 @@
 Recommends: kdeedu-data (>= ${Source-Version})
 Suggests: khelpcenter, kdeedu-doc-html
 Description: interactive geometry program for KDE
- Kig is an application for interactive geometry.  It is intended to serve
- two purposes:
+ Kig is an application for interactive geometry.  It is intended to
+ serve two purposes:
  .
   - to allow students to interactively explore mathematical figures and
     concepts using the computer;
   - to serve as a WYSIWYG tool for drawing mathematical figures and
     including them in other documents.
  .
- With this program you can do geometry on a computer just like you would
- on a blackboard in a classroom.  However, the program allows you to move
- and change parts of a geometrical drawing so that you can see how the other
- parts change as a result.
+ With this program you can do geometry on a computer just like you
+ would on a blackboard in a classroom.  However, the program allows
+ you to move and change parts of a geometrical drawing so that you can
+ see how the other parts change as a result.
  .
  Kig supports loci and user-defined macros.  It also supports imports
- and exports to/from foreign file formats including Cabri, Dr. Geo, KGeo,
- KSeg and XFig.
+ and exports to/from foreign file formats including Cabri, Dr. Geo,
+ KGeo, KSeg and XFig.
  .
  This package is part of the official KDE edutainment module.
 
@@ -156,9 +243,9 @@
 Description: Japanese reference/study tool for KDE
  Kiten is a Japanese reference and study tool for KDE.  It is an
  application with multiple functions.  Firstly, it is a convenient
- English to Japanese and Japanese to English dictionary.  Secondly, it is
- a Kanji dictionary, with multiple ways to look up specific characters.
- Thirdly, it is a tool to help you learn Kanji.
+ English to Japanese and Japanese to English dictionary.  Secondly, it
+ is a Kanji dictionary, with multiple ways to look up specific
+ characters.  Thirdly, it is a tool to help you learn Kanji.
  .
  This package is part of the official KDE edutainment module.
 
@@ -169,18 +256,18 @@
 Recommends: kdeedu-data (>= ${Source-Version})
 Suggests: khelpcenter, kdeedu-doc-html
 Description: application to help revise/teach Latin
- KLatin is a program to help revise Latin.  There are three "sections" in
- which different aspects of the language can be revised.  These are the
- vocabulary, grammar and verb testing sections.  In addition there is a
- set of revision notes that can be used for self-guided revision.
+ KLatin is a program to help revise Latin.  There are three "sections"
+ in which different aspects of the language can be revised.  These are
+ the vocabulary, grammar and verb testing sections.  In addition there
+ is a set of revision notes that can be used for self-guided revision.
  .
  In the vocabulary section an XML file is loaded containing various
- words and their local language translations.  KLatin asks you what each
- of these words translate into.  The questions take place in a
+ words and their local language translations.  KLatin asks you what
+ each of these words translate into.  The questions take place in a
  multiple-choice environment.
  .
- In the grammar and verb sections KLatin asks for a particular part of a
- noun or a verb, such as the "ablative singular", or the "1st person
+ In the grammar and verb sections KLatin asks for a particular part of
+ a noun or a verb, such as the "ablative singular", or the "1st person
  indicative passive plural", and is not multiple choice.
  .
  This package is part of the official KDE edutainment module.
@@ -188,66 +275,34 @@
 Package: klettres
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, klettres-data (= ${Source-Version})
+Depends: ${shlibs:Depends}, klettres-data (>> ${KDE-Version3}), klettres-data (<< ${KDE-Next-Version3})
 Recommends: kdeedu-data (>= ${Source-Version})
 Suggests: khelpcenter, kdeedu-doc-html
 Description: foreign alphabet tutor for KDE
  KLettres is an application specially designed to help the user to
  learn the alphabet in a new language and then to learn to read simple
- syllables.  The user can be a young child aged from two and a half or an
- adult that wants to learn the basics of a foreign language.
+ syllables.  The user can be a young child aged from two and a half or
+ an adult that wants to learn the basics of a foreign language.
  .
- Seven languages are currently available: Czech, Danish, Dutch, English,
- French, Italian and Slovak.
+ Seven languages are currently available: Czech, Danish, Dutch,
+ English, French, Italian and Slovak.
  .
  This package is part of the official KDE edutainment module.
 
 Package: klettres-data
 Architecture: all
 Section: kde
-Recommends: klettres (= ${Source-Version})
+Recommends: klettres
 Replaces: klettres (<< 4:3.2.0.1)
 Description: data files for KLettres foreign alphabet tutor
- This package contains architecture-independent data files for KLettres,
- the foreign alphabet tutor for KDE.  This includes sound files and
- graphics.
+ This package contains architecture-independent data files for
+ KLettres, the foreign alphabet tutor for KDE.  This includes sound
+ files and graphics.
  .
  See the klettres package for further information.
  .
  This package is part of the official KDE edutainment module.
 
-Package: kanagram
-Architecture: any
-Section: games
-Depends: ${shlibs:Depends}
-Recommends: kdeedu-data (>= ${Source-Version})
-Suggests: khelpcenter, kdeedu-doc-html
-Replaces: kmessedwords
-Conflicts: kmessedwords
-Description: letter order game for KDE
- Kanagram is a game that is based on the word/letter puzzles that the
- author played as a child.  A word is picked at random and displayed with
- its letters in a messed order, with difficulty dependent on the chosen level.
- You have an unlimited number of attempts, and scores are kept.
- .
- It is a very simply constructed game, with 3 dificulty levels of play.
- It is fully customizable, allowing you to write in your own words and set
- your own 'look and feel' of the game.  It is aimed for children aged 10+
- because of the dificulty, but of course everyone is welcome to try.
- .
- This package is part of the official KDE edutainment module.
-
-Package: kgeography
-Architecture: any
-Section: games
-Depends: ${shlibs:Depends}
-Recommends: kdeedu-data (>= ${Source-Version})
-Suggests: khelpcenter, kdeedu-doc-html
-Description: geography learning program
- KGeography is a geography learning program.
- .
- This package is part of the official KDE edutainment module.
-
 Package: kmplot
 Architecture: any
 Section: math
@@ -263,10 +318,10 @@
  coordinates.  Several grid modes are supported.  Plots may be printed
  with high precision in the correct scale.
  .
- KmPlot also provides some numerical and visual features, like
- filling and calculating the area between the plot and the first axis,
- finding maximum and minimum values, changing function parameters
- dynamically and plotting derivatives and integral functions.
+ KmPlot also provides some numerical and visual features, like filling
+ and calculating the area between the plot and the first axis, finding
+ maximum and minimum values, changing function parameters dynamically
+ and plotting derivatives and integral functions.
  .
  This package is part of the official KDE edutainment module.
 
@@ -280,36 +335,37 @@
  KPercentage is a small math application that will help pupils to
  improve their skills in calculating percentages.
  .
- There is a special training section for the three basic tasks.  Finally
- the pupil can select a random mode, in which all three tasks are mixed
- randomly.
+ There is a special training section for the three basic tasks.
+ Finally the pupil can select a random mode, in which all three tasks
+ are mixed randomly.
  .
  This package is part of the official KDE edutainment module.
 
 Package: kstars
 Architecture: any
 Section: science
-Depends: ${shlibs:Depends}, kstars-data (= ${Source-Version})
+Depends: ${shlibs:Depends}, kstars-data (>> ${KDE-Version3}), kstars-data (<< ${KDE-Next-Version3})
 Recommends: kdeedu-data (>= ${Source-Version})
 Suggests: konqueror, khelpcenter, kdeedu-doc-html
 Description: desktop planetarium for KDE
  KStars is a graphical desktop planetarium for KDE.  It depicts an
- accurate simulation of the night sky, including stars, constellations,
- star clusters, nebulae, galaxies, all planets, the Sun, the Moon,
- comets and asteroids.  You can see the sky as it appears from any
- location on Earth, on any date.
+ accurate simulation of the night sky, including stars,
+ constellations, star clusters, nebulae, galaxies, all planets, the
+ Sun, the Moon, comets and asteroids.  You can see the sky as it
+ appears from any location on Earth, on any date.
  .
  The user interface is highly intuitive and flexible.  The display can
  be panned and zoomed with the mouse, and you can easily identify
  objects and track their motion across the sky.  KStars includes many
- powerful features, yet the interface is clean and simple and fun to use.
+ powerful features, yet the interface is clean and simple and fun to
+ use.
  .
  This package is part of the official KDE edutainment module.
 
 Package: kstars-data
 Architecture: all
 Section: science
-Recommends: kstars (= ${Source-Version})
+Recommends: kstars
 Replaces: kstars (<< 4:3.2.0.1)
 Description: data files for KStars desktop planetarium
  This package contains architecture-independent data files for KStars,
@@ -328,12 +384,13 @@
 Suggests: khelpcenter, kdeedu-doc-html
 Description: touch typing tutor for KDE
  KTouch is a program for learning touch typing - it helps you learn to
- type on a keyboard quickly and correctly.  Every finger has its place on
- the keyboard with associated keys to press.
+ type on a keyboard quickly and correctly.  Every finger has its place
+ on the keyboard with associated keys to press.
  .
  KTouch helps you learn to touch type by providing you with text to
- train on, and adjusts to different levels depending on how good you are.
- It can display which key to press next, and the correct finger to use.
+ train on, and adjusts to different levels depending on how good you
+ are.  It can display which key to press next, and the correct finger
+ to use.
  .
  This package is part of the official KDE edutainment module.
 
@@ -346,16 +403,16 @@
 Description: educational Logo programming environment
  KTurtle is an educational programming environment using the Logo
  programming language.  It tries to make programming as easy and
- accessible as possible.  This makes KTurtle suitable for teaching kids
- the basics of mathematics, geometry and programming.
+ accessible as possible.  This makes KTurtle suitable for teaching
+ kids the basics of mathematics, geometry and programming.
  .
  The commands used to program are in the style of the Logo programming
  language.  The unique feature of Logo is that the commands are often
  translated into the speaking language of the programmer.
  .
  KTurtle is named after "the turtle" that plays a central role in the
- programming environment.  The user programs the turtle, using the Logo
- commands, to draw a picture on the canvas.
+ programming environment.  The user programs the turtle, using the
+ Logo commands, to draw a picture on the canvas.
  .
  Note that this version of Logo is only focused on the educational
  qualities of the programming language and will not try to suit
@@ -370,13 +427,13 @@
 Recommends: kdeedu-data (>= ${Source-Version})
 Suggests: khelpcenter, kdeedu-doc-html
 Description: Spanish verb form study application for KDE
- Kverbos allows the user to learn the forms of Spanish verbs.  The program
- suggests a verb and a time and the user enters the different verb forms.
- The program corrects the user input and gives feedback.
+ Kverbos allows the user to learn the forms of Spanish verbs.  The
+ program suggests a verb and a time and the user enters the different
+ verb forms.  The program corrects the user input and gives feedback.
  .
- The user can edit the list of the verbs that can be studied.  The program
- can build regular verb forms by itself.  Irregular verb forms have to be
- entered by the user.
+ The user can edit the list of the verbs that can be studied.  The
+ program can build regular verb forms by itself.  Irregular verb forms
+ have to be entered by the user.
  .
  This package is part of the official KDE edutainment module.
 
@@ -387,19 +444,20 @@
 Recommends: kdeedu-data (>= ${Source-Version})
 Suggests: khelpcenter, kdeedu-doc-html
 Description: vocabulary trainer for KDE
- KVocTrain is a little utility to help you train your vocabulary when you
- are trying to learn a foreign language.  You can create your own database
- with the words you need.  It is intended as a replacement for index
- (flash) cards.
+ KVocTrain is a little utility to help you train your vocabulary when
+ you are trying to learn a foreign language.  You can create your own
+ database with the words you need.  It is intended as a replacement
+ for index (flash) cards.
  .
- You probably remember flashcards from school.  The teacher would write the
- original expression on the front side of the card and the translation on
- the back.  Then look at the cards one after another.  If you knew the
- translation, you could put it away.  If you failed, you put it back to
- try again.
+ You probably remember flashcards from school.  The teacher would
+ write the original expression on the front side of the card and the
+ translation on the back.  Then look at the cards one after another.
+ If you knew the translation, you could put it away.  If you failed,
+ you put it back to try again.
  .
  KVocTrain is not intended to teach you grammer or other sophisticated
- things.  This is and probably will stay beyond the scope of this application.
+ things.  This is and probably will stay beyond the scope of this
+ application.
  .
  This package is part of the official KDE edutainment module.
 
@@ -413,10 +471,10 @@
  KWordQuiz is a flashcard-based tool that helps you to master new
  vocabularies.  It may be a language or any other kind of terminology.
  .
- KWordQuiz can open several types of vocabulary data.  Supported are .kvtml
- files used by other KDE programs such as KVocTrain, .wql files used by
- WordQuiz for Windows, .csv files with comma-separated text, and .xml.gz
- files created by Pauker (http://pauker.sourceforge.net/).
+ KWordQuiz can open several types of vocabulary data.  Supported are
+ .kvtml files used by other KDE programs such as KVocTrain, .wql files
+ used by WordQuiz for Windows, .csv files with comma-separated text,
+ and .xml.gz files created by Pauker (http://pauker.sourceforge.net/).
  .
  This package is part of the official KDE edutainment module.
 
@@ -424,12 +482,12 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libkdeedu1
 Replaces: libkdeedu1
-Conflicts: libkdeedu1
 Description: library for use with KDE educational apps
- The KDE-based library libkdeedu is used with educational applications.
- It currently provides support for data plotting and vocabulary items
- (including a parser for kvtml vocabulary files).
+ The KDE-based library libkdeedu is used with educational
+ applications.  It currently provides support for data plotting and
+ vocabulary items (including a parser for kvtml vocabulary files).
  .
  This package is part of the official KDE edutainment module.
 
@@ -438,9 +496,9 @@
 Section: libdevel
 Depends: libkdeedu3 (= ${Source-Version}), kdelibs4-dev (>= 4:3.4.2-1)
 Description: development files for KDE educational library
- The KDE-based library libkdeedu is used with educational applications.
- It currently provides support for data plotting and vocabulary items
- (including a parser for kvtml vocabulary files).
+ The KDE-based library libkdeedu is used with educational
+ applications.  It currently provides support for data plotting and
+ vocabulary items (including a parser for kvtml vocabulary files).
  .
  Development files for libkdeedu are included in this package.
  .
@@ -454,13 +512,14 @@
 Suggests: kiten
 Replaces: kiten (<< 4:3.4.0)
 Description: library for Kiten Japanese reference/study tool
- Kiten is a Japanese reference/study tool for KDE.  The library libkiten
- contains portions of Kiten that may be useful for other applications.
- These portions include dictionary, character lookup and widget classes.
+ Kiten is a Japanese reference/study tool for KDE.  The library
+ libkiten contains portions of Kiten that may be useful for other
+ applications.  These portions include dictionary, character lookup
+ and widget classes.
  .
- This package contains the libkiten library along with supporting data,
- such as Japanese language data files and GUI resource files.  For further
- information, see the kiten package.
+ This package contains the libkiten library along with supporting
+ data, such as Japanese language data files and GUI resource files.
+ For further information, see the kiten package.
  .
  This package is part of the official KDE edutainment module.
 
@@ -469,12 +528,12 @@
 Section: libdevel
 Depends: libkiten1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.4.2-1)
 Description: development files for Kiten library
- Kiten is a Japanese reference/study tool for KDE.  The library libkiten
- contains portions of Kiten that may be useful for other applications.
- These portions include dictionary, character lookup and widget classes.
+ Kiten is a Japanese reference/study tool for KDE.  The library
+ libkiten contains portions of Kiten that may be useful for other
+ applications.  These portions include dictionary, character lookup
+ and widget classes.
  .
  Development files for libkiten are included in this package.  For
  further information, see the kiten package.
  .
  This package is part of the official KDE edutainment module.
-

Modified: people/jriddell/KDE/3.5/kdeedu/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/copyright	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/copyright	2006-07-13 08:44:45 UTC (rev 4109)
@@ -7,12 +7,17 @@
 
 Upstream Authors:
 
+  Blinken: Albert Astals Cid <tsdgeos at terra.es>,
+      Danny Allen <danny at dannyallen.co.uk>
   Kalzium: Carsten Niehaus <cniehaus at kde.org>
+  KAnagram: Joshua Keel <joshuakeel at gmail.com>,
+      Danny Allen <danny at dannyallen.co.uk>
   KBruch: Sebastian Stein <seb.kde at hpfsc.de>,
       Eva Brucherseifer <eva at kde.org> and others
   KEduca: Javier Campos <javi at asyris.org>, Klas Kalass <klas at kde.org>,
       Henrique Pinto <henrique.pinto at kdemail.net>,
       Anne-Marie Mahfouf <annma at kde.org>
+  KGeography: Albert Astals Cid <tsdgeos at terra.es>
   KHangMan: Primoz Anzur <zerokode at gmx.net>, Anne-Marie Mahfouf <annma at kde.org>
   Kig: Dominique Devriese <devriese at kde.org>,
       Maurizio Paolini <paolini at dmf.bs.unicatt.it>,
@@ -25,10 +30,6 @@
   KLettres: Anne-Marie Mahfouf <annma at kde.org> and many others
   KMathTool: Birgit Schulz <B.Schulz at Superlehrer.de>,
       Marco Wegner <mail at marcowegner.de>
-  KMessedWords: Primoz Anzur <zerokode at gmx.net>,
-      Waldo Bastian <bastian at kde.org>, Daniel Molkentin <molkentin at kde.org>,
-      Reuben Sutton <reuben at microsucks.co.uk>,
-      Anne-Marie Mahfouf <annma at kde.org>
   KmPlot: Klaus-Dieter Möller <kdmoeller at foni.net>,
       Matthias Messmer <bmlmessmer at web.de>,
       Fredrik Edemar <f_edemar at linux.se>

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kalzium.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kalzium.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kalzium.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-kalzium/TODO
+build-tree/kdeedu-*/kalzium/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kalzium.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kalzium.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kalzium.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,17 +1,15 @@
 usr/bin/kalzium
 usr/share/applications/kde/kalzium.desktop
-usr/share/apps/kalzium
 usr/share/config.kcfg/kalzium.kcfg
-usr/share/doc/kde/HTML/en/kalzium/*.docbook
-usr/share/doc/kde/HTML/en/kalzium/*.png
 usr/share/doc/kde/HTML/en/kalzium/common
 usr/share/doc/kde/HTML/en/kalzium/index.cache.bz2
-usr/share/icons/hicolor/128x128/apps/kalzium.png
+usr/share/doc/kde/HTML/en/kalzium/*.docbook
+usr/share/doc/kde/HTML/en/kalzium/*.png
 usr/share/icons/hicolor/16x16/apps/kalzium.png
 usr/share/icons/hicolor/22x22/apps/kalzium.png
 usr/share/icons/hicolor/32x32/apps/kalzium.png
 usr/share/icons/hicolor/48x48/apps/kalzium.png
 usr/share/icons/hicolor/64x64/apps/kalzium.png
+usr/share/icons/hicolor/128x128/apps/kalzium.png
 usr/share/icons/hicolor/scalable/apps/kalzium.svgz
-
-../kalzium.xpm usr/share/pixmaps
+../icons/kalzium.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kalzium.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kalzium.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kalzium.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/kalzium.1
+debian/man/kalzium.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kanagram.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kanagram.README.Debian	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kanagram.README.Debian	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,4 +1,4 @@
-Kanagram for Debian
+KMessedWords for Debian
 -----------------------
 
 This application provides documentation in a docbook format that the KDE

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kanagram.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kanagram.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kanagram.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-kanagram/DATA_FILE_TRANSLATION.readme
-kanagram/TODO
+build-tree/kdeedu-*/kanagram/DATA_FILE_TRANSLATION.readme
+build-tree/kdeedu-*/kanagram/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kanagram.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kanagram.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kanagram.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -2,24 +2,15 @@
 usr/share/applications/kde/kanagram.desktop
 usr/share/apps/kanagram
 usr/share/config.kcfg/kanagram.kcfg
-usr/share/doc/kde/HTML/en/kanagram/*.docbook
-usr/share/doc/kde/HTML/en/kanagram/*.png
 usr/share/doc/kde/HTML/en/kanagram/common
-usr/share/doc/kde/HTML/en/kanagram/compilation.html
-usr/share/doc/kde/HTML/en/kanagram/configuring.html
-usr/share/doc/kde/HTML/en/kanagram/credits.html
 usr/share/doc/kde/HTML/en/kanagram/index.cache.bz2
-usr/share/doc/kde/HTML/en/kanagram/index.html
-usr/share/doc/kde/HTML/en/kanagram/installation.html
-usr/share/doc/kde/HTML/en/kanagram/introduction.html
-usr/share/doc/kde/HTML/en/kanagram/main_overlay.svgz
-usr/share/doc/kde/HTML/en/kanagram/newstuff-config.html
-usr/share/doc/kde/HTML/en/kanagram/using-kanagram.html
-usr/share/icons/hicolor/128x128/apps/kanagram.png
+usr/share/doc/kde/HTML/en/kanagram/*.docbook
+usr/share/doc/kde/HTML/en/kanagram/*.png
+usr/share/doc/kde/HTML/en/kanagram/*.svgz
 usr/share/icons/hicolor/16x16/apps/kanagram.png
 usr/share/icons/hicolor/22x22/apps/kanagram.png
 usr/share/icons/hicolor/32x32/apps/kanagram.png
 usr/share/icons/hicolor/48x48/apps/kanagram.png
+usr/share/icons/hicolor/128x128/apps/kanagram.png
 usr/share/icons/hicolor/scalable/apps/kanagram.svgz
-
-../kanagram.xpm usr/share/pixmaps
+../icons/kanagram.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kanagram.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kanagram.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kanagram.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/kanagram.1
+debian/man/kanagram.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kanagram.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kanagram.menu	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kanagram.menu	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,7 +1,7 @@
 ?package(kanagram):needs="X11"\
   section="Games/Puzzles"\
   hints="KDE"\
-  title="Kanagram"\
-  longtitle="Kanagram (Letter Order Game)"\
+  title="KAnagram"\
+  longtitle="KAnagram (Letter Order Game)"\
   command="/usr/bin/kanagram"\
   icon="/usr/share/pixmaps/kanagram.xpm"

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kbruch.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kbruch.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kbruch.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-kbruch/AUTHORS
-kbruch/TODO
+build-tree/kdeedu-*/kbruch/AUTHORS
+build-tree/kdeedu-*/kbruch/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kbruch.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kbruch.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kbruch.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,19 +1,18 @@
 usr/bin/kbruch
-usr/share/applications/kde/kbruch.desktop
 usr/share/apps/kbruch/kbruchui.rc
+usr/share/applications/kde/kbruch.desktop
 usr/share/config.kcfg/kbruch.kcfg
 usr/share/doc/kde/HTML/en/kbruch/*.bz2
+usr/share/doc/kde/HTML/en/kbruch/common
 usr/share/doc/kde/HTML/en/kbruch/*.docbook
 usr/share/doc/kde/HTML/en/kbruch/*.png
-usr/share/doc/kde/HTML/en/kbruch/common
-usr/share/icons/crystalsvg/32x32/actions/kbruch_*.png
-usr/share/icons/crystalsvg/64x64/actions/kbruch_*.png
-usr/share/icons/hicolor/128x128/apps/kbruch.png
 usr/share/icons/hicolor/16x16/apps/kbruch.png
 usr/share/icons/hicolor/22x22/apps/kbruch.png
 usr/share/icons/hicolor/32x32/apps/kbruch.png
 usr/share/icons/hicolor/48x48/apps/kbruch.png
 usr/share/icons/hicolor/64x64/apps/kbruch.png
+usr/share/icons/hicolor/128x128/apps/kbruch.png
 usr/share/icons/hicolor/scalable/apps/kbruch.svgz
-
-../kbruch.xpm usr/share/pixmaps
+usr/share/icons/crystalsvg/32x32/actions/kbruch_*.png
+usr/share/icons/crystalsvg/64x64/actions/kbruch_*.png
+../icons/kbruch.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kbruch.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kbruch.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kbruch.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/kbruch.1
+debian/man/kbruch.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-data.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-data.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-data.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,5 +1,5 @@
 usr/share/applnk/Edutainment/Languages/.directory
+usr/share/applnk/Edutainment/Miscellaneous/.directory
 usr/share/applnk/Edutainment/Mathematics/.directory
-usr/share/applnk/Edutainment/Miscellaneous/.directory
 usr/share/applnk/Edutainment/Science/.directory
 usr/share/applnk/Edutainment/Tools/.directory

Modified: people/jriddell/KDE/3.5/kdeedu/debian/keduca.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keduca.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keduca.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-keduca/AUTHORS
-keduca/TODO
+build-tree/kdeedu-*/keduca/AUTHORS
+build-tree/kdeedu-*/keduca/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/keduca.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keduca.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keduca.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -6,19 +6,18 @@
 usr/share/applications/kde/keducabuilder.desktop
 usr/share/apps/keduca
 usr/share/config.kcfg/keduca.kcfg
-usr/share/doc/kde/HTML/en/keduca/*.docbook
-usr/share/doc/kde/HTML/en/keduca/*.png
 usr/share/doc/kde/HTML/en/keduca/common
 usr/share/doc/kde/HTML/en/keduca/index.cache.bz2
-usr/share/icons/hicolor/128x128/apps/keduca.png
+usr/share/doc/kde/HTML/en/keduca/*.docbook
+usr/share/doc/kde/HTML/en/keduca/*.png
 usr/share/icons/hicolor/16x16/apps/keduca.png
 usr/share/icons/hicolor/22x22/apps/keduca.png
 usr/share/icons/hicolor/32x32/apps/keduca.png
 usr/share/icons/hicolor/48x48/apps/keduca.png
 usr/share/icons/hicolor/64x64/apps/keduca.png
+usr/share/icons/hicolor/128x128/apps/keduca.png
 usr/share/mimelnk/application/x-edu.desktop
 usr/share/mimelnk/application/x-edugallery.desktop
 usr/share/services/keduca_part.desktop
-
+../icons/keduca.xpm usr/share/pixmaps
 ../keduca-shrinker usr/bin
-../keduca.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/keduca.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keduca.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keduca.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,3 +1,3 @@
-debian/keduca.1
-debian/keduca-shrinker.1
-debian/keducabuilder.1
+debian/man/keduca.1
+debian/man/keduca-shrinker.1
+debian/man/keducabuilder.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kgeography.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kgeography.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kgeography.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,327 +1,7 @@
 usr/bin/kgeography
 usr/share/applications/kde/kgeography.desktop
-usr/share/apps/kgeography/africa.kgm
-usr/share/apps/kgeography/africa.png
-usr/share/apps/kgeography/asia.kgm
-usr/share/apps/kgeography/asia.png
-usr/share/apps/kgeography/austria.kgm
-usr/share/apps/kgeography/austria.png
-usr/share/apps/kgeography/brazil.kgm
-usr/share/apps/kgeography/brazil.png
-usr/share/apps/kgeography/canada.kgm
-usr/share/apps/kgeography/canada.png
-usr/share/apps/kgeography/china.kgm
-usr/share/apps/kgeography/china.png
-usr/share/apps/kgeography/europe.kgm
-usr/share/apps/kgeography/europe.png
-usr/share/apps/kgeography/flags/Monaco.png
-usr/share/apps/kgeography/flags/NewZealand.png
-usr/share/apps/kgeography/flags/SriLanka.png
-usr/share/apps/kgeography/flags/Vatican.png
-usr/share/apps/kgeography/flags/afghanistan.png
-usr/share/apps/kgeography/flags/albania.png
-usr/share/apps/kgeography/flags/alberta.png
-usr/share/apps/kgeography/flags/algeria.png
-usr/share/apps/kgeography/flags/andorra.png
-usr/share/apps/kgeography/flags/angola.png
-usr/share/apps/kgeography/flags/antigua.png
-usr/share/apps/kgeography/flags/argentina.png
-usr/share/apps/kgeography/flags/armenia.png
-usr/share/apps/kgeography/flags/australia.png
-usr/share/apps/kgeography/flags/austria.png
-usr/share/apps/kgeography/flags/azerbaijan.png
-usr/share/apps/kgeography/flags/baden_wurttemberg.png
-usr/share/apps/kgeography/flags/bahamas.png
-usr/share/apps/kgeography/flags/bahrain.png
-usr/share/apps/kgeography/flags/bangladesh.png
-usr/share/apps/kgeography/flags/barbados.png
-usr/share/apps/kgeography/flags/bavaria.png
-usr/share/apps/kgeography/flags/bc.png
-usr/share/apps/kgeography/flags/belarus.png
-usr/share/apps/kgeography/flags/belgium.png
-usr/share/apps/kgeography/flags/belize.png
-usr/share/apps/kgeography/flags/benin.png
-usr/share/apps/kgeography/flags/berlin.png
-usr/share/apps/kgeography/flags/bhutan.png
-usr/share/apps/kgeography/flags/bolivia.png
-usr/share/apps/kgeography/flags/bosnia_herzegovina.png
-usr/share/apps/kgeography/flags/botswana.png
-usr/share/apps/kgeography/flags/br_AC.png
-usr/share/apps/kgeography/flags/br_AL.png
-usr/share/apps/kgeography/flags/br_AM.png
-usr/share/apps/kgeography/flags/br_AP.png
-usr/share/apps/kgeography/flags/br_BA.png
-usr/share/apps/kgeography/flags/br_CE.png
-usr/share/apps/kgeography/flags/br_DF.png
-usr/share/apps/kgeography/flags/br_ES.png
-usr/share/apps/kgeography/flags/br_GO.png
-usr/share/apps/kgeography/flags/br_MA.png
-usr/share/apps/kgeography/flags/br_MG.png
-usr/share/apps/kgeography/flags/br_MS.png
-usr/share/apps/kgeography/flags/br_MT.png
-usr/share/apps/kgeography/flags/br_PA.png
-usr/share/apps/kgeography/flags/br_PE.png
-usr/share/apps/kgeography/flags/br_PI.png
-usr/share/apps/kgeography/flags/br_PN.png
-usr/share/apps/kgeography/flags/br_PR.png
-usr/share/apps/kgeography/flags/br_RJ.png
-usr/share/apps/kgeography/flags/br_RN.png
-usr/share/apps/kgeography/flags/br_RO.png
-usr/share/apps/kgeography/flags/br_RR.png
-usr/share/apps/kgeography/flags/br_RS.png
-usr/share/apps/kgeography/flags/br_SC.png
-usr/share/apps/kgeography/flags/br_SE.png
-usr/share/apps/kgeography/flags/br_SP.png
-usr/share/apps/kgeography/flags/br_TO.png
-usr/share/apps/kgeography/flags/brandenburg.png
-usr/share/apps/kgeography/flags/brazil.png
-usr/share/apps/kgeography/flags/bremen.png
-usr/share/apps/kgeography/flags/brunei.png
-usr/share/apps/kgeography/flags/bulgaria.png
-usr/share/apps/kgeography/flags/burkina.png
-usr/share/apps/kgeography/flags/burundi.png
-usr/share/apps/kgeography/flags/cambodia.png
-usr/share/apps/kgeography/flags/cameroon.png
-usr/share/apps/kgeography/flags/canada.png
-usr/share/apps/kgeography/flags/central_african_republic.png
-usr/share/apps/kgeography/flags/chad.png
-usr/share/apps/kgeography/flags/chile.png
-usr/share/apps/kgeography/flags/china.png
-usr/share/apps/kgeography/flags/colombia.png
-usr/share/apps/kgeography/flags/congo_brazzaville.png
-usr/share/apps/kgeography/flags/congo_kinshasa.png
-usr/share/apps/kgeography/flags/costa_rica.png
-usr/share/apps/kgeography/flags/cote_divoire.png
-usr/share/apps/kgeography/flags/croatia.png
-usr/share/apps/kgeography/flags/cuba_3x2.png
-usr/share/apps/kgeography/flags/cyprus_4x3.png
-usr/share/apps/kgeography/flags/czech.png
-usr/share/apps/kgeography/flags/denmark.png
-usr/share/apps/kgeography/flags/djibouti.png
-usr/share/apps/kgeography/flags/dominica.png
-usr/share/apps/kgeography/flags/dominicanrepublic.png
-usr/share/apps/kgeography/flags/easttimor.png
-usr/share/apps/kgeography/flags/ecuador.png
-usr/share/apps/kgeography/flags/egypt.png
-usr/share/apps/kgeography/flags/el_salvador.png
-usr/share/apps/kgeography/flags/equatorial_guinea.png
-usr/share/apps/kgeography/flags/eritrea.png
-usr/share/apps/kgeography/flags/estonia.png
-usr/share/apps/kgeography/flags/ethiopia.png
-usr/share/apps/kgeography/flags/fiji.png
-usr/share/apps/kgeography/flags/finland.png
-usr/share/apps/kgeography/flags/france.png
-usr/share/apps/kgeography/flags/gabon.png
-usr/share/apps/kgeography/flags/gambia.png
-usr/share/apps/kgeography/flags/georgia.png
-usr/share/apps/kgeography/flags/germany.png
-usr/share/apps/kgeography/flags/ghana.png
-usr/share/apps/kgeography/flags/greece.png
-usr/share/apps/kgeography/flags/greenland.png
-usr/share/apps/kgeography/flags/guatemala.png
-usr/share/apps/kgeography/flags/guinea.png
-usr/share/apps/kgeography/flags/guineabissau.png
-usr/share/apps/kgeography/flags/guyana.png
-usr/share/apps/kgeography/flags/haiti.png
-usr/share/apps/kgeography/flags/hamburg.png
-usr/share/apps/kgeography/flags/hesse.png
-usr/share/apps/kgeography/flags/honduras.png
-usr/share/apps/kgeography/flags/hungary.png
-usr/share/apps/kgeography/flags/iceland.png
-usr/share/apps/kgeography/flags/india.png
-usr/share/apps/kgeography/flags/indonesia.png
-usr/share/apps/kgeography/flags/iran.png
-usr/share/apps/kgeography/flags/iraq.png
-usr/share/apps/kgeography/flags/ireland.png
-usr/share/apps/kgeography/flags/israel.png
-usr/share/apps/kgeography/flags/italy.png
-usr/share/apps/kgeography/flags/italy/it-abr200.png
-usr/share/apps/kgeography/flags/italy/it-aos200.png
-usr/share/apps/kgeography/flags/italy/it-bas200.png
-usr/share/apps/kgeography/flags/italy/it-cal200.png
-usr/share/apps/kgeography/flags/italy/it-cam200.png
-usr/share/apps/kgeography/flags/italy/it-emi200.png
-usr/share/apps/kgeography/flags/italy/it-fri200.png
-usr/share/apps/kgeography/flags/italy/it-lat200.png
-usr/share/apps/kgeography/flags/italy/it-lig200.png
-usr/share/apps/kgeography/flags/italy/it-lom200.png
-usr/share/apps/kgeography/flags/italy/it-mar200.png
-usr/share/apps/kgeography/flags/italy/it-mol200.png
-usr/share/apps/kgeography/flags/italy/it-pie200.png
-usr/share/apps/kgeography/flags/italy/it-pug200.png
-usr/share/apps/kgeography/flags/italy/it-sar200.png
-usr/share/apps/kgeography/flags/italy/it-sic200.png
-usr/share/apps/kgeography/flags/italy/it-tre200.png
-usr/share/apps/kgeography/flags/italy/it-tus200.png
-usr/share/apps/kgeography/flags/italy/it-umb200.png
-usr/share/apps/kgeography/flags/italy/it-ven200.png
-usr/share/apps/kgeography/flags/jamaica.png
-usr/share/apps/kgeography/flags/japan.png
-usr/share/apps/kgeography/flags/jordan.png
-usr/share/apps/kgeography/flags/kazakhstan.png
-usr/share/apps/kgeography/flags/kenya.png
-usr/share/apps/kgeography/flags/kuwait.png
-usr/share/apps/kgeography/flags/kyrgyzstan.png
-usr/share/apps/kgeography/flags/laos.png
-usr/share/apps/kgeography/flags/latvia.png
-usr/share/apps/kgeography/flags/lebanon.png
-usr/share/apps/kgeography/flags/lesotho.png
-usr/share/apps/kgeography/flags/liberia.png
-usr/share/apps/kgeography/flags/libya.png
-usr/share/apps/kgeography/flags/lithuania.png
-usr/share/apps/kgeography/flags/lower_saxony.png
-usr/share/apps/kgeography/flags/luxembourg.png
-usr/share/apps/kgeography/flags/macedonia.png
-usr/share/apps/kgeography/flags/madagascar.png
-usr/share/apps/kgeography/flags/malawi.png
-usr/share/apps/kgeography/flags/malaysia.png
-usr/share/apps/kgeography/flags/mali.png
-usr/share/apps/kgeography/flags/manitoba.png
-usr/share/apps/kgeography/flags/mauritania.png
-usr/share/apps/kgeography/flags/mecklenburg_western_pomerania.png
-usr/share/apps/kgeography/flags/mexico.png
-usr/share/apps/kgeography/flags/moldova.png
-usr/share/apps/kgeography/flags/mongolia.png
-usr/share/apps/kgeography/flags/morocco.png
-usr/share/apps/kgeography/flags/mozambique.png
-usr/share/apps/kgeography/flags/myanmar.png
-usr/share/apps/kgeography/flags/namibia.png
-usr/share/apps/kgeography/flags/nepal.png
-usr/share/apps/kgeography/flags/netherlands.png
-usr/share/apps/kgeography/flags/newbrunswick.png
-usr/share/apps/kgeography/flags/newfoundland.png
-usr/share/apps/kgeography/flags/nicaragua.png
-usr/share/apps/kgeography/flags/niger.png
-usr/share/apps/kgeography/flags/nigeria.png
-usr/share/apps/kgeography/flags/nkorea.png
-usr/share/apps/kgeography/flags/north_rhine_westphalia.png
-usr/share/apps/kgeography/flags/norway.png
-usr/share/apps/kgeography/flags/novascotia.png
-usr/share/apps/kgeography/flags/nunavut.png
-usr/share/apps/kgeography/flags/nwterritories.png
-usr/share/apps/kgeography/flags/oman.png
-usr/share/apps/kgeography/flags/ontario.png
-usr/share/apps/kgeography/flags/pakistan.png
-usr/share/apps/kgeography/flags/panama.png
-usr/share/apps/kgeography/flags/papua_new_guinea.png
-usr/share/apps/kgeography/flags/paraguay.png
-usr/share/apps/kgeography/flags/pei.png
-usr/share/apps/kgeography/flags/peru.png
-usr/share/apps/kgeography/flags/philippines.png
-usr/share/apps/kgeography/flags/poland.png
-usr/share/apps/kgeography/flags/portugal.png
-usr/share/apps/kgeography/flags/qatar.png
-usr/share/apps/kgeography/flags/quebec.png
-usr/share/apps/kgeography/flags/rhineland_palatinate.png
-usr/share/apps/kgeography/flags/romania.png
-usr/share/apps/kgeography/flags/russia.png
-usr/share/apps/kgeography/flags/rwanda.png
-usr/share/apps/kgeography/flags/saarland.png
-usr/share/apps/kgeography/flags/san_marino.png
-usr/share/apps/kgeography/flags/saskatchewan.png
-usr/share/apps/kgeography/flags/saudiarabia.png
-usr/share/apps/kgeography/flags/saxony.png
-usr/share/apps/kgeography/flags/saxony_anhalt.png
-usr/share/apps/kgeography/flags/schleswig_holstein.png
-usr/share/apps/kgeography/flags/senegal.png
-usr/share/apps/kgeography/flags/serbiamontenegro_3x2.png
-usr/share/apps/kgeography/flags/sierra_leone.png
-usr/share/apps/kgeography/flags/singapore.png
-usr/share/apps/kgeography/flags/skorea.png
-usr/share/apps/kgeography/flags/slovakia.png
-usr/share/apps/kgeography/flags/slovenia.png
-usr/share/apps/kgeography/flags/somalia.png
-usr/share/apps/kgeography/flags/southafrica.png
-usr/share/apps/kgeography/flags/spain.png
-usr/share/apps/kgeography/flags/sudan.png
-usr/share/apps/kgeography/flags/suriname.png
-usr/share/apps/kgeography/flags/swaziland.png
-usr/share/apps/kgeography/flags/sweden.png
-usr/share/apps/kgeography/flags/switzerland.png
-usr/share/apps/kgeography/flags/syria.png
-usr/share/apps/kgeography/flags/taiwan.png
-usr/share/apps/kgeography/flags/tajikistan.png
-usr/share/apps/kgeography/flags/tanzania.png
-usr/share/apps/kgeography/flags/thailand.png
-usr/share/apps/kgeography/flags/thuringia.png
-usr/share/apps/kgeography/flags/togo.png
-usr/share/apps/kgeography/flags/tonga.png
-usr/share/apps/kgeography/flags/trinidad_tobago.png
-usr/share/apps/kgeography/flags/tunisia.png
-usr/share/apps/kgeography/flags/turkey.png
-usr/share/apps/kgeography/flags/turkmenistan.png
-usr/share/apps/kgeography/flags/uae.png
-usr/share/apps/kgeography/flags/uganda.png
-usr/share/apps/kgeography/flags/uk.png
-usr/share/apps/kgeography/flags/ukraine.png
-usr/share/apps/kgeography/flags/uruguay.png
-usr/share/apps/kgeography/flags/usa.png
-usr/share/apps/kgeography/flags/uzbekistan.png
-usr/share/apps/kgeography/flags/venezuela.png
-usr/share/apps/kgeography/flags/vietnam.png
-usr/share/apps/kgeography/flags/western_sahara.png
-usr/share/apps/kgeography/flags/yemen.png
-usr/share/apps/kgeography/flags/yukon.png
-usr/share/apps/kgeography/flags/zambia.png
-usr/share/apps/kgeography/flags/zimbabwe.png
-usr/share/apps/kgeography/france.kgm
-usr/share/apps/kgeography/france.png
-usr/share/apps/kgeography/germany.kgm
-usr/share/apps/kgeography/germany.png
-usr/share/apps/kgeography/italy.kgm
-usr/share/apps/kgeography/italy.png
-usr/share/apps/kgeography/italyprovince.kgm
-usr/share/apps/kgeography/italyprovince.png
-usr/share/apps/kgeography/kgeographyui.rc
-usr/share/apps/kgeography/ncamerica.kgm
-usr/share/apps/kgeography/ncamerica.png
-usr/share/apps/kgeography/netherlands.kgm
-usr/share/apps/kgeography/netherlands.png
-usr/share/apps/kgeography/norway.kgm
-usr/share/apps/kgeography/norway.png
-usr/share/apps/kgeography/poland.kgm
-usr/share/apps/kgeography/poland.png
-usr/share/apps/kgeography/southamerica.kgm
-usr/share/apps/kgeography/southamerica.png
-usr/share/apps/kgeography/spain.kgm
-usr/share/apps/kgeography/spain.png
-usr/share/apps/kgeography/usa.kgm
-usr/share/apps/kgeography/usa.png
-usr/share/apps/kgeography/world.kgm
-usr/share/apps/kgeography/world.png
 usr/share/config.kcfg/kgeography.kcfg
-usr/share/doc/kde/HTML/en/kgeography/commands.html
-usr/share/doc/kde/HTML/en/kgeography/common
-usr/share/doc/kde/HTML/en/kgeography/compilation.html
-usr/share/doc/kde/HTML/en/kgeography/credits.html
-usr/share/doc/kde/HTML/en/kgeography/description-file.html
-usr/share/doc/kde/HTML/en/kgeography/first-start1.png
-usr/share/doc/kde/HTML/en/kgeography/first-start10.png
-usr/share/doc/kde/HTML/en/kgeography/first-start11.png
-usr/share/doc/kde/HTML/en/kgeography/first-start12.png
-usr/share/doc/kde/HTML/en/kgeography/first-start2.png
-usr/share/doc/kde/HTML/en/kgeography/first-start3.png
-usr/share/doc/kde/HTML/en/kgeography/first-start4.png
-usr/share/doc/kde/HTML/en/kgeography/first-start5.png
-usr/share/doc/kde/HTML/en/kgeography/first-start6.png
-usr/share/doc/kde/HTML/en/kgeography/first-start7.png
-usr/share/doc/kde/HTML/en/kgeography/first-start8.png
-usr/share/doc/kde/HTML/en/kgeography/first-start9.png
-usr/share/doc/kde/HTML/en/kgeography/flags.html
-usr/share/doc/kde/HTML/en/kgeography/how-to-maps.html
-usr/share/doc/kde/HTML/en/kgeography/how-to-test.html
-usr/share/doc/kde/HTML/en/kgeography/index.cache.bz2
-usr/share/doc/kde/HTML/en/kgeography/index.docbook
-usr/share/doc/kde/HTML/en/kgeography/index.html
-usr/share/doc/kde/HTML/en/kgeography/installation.html
-usr/share/doc/kde/HTML/en/kgeography/introduction.html
-usr/share/doc/kde/HTML/en/kgeography/kgeography.png
-usr/share/doc/kde/HTML/en/kgeography/map-file.html
-usr/share/doc/kde/HTML/en/kgeography/non-political-maps.html
-usr/share/doc/kde/HTML/en/kgeography/quick-start.html
-usr/share/doc/kde/HTML/en/kgeography/river.png
-usr/share/doc/kde/HTML/en/kgeography/using-kapp.html
-usr/share/doc/kde/HTML/en/kgeography/zoom.png
+usr/share/doc/kde/HTML/en/kgeography
 usr/share/icons/crystalsvg/128x128/apps/kgeography.png
 usr/share/icons/crystalsvg/16x16/apps/kgeography.png
 usr/share/icons/crystalsvg/22x22/apps/kgeography.png
@@ -335,3 +15,4 @@
 usr/share/icons/hicolor/32x32/apps/kgeography.png
 usr/share/icons/hicolor/48x48/apps/kgeography.png
 usr/share/icons/hicolor/64x64/apps/kgeography.png
+../icons/kgeography.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/khangman.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/khangman.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/khangman.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-khangman/AUTHORS
-khangman/TODO
+build-tree/kdeedu-*/khangman/AUTHORS
+build-tree/kdeedu-*/khangman/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/khangman.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/khangman.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/khangman.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,18 +1,20 @@
 etc/kde3/khangmanrc
 usr/bin/khangman
 usr/share/applications/kde/khangman.desktop
-usr/share/apps/khangman
+usr/share/apps/khangman/data
+usr/share/apps/khangman/khangmanui.rc
+usr/share/apps/khangman/pics
+usr/share/apps/khangman/sounds
 usr/share/config.kcfg/khangman.kcfg
+usr/share/doc/kde/HTML/en/khangman/common
+usr/share/doc/kde/HTML/en/khangman/index.cache.bz2
 usr/share/doc/kde/HTML/en/khangman/*.docbook
 usr/share/doc/kde/HTML/en/khangman/*.png
-usr/share/doc/kde/HTML/en/khangman/common
-usr/share/doc/kde/HTML/en/khangman/index.cache.bz2
-usr/share/icons/hicolor/128x128/apps/khangman.png
 usr/share/icons/hicolor/16x16/apps/khangman.png
 usr/share/icons/hicolor/22x22/apps/khangman.png
 usr/share/icons/hicolor/32x32/apps/khangman.png
 usr/share/icons/hicolor/48x48/apps/khangman.png
 usr/share/icons/hicolor/64x64/apps/khangman.png
+usr/share/icons/hicolor/128x128/apps/khangman.png
 usr/share/icons/hicolor/scalable/apps/khangman.svgz
-
-../khangman.xpm usr/share/pixmaps
+../icons/khangman.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/khangman.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/khangman.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/khangman.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/khangman.1
+debian/man/khangman.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kig.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kig.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kig.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,3 +1,3 @@
-kig/AUTHORS
-kig/FEATURES
-kig/TODO
+build-tree/kdeedu-*/kig/AUTHORS
+build-tree/kdeedu-*/kig/FEATURES
+build-tree/kdeedu-*/kig/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kig.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kig.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kig.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -12,30 +12,29 @@
 usr/share/apps/katepart/syntax/python-kig.xml
 usr/share/apps/kig
 usr/share/doc/kde/HTML/en/kig/*.bz2
+usr/share/doc/kde/HTML/en/kig/common
 usr/share/doc/kde/HTML/en/kig/*.docbook
 usr/share/doc/kde/HTML/en/kig/*.png
-usr/share/doc/kde/HTML/en/kig/common
-usr/share/icons/crystalsvg/128x128/mimetypes/kig_doc.png
 usr/share/icons/crystalsvg/16x16/mimetypes/kig_doc.png
 usr/share/icons/crystalsvg/22x22/mimetypes/kig_doc.png
 usr/share/icons/crystalsvg/32x32/mimetypes/kig_doc.png
 usr/share/icons/crystalsvg/48x48/mimetypes/kig_doc.png
 usr/share/icons/crystalsvg/64x64/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/128x128/mimetypes/kig_doc.png
 usr/share/icons/crystalsvg/scalable/mimetypes/kig_doc.svgz
-usr/share/icons/hicolor/128x128/apps/kig.png
 usr/share/icons/hicolor/16x16/apps/kig.png
 usr/share/icons/hicolor/22x22/apps/kig.png
 usr/share/icons/hicolor/32x32/apps/kig.png
 usr/share/icons/hicolor/48x48/apps/kig.png
 usr/share/icons/hicolor/64x64/apps/kig.png
+usr/share/icons/hicolor/128x128/apps/kig.png
 usr/share/icons/hicolor/scalable/apps/kig.svgz
 usr/share/mimelnk/application/x-cabri.desktop
 usr/share/mimelnk/application/x-drgeo.desktop
-usr/share/mimelnk/application/x-kgeo.desktop
 usr/share/mimelnk/application/x-kig.desktop
+usr/share/mimelnk/application/x-kgeo.desktop
 usr/share/mimelnk/application/x-kseg.desktop
 usr/share/services/kfile_drgeo.desktop
 usr/share/services/kfile_kig.desktop
 usr/share/services/kig_part.desktop
-
-../kig.xpm usr/share/pixmaps
+../icons/kig.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kig.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kig.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kig.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/kig.1
+debian/man/kig.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kiten.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kiten.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kiten.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,3 +1,3 @@
-kiten/AUTHORS
-kiten/README
-kiten/TODO
+build-tree/kdeedu-*/kiten/AUTHORS
+build-tree/kdeedu-*/kiten/README
+build-tree/kdeedu-*/kiten/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kiten.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kiten.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kiten.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,14 +1,13 @@
 usr/bin/kiten
 usr/bin/kitengen
 usr/share/applications/kde/kiten.desktop
-usr/share/doc/kde/HTML/en/kiten/*.docbook
-usr/share/doc/kde/HTML/en/kiten/*.png
 usr/share/doc/kde/HTML/en/kiten/common
 usr/share/doc/kde/HTML/en/kiten/index.cache.bz2
-usr/share/icons/hicolor/128x128/apps/kiten.png
+usr/share/doc/kde/HTML/en/kiten/*.docbook
+usr/share/doc/kde/HTML/en/kiten/*.png
 usr/share/icons/hicolor/16x16/apps/kiten.png
 usr/share/icons/hicolor/32x32/apps/kiten.png
 usr/share/icons/hicolor/48x48/apps/kiten.png
+usr/share/icons/hicolor/128x128/apps/kiten.png
 usr/share/icons/hicolor/scalable/apps/kiten.svgz
-
-../kiten.xpm usr/share/pixmaps
+../icons/kiten.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kiten.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kiten.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kiten.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-debian/kiten.1
-debian/kitengen.1
+debian/man/kiten.1
+debian/man/kitengen.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/klatin.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klatin.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klatin.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-klatin/AUTHORS
-klatin/TODO
+build-tree/kdeedu-*/klatin/AUTHORS
+build-tree/kdeedu-*/klatin/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/klatin.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klatin.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klatin.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -3,16 +3,15 @@
 usr/share/apps/klatin
 usr/share/config.kcfg/klatin.kcfg
 usr/share/doc/kde/HTML/en/klatin/*.bz2
+usr/share/doc/kde/HTML/en/klatin/common
 usr/share/doc/kde/HTML/en/klatin/*.docbook
 usr/share/doc/kde/HTML/en/klatin/*.png
 usr/share/doc/kde/HTML/en/klatin/README
-usr/share/doc/kde/HTML/en/klatin/common
-usr/share/icons/hicolor/128x128/apps/klatin.png
 usr/share/icons/hicolor/16x16/apps/klatin.png
 usr/share/icons/hicolor/22x22/apps/klatin.png
 usr/share/icons/hicolor/32x32/apps/klatin.png
 usr/share/icons/hicolor/48x48/apps/klatin.png
 usr/share/icons/hicolor/64x64/apps/klatin.png
+usr/share/icons/hicolor/128x128/apps/klatin.png
 usr/share/icons/hicolor/scalable/apps/klatin.svgz
-
-../klatin.xpm usr/share/pixmaps
+../icons/klatin.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/klatin.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klatin.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klatin.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/klatin.1
+debian/man/klatin.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/klettres-data.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klettres-data.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klettres-data.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-klettres/AUTHORS
-klettres/TODO
+build-tree/kdeedu-*/klettres/AUTHORS
+build-tree/kdeedu-*/klettres/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/klettres.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klettres.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klettres.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-klettres/AUTHORS
-klettres/TODO
+build-tree/kdeedu-*/klettres/AUTHORS
+build-tree/kdeedu-*/klettres/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/klettres.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klettres.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klettres.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -2,15 +2,14 @@
 usr/bin/klettres
 usr/share/applications/kde/klettres.desktop
 usr/share/config.kcfg/klettres.kcfg
-usr/share/doc/kde/HTML/en/klettres/*.docbook
-usr/share/doc/kde/HTML/en/klettres/*.png
 usr/share/doc/kde/HTML/en/klettres/common
 usr/share/doc/kde/HTML/en/klettres/index.cache.bz2
-usr/share/icons/hicolor/128x128/apps/klettres.png
+usr/share/doc/kde/HTML/en/klettres/*.docbook
+usr/share/doc/kde/HTML/en/klettres/*.png
 usr/share/icons/hicolor/16x16/apps/klettres.png
 usr/share/icons/hicolor/22x22/apps/klettres.png
 usr/share/icons/hicolor/32x32/apps/klettres.png
 usr/share/icons/hicolor/48x48/apps/klettres.png
+usr/share/icons/hicolor/128x128/apps/klettres.png
 usr/share/icons/hicolor/scalable/apps/klettres.svgz
-
-../klettres.xpm usr/share/pixmaps
+../icons/klettres.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/klettres.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klettres.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klettres.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/klettres.1
+debian/man/klettres.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kmplot.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kmplot.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kmplot.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-kmplot/TODO
+build-tree/kdeedu-*/kmplot/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kmplot.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kmplot.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kmplot.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -4,18 +4,17 @@
 usr/share/applications/kde/kmplot.desktop
 usr/share/apps/kmplot
 usr/share/config.kcfg/kmplot.kcfg
-usr/share/doc/kde/HTML/en/kmplot/*.docbook
-usr/share/doc/kde/HTML/en/kmplot/*.png
 usr/share/doc/kde/HTML/en/kmplot/common
 usr/share/doc/kde/HTML/en/kmplot/index.cache.bz2
-usr/share/icons/hicolor/128x128/apps/kmplot.png
+usr/share/doc/kde/HTML/en/kmplot/*.docbook
+usr/share/doc/kde/HTML/en/kmplot/*.png
 usr/share/icons/hicolor/16x16/apps/kmplot.png
 usr/share/icons/hicolor/22x22/apps/kmplot.png
 usr/share/icons/hicolor/32x32/apps/kmplot.png
 usr/share/icons/hicolor/48x48/apps/kmplot.png
 usr/share/icons/hicolor/64x64/apps/kmplot.png
+usr/share/icons/hicolor/128x128/apps/kmplot.png
 usr/share/icons/hicolor/scalable/apps/kmplot.svgz
 usr/share/mimelnk/application/x-kmplot.desktop
 usr/share/services/kmplot_part.desktop
-
-../kmplot.xpm usr/share/pixmaps
+../icons/kmplot.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kmplot.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kmplot.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kmplot.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/kmplot.1
+debian/man/kmplot.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-kpercentage/TODO
+build-tree/kdeedu-*/kpercentage/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,15 +1,14 @@
 usr/bin/kpercentage
 usr/share/applications/kde/kpercentage.desktop
 usr/share/apps/kpercentage
-usr/share/doc/kde/HTML/en/kpercentage/*.docbook
-usr/share/doc/kde/HTML/en/kpercentage/*.png
 usr/share/doc/kde/HTML/en/kpercentage/common
 usr/share/doc/kde/HTML/en/kpercentage/index.cache.bz2
-usr/share/icons/hicolor/128x128/apps/kpercentage.png
+usr/share/doc/kde/HTML/en/kpercentage/*.docbook
+usr/share/doc/kde/HTML/en/kpercentage/*.png
 usr/share/icons/hicolor/16x16/apps/kpercentage.png
 usr/share/icons/hicolor/22x22/apps/kpercentage.png
 usr/share/icons/hicolor/32x32/apps/kpercentage.png
 usr/share/icons/hicolor/48x48/apps/kpercentage.png
+usr/share/icons/hicolor/128x128/apps/kpercentage.png
 usr/share/icons/hicolor/scalable/apps/kpercentage.svgz
-
-../kpercentage.xpm usr/share/pixmaps
+../icons/kpercentage.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/kpercentage.1
+debian/man/kpercentage.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,7 +1,7 @@
-kstars/AUTHORS
-kstars/README
-kstars/README.customize
-kstars/README.ephemerides
-kstars/README.planetmath
-kstars/README.timekeeping
-kstars/TODO
+build-tree/kdeedu-*/kstars/AUTHORS
+build-tree/kdeedu-*/kstars/README
+build-tree/kdeedu-*/kstars/README.customize
+build-tree/kdeedu-*/kstars/README.ephemerides
+build-tree/kdeedu-*/kstars/README.planetmath
+build-tree/kdeedu-*/kstars/README.timekeeping
+build-tree/kdeedu-*/kstars/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kstars.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,7 +1,7 @@
-kstars/AUTHORS
-kstars/README
-kstars/README.customize
-kstars/README.ephemerides
-kstars/README.planetmath
-kstars/README.timekeeping
-kstars/TODO
+build-tree/kdeedu-*/kstars/AUTHORS
+build-tree/kdeedu-*/kstars/README
+build-tree/kdeedu-*/kstars/README.customize
+build-tree/kdeedu-*/kstars/README.ephemerides
+build-tree/kdeedu-*/kstars/README.planetmath
+build-tree/kdeedu-*/kstars/README.timekeeping
+build-tree/kdeedu-*/kstars/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kstars.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -5,13 +5,13 @@
 usr/bin/fliccd
 usr/bin/fliwheel
 usr/bin/indiserver
-usr/bin/kstars
 usr/bin/lx200_16
 usr/bin/lx200autostar
 usr/bin/lx200basic
 usr/bin/lx200classic
 usr/bin/lx200generic
 usr/bin/lx200gps
+usr/bin/kstars
 usr/bin/meade_lpi
 usr/bin/sbigccd
 usr/bin/skycommander
@@ -22,15 +22,14 @@
 usr/include/kde/simclockinterface.h
 usr/share/applications/kde/kstars.desktop
 usr/share/config.kcfg/kstars.kcfg
-usr/share/doc/kde/HTML/en/kstars/*.docbook
-usr/share/doc/kde/HTML/en/kstars/*.png
 usr/share/doc/kde/HTML/en/kstars/common
 usr/share/doc/kde/HTML/en/kstars/index.cache.bz2
-usr/share/icons/hicolor/128x128/apps/kstars.png
+usr/share/doc/kde/HTML/en/kstars/*.docbook
+usr/share/doc/kde/HTML/en/kstars/*.png
 usr/share/icons/hicolor/16x16/apps/kstars.png
 usr/share/icons/hicolor/32x32/apps/kstars.png
 usr/share/icons/hicolor/48x48/apps/kstars.png
 usr/share/icons/hicolor/64x64/apps/kstars.png
+usr/share/icons/hicolor/128x128/apps/kstars.png
 usr/share/icons/hicolor/scalable/apps/kstars.svgz
-
-../kstars.xpm usr/share/pixmaps
+../icons/kstars.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kstars.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,12 +1,12 @@
-debian/celestrongps.1
-debian/fliccd.1
-debian/indiserver.1
-debian/kstars.1
-debian/lx200_16.1
-debian/lx200autostar.1
-debian/lx200classic.1
-debian/lx200generic.1
-debian/lx200gps.1
-debian/temma.1
-debian/v4ldriver.1
-debian/v4lphilips.1
+debian/man/celestrongps.1
+debian/man/fliccd.1
+debian/man/indiserver.1
+debian/man/kstars.1
+debian/man/lx200_16.1
+debian/man/lx200autostar.1
+debian/man/lx200classic.1
+debian/man/lx200generic.1
+debian/man/lx200gps.1
+debian/man/temma.1
+debian/man/v4ldriver.1
+debian/man/v4lphilips.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/ktouch.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/ktouch.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/ktouch.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-ktouch/AUTHORS
+build-tree/kdeedu-*/ktouch/AUTHORS

Modified: people/jriddell/KDE/3.5/kdeedu/debian/ktouch.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/ktouch.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/ktouch.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -2,15 +2,14 @@
 usr/share/applications/kde/ktouch.desktop
 usr/share/apps/ktouch
 usr/share/config.kcfg/ktouch.kcfg
-usr/share/doc/kde/HTML/en/ktouch/*.docbook
-usr/share/doc/kde/HTML/en/ktouch/*.png
 usr/share/doc/kde/HTML/en/ktouch/common
 usr/share/doc/kde/HTML/en/ktouch/index.cache.bz2
-usr/share/icons/hicolor/128x128/apps/ktouch.png
+usr/share/doc/kde/HTML/en/ktouch/*.docbook
+usr/share/doc/kde/HTML/en/ktouch/*.png
 usr/share/icons/hicolor/16x16/apps/ktouch.png
 usr/share/icons/hicolor/22x22/apps/ktouch.png
 usr/share/icons/hicolor/32x32/apps/ktouch.png
 usr/share/icons/hicolor/48x48/apps/ktouch.png
+usr/share/icons/hicolor/128x128/apps/ktouch.png
 usr/share/icons/hicolor/scalable/apps/ktouch.svgz
-
-../ktouch.xpm usr/share/pixmaps
+../icons/ktouch.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/ktouch.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/ktouch.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/ktouch.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/ktouch.1
+debian/man/ktouch.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kturtle.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kturtle.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kturtle.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-kturtle/AUTHORS
-kturtle/TODO
+build-tree/kdeedu-*/kturtle/AUTHORS
+build-tree/kdeedu-*/kturtle/TODO

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kturtle.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kturtle.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kturtle.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -4,10 +4,9 @@
 usr/share/apps/kturtle
 usr/share/config.kcfg/kturtle.kcfg
 usr/share/doc/kde/HTML/en/kturtle/*.bz2
+usr/share/doc/kde/HTML/en/kturtle/common
 usr/share/doc/kde/HTML/en/kturtle/*.docbook
 usr/share/doc/kde/HTML/en/kturtle/*.png
-usr/share/doc/kde/HTML/en/kturtle/common
 usr/share/icons/hicolor/16x16/apps/kturtle.png
 usr/share/icons/hicolor/32x32/apps/kturtle.png
-
-../kturtle.xpm usr/share/pixmaps
+../icons/kturtle.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kturtle.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kturtle.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kturtle.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/kturtle.1
+debian/man/kturtle.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kverbos.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kverbos.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kverbos.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-kverbos/AUTHORS
+build-tree/kdeedu-*/kverbos/AUTHORS

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kverbos.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kverbos.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kverbos.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -2,16 +2,15 @@
 usr/share/applications/kde/kverbos.desktop
 usr/share/apps/kverbos
 usr/share/config.kcfg/kverbos.kcfg
-usr/share/doc/kde/HTML/en/kverbos/*.docbook
-usr/share/doc/kde/HTML/en/kverbos/*.png
 usr/share/doc/kde/HTML/en/kverbos/common
 usr/share/doc/kde/HTML/en/kverbos/index.cache.bz2
+usr/share/doc/kde/HTML/en/kverbos/*.docbook
+usr/share/doc/kde/HTML/en/kverbos/*.png
 usr/share/icons/crystalsvg/16x16/actions/kverbosuser.png
-usr/share/icons/hicolor/128x128/apps/kverbos.png
 usr/share/icons/hicolor/16x16/apps/kverbos.png
 usr/share/icons/hicolor/22x22/apps/kverbos.png
 usr/share/icons/hicolor/32x32/apps/kverbos.png
 usr/share/icons/hicolor/48x48/apps/kverbos.png
+usr/share/icons/hicolor/128x128/apps/kverbos.png
 usr/share/icons/hicolor/scalable/apps/kverbos.svgz
-
-../kverbos.xpm usr/share/pixmaps
+../icons/kverbos.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kverbos.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kverbos.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kverbos.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/kverbos.1
+debian/man/kverbos.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-kvoctrain/AUTHORS
+build-tree/kdeedu-*/kvoctrain/AUTHORS

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,6 +1,8 @@
 etc/kde3/kvoctrainrc
 usr/bin/kvoctrain
 usr/bin/spotlight2kvtml
+usr/lib/libkvoctraincore.la
+usr/lib/libkvoctraincore.so
 usr/lib/libkvoctraincore.so.0
 usr/lib/libkvoctraincore.so.0.0.0
 usr/share/applications/kde/kvoctrain.desktop
@@ -8,13 +10,12 @@
 usr/share/config.kcfg/kvoctrain.kcfg
 usr/share/config.kcfg/languagesettings.kcfg
 usr/share/config.kcfg/presettings.kcfg
+usr/share/doc/kde/HTML/en/kvoctrain/common
+usr/share/doc/kde/HTML/en/kvoctrain/index.cache.bz2
 usr/share/doc/kde/HTML/en/kvoctrain/*.docbook
 usr/share/doc/kde/HTML/en/kvoctrain/*.png
-usr/share/doc/kde/HTML/en/kvoctrain/common
-usr/share/doc/kde/HTML/en/kvoctrain/index.cache.bz2
 usr/share/icons/hicolor/16x16/apps/kvoctrain.png
 usr/share/icons/hicolor/22x22/apps/kvoctrain.png
 usr/share/icons/hicolor/32x32/apps/kvoctrain.png
 usr/share/icons/hicolor/48x48/apps/kvoctrain.png
-
-../kvoctrain.xpm usr/share/pixmaps
+../icons/kvoctrain.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,3 +1,3 @@
-debian/kvoctrain.1
-debian/langen2kvtml.1
-debian/spotlight2kvtml.1
+debian/man/kvoctrain.1
+debian/man/langen2kvtml.1
+debian/man/spotlight2kvtml.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-kwordquiz/AUTHORS
+build-tree/kdeedu-*/kwordquiz/AUTHORS

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -4,21 +4,20 @@
 usr/share/apps/kwordquiz
 usr/share/config.kcfg/kwordquiz.kcfg
 usr/share/doc/kde/HTML/en/kwordquiz/*.bz2
+usr/share/doc/kde/HTML/en/kwordquiz/common
 usr/share/doc/kde/HTML/en/kwordquiz/*.docbook
 usr/share/doc/kde/HTML/en/kwordquiz/*.png
-usr/share/doc/kde/HTML/en/kwordquiz/common
-usr/share/icons/crystalsvg/128x128/mimetypes/kwordquiz_doc.png
-usr/share/icons/crystalsvg/16x16/mimetypes/kwordquiz_doc.png
-usr/share/icons/crystalsvg/22x22/mimetypes/kwordquiz_doc.png
-usr/share/icons/crystalsvg/32x32/mimetypes/kwordquiz_doc.png
-usr/share/icons/crystalsvg/48x48/mimetypes/kwordquiz_doc.png
-usr/share/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
-usr/share/icons/hicolor/128x128/apps/kwordquiz.png
 usr/share/icons/hicolor/16x16/apps/kwordquiz.png
 usr/share/icons/hicolor/22x22/apps/kwordquiz.png
 usr/share/icons/hicolor/32x32/apps/kwordquiz.png
 usr/share/icons/hicolor/48x48/apps/kwordquiz.png
+usr/share/icons/hicolor/128x128/apps/kwordquiz.png
 usr/share/icons/hicolor/scalable/apps/kwordquiz.svg
+usr/share/icons/crystalsvg/16x16/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/22x22/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/32x32/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/48x48/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/128x128/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
 usr/share/mimelnk/application/x-kwordquiz.desktop
-
-../kwordquiz.xpm usr/share/pixmaps
+../icons/kwordquiz.xpm usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1 +1 @@
-debian/kwordquiz.1
+debian/man/kwordquiz.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-libkdeedu/AUTHORS
-libkdeedu/README
+build-tree/kdeedu-*/libkdeedu/AUTHORS
+build-tree/kdeedu-*/libkdeedu/README

Modified: people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,17 +1,11 @@
 usr/bin/test_extdate
 usr/bin/test_extdatepicker
-usr/include/kde/libkdeedu/kdeeduglossary.h
-usr/include/kde/libkdeedu/keduvocdata.h
-usr/include/kde/libkdeedu/kplotaxis.h
-usr/include/kde/libkdeedu/kplotobject.h
-usr/include/kde/libkdeedu/kplotwidget.h
+usr/include/kde/libkdeedu
 usr/lib/libextdate.la
 usr/lib/libextdate.so
 usr/lib/libkdeeducore.la
 usr/lib/libkdeeducore.so
-usr/lib/libkdeeduplot.la
-usr/lib/libkdeeduplot.so
 usr/lib/libkdeeduui.la
 usr/lib/libkdeeduui.so
-usr/lib/libkvoctraincore.la
-usr/lib/libkvoctraincore.so
+usr/lib/libkdeeduplot.la
+usr/lib/libkdeeduplot.so

Modified: people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.manpages	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.manpages	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-debian/test_extdate.1
-debian/test_extdatepicker.1
+debian/man/test_extdate.1
+debian/man/test_extdatepicker.1

Modified: people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.docs	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.docs	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
-libkdeedu/AUTHORS
-libkdeedu/README
+build-tree/kdeedu-*/libkdeedu/AUTHORS
+build-tree/kdeedu-*/libkdeedu/README

Modified: people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.override
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.override	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.override	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,2 +1,2 @@
 # This package contains several libraries.
-libkdeedu3: package-name-doesnt-match-sonames libkdeeduplot1 libkdeeducore1 libextdate1 libkdeeduui1
+libkdeedu3: package-name-doesnt-match-sonames libkdeeduplot1 libkdeeducore1 libextdate1 libkdeeduui3

Modified: people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.install	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.install	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,5 +1,5 @@
+usr/lib/libkiten.so.1.0.0
 usr/lib/libkiten.so.1
-usr/lib/libkiten.so.1.0.0
 usr/share/apps/kiten
 usr/share/config.kcfg/kiten.kcfg
 usr/share/icons/crystalsvg/16x16/actions/kanjidic.png

Modified: people/jriddell/KDE/3.5/kdeedu/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/rules	2006-07-13 08:33:43 UTC (rev 4108)
+++ people/jriddell/KDE/3.5/kdeedu/debian/rules	2006-07-13 08:44:45 UTC (rev 4109)
@@ -1,248 +1,57 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+#! /usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_TAR_SRCDIR := $(shell basename $(wildcard *.tar.bz2) .tar.bz2)
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
+include /usr/share/cdbs/1/rules/tarball.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/debian-qt-kde.mk
+include debian/cdbs/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+DEB_KDE_CVS_MAKE := yes
+DEB_KDE_ENABLE_FINAL := yes
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
 
-INSTALL_DIR = install -p -d -o root -g root -m 755
-INSTALL_FILE = install -p -o root -g root -m 644
+# Ensure that kig's python scripting built successfully.
+common-build-arch::
+	test -e $(DEB_BUILDDIR)/kig/scripting/libscripting.la
 
-libdocdir = debian/libkdeedu-dev/usr/share/doc/libkdeedu-dev
+# kalzium/solver doesn't work with builddir != srcdir; work around
+# this by copying from srcdir to builddir
+common-configure-impl:: debian/stamp-solver-copy
 
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+debian/stamp-solver-copy:
+	rm -rf $(DEB_BUILDDIR)/kalzium/src/solver/
+	mkdir -p $(DEB_BUILDDIR)/kalzium/src
+	cp -a $(DEB_SRCDIR)/kalzium/src/solver/ $(DEB_BUILDDIR)/kalzium/src/solver
+	touch $@
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+post-patches:: debian/stamp-libtool-update
 
-ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
-  # Uncomment the following 2 lines to enable i686 optimziation
-  # You may want to tweak the settings to your likings
-  #export CFLAGS=-O3 -march=i686 -ffast-math -finline-functions
-  #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
-endif
-
-ifeq ($(DEB_BUILD_GNU_TYPE),alpha-linux)
-  # Required to avoid SIGFPE in kstars (#226966).
-  export CFLAGS += -mieee
-  export CXXFLAGS += -mieee
-endif
-
-# ifeq ($(DEB_BUILD_GNU_TYPE),arm-linux)
-#   # Required since boost.python is broken on arm (#245893).
-#   BOOST_FLAGS=--disable-kig-python-scripting
-#   BOOST_TEST=true
-# else
-#   BOOST_TEST=-e $(objdir)/kig/scripting/libscripting.la
-# endif
-
-# We now have boost.python working on all platforms (as of 1.32.0).
-BOOST_TEST=-e $(objdir)/kig/scripting/libscripting.la
-
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	# Apply Debian specific patches
-	if test ! -f patch-stamp; then \
-		for patch in $(CURDIR)/debian/patches/*.diff ;\
-		do \
-			echo APPLYING PATCH\: $${patch##*/};\
-			patch -p1 < $$patch ;\
-		done ;\
-		touch patch-stamp ;\
-	fi
-
-	# KDE CVS does not have aclocal.m4 or configure
-	# if test ! -f configure; then \
-	# 	$(MAKE) -f admin/Makefile.common ;\
-	# fi
-	$(MAKE) -f admin/Makefile.common ;\
-
-	# ensure configure is executable
-	chmod +x configure
-
-	# make build directory
-	mkdir $(objdir)
-
-	# run configure with build tree $(objdir)
-	cd $(objdir) && \
-	../configure $(configkde) $(BOOST_FLAGS)
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	cd $(objdir) && \
-	$(MAKE)
-
-	# Ensure that the boost scripting library built okay.
-	if ! test $(BOOST_TEST); then \
-		echo "ERROR: The boost scripting library was not built."; \
-		false; \
-	fi
-
-	touch build-stamp
-
-debian-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp debian/debiandirs
-
-	# Remove Debian specific patches
-	if test -f patch-stamp; then \
-		for patch in $(CURDIR)/debian/patches/*.diff ;\
-		do \
-			echo REMOVING PATCH\: $${patch##*/};\
-			patch -p1 -R < $$patch ;\
-		done ;\
-		rm -f patch-stamp ;\
-	fi
-	rm -rf po
-
-	# Remove build tree
-	rm -rf $(objdir)
-
-	rm -rf po
-
-	# if Makefile exists run distclean
-	if test -f Makefile; then \
-		$(MAKE) distclean; \
-	fi
-
-	# if test -d CVS; then \
-	# 	$(MAKE) -f admin/Makefile.common cvs-clean ;\
-	# fi
-
-	dh_clean
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	cd $(objdir) && \
-	$(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 \
-	  ( cd `dirname $$i`; meinproc `basename $$i` ); \
+debian/stamp-libtool-update:
+	cp -f /usr/share/libtool/libtool.m4 $(DEB_SRCDIR)/admin/libtool.m4.in
+	cp -f /usr/share/libtool/ltmain.sh $(DEB_SRCDIR)/admin/ltmain.sh
+	for f in /usr/share/automake-1.9/*; do \
+		if test -f $$f && ! test -L $$f && \
+			test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
+			cp -f $$f $(DEB_SRCDIR)/admin/; \
+		fi; \
 	done
+	touch debian/stamp-libtool-update
 
-	# Split into separate binary packages.
-	dh_install --sourcedir=debian/tmp -Xkmathtool --list-missing
+clean::
+	rm -f debian/stamp-libtool-update
+	rm -f debian/stamp-solver-copy
+	rm -f debian/patches/common/02_autotools_update.diff \
+		debian/patches/common/03_libtool_update.diff
+	rm -f $(DEB_TAR_SRCDIR).tar.bz2.cdbs-config_list
 
-	# Install library documentation.
-	$(INSTALL_DIR) $(libdocdir)
-	$(INSTALL_FILE) libkdeedu/extdate/README $(libdocdir)/README.extdate
-	$(INSTALL_FILE) libkdeedu/kdeeduplot/README $(libdocdir)/README.kdeeduplot
+DEB_INSTALL_DOCS_ALL :=
 
-	# Install standard documentation links.
-	for pkg in `dh_listpackages`; do \
-	  if test -d debian/$$pkg/usr/share/doc/kde/HTML/en/$$pkg; then \
-	    dh_link -p$$pkg usr/share/doc/kde/HTML/en/$$pkg \
-	      usr/share/doc/$$pkg/html; \
-	  fi; \
-	done
+DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
 
-	# Install lintian and linda overrides.
-	for pkg in `dh_listpackages`; do \
-	  if test -e debian/$$pkg.override; then \
-	    $(INSTALL_DIR) debian/$$pkg/usr/share/lintian/overrides; \
-	    $(INSTALL_FILE) debian/$$pkg.override \
-	      debian/$$pkg/usr/share/lintian/overrides/$$pkg; \
-	  fi; \
-	  if test -e debian/$$pkg.linda; then \
-	    $(INSTALL_DIR) debian/$$pkg/usr/share/linda/overrides; \
-	    $(INSTALL_FILE) debian/$$pkg.linda \
-	      debian/$$pkg/usr/share/linda/overrides/$$pkg; \
-	  fi; \
-	done
+DEB_DH_MAKESHLIBS_ARGS_libkdeedu3 := -V'libkdeedu3 (>= 4:3.5.0)'
+DEB_DH_MAKESHLIBS_ARGS_libkiten1 := -V'libkiten1 (>= 4:3.5.0)'
 
-	mkdir -p po
-	XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages
-
-# This single target is used to build all the packages, all at once, or
-# one at a time. So keep in mind: any options passed to commands here will
-# affect _all_ packages. Anything you want to only affect one package
-# should be put in another target, such as the install target.
-binary-common:
-	dh_testdir
-	dh_testroot
-
-	# Install the correct upstream changelogs.
-	for pkg in `dh_listpackages`; do \
-	  case "$$pkg" in \
-	    kalzium | kbruch | khangman | kig | klettres | kmessedwords | kstars | ktouch ) \
-	      DH_OPTIONS='' dh_installchangelogs -p$$pkg $$pkg/ChangeLog ;; \
-	    * ) \
-	      DH_OPTIONS='' dh_installchangelogs -p$$pkg ;; \
-	  esac; \
-	done
-
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_installmenu
-	dh_installmime
-	dh_strip
-	dh_link
-	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_perl
-	dh_shlibdeps -ldebian/libkdeedu3/usr/lib -ldebian/libkiten1/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# Any other binary targets build just one binary package at a time.
-binary-%: build install
-	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+PACKAGES_WITH_LIBS := libkdeedu3 libkiten1 kvoctrain




More information about the pkg-kde-commits mailing list