Commit c8b915ff by Ruben Rodriguez

Final release for 5.0, fixed #4235 and #3437

parent e68e4860
trisquel-base-data (5.0) slaine; urgency=low
* Final release for Dagda
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 13:31:40 +0200
trisquel-base-data (4.99-1) slaine; urgency=low
* Updated grub artwork
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 02:24:57 +0200
trisquel-base-data (4.99) slaine; urgency=low
* Initial release for Dagda
......
[settings]
toolbar-style=MIDORI_TOOLBAR_SMALL_ICONS
toolbar-items=TabNew,Back,Forward,ReloadStop,Separator,Homepage,Location,Separator,Search,
homepage=http://trisquel.info
location-entry-search=https://duckduckgo.com/?q=!+%s
[extensions]
libdnsprefetch.so=true
libtoolbar-editor.so=true
libweb-cache.so=true
trisquel-desktop-common-data (5.0) slaine; urgency=low
* Final release for Dagda
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 13:31:45 +0200
trisquel-desktop-common-data (4.99-5) slaine; urgency=low
* Changed IceCat back to Abrowser
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 08 Sep 2011 15:36:50 +0200
trisquel-desktop-common-data (4.99-4) slaine; urgency=low
* Gconf xml tree moved to /usr/share/gconf/defaults value list file
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Sun, 07 Aug 2011 01:22:36 +0200
trisquel-desktop-common-data (4.99-3) slaine; urgency=low
* Removed Midori xdg file
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Mon, 01 Aug 2011 02:54:19 +0200
trisquel-desktop-common-data (4.99-2) slaine; urgency=low
* Replaced Firefox with IceCat and OpenOffice.org with LibreOffice
......
#! /bin/sh
[ -f /etc/gconf/gconf.xml.defaults/%gconf-tree.xml ] && mv /etc/gconf/gconf.xml.defaults/%gconf-tree.xml /etc/gconf/gconf.xml.defaults/%gconf-tree.xml-old
[ -f /etc/gconf/gconf.xml.defaults/%gconf-tree-trisquel.xml ] && ln -s /etc/gconf/gconf.xml.defaults/%gconf-tree-trisquel.xml /etc/gconf/gconf.xml.defaults/%gconf-tree.xml
#!/bin/sh
item="/usr/bin/gnome-panel"
if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" -o abort-upgrade = "$1" ]
then
[ -f "$item"".real" ] && dpkg-divert --package trisquel-desktop-common-data --remove --rename --divert "$item"".real" "$item"
fi
#!/bin/sh
item="/usr/bin/gnome-panel"
[ -f "$item"".real" ] && exit 0 || true
dpkg-divert --package trisquel-desktop-common-data --add --rename --divert "$item"".real" "$item"
cat << EOF > $item
#!/bin/sh
/usr/bin/gnome-panel.real --replace
EOF
chmod 755 $item
trisquel-gtk-theme (5.0-1) slaine; urgency=low
* Removed hack to hide resize grips
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Fri, 16 Sep 2011 21:18:11 +0200
trisquel-gtk-theme (5.0) slaine; urgency=low
* Final release for Dagda
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 13:31:50 +0200
trisquel-gtk-theme (4.99-1) slaine; urgency=low
* Removed resize widget in the lower right corner
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Tue, 09 Aug 2011 18:13:27 +0200
trisquel-gtk-theme (4.99) slaine; urgency=low
* Initial release for Dagda
......
[Icon Theme]
Name=Trisquel
Comment=Trisquel icons for GNOME
Inherits=elementary
Inherits=elementary-mono-dark
Example=folder
Directories=scalable/apps,scalable/devices,scalable/places,24x24/apps,24x24/status
......
trisquel-icon-theme (5.0) slaine; urgency=low
* Final release for Dagda
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 13:31:55 +0200
trisquel-icon-theme (4.99-1) slaine; urgency=low
* Now inherits from Elementary Dark
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Tue, 09 Aug 2011 18:51:55 +0200
trisquel-icon-theme (4.99) slaine; urgency=low
* Initial release for Dagda
......
trisquel-meta (4.99-4) slaine; urgency=low
trisquel-meta (5.0-3) slaine; urgency=low
* Replaced Firefox with IceCat and OpenOffice.org with LibreOffice
* Added gstreamer0.10-plugins-bad back
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Wed, 27 Jul 2011 02:42:47 +0200
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Wed, 26 Oct 2011 15:52:55 +0200
trisquel-meta (4.99-3) slaine; urgency=low
trisquel-meta (5.0-2) slaine; urgency=low
* Added back gnome-user-guide-en and gnome-user-guide-es
* Added mobile-broadband-provider-info
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Wed, 20 Jul 2011 03:33:44 +0200
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Fri, 16 Sep 2011 04:12:43 +0200
trisquel-meta (4.99-2) slaine; urgency=low
trisquel-meta (5.0-1) slaine; urgency=low
* Added gwibber services and friendly-recovery
* Added usbmodeswitch
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Tue, 19 Jul 2011 17:22:35 +0200
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 20:32:46 +0200
trisquel-meta (4.99-1) slaine; urgency=low
trisquel-meta (5.0) slaine; urgency=low
* Final release for Dagda
* Added trisquel-gnome-base transitional package
* Removed "Recommended:" entries and added -recommended transitional packages
* Removed compizconfig-settings-manager, added libreoffice-style-tango, choqok and ark
* Removed -recommended packages, added triskel
* Removed gstreamer0.10-schroedinger and gstreamer0.10-plugins-bad
* Removed friendly-recovery
* Added gnome-keyring
* Replaced Firefox with IceCat and OpenOffice.org with LibreOffice
* Added back gnome-user-guide-en and gnome-user-guide-es
* Added gwibber services and friendly-recovery
* Removed flashvideoreplacer, xul-ext-notify and remmina-gnome dependencies
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Tue, 19 Jul 2011 02:10:26 +0200
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 13:32:07 +0200
trisquel-meta (4.99) slaine; urgency=low
......
trisquel-mini-data (5.0-1) slaine; urgency=low
* Added changes from http://trisquel.info/es/issues/4235
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Tue, 08 Nov 2011 22:42:19 +0100
trisquel-mini-data (5.0) slaine; urgency=low
* Final release for Dagda
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 13:32:13 +0200
trisquel-mini-data (4.99-1) slaine; urgency=low
* Added final artwork
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 01:52:08 +0200
trisquel-mini-data (4.99) slaine; urgency=low
* Initial release for Dagda
......
......@@ -2,5 +2,5 @@
@lxpanel --profile Trisquel-mini
@xscreensaver -no-splash
@gnome-power-manager
@pcmanfm --desktop
@pcmanfm --desktop --profile Trisquel-mini
@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
......@@ -13,7 +13,7 @@ last_lang=
[display]
gtk_theme=Trisquel
bg=/usr/share/backgrounds/slaine.jpg
bg=/usr/share/backgrounds/dagda-g.jpg
bottom_pane=1
lang=1
theme=Trisquel-mini
......
......@@ -22,7 +22,7 @@ fi
export XDG_DATA_DIRS
# Ensure the existance of pcmanfm config file
PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/Trisquel-mini"
if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
mkdir -p "$PCMANFM_CONF_DIR"
cp /usr/share/trisquel-mini/pcmanfm/main.trisquel-mini "$PCMANFM_CONF_DIR/pcmanfm.conf"
......
......@@ -7,7 +7,7 @@ style "back"
function = FLAT_BOX
shadow=NONE
state = NORMAL
file="/usr/share/backgrounds/slaine.jpg"
file="/usr/share/backgrounds/dagda-g.jpg"
stretch=TRUE
detail = "base"
}
......
[desktop]
wallpaper=/usr/share/backgrounds/slaine.jpg
wallpaper=/usr/share/backgrounds/dagda-g.jpg
wallpaper_mode=1
trisquel-screensaver (5.0) slaine; urgency=low
* Final release for Dagda
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 13:32:18 +0200
trisquel-screensaver (4.99) slaine; urgency=low
* Initial release for Dagda
......
trisquel-sounds (5.0) slaine; urgency=low
* Final release for Dagda
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 13:32:24 +0200
trisquel-sounds (4.99) slaine; urgency=low
* Initial release for Dagda
......
/desktop/gnome/background/picture_filename "/usr/share/backgrounds/slaine.jpg"
/desktop/gnome/background/picture_filename "/usr/share/backgrounds/dagda-g.jpg"
/desktop/gnome/background/picture_options "stretched"
/desktop/gnome/background/color_shading_type "solid"
/desktop/gnome/background/primary_color "#000000"
......@@ -33,4 +33,29 @@
<scolor>#000000</scolor>
<shade_type>solid</shade_type>
</wallpaper>
<wallpaper>
<name>Trisquel Slaine</name>
<filename>/usr/share/backgrounds/slaine.jpg</filename>
<options>stretched</options>
<pcolor>#000000</pcolor>
<scolor>#000000</scolor>
<shade_type>solid</shade_type>
</wallpaper>
<wallpaper>
<name>Trisquel Dagda Blue</name>
<filename>/usr/share/backgrounds/dagda-b.jpg</filename>
<options>stretched</options>
<pcolor>#000000</pcolor>
<scolor>#000000</scolor>
<shade_type>solid</shade_type>
</wallpaper>
<wallpaper>
<name>Trisquel Dagda Red</name>
<filename>/usr/share/backgrounds/dagda-r.jpg</filename>
<options>stretched</options>
<pcolor>#000000</pcolor>
<scolor>#000000</scolor>
<shade_type>solid</shade_type>
</wallpaper>
</wallpapers>
trisquel-wallpapers (5.0) slaine; urgency=low
* Final release for Dagda
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 13:32:29 +0200
trisquel-wallpapers (5.0) slaine; urgency=low
* Added final artwork
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 01:58:37 +0200
trisquel-wallpapers (4.99) slaine; urgency=low
* Initial release for Dagda
......
This diff is collapsed. Click to expand it.
......@@ -25,8 +25,6 @@
type="bool" />
<preference id="pref_bliptv" name="extensions.flvideoreplacer.bliptv"
type="bool" />
<preference id="pref_ustream" name="extensions.flvideoreplacer.ustream"
type="bool" />
<preference id="pref_other" name="extensions.flvideoreplacer.other"
type="bool" />
<preference id="pref_alertsinfo" name="extensions.flvideoreplacer.alertsinfo"
......@@ -69,7 +67,7 @@
type="bool" />
</preferences>
<vbox style="width:390px;height:300px;overflow:auto;" flex="1">
<vbox style="width:420px;height:320px;overflow:auto;" flex="1">
<tabbox flex="1">
<tabs>
......@@ -254,10 +252,10 @@
<vbox>
<hbox>
<image src="chrome://flvideoreplacer/skin/search24.png"
onmouseover="this.style.cursor='pointer';"
style="cursor:pointer;"
tooltiptext="&Search;" onclick="flvideoreplacerOptions.openFile('&SelectFile;');" />
<image src="chrome://flvideoreplacer/skin/delete24.png"
onmouseover="this.style.cursor='pointer';"
style="cursor:pointer;"
tooltiptext="&Reset;" onclick="flvideoreplacerOptions.resetFile('standalone');" />
</hbox>
</vbox>
......@@ -312,10 +310,10 @@
<vbox>
<hbox>
<image src="chrome://flvideoreplacer/skin/search24.png"
onmouseover="this.style.cursor='pointer';"
style="cursor:pointer;"
tooltiptext="&Search;" onclick="flvideoreplacerOptions.openDir('&SelectDir;');" />
<image src="chrome://flvideoreplacer/skin/delete24.png"
onmouseover="this.style.cursor='pointer';"
style="cursor:pointer;"
tooltiptext="&Reset;" onclick="flvideoreplacerOptions.resetFile('downdir');" />
</hbox>
</vbox>
......@@ -357,8 +355,6 @@
</hbox>
<spacer height="10" flex="0" />
<hbox>
<checkbox label="Ustream" preference="pref_ustream" id="ustream"
size="30" />
<spacer width="10" flex="0"/>
<checkbox label="&Other;" preference="pref_other" id="other"
size="30" onclick="flvideoreplacerOptions.toggleOptions();" />
......
var flvideoreplacerFirstrun = {
init : function() {// get current version from extension manager
"use strict";
// access preferences interface
this.prefs = Components.classes["@mozilla.org/preferences-service;1"]
......@@ -9,9 +11,6 @@ var flvideoreplacerFirstrun = {
try {// Firefox <= 3.6
// store browser version
this.prefs.setIntPref("performance", 3);
var gExtensionManager = Components.classes["@mozilla.org/extensions/manager;1"]
.getService(Components.interfaces.nsIExtensionManager);
var current = gExtensionManager.getItemForID("flvideoreplacer@lovinglinux.megabyet.net").version;
......@@ -20,9 +19,6 @@ var flvideoreplacerFirstrun = {
} catch (e) {// Firefox >=4.0
// store browser version
this.prefs.setIntPref("performance", 4);
Components.utils.import("resource://gre/modules/AddonManager.jsm");
AddonManager.getAddonByID("flvideoreplacer@lovinglinux.megabyet.net", function(addon) {
var current = addon.version;
......@@ -33,6 +29,8 @@ var flvideoreplacerFirstrun = {
},
updateInstall : function(aVersion) {// check version and perform updates
"use strict";
// get osString
var osString = Components.classes["@mozilla.org/network/protocol;1?name=http"]
......@@ -122,7 +120,6 @@ var flvideoreplacerFirstrun = {
if(url.match(/youtube\.com/)
|| url.match(/vimeo\.com/)
|| url.match(/metacafe\.com/)
|| url.match(/ustream\.tv/)
|| url.match(/youporn\.com/)
|| url.match(/pornhub\.com/)
|| url.match(/redtube\.com/)
......@@ -141,6 +138,8 @@ var flvideoreplacerFirstrun = {
},
pluginCheck : function() {
"use strict";
// get osString
var osString = Components.classes["@mozilla.org/network/protocol;1?name=http"]
......@@ -267,6 +266,8 @@ var flvideoreplacerFirstrun = {
},
playerCheck : function() {
"use strict";
// get osString
var osString = Components.classes["@mozilla.org/network/protocol;1?name=http"]
......@@ -487,6 +488,8 @@ var flvideoreplacerFirstrun = {
},
checkTPE: function() {
"use strict";
//access preferences interface
this.prefs = Components.classes["@mozilla.org/preferences-service;1"]
......
......@@ -14,7 +14,6 @@ const FlashVideoReplacerObserver =
if((sourceurl.match(/youtube.*watch.*v\=/) && !sourceurl.match("html5=True"))
|| sourceurl.match(/vimeo\.com\/\d{1,8}/)
|| (sourceurl.match(/metacafe\.com\/watch\//) && !sourceurl.match(/http.*http:\/\/www.metacafe\.com/))
|| sourceurl.match(/ustream\.tv\/recorded\/\d{1,8}/)
|| sourceurl.match(/youporn\.com\/watch\//)
|| sourceurl.match(/pornhub\.com\/view_video.php\?viewkey=/)
|| sourceurl.match(/redtube\.com\/\d{1,8}/)
......
var flvideoreplacerOptions = {
toggleTPE: function() {
"use strict";
//access preferences interface
this.prefs = Components.classes["@mozilla.org/preferences-service;1"]
......@@ -18,6 +20,8 @@ var flvideoreplacerOptions = {
},
toggleMime: function() {
"use strict";
//get osString
var osString = Components.classes["@mozilla.org/network/protocol;1?name=http"]
......@@ -124,6 +128,8 @@ var flvideoreplacerOptions = {
},
togglePlayer: function() {
"use strict";
//access preferences interface
this.prefs = Components.classes["@mozilla.org/preferences-service;1"]
......@@ -189,6 +195,8 @@ var flvideoreplacerOptions = {
},
toggleOptions: function() {
"use strict";
//get osString
var osString = Components.classes["@mozilla.org/network/protocol;1?name=http"]
......@@ -551,6 +559,8 @@ var flvideoreplacerOptions = {
},
resetFile : function(aField) {//reset prefs file paths
"use strict";
//get osString
var osString = Components.classes["@mozilla.org/network/protocol;1?name=http"]
......@@ -590,6 +600,8 @@ var flvideoreplacerOptions = {
},
openFile : function(aText) {//open file and set path in prefs
"use strict";
//access preferences interface
this.prefs = Components.classes["@mozilla.org/preferences-service;1"]
......@@ -610,6 +622,8 @@ var flvideoreplacerOptions = {
},
openDir : function(aText) {//open folder and set path in prefs
"use strict";
//access preferences interface
this.prefs = Components.classes["@mozilla.org/preferences-service;1"]
......
var flvideoreplacerOverlay = {
changePref : function(aPreference,aType,aValue) {
"use strict";
//access preferences interface
this.prefs = Components.classes["@mozilla.org/preferences-service;1"]
......
var flvideoreplacerPlayer = {
startPlayer: function() {//detect video path and start player
"use strict";
//access preferences interface
this.prefs = Components.classes["@mozilla.org/preferences-service;1"]
......
var flvideoreplacerPlugins = {
pluginSwitch: function() {
"use strict";
//access preferences interface
this.prefs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService)
.getBranch("extensions.flvideoreplacer.");
//get plugin compatibility
var pluginmkv = this.prefs.getBoolPref("pluginmkv");
var pluginxth = this.prefs.getBoolPref("pluginxth");
var pluginxtp = this.prefs.getBoolPref("pluginxtp");
var pluginxin = this.prefs.getBoolPref("pluginxin");
var pluginvlc = this.prefs.getBoolPref("pluginvlc");
var pluginwmp = this.prefs.getBoolPref("pluginwmp");
var pluginwmv = this.prefs.getBoolPref("pluginwmv");
var pluginmov = this.prefs.getBoolPref("pluginmov");
var pluginqt = this.prefs.getBoolPref("pluginqt");
var pluginm4v = this.prefs.getBoolPref("pluginm4v");
var pluginmp4 = this.prefs.getBoolPref("pluginmp4");
var pluginflv = this.prefs.getBoolPref("pluginflv");
if(pluginxtp === true){
return "application/x-totem-plugin";
}else{
if(pluginxth === true){
return "video/x-theora";
}else{
if(pluginvlc === true){
return "application/x-vlc-plugin";
}else{
if(pluginxin === true){
return "application/x-xine-plugin";
}else{
if(pluginmkv === true){
return "video/x-matroska";
}else{
if(pluginmp4 === true){
return "video/mp4";
}else{
if(pluginm4v === true){
return "video/x-m4v";
}else{
if(pluginqt === true){
return "video/quicktime";
}else{
if(pluginmov === true){
return "video/x-quicktime";
}else{
if(pluginwmp === true){
return "application/x-mplayer2";
}else{
if(pluginwmv === true){
return "application/x-ms-wmv";
}else{
if(pluginflv === true){
return "application/x-flv";
}else{
return false;
}
}
}
}
}
}
}
}
}
}
}
}
}
};
\ No newline at end of file
var flvideoreplacerUrlBarListener = {
QueryInterface: function(aIID) {
"use strict";
if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
aIID.equals(Components.interfaces.nsISupports))
......@@ -9,6 +12,9 @@ var flvideoreplacerUrlBarListener = {
},
onLocationChange: function(aProgress, aRequest, aURI) {
"use strict";
flvideoreplacerURLBar.processNewURL(aURI);
},
......@@ -23,16 +29,23 @@ var flvideoreplacerURLBar = {
oldURL: null,
init: function() {
"use strict";
//listen for webpage loads
gBrowser.addProgressListener(flvideoreplacerUrlBarListener,
Components.interfaces.nsIWebProgress.NOTIFY_LOCATION);
gBrowser.addProgressListener(flvideoreplacerUrlBarListener);
},
uninit: function() {
"use strict";
gBrowser.removeProgressListener(flvideoreplacerUrlBarListener);
},
processNewURL: function(aURI) {
"use strict";
if (aURI.spec == this.oldURL) {
return;
......@@ -56,7 +69,6 @@ var flvideoreplacerURLBar = {
if(aURI.spec.match(/youtube\.com/)
|| aURI.spec.match(/vimeo\.com/)
|| aURI.spec.match(/metacafe\.com/)
|| aURI.spec.match(/ustream\.tv/)
|| aURI.spec.match(/youporn\.com/)
|| aURI.spec.match(/pornhub\.com/)
|| aURI.spec.match(/redtube\.com/)
......@@ -95,6 +107,7 @@ var flvideoreplacerURLBar = {
var mimetype = this.prefs.getCharPref("filemime");
var baseurl = this.prefs.getCharPref("videourl");
var alertserror = this.prefs