update debian / ubuntu info to install daily package. Fixes #7

downloads.php

@@ -127,16 +127,32 @@ print "</div>\n";
 #3)Debian GNU/Linux
 print "<div id='debian'>\n";
 print "<h2>Debian GNU/Linux:</h2>\n";
-print _("    If you use Debian unstable do")." <i>apt-get install gajim</i>\n";
+print _("Just")." <i>sudo apt-get install gajim</i>\n";
 print ("    <br/>\n");
 #printf(_("   The Debian package of %s is "), "0.16-rc2");
 #print "<a href='ftp://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim_0.16~rc2-1_all.deb'>"._("here")."</a>.<br />\n";
-print _("    A daily package from git is also built. To use it, remove gajim")." (<i>apt-get remove gajim</i>), "._("create a file named") . " /etc/apt/sources.list.d/gajim.list " . _("and add this line:");
 print ("    <br/>\n");
-print ("    <i>deb ftp://ftp.gajim.org/debian unstable main</i>\n");
-print ("    <br/>\n");
-print _("and install it by doing")." <i>apt-get install gajim-nightly</i>.\n";
-print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository (or via") . " <a href='https://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim-dev-keyring_2016.03.29_all.deb'>https</a>). " . _("Just do")." <i>apt-get install gajim-dev-keyring</i>.\n";
+print _("    A daily package from git is also built. To use it:");
+print "    <br/>\n";
+print _("remove gajim:");
+print "    <br/>\n";
+print " <i>sudo apt-get remove gajim</i>";
+print "    <br/>\n";
+print _("add  the GPG key:");
+print "    <br/>\n";
+print " <i>wget -q https://gajim.org/gajim.key -O - | apt-key add -</i>";
+print "    <br/>\n";
+print _("add  the repository:");
+print "    <br/>\n";
+print "sudo sh -c \"echo deb ftp://ftp.gajim.org/debian unstable main > /etc/apt/sources.list.d/gajim.list\"";
+print "    <br/>\n";
+print _("update  the repository:");
+print "    <br/>\n";
+print " <i>sudo apt-get update</i>";
+print "    <br/>\n";
+print _("and install it by doing:");
+print "    <br/>\n";
+print " <i>sudo apt-get install gajim-nightly</i>n";
 print "</div>\n";
 
 #4)Fedora
@@ -193,14 +209,30 @@ print "</div>\n";
 #12)Ubuntu
 print "<div id='ubuntu'>\n";
 print "<h2>Ubuntu:</h2>\n";
-print _("If you use Ubuntu universe repository do")." <i>apt-get install gajim</i>\n";
+print _("Just")." <i>sudo apt-get install gajim</i>\n";
 print ("<br/>\n");
-print _("    A daily package from git is also built. To use it, remove gajim")." (<i>apt-get remove gajim</i>), "._("create a file named") . " /etc/apt/sources.list.d/gajim " . _("and add this line:");
-print ("    <br/>\n");
-print ("    <i>deb ftp://ftp.gajim.org/debian unstable main</i>\n");
 print ("    <br/>\n");
-print _("and install it by doing")." <i>apt-get install gajim-nightly</i>.\n";
-print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository. Just do")." <i>apt-get install gajim-dev-keyring</i>.\n";
+print _("    A daily package from git is also built. To use it:");
+print "    <br/>\n";
+print _("remove gajim:");
+print "    <br/>\n";
+print " <i>sudo apt-get remove gajim</i>";
+print "    <br/>\n";
+print _("add  the GPG key:");
+print "    <br/>\n";
+print " <i>wget -q https://gajim.org/gajim.key -O - | apt-key add -</i>";
+print "    <br/>\n";
+print _("add  the repository:");
+print "    <br/>\n";
+print "sudo sh -c \"echo deb ftp://ftp.gajim.org/debian unstable main > /etc/apt/sources.list.d/gajim.list\"";
+print "    <br/>\n";
+print _("update  the repository:");
+print "    <br/>\n";
+print " <i>sudo apt-get update</i>";
+print "    <br/>\n";
+print _("and install it by doing:");
+print "    <br/>\n";
+print " <i>sudo apt-get install gajim-nightly</i>n";
 print "</div>\n";
 
 #13)Windows