summaryrefslogtreecommitdiffstats
path: root/advertising
diff options
context:
space:
mode:
Diffstat (limited to 'advertising')
-rw-r--r--advertising/01_IM_mageia.pl1
-rw-r--r--advertising/01_IM_mageia.pngbin0 -> 69206 bytes
-rw-r--r--advertising/02_IM_mageia.pl1
-rw-r--r--advertising/02_IM_mageia.pngbin0 -> 81615 bytes
-rw-r--r--advertising/03_IM_mageia.pl1
-rw-r--r--advertising/03_IM_mageia.pngbin0 -> 81868 bytes
-rw-r--r--advertising/04_IM_mageia.pl1
-rw-r--r--advertising/04_IM_mageia.pngbin0 -> 65295 bytes
-rw-r--r--advertising/05_IM_mageia.pl1
-rw-r--r--advertising/05_IM_mageia.pngbin0 -> 79652 bytes
-rw-r--r--advertising/06_IM_mageia.pl1
-rw-r--r--advertising/06_IM_mageia.pngbin0 -> 84628 bytes
-rw-r--r--advertising/07_IM_mageia.pl1
-rw-r--r--advertising/07_IM_mageia.pngbin0 -> 68380 bytes
-rw-r--r--advertising/08_IM_mageia.pl1
-rw-r--r--advertising/08_IM_mageia.pngbin0 -> 88717 bytes
-rw-r--r--advertising/09_IM_mageia.pl1
-rw-r--r--advertising/09_IM_mageia.pngbin0 -> 87501 bytes
-rw-r--r--advertising/10_IM_mageia.pl1
-rw-r--r--advertising/10_IM_mageia.pngbin0 -> 69206 bytes
-rw-r--r--advertising/IM_flash.pl1
-rw-r--r--advertising/IM_flash.pngbin127151 -> 0 bytes
-rw-r--r--advertising/IM_free09.pl1
-rw-r--r--advertising/IM_free09.pngbin137009 -> 0 bytes
-rw-r--r--advertising/IM_one09.pl1
-rw-r--r--advertising/IM_one09.pngbin72541 -> 0 bytes
-rw-r--r--advertising/IM_pwp09.pl1
-rw-r--r--advertising/IM_pwp09.pngbin80676 -> 0 bytes
-rw-r--r--advertising/IM_range09.pl1
-rw-r--r--advertising/IM_range09.pngbin95592 -> 0 bytes
-rw-r--r--advertising/Makefile7
-rw-r--r--advertising/NEWS58
-rw-r--r--advertising/list-dis14
-rw-r--r--advertising/list-dwd14
-rw-r--r--advertising/list-ppp13
-rw-r--r--advertising/list-pwp15
36 files changed, 80 insertions, 56 deletions
diff --git a/advertising/01_IM_mageia.pl b/advertising/01_IM_mageia.pl
new file mode 100644
index 000000000..e8b554b51
--- /dev/null
+++ b/advertising/01_IM_mageia.pl
@@ -0,0 +1 @@
+$title = N("Join Us!");
diff --git a/advertising/01_IM_mageia.png b/advertising/01_IM_mageia.png
new file mode 100644
index 000000000..0ad6cb769
--- /dev/null
+++ b/advertising/01_IM_mageia.png
Binary files differ
diff --git a/advertising/02_IM_mageia.pl b/advertising/02_IM_mageia.pl
new file mode 100644
index 000000000..ddeeb73d5
--- /dev/null
+++ b/advertising/02_IM_mageia.pl
@@ -0,0 +1 @@
+$title = N("Make it yours!");
diff --git a/advertising/02_IM_mageia.png b/advertising/02_IM_mageia.png
new file mode 100644
index 000000000..c19f00867
--- /dev/null
+++ b/advertising/02_IM_mageia.png
Binary files differ
diff --git a/advertising/03_IM_mageia.pl b/advertising/03_IM_mageia.pl
new file mode 100644
index 000000000..85dfe0561
--- /dev/null
+++ b/advertising/03_IM_mageia.pl
@@ -0,0 +1 @@
+$title = N("Your choice!");
diff --git a/advertising/03_IM_mageia.png b/advertising/03_IM_mageia.png
new file mode 100644
index 000000000..3bf05ef0f
--- /dev/null
+++ b/advertising/03_IM_mageia.png
Binary files differ
diff --git a/advertising/04_IM_mageia.pl b/advertising/04_IM_mageia.pl
new file mode 100644
index 000000000..d79d45a3a
--- /dev/null
+++ b/advertising/04_IM_mageia.pl
@@ -0,0 +1 @@
+$title = N("Office tools");
diff --git a/advertising/04_IM_mageia.png b/advertising/04_IM_mageia.png
new file mode 100644
index 000000000..a759ae383
--- /dev/null
+++ b/advertising/04_IM_mageia.png
Binary files differ
diff --git a/advertising/05_IM_mageia.pl b/advertising/05_IM_mageia.pl
new file mode 100644
index 000000000..0be976b2f
--- /dev/null
+++ b/advertising/05_IM_mageia.pl
@@ -0,0 +1 @@
+$title = N("Home entertainment");
diff --git a/advertising/05_IM_mageia.png b/advertising/05_IM_mageia.png
new file mode 100644
index 000000000..01b0ef866
--- /dev/null
+++ b/advertising/05_IM_mageia.png
Binary files differ
diff --git a/advertising/06_IM_mageia.pl b/advertising/06_IM_mageia.pl
new file mode 100644
index 000000000..96c259df7
--- /dev/null
+++ b/advertising/06_IM_mageia.pl
@@ -0,0 +1 @@
+$title = N("For kids");
diff --git a/advertising/06_IM_mageia.png b/advertising/06_IM_mageia.png
new file mode 100644
index 000000000..7f2a5e76b
--- /dev/null
+++ b/advertising/06_IM_mageia.png
Binary files differ
diff --git a/advertising/07_IM_mageia.pl b/advertising/07_IM_mageia.pl
new file mode 100644
index 000000000..d205668a6
--- /dev/null
+++ b/advertising/07_IM_mageia.pl
@@ -0,0 +1 @@
+$title = N("For family!");
diff --git a/advertising/07_IM_mageia.png b/advertising/07_IM_mageia.png
new file mode 100644
index 000000000..5aa4ec481
--- /dev/null
+++ b/advertising/07_IM_mageia.png
Binary files differ
diff --git a/advertising/08_IM_mageia.pl b/advertising/08_IM_mageia.pl
new file mode 100644
index 000000000..d6767f491
--- /dev/null
+++ b/advertising/08_IM_mageia.pl
@@ -0,0 +1 @@
+$title = N("For developers!");
diff --git a/advertising/08_IM_mageia.png b/advertising/08_IM_mageia.png
new file mode 100644
index 000000000..3a2dc4624
--- /dev/null
+++ b/advertising/08_IM_mageia.png
Binary files differ
diff --git a/advertising/09_IM_mageia.pl b/advertising/09_IM_mageia.pl
new file mode 100644
index 000000000..55e63f502
--- /dev/null
+++ b/advertising/09_IM_mageia.pl
@@ -0,0 +1 @@
+$title = N("Thank you!");
diff --git a/advertising/09_IM_mageia.png b/advertising/09_IM_mageia.png
new file mode 100644
index 000000000..e80d49a11
--- /dev/null
+++ b/advertising/09_IM_mageia.png
Binary files differ
diff --git a/advertising/10_IM_mageia.pl b/advertising/10_IM_mageia.pl
new file mode 100644
index 000000000..a75b16b5f
--- /dev/null
+++ b/advertising/10_IM_mageia.pl
@@ -0,0 +1 @@
+$title = N("Be Free!");
diff --git a/advertising/10_IM_mageia.png b/advertising/10_IM_mageia.png
new file mode 100644
index 000000000..ef1261f43
--- /dev/null
+++ b/advertising/10_IM_mageia.png
Binary files differ
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 6db20ebbe..000000000
--- a/advertising/IM_flash.png
+++ /dev/null
Binary files differ
diff --git a/advertising/IM_free09.pl b/advertising/IM_free09.pl
deleted file mode 100644
index da447e629..000000000
--- a/advertising/IM_free09.pl
+++ /dev/null
@@ -1 +0,0 @@
-$title = N("The 100%% open source Mandriva Linux distribution");
diff --git a/advertising/IM_free09.png b/advertising/IM_free09.png
deleted file mode 100644
index ff3c1c90b..000000000
--- a/advertising/IM_free09.png
+++ /dev/null
Binary files differ
diff --git a/advertising/IM_one09.pl b/advertising/IM_one09.pl
deleted file mode 100644
index d2cc11ed0..000000000
--- a/advertising/IM_one09.pl
+++ /dev/null
@@ -1 +0,0 @@
-$title = N("Explore Linux easily with Mandriva One");
diff --git a/advertising/IM_one09.png b/advertising/IM_one09.png
deleted file mode 100644
index c359c83b6..000000000
--- a/advertising/IM_one09.png
+++ /dev/null
Binary files differ
diff --git a/advertising/IM_pwp09.pl b/advertising/IM_pwp09.pl
deleted file mode 100644
index 21c698e9f..000000000
--- a/advertising/IM_pwp09.pl
+++ /dev/null
@@ -1 +0,0 @@
-$title = N("A full Mandriva Linux desktop, with support");
diff --git a/advertising/IM_pwp09.png b/advertising/IM_pwp09.png
deleted file mode 100644
index 1d2ae295d..000000000
--- a/advertising/IM_pwp09.png
+++ /dev/null
Binary files differ
diff --git a/advertising/IM_range09.pl b/advertising/IM_range09.pl
deleted file mode 100644
index fde1186af..000000000
--- a/advertising/IM_range09.pl
+++ /dev/null
@@ -1 +0,0 @@
-$title = N("Mandriva: distributions for everybody's needs");
diff --git a/advertising/IM_range09.png b/advertising/IM_range09.png
deleted file mode 100644
index 9c3d52eaf..000000000
--- a/advertising/IM_range09.png
+++ /dev/null
Binary files differ
diff --git a/advertising/Makefile b/advertising/Makefile
index 9666a9636..d897938b8 100644
--- a/advertising/Makefile
+++ b/advertising/Makefile
@@ -1,4 +1,4 @@
-VERSION = 2009.1
+VERSION = 9.1
PRODUCT = drakx-installer-advertising
THEME = pwp
@@ -12,10 +12,7 @@ install:
install -m644 list-$(THEME) $(DESTDIR)/list
tar:
- rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION)
- svn export -q . $(PRODUCT)-$(VERSION)
- tar cfj $(PRODUCT)-$(VERSION).tar.bz2 $(PRODUCT)-$(VERSION)
- rm -rf $(PRODUCT)-$(VERSION)
+ git archive --prefix $(PRODUCT)-$(VERSION)/ HEAD | xz -9 > $(PRODUCT)-$(VERSION).tar.xz
clean:
find . -name "*~" -o -name ".#*" | xargs rm -f
diff --git a/advertising/NEWS b/advertising/NEWS
index e11109ecb..415fbe9ee 100644
--- a/advertising/NEWS
+++ b/advertising/NEWS
@@ -1,7 +1,65 @@
+Version 9.1 - 24 June 2023
+
+- Fix typos in slideshow (developer and Languages) (mga#31872)
+
+Version 9 - 17 April 2023
+
+- Mageia 9 artwork
+
+Version 8 - 11 January 2021
+
+- Mageia 8 artwork
+
+Version 7 - 4 May 2019
+
+- Mageia 7
+
+Version 6 - 8 May 2017
+
+- Mageia 6
+
+Version 5.1 - 18 December 2014
+
+- Fix badly exported 03_IM_mageia.png
+
+Version 5 - 17 December 2014
+
+- Mageia 5
+
+Version 4 - 8 January 2014
+
+- Mageia 4
+
+Version 3 - 6 april 2013
+
+- Mageia 3
+
+Version 2 - 25 april 2011
+
+- make it more generic for Mageia 2
+
+Version 1 - 12 March 2011
+
+- new advertising for Mageia 1
+
+Version 2011.0 - 13 Oct 2010
+
+- bump version
+
+Version 2010.1 - 02 May 2010
+
+- 2010.1 images
+
+Version 2010.0 - 28 October 2009
+
+- 2010.0 images
+
Version 2009.1 - 7 March 2009
+
- 2009.1 images
Version 2009.0 - 11 September 2008
+
- 2009.0 images
Version 2008.1.1 - 21 March 2008
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 b7c37918d..65540338b 100644
--- a/advertising/list-pwp
+++ b/advertising/list-pwp
@@ -1,5 +1,10 @@
-IM_flash.png
-IM_free09.png
-IM_one09.png
-IM_pwp09.png
-IM_range09.png
+01_IM_mageia.png
+02_IM_mageia.png
+03_IM_mageia.png
+04_IM_mageia.png
+05_IM_mageia.png
+06_IM_mageia.png
+07_IM_mageia.png
+08_IM_mageia.png
+09_IM_mageia.png
+10_IM_mageia.png