aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMageia SVN-Git Migration <svn-git-migration@mageia.org>2011-02-03 10:31:48 +0000
committerMageia SVN-Git Migration <svn-git-migration@mageia.org>2011-02-03 10:31:48 +0000
commit9128a8328b491b338b2fee7fcfe81266c81b0a22 (patch)
treef5cc0a51ec2e4e0201600365b0a208fbff4046d7 /bin
parent7c9a6a4a50cca46ea0f54d2baf85776cf5af350e (diff)
downloadcommon-data-9128a8328b491b338b2fee7fcfe81266c81b0a22.tar
common-data-9128a8328b491b338b2fee7fcfe81266c81b0a22.tar.gz
common-data-9128a8328b491b338b2fee7fcfe81266c81b0a22.tar.bz2
common-data-9128a8328b491b338b2fee7fcfe81266c81b0a22.tar.xz
common-data-9128a8328b491b338b2fee7fcfe81266c81b0a22.zip
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
Diffstat (limited to 'bin')
-rwxr-xr-x[-rw-r--r--]bin/print-cups.sh0
-rwxr-xr-xbin/www-browser2
-rwxr-xr-xbin/xvt2
3 files changed, 2 insertions, 2 deletions
diff --git a/bin/print-cups.sh b/bin/print-cups.sh
index 230df13..230df13 100644..100755
--- a/bin/print-cups.sh
+++ b/bin/print-cups.sh
diff --git a/bin/www-browser b/bin/www-browser
index 4862616..9628889 100755
--- a/bin/www-browser
+++ b/bin/www-browser
@@ -3,7 +3,7 @@
# Project : Mandrakelinux
# Module : bin
# File : www-browser
-# Version : $Id$
+# Version : $Id: www-browser 243941 2008-08-12 12:48:22Z fcrozat $
# Author : Frederic Lepied
# Created On : Tue Aug 31 16:26:54 2004
# Purpose : launch a web browser
diff --git a/bin/xvt b/bin/xvt
index 2190461..0dd20c4 100755
--- a/bin/xvt
+++ b/bin/xvt
@@ -3,7 +3,7 @@
# Project : MandrivaLinux
# Module : bin
# File : xvt
-# Version : $Id$
+# Version : $Id: xvt 266850 2010-03-15 16:54:17Z fcrozat $
# Author : Frederic Lepied
# Created On : Tue Aug 31 16:26:54 2004
# Purpose : launch a terminal emulator