From fd8bbba2f02b8bccd69e67c326fd320c0827941d Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sun, 6 Feb 2011 22:37:08 +0000 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Mageia. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line Add drakx structure on the SVN ------------------------------------------------------------------------ r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned advertising ------------------------------------------------------------------------ r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line Import Clean perl-install ------------------------------------------------------------------------ r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line Add cleaned files ------------------------------------------------------------------------ r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned kernel ------------------------------------------------------------------------ r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned tools ------------------------------------------------------------------------ r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line Import stage1 ------------------------------------------------------------------------ r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line Import images ------------------------------------------------------------------------ r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines readd missing file ------------------------------------------------------------------------ r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line Import rescue ------------------------------------------------------------------------ r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines import cleaned rescue for Mageia ------------------------------------------------------------------------ r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line import (cleaned) doc ------------------------------------------------------------------------ --- advertising/IM_flash.pl | 1 - advertising/IM_flash.png | Bin 148454 -> 0 bytes advertising/IM_free.pl | 1 - advertising/IM_free.png | Bin 112708 -> 0 bytes advertising/IM_mageia.pl | 1 + advertising/IM_mageia.png | Bin 0 -> 16782 bytes advertising/IM_one.pl | 1 - advertising/IM_one.png | Bin 101872 -> 0 bytes advertising/IM_pwp.pl | 1 - advertising/IM_pwp.png | Bin 107313 -> 0 bytes advertising/IM_range.pl | 1 - advertising/IM_range.png | Bin 104588 -> 0 bytes advertising/Makefile | 2 +- advertising/NEWS | 4 ++++ advertising/list-dis | 14 -------------- advertising/list-dwd | 14 -------------- advertising/list-ppp | 13 ------------- advertising/list-pwp | 6 +----- 18 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 advertising/IM_flash.pl delete mode 100644 advertising/IM_flash.png delete mode 100644 advertising/IM_free.pl delete mode 100644 advertising/IM_free.png create mode 100644 advertising/IM_mageia.pl create mode 100644 advertising/IM_mageia.png delete mode 100644 advertising/IM_one.pl delete mode 100644 advertising/IM_one.png delete mode 100644 advertising/IM_pwp.pl delete mode 100644 advertising/IM_pwp.png delete mode 100644 advertising/IM_range.pl delete mode 100644 advertising/IM_range.png delete mode 100644 advertising/list-dis delete mode 100644 advertising/list-dwd delete mode 100644 advertising/list-ppp (limited to 'advertising') diff --git a/advertising/IM_flash.pl b/advertising/IM_flash.pl deleted file mode 100644 index 57f146bb6..000000000 --- a/advertising/IM_flash.pl +++ /dev/null @@ -1 +0,0 @@ -$title = N("Your desktop on a USB key"); diff --git a/advertising/IM_flash.png b/advertising/IM_flash.png deleted file mode 100644 index eb94494b8..000000000 Binary files a/advertising/IM_flash.png and /dev/null differ diff --git a/advertising/IM_free.pl b/advertising/IM_free.pl deleted file mode 100644 index da447e629..000000000 --- a/advertising/IM_free.pl +++ /dev/null @@ -1 +0,0 @@ -$title = N("The 100%% open source Mandriva Linux distribution"); diff --git a/advertising/IM_free.png b/advertising/IM_free.png deleted file mode 100644 index 9d994d6cb..000000000 Binary files a/advertising/IM_free.png and /dev/null differ diff --git a/advertising/IM_mageia.pl b/advertising/IM_mageia.pl new file mode 100644 index 000000000..74bb44afa --- /dev/null +++ b/advertising/IM_mageia.pl @@ -0,0 +1 @@ +$title = N("Mageia Alpha distribution"); diff --git a/advertising/IM_mageia.png b/advertising/IM_mageia.png new file mode 100644 index 000000000..f3fc768c6 Binary files /dev/null and b/advertising/IM_mageia.png differ diff --git a/advertising/IM_one.pl b/advertising/IM_one.pl deleted file mode 100644 index d2cc11ed0..000000000 --- a/advertising/IM_one.pl +++ /dev/null @@ -1 +0,0 @@ -$title = N("Explore Linux easily with Mandriva One"); diff --git a/advertising/IM_one.png b/advertising/IM_one.png deleted file mode 100644 index 483b62573..000000000 Binary files a/advertising/IM_one.png and /dev/null differ diff --git a/advertising/IM_pwp.pl b/advertising/IM_pwp.pl deleted file mode 100644 index 21c698e9f..000000000 --- a/advertising/IM_pwp.pl +++ /dev/null @@ -1 +0,0 @@ -$title = N("A full Mandriva Linux desktop, with support"); diff --git a/advertising/IM_pwp.png b/advertising/IM_pwp.png deleted file mode 100644 index 09e40d9aa..000000000 Binary files a/advertising/IM_pwp.png and /dev/null differ diff --git a/advertising/IM_range.pl b/advertising/IM_range.pl deleted file mode 100644 index fde1186af..000000000 --- a/advertising/IM_range.pl +++ /dev/null @@ -1 +0,0 @@ -$title = N("Mandriva: distributions for everybody's needs"); diff --git a/advertising/IM_range.png b/advertising/IM_range.png deleted file mode 100644 index e26a3cac1..000000000 Binary files a/advertising/IM_range.png and /dev/null differ diff --git a/advertising/Makefile b/advertising/Makefile index 022cee4b4..a710284cc 100644 --- a/advertising/Makefile +++ b/advertising/Makefile @@ -1,4 +1,4 @@ -VERSION = 2010.1 +VERSION = 2011.0 PRODUCT = drakx-installer-advertising THEME = pwp diff --git a/advertising/NEWS b/advertising/NEWS index 3163c1237..924adf1cd 100644 --- a/advertising/NEWS +++ b/advertising/NEWS @@ -1,3 +1,7 @@ +Version 2011.0 - 13 Oct 2010 + +- bump version + Version 2010.1 - 02 May 2010 - 2010.1 images diff --git a/advertising/list-dis b/advertising/list-dis deleted file mode 100644 index 3ca560e8d..000000000 --- a/advertising/list-dis +++ /dev/null @@ -1,14 +0,0 @@ -LinDVD.png -TRANSGAMING-CEDEGA.png -FLATOUT.png -Kaspersky.png -Skype.png -IM_ONE.png -IM_3D.png -IM_THEME.png -IM-GWENVIEW.png -IM_RPMDRAKE.png -IM_web2.png -IM_SERVICES.png -IM_GAMME.png -IM_REGISTER.png diff --git a/advertising/list-dwd b/advertising/list-dwd deleted file mode 100644 index d6d6cbc9d..000000000 --- a/advertising/list-dwd +++ /dev/null @@ -1,14 +0,0 @@ -LinDVD.png -TRANSGAMING-CEDEGA.png -FLATOUT.png -Kaspersky.png -Skype.png -ARKEIA_EN.png -IM_3D.png -IM_THEME.png -VPN.png -IM_RPMDRAKE.png -IM_web2.png -IM_SERVICES.png -IM_GAMME.png -IM_REGISTER.png diff --git a/advertising/list-ppp b/advertising/list-ppp deleted file mode 100644 index 862cd4833..000000000 --- a/advertising/list-ppp +++ /dev/null @@ -1,13 +0,0 @@ -bitdefender.png -ARKEIA_EN.png -VPN.png -IM_INVICTUS.png -IM_RPMDRAKE.png -IM_CRM.png -IM_CMSJOOMLA.png -IM_web2.png -IM_THEME.png -IM_3D.png -IM_SERVICES.png -IM_GAMME.png -IM_REGISTER.png diff --git a/advertising/list-pwp b/advertising/list-pwp index 75a525574..badf546ec 100644 --- a/advertising/list-pwp +++ b/advertising/list-pwp @@ -1,5 +1 @@ -IM_flash.png -IM_free.png -IM_one.png -IM_pwp.png -IM_range.png +IM_mageia.png -- cgit v1.2.1