summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--NEWS7
-rw-r--r--gnome-mandrakeonline.desktop5
-rwxr-xr-xmgaapplet-add-media-helper8
-rwxr-xr-xmgaapplet-upgrade-helper2
-rw-r--r--mgaonline.xml4
-rwxr-xr-xmgaupdate2
-rw-r--r--x-mga-exec.desktop4
8 files changed, 19 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index c3dc05bd..5552d506 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,6 @@ MGAUPDATE = mgaupdate
MGAAPPLET = mgaapplet
SUBDIRS = po
-MANDRIVA_VERSION = $(shell awk 'BEGIN { RS=","; FS="=" } $$1 == "version" { print $$2 }' /etc/product.id)
-
PREFIX = /
DATADIR = $(PREFIX)/usr/share
ICONSDIR = $(DATADIR)/icons
diff --git a/NEWS b/NEWS
index 17d008a4..986d0c80 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Version 2.77.32 - 15 March 2012, Kamil Rytarowski
+- stop using Mandriva URLs and replace them by www.mageia.org (mga#1590)
+- replace Mandriva strings by Mageia in gnome-mandrakeonline.desktop
+- replace MIME Type application/x-mdv-exec by application/x-mga-exec
+- extend $MGA_YEARS in mgaupdate to 2012
+- delete MANDRIVA_VERSION variable as not used
+
Version 2.77.31 - 12 March 2012, Thierry Vignaud
- drop support for mdv2007.x/2008.x/2009.x
diff --git a/gnome-mandrakeonline.desktop b/gnome-mandrakeonline.desktop
index e14ad9d3..665f5d3a 100644
--- a/gnome-mandrakeonline.desktop
+++ b/gnome-mandrakeonline.desktop
@@ -1,7 +1,6 @@
-
[Desktop Entry]
-Name=Mandriva Online
-Icon=mgaonline.png
+Name=Mageia Online
+Icon=mgaonline
Exec=/usr/sbin/mgaonline
Terminal=false
MultipleArgs=false
diff --git a/mgaapplet-add-media-helper b/mgaapplet-add-media-helper
index cd6e747b..7c25e174 100755
--- a/mgaapplet-add-media-helper
+++ b/mgaapplet-add-media-helper
@@ -40,7 +40,7 @@ use utf8;
# restricted media for each product.
my %product = (
powerpack => {
- info_url => 'https://my.mandriva.com/powerpack/',
+ info_url => 'https://www.mageia.org/',
has_rights => sub {
my $profile = shift @_;
$profile->{data}{'can-access-restricted-repositories'} eq 'YES';
@@ -50,7 +50,7 @@ my %product = (
},
server => {
- info_url => 'http://www2.mandriva.com/linux/server/',
+ info_url => 'http://www.mageia.org/',
has_rights => sub {
my $profile = shift @_;
$profile->{data}{groups}{'es5-prod'} or
@@ -60,7 +60,7 @@ my %product = (
add_medium => \&mgaonline::add_medium_enterprise
},
extended => {
- info_url => 'https://my.mandriva.com/',
+ info_url => 'https://www.mageia.org/',
has_rights => sub {
my ($profile, $version) = @_;
return ! ref $profile->{data}{groups}{'ext-maint-' . $version};
@@ -170,7 +170,7 @@ sub run_authentication_dialog {
N("You can subscribe <b>right now</b> to get extended maintenance:"),
),
@common),
- new_link_button('http://www2.mandriva.com/support/lifecycle/',
+ new_link_button('http://www.mageia.org/',
N("Lifetime policy")),
new_link_button($url, N("Online subscription"))
];
diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper
index 103a74fa..357f7703 100755
--- a/mgaapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -190,7 +190,7 @@ sub powerpack_auth_callback {
mgaapplet_gui::run_no_rights_dialog(
N("Powerpack Media Configuration"),
N("You current Mageia account does not have Powerpack subscription enabled."),
- 'https://my.mandriva.com/powerpack/',
+ 'http://www.mageia.org',
);
return;
}
diff --git a/mgaonline.xml b/mgaonline.xml
index a7361251..97120782 100644
--- a/mgaonline.xml
+++ b/mgaonline.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
- <mime-type type="application/x-mdv-exec">
- <comment>Mandriva Bundle</comment>
+ <mime-type type="application/x-mga-exec">
+ <comment>Mageia Bundle</comment>
<glob pattern="*.bundle"/>
</mime-type>
</mime-info>
diff --git a/mgaupdate b/mgaupdate
index 7c1623ab..10e022c7 100755
--- a/mgaupdate
+++ b/mgaupdate
@@ -49,7 +49,7 @@ my $logfile = '/var/tmp/mgaupdate.log';
my $CLIENT_VERSION = "4";
my $YEARS = "2002-2006";
-my $MGA_YEARS = "2010-2011";
+my $MGA_YEARS = "2010-2012";
#for compatibilities with former versions
mkdir_p($confdir) if !-d $confdir;
diff --git a/x-mga-exec.desktop b/x-mga-exec.desktop
index ce098144..6f534942 100644
--- a/x-mga-exec.desktop
+++ b/x-mga-exec.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Name=MGAonline
-Icon=/usr/share/icons/mgaonline.png
+Icon=mgaonline
Type=MimeType
-MimeType=application/x-mdv-exec;
+MimeType=application/x-mga-exec;
Comment=mgaonline application updater
Hidden=false
X-KDE-AutoEmbed=false