From 9128a8328b491b338b2fee7fcfe81266c81b0a22 Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Thu, 3 Feb 2011 10:31:48 +0000 Subject: 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 --- dm/disconnect.png | Bin 1229 -> 2185 bytes dm/screenshot-gdm-nolist.png | Bin 131104 -> 5420 bytes dm/screenshot.png | Bin 128433 -> 5420 bytes dm/screenshot_kdm.png | Bin 85477 -> 5420 bytes dm/sessions.png | Bin 1494 -> 2382 bytes dm/system.png | Bin 1416 -> 1929 bytes 6 files changed, 0 insertions(+), 0 deletions(-) (limited to 'dm') diff --git a/dm/disconnect.png b/dm/disconnect.png index ed79853..f36fd3d 100644 Binary files a/dm/disconnect.png and b/dm/disconnect.png differ diff --git a/dm/screenshot-gdm-nolist.png b/dm/screenshot-gdm-nolist.png index 7a9ae0e..ea5b59b 100644 Binary files a/dm/screenshot-gdm-nolist.png and b/dm/screenshot-gdm-nolist.png differ diff --git a/dm/screenshot.png b/dm/screenshot.png index b6ca05a..b33f7fa 100644 Binary files a/dm/screenshot.png and b/dm/screenshot.png differ diff --git a/dm/screenshot_kdm.png b/dm/screenshot_kdm.png index f36b947..e152ee5 100644 Binary files a/dm/screenshot_kdm.png and b/dm/screenshot_kdm.png differ diff --git a/dm/sessions.png b/dm/sessions.png index 07c1494..7be0ca6 100644 Binary files a/dm/sessions.png and b/dm/sessions.png differ diff --git a/dm/system.png b/dm/system.png index 4dd1a11..f93922f 100644 Binary files a/dm/system.png and b/dm/system.png differ -- cgit v1.2.1