Synthesized commit during git-svn import combining previous Mandriva history with Mageia.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r386 | dmorgan | 2011-02-03 10:31:48 +0000 (Thu, 03 Feb 2011) | 1 line

Import Cleaned desktop-common-data
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

- License is GPL according to the relevant rpm spec written by Mandriva

Each subdir on its own, only problematic ones are mentioned:
o backgrounds : three .jpg files will need to be replaced

o bookmarks:
  - konqueror/bookmarks-download.xml:  icons used in the file come from mandriva-kde-icons
    we'll have to replace them
    - the links will be much easier to replace when our wiki/forum... etc is up
  - konqueror/bookmarks-powerpack.xml: deleted, we don't have a powerpack
  - konqueror/bookmarks-one.xml: a subset from konqueror/bookmarks-download.xml, so we'll
    fix it along with bookmarks-download.xml

  - mozilla/* : the same goes as for konqueror bookmarks
  - cleant bookmarks to remove Mandriva's and add Mageia reference

o desktop:
  - delete powerpack/, we don't have a powerpack
  - detele {free,one}/upgrade.desktop.in, no powerpack so nothing to upgrade to
  - modify {free,one}/register.desktop.in to say Mageia instead of Mandriva and
    point to https://identity.mageia.org/

o dm:
  - changed Mandriva images

o faces: icons in this dir need to be replaced
  - added 2 oxygen icons to deal with

o kde: one icon in here need to be replaced (or dropped)  => DROPPED

o krootwarning: it's empty, drop it?

o man/*/chksession.8 : Occurances of "MandrakeSoft", 1) at the top of the page and
  2) copyright statement at the bottom

o menu:
  - the menu section icons in ./icons need to be replaced => done (oxygen icons)
  - category names should be changed? (i.e. s/X-MandrivaLinux/X-MageiaLinux/),
    a list of categories is available in menu-categories-list (same dir as CLEANUP_PROGRESS.txt)
    we keep it for now until decision is taken (best thing would be to push missing categories
    upstream) => not for now

o sounds: sound files need to be replaced

3 files changed, 3 insertions, 156 deletions

diff --git a/bookmarks/konqueror/bookmarks-download.xml b/bookmarks/konqueror/bookmarks-download.xml
index adcbc64..1fa5713 100644
--- a/bookmarks/konqueror/bookmarks-download.xml
+++ b/bookmarks/konqueror/bookmarks-download.xml
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xbel>
 <xbel folded="no" >
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/" >
+<bookmark con="/usr/share/icons/favicons/empty.png" href="http://www.mageia.com/" >
   <title>Mandriva</title>
  </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/" >
-  <title>Mandriva Store</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://expert.mandriva.com/" >
-  <title>Mandriva Expert</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/community/" >
-  <title>Mandriva Community</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://wiki.mandriva.com/" >
-  <title>Mandriva Wiki</title>
- </bookmark>
  <bookmark icon="/usr/share/icons/favicons/jamendo.png" href="http://www.jamendo.com/" >
   <title>Jamendo</title>
  </bookmark>
@@ -80,9 +68,6 @@
  </folder>
  <folder folded="no" >
   <title>Programming</title>
-  <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://wiki.mandriva.com/en/Development" >
-   <title>Mandriva Cooker</title>
-  </bookmark>
   <separator/>
   <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://gcc.gnu.org/" >
    <title>GCC</title>
diff --git a/bookmarks/konqueror/bookmarks-one.xml b/bookmarks/konqueror/bookmarks-one.xml
index d81fe84..70e53b1 100644
--- a/bookmarks/konqueror/bookmarks-one.xml
+++ b/bookmarks/konqueror/bookmarks-one.xml
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xbel>
 <xbel folded="no" >
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/" >
-  <title>Mandriva</title>
  </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/" >
-  <title>Mandriva Store</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://expert.mandriva.com/" >
-  <title>Mandriva Expert</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/community/" >
-  <title>Mandriva Community</title>
+ <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.mageia.org/" >
+  <title>Mageia Community</title>
  </bookmark>
  <bookmark icon="/usr/share/icons/favicons/jamendo.png" href="http://www.jamendo.com/" >
   <title>Jamendo</title>
diff --git a/bookmarks/konqueror/bookmarks-powerpack.xml b/bookmarks/konqueror/bookmarks-powerpack.xml
deleted file mode 100644
index 8d43533..0000000
--- a/bookmarks/konqueror/bookmarks-powerpack.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xbel>
-<xbel folded="no" >
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/" >
-  <title>Mandriva</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/" >
-  <title>Mandriva Store</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://expert.mandriva.com/" >
-  <title>Mandriva Expert</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/community/" >
-  <title>Mandriva Community</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/jamendo.png" href="http://www.jamendo.com/" >
-  <title>Jamendo</title>
- </bookmark>
- <folder folded="yes" >
-  <title>Partners</title>
-  <bookmark href="http://www.transgaming.com/products/cedega/" >
-  <title>Cedega</title>
- </bookmark>
- <bookmark href="http://www.fluendo.com/" >
-  <title>Fluendo</title>
- </bookmark>
- <bookmark href="http://picasa.google.com/linux/" >
-  <title>Picasa</title>
- </bookmark>
- <bookmark href="http://earth.google.com/" >
-  <title>Google Earth</title>
- </bookmark>
- </folder>
- <separator/>
- <folder folded="yes" >
-  <title>Community</title>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gnu.org/software/software.html" >
-   <title>Free Software Foundation</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gnu.org/" >
-   <title>The GNU Project</title>
-  </bookmark>
-  <separator/>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://freshmeat.net/" >
-   <title>Freshmeat</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gnome.org/" >
-   <title>GNOME</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.kde.org/" >
-   <title>KDE</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linux.org/" >
-   <title>Linux.org</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxfoundation.org/" >
-   <title>Linux Foundation</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxgames.com/" >
-   <title>Linux Games</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxhq.com/" >
-   <title>Linux HeadQuarters</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.kernel.org/" >
-   <title>Linux Kernel Archives</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.x.org/" >
-   <title>X.org</title>
-  </bookmark>
- </folder>
- <folder folded="yes" >
-  <title>News</title>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://alllinuxdevices.com/" >
-   <title>All Linux Devices</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linux.com/" >
-   <title>Linux.com</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxplanet.com/" >
-   <title>Linux Planet</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://linuxtoday.com/" >
-   <title>Linux Today</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.lwn.net/" >
-   <title>Linux Weekly News</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://slashdot.org/" >
-   <title>Slashdot</title>
-  </bookmark>
- </folder>
- <folder folded="no" >
-  <title>Programming</title>
-  <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://wiki.mandriva.com/en/Development" >
-   <title>Mandriva Cooker</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://wiki.mandriva.com/" >
-   <title>Mandriva Wiki</title>
-  </bookmark>
-  <separator/>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://gcc.gnu.org/" >
-   <title>GCC</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gtk.org/" >
-   <title>GTK+</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://techbase.kde.org/" >
-   <title>KDE TechBase</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.opensource.org/" >
-   <title>OpenSource.org</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.perl.org/" >
-   <title>Perl.org</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.python.org/" >
-   <title>Python.org</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.qtsoftware.com/products/" >
-   <title>Qt Software</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.rpm.org/" >
-   <title>RPM.org</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://sourceforge.net/" >
-   <title>SourceForge</title>
-  </bookmark>
- </folder>
-</xbel>