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 --- faces/default.png | Bin 1218 -> 1831 bytes faces/user-1.png | Bin 1409 -> 1632 bytes faces/user-10.png | Bin 1194 -> 0 bytes faces/user-2.png | Bin 1229 -> 0 bytes faces/user-3.png | Bin 1162 -> 0 bytes faces/user-4.png | Bin 1477 -> 0 bytes faces/user-5.png | Bin 1272 -> 0 bytes faces/user-6.png | Bin 1218 -> 0 bytes faces/user-7.png | Bin 1169 -> 0 bytes faces/user-8.png | Bin 1056 -> 0 bytes faces/user-9.png | Bin 1232 -> 0 bytes 11 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 faces/user-10.png delete mode 100644 faces/user-2.png delete mode 100644 faces/user-3.png delete mode 100644 faces/user-4.png delete mode 100644 faces/user-5.png delete mode 100644 faces/user-6.png delete mode 100644 faces/user-7.png delete mode 100644 faces/user-8.png delete mode 100644 faces/user-9.png (limited to 'faces') diff --git a/faces/default.png b/faces/default.png index e98dfbb..0254741 100755 Binary files a/faces/default.png and b/faces/default.png differ diff --git a/faces/user-1.png b/faces/user-1.png index c91e23a..cace13e 100644 Binary files a/faces/user-1.png and b/faces/user-1.png differ diff --git a/faces/user-10.png b/faces/user-10.png deleted file mode 100644 index c735636..0000000 Binary files a/faces/user-10.png and /dev/null differ diff --git a/faces/user-2.png b/faces/user-2.png deleted file mode 100644 index 5a5075a..0000000 Binary files a/faces/user-2.png and /dev/null differ diff --git a/faces/user-3.png b/faces/user-3.png deleted file mode 100644 index a9ce488..0000000 Binary files a/faces/user-3.png and /dev/null differ diff --git a/faces/user-4.png b/faces/user-4.png deleted file mode 100644 index 3a50b76..0000000 Binary files a/faces/user-4.png and /dev/null differ diff --git a/faces/user-5.png b/faces/user-5.png deleted file mode 100644 index daccf8d..0000000 Binary files a/faces/user-5.png and /dev/null differ diff --git a/faces/user-6.png b/faces/user-6.png deleted file mode 100644 index e98dfbb..0000000 Binary files a/faces/user-6.png and /dev/null differ diff --git a/faces/user-7.png b/faces/user-7.png deleted file mode 100644 index f08af4d..0000000 Binary files a/faces/user-7.png and /dev/null differ diff --git a/faces/user-8.png b/faces/user-8.png deleted file mode 100644 index 60bdfac..0000000 Binary files a/faces/user-8.png and /dev/null differ diff --git a/faces/user-9.png b/faces/user-9.png deleted file mode 100644 index 1085194..0000000 Binary files a/faces/user-9.png and /dev/null differ -- cgit v1.2.1