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 --- bookmarks/konqueror/bookmarks-download.xml | 17 +--- bookmarks/konqueror/bookmarks-one.xml | 12 +-- bookmarks/konqueror/bookmarks-powerpack.xml | 130 ---------------------------- bookmarks/mozilla/mozilla-download.html | 9 +- bookmarks/mozilla/mozilla-one.html | 7 +- bookmarks/mozilla/mozilla-powerpack.html | 59 ------------- 6 files changed, 7 insertions(+), 227 deletions(-) delete mode 100644 bookmarks/konqueror/bookmarks-powerpack.xml delete mode 100644 bookmarks/mozilla/mozilla-powerpack.html (limited to 'bookmarks') 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 @@ - + Mandriva - - Mandriva Store - - - Mandriva Expert - - - Mandriva Community - - - Mandriva Wiki - Jamendo @@ -80,9 +68,6 @@ Programming - - Mandriva Cooker - GCC 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 @@ - - Mandriva - - Mandriva Store - - - Mandriva Expert - - - Mandriva Community + + Mageia Community Jamendo 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 @@ - - - - - Mandriva - - - Mandriva Store - - - Mandriva Expert - - - Mandriva Community - - - Jamendo - - - Partners - - Cedega - - - Fluendo - - - Picasa - - - Google Earth - - - - - Community - - Free Software Foundation - - - The GNU Project - - - - Freshmeat - - - GNOME - - - KDE - - - Linux.org - - - Linux Foundation - - - Linux Games - - - Linux HeadQuarters - - - Linux Kernel Archives - - - X.org - - - - News - - All Linux Devices - - - Linux.com - - - Linux Planet - - - Linux Today - - - Linux Weekly News - - - Slashdot - - - - Programming - - Mandriva Cooker - - - Mandriva Wiki - - - - GCC - - - GTK+ - - - KDE TechBase - - - OpenSource.org - - - Perl.org - - - Python.org - - - Qt Software - - - RPM.org - - - SourceForge - - - diff --git a/bookmarks/mozilla/mozilla-download.html b/bookmarks/mozilla/mozilla-download.html index 98df84d..32df31d 100644 --- a/bookmarks/mozilla/mozilla-download.html +++ b/bookmarks/mozilla/mozilla-download.html @@ -3,14 +3,9 @@ Bookmarks

Bookmarks

-

Mandriva

+

Mageia

-

Mandriva -
Mandriva Store -
Mandriva Expert -
Community -
Mandriva Wiki -
Jamendo +
Mageia

Community

diff --git a/bookmarks/mozilla/mozilla-one.html b/bookmarks/mozilla/mozilla-one.html index dc5c30e..5899edd 100644 --- a/bookmarks/mozilla/mozilla-one.html +++ b/bookmarks/mozilla/mozilla-one.html @@ -3,11 +3,8 @@ Bookmarks

Bookmarks

-

Mandriva

+

Mageia

-

Mandriva -
Mandriva Store -
Mandriva Expert -
Community +
Mageia
Jamendo

diff --git a/bookmarks/mozilla/mozilla-powerpack.html b/bookmarks/mozilla/mozilla-powerpack.html deleted file mode 100644 index 96d1bf6..0000000 --- a/bookmarks/mozilla/mozilla-powerpack.html +++ /dev/null @@ -1,59 +0,0 @@ - - -Bookmarks -

Bookmarks

-

-

Mandriva

-

-

Mandriva -
Mandriva Store -
Mandriva Expert -
Community -
Jamendo -

Partners

-
Cedega -
Fluendo -
Picasa -
Google Earth -

-

-

Community

-

-

Free Software Foundation -
The GNU Project -
-
Freshmeat -
GNOME -
KDE -
Linux.org -
Linux Foundation -
Linux Games -
Linux HeadQuarters -
Linux Kernel Archives -
X.org -

-

News

-

-

All Linux Devices -
Linux.com -
Linux Planet -
Linux Today -
Linux Weekly News -
Slashdot -

-

Programming

-

-

Mandriva Cooker -
Mandriva Wiki -
-
GCC -
GTK+ -
KDE TechBase -
OpenSource.org -
Perl.org -
Python.org -
Qt Software -
RPM.org -
SourceForge -

-

-- cgit v1.2.1