Commit 8be30a10 authored by Ruben Rodriguez's avatar Ruben Rodriguez

Updated deja-dup firefox gfxboot-theme-ubuntu gnome-control-center gnome-menus...

Updated deja-dup firefox gfxboot-theme-ubuntu gnome-control-center gnome-menus gnome-panel gnome-session kdenetwork casper compiz
parent b3a74adb
=== modified file 'metadata/core.xml.in'
Index: compiz-0.9.7.4/metadata/core.xml.in
===================================================================
--- compiz-0.9.7.4.orig/metadata/core.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/metadata/core.xml.in 2012-04-05 12:43:06.231451763 +0200
@@ -138,7 +138,7 @@
<option name="focus_prevention_match" type="match">
<_short>Focus Prevention Windows</_short>
<_long>Focus prevention windows</_long>
- <default>any</default>
+ <default>!(class=Polkit-gnome-authentication-agent-1)</default>
</option>
</group>
<group>
@@ -173,7 +173,7 @@
<option name="minimize_window_key" type="key">
<_short>Minimize Window</_short>
<_long>Minimize active window</_long>
- <default>&lt;Alt&gt;F9</default>
+ <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
</option>
<option name="minimize_window_button" type="button">
<_short>Minimize Window</_short>
@@ -182,12 +182,12 @@
<option name="maximize_window_key" type="key">
<_short>Maximize Window</_short>
<_long>Maximize active window</_long>
- <default>&lt;Alt&gt;F10</default>
+ <default>&lt;Control&gt;&lt;Super&gt;Up</default>
</option>
<option name="unmaximize_window_key" type="key">
<_short>Unmaximize Window</_short>
<_long>Unmaximize active window</_long>
- <default>&lt;Alt&gt;F5</default>
+ <default>&lt;Control&gt;&lt;Super&gt;Down</default>
</option>
<option name="maximize_window_horizontally_key" type="key">
<_short>Maximize Window Horizontally</_short>
@@ -210,7 +210,7 @@
<option name="show_desktop_key" type="key">
<_short>Show Desktop</_short>
<_long>Hide all windows and focus desktop</_long>
- <default>&lt;Control&gt;&lt;Alt&gt;d</default>
+ <default>&lt;Control&gt;&lt;Super&gt;d</default>
</option>
<option name="show_desktop_edge" type="edge">
<_short>Show Desktop</_short>
@@ -220,6 +220,7 @@
<option name="toggle_window_maximized_key" type="key">
<_short>Toggle Window Maximized</_short>
<_long>Toggle active window maximized</_long>
+ <default>&lt;Control&gt;&lt;Alt&gt;KP_5</default>
</option>
<option name="toggle_window_maximized_button" type="button">
<_short>Toggle Window Maximized</_short>
@@ -244,14 +245,14 @@
<option name="hsize" type="int">
<_short>Horizontal Virtual Size</_short>
<_long>Screen size multiplier for horizontal virtual size</_long>
- <default>4</default>
+ <default>2</default>
<min>1</min>
<max>32</max>
</option>
<option name="vsize" type="int">
<_short>Vertical Virtual Size</_short>
<_long>Screen size multiplier for vertical virtual size</_long>
- <default>1</default>
+ <default>2</default>
<min>1</min>
<max>32</max>
</option>
Index: compiz-0.9.7.4/plugins/fade/fade.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/fade/fade.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/fade/fade.xml.in 2012-04-05 12:43:06.247451838 +0200
@@ -9,6 +9,7 @@
</requirement>
<relation type="after">
<plugin>decor</plugin>
+ <plugin>staticswitcher</plugin>
</relation>
<relation type="before">
<plugin>cube</plugin>
@@ -49,7 +50,7 @@
<option name="window_match" type="match">
<_short>Fade windows</_short>
<_long>Windows that should be fading</_long>
- <default>any</default>
+ <default>any &amp; !(title=notify-osd)</default>
</option>
<option name="visual_bell" type="bell">
<_short>Visual Bell</_short>
Index: compiz-0.9.7.4/plugins/place/place.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/place/place.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/place/place.xml.in 2012-04-05 12:43:06.247451838 +0200
@@ -19,8 +19,8 @@
<option name="mode" type="int">
<_short>Placement Mode</_short>
<_long>Algorithm to use for window placement</_long>
- <default>0</default>
- <min>2</min>
+ <default>2</default>
+ <min>0</min>
<max>5</max>
<desc>
<value>0</value>
Index: compiz-0.9.7.4/plugins/resize/resize.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/resize/resize.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/resize/resize.xml.in 2012-04-05 12:43:06.247451838 +0200
@@ -28,7 +28,7 @@
<option name="mode" type="int">
<_short>Default Resize Mode</_short>
<_long>Default mode used for window resizing</_long>
- <default>0</default>
+ <default>2</default>
<min>0</min>
<max>3</max>
<desc>
Index: compiz-0.9.7.4/plugins/scale/scale.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/scale/scale.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/scale/scale.xml.in 2012-04-05 12:43:51.243674966 +0200
@@ -18,14 +18,14 @@
<option name="spacing" type="int">
<_short>Spacing</_short>
<_long>Space between windows</_long>
- <default>10</default>
+ <default>68</default>
<min>0</min>
<max>250</max>
</option>
<option name="speed" type="float">
<_short>Speed</_short>
<_long>Scale speed</_long>
- <default>1.5</default>
+ <default>2.4</default>
<min>0.1</min>
<max>50</max>
<precision>0.1</precision>
@@ -33,7 +33,7 @@
<option name="timestep" type="float">
<_short>Timestep</_short>
<_long>Scale timestep</_long>
- <default>1.2</default>
+ <default>0.1</default>
<min>0.1</min>
<max>50</max>
<precision>0.1</precision>
@@ -46,7 +46,7 @@
<option name="opacity" type="int">
<_short>Opacity</_short>
<_long>Amount of opacity in percent</_long>
- <default>75</default>
+ <default>100</default>
<min>0</min>
<max>100</max>
</option>
@@ -55,7 +55,7 @@
<_long>Overlay an icon on windows once they are scaled</_long>
<min>0</min>
<max>2</max>
- <default>1</default>
+ <default>0</default>
<desc>
<value>0</value>
<_name>None</_name>
@@ -96,7 +96,7 @@
<_long>Selects where windows are scaled if multiple output devices are used.</_long>
<min>0</min>
<max>1</max>
- <default>0</default>
+ <default>1</default>
<desc>
<value>0</value>
<_name>On current output device</_name>
@@ -112,7 +112,7 @@
<option name="key_bindings_toggle" type="bool">
<_short>Key Bindings Toggle Scale Mode</_short>
<_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long>
- <default>false</default>
+ <default>true</default>
</option>
<option name="button_bindings_toggle" type="bool">
<_short>Button Bindings Toggle Scale Mode</_short>
@@ -122,9 +122,6 @@
<option name="initiate_edge" type="edge">
<_short>Initiate Window Picker</_short>
<_long>Layout and start transforming windows</_long>
- <default>
- <edge name="TopRight"/>
- </default>
<allowed edgednd="true"/>
</option>
<option name="initiate_key" type="key">
@@ -148,6 +145,7 @@
<option name="initiate_all_key" type="key">
<_short>Initiate Window Picker For All Windows</_short>
<_long>Layout and start transforming all windows</_long>
+ <default>&lt;Super&gt;w</default>
</option>
<option name="initiate_group_edge" type="edge">
<_short>Initiate Window Picker For Window Group</_short>
@@ -178,7 +176,7 @@
<option name="show_desktop" type="bool">
<_short>Click Desktop to Show Desktop</_short>
<_long>Enter Show Desktop mode when Desktop is clicked during Scale</_long>
- <default>true</default>
+ <default>false</default>
</option>
</group>
</options>
Index: compiz-0.9.7.4/plugins/decor/decor.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/decor/decor.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/decor/decor.xml.in 2012-04-05 12:43:06.247451838 +0200
@@ -30,7 +30,7 @@
<option name="active_shadow_opacity" type="float">
<_short>Shadow Opacity</_short>
<_long>Drop shadow opacity</_long>
- <default>0.5</default>
+ <default>0.8</default>
<min>0.01</min>
<max>6.0</max>
<precision>0.01</precision>
@@ -65,7 +65,7 @@
<option name="inactive_shadow_radius" type="float">
<_short>Shadow Radius</_short>
<_long>Drop shadow radius</_long>
- <default>8.0</default>
+ <default>5.0</default>
<min>0.1</min>
<max>13.0</max>
<precision>0.1</precision>
@@ -73,7 +73,7 @@
<option name="inactive_shadow_opacity" type="float">
<_short>Shadow Opacity</_short>
<_long>Drop shadow opacity</_long>
- <default>0.5</default>
+ <default>0.4</default>
<min>0.01</min>
<max>6.0</max>
<precision>0.01</precision>
@@ -100,6 +100,7 @@
<option name="command" type="string">
<_short>Command</_short>
<_long>Decorator command line that is executed if no decorator is already running</_long>
+ <default>/usr/bin/compiz-decorator</default>
</option>
<option name="mipmap" type="bool">
<_short>Mipmap</_short>
Index: compiz-0.9.7.4/plugins/gnomecompat/gnomecompat.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/gnomecompat/gnomecompat.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/gnomecompat/gnomecompat.xml.in 2012-04-05 12:43:06.247451838 +0200
@@ -52,6 +52,7 @@
<option name="run_command_terminal_key" type="key">
<_short>Open a terminal</_short>
<_long>Open a terminal</_long>
+ <default>&lt;Control&gt;&lt;Alt&gt;T</default>
</option>
</group>
</options>
#!/bin/sh
#
# Copyright (C) 2012 Rubén Rodríguez <ruben@trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
sed '/v3/ s/$/\npgrep orca || exit/' ubiquity-hooks/30accessibility -i
changelog "Compiled for Trisquel"
compile
#!/bin/sh
#
# Copyright (C) 2012 Rubén Rodríguez <ruben@trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=2
. ./config
cp $DATA/config.patch debian/patches/config.patch
sed 's/ubuntu-config/config/' -i debian/patches/series
changelog "Removed Ubuntu customizations for Unity"
compile
......@@ -23,7 +23,7 @@ COMPONENT=main
. ./config
sed -i "s:<default>'auto'</default>:<default>'file'</default>:" data/org.gnome.DejaDup.gschema.xml.in
sed -i 's/Categories.*/Categories=Application;System;Settings/g' data/deja-dup*desktop*
sed -i 's/Categories.*/Categories=Application;System;Settings;/g' data/deja-dup*desktop*
changelog "Compiled for Trisquel"
......
......@@ -17,13 +17,14 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
QUILT=skip
VERSION=2
. ./config
rm debian/control
# Make ubufox mandatory
sed 's/Depends: lsb-release,/Depends: lsb-release, xul-ext-ubufox,/' -i debian/control debian/control.in
sed 's/Depends: lsb-release,/Depends: lsb-release, xul-ext-ubufox,/' -i debian/control.in
sed 's/iceweasel,/iceweasel, firefox, icecat,/' -i debian/control*
# Remove extra firefox metapackages
......@@ -59,7 +60,9 @@ sed "s/\(^MOZ_BUILD_UNOFFICIAL.*\)0/\1 1/; s/release$/$CODENAME/" -i debian/rule
#TARBALL=$(ls *.tar.bz2)
#tar -jxf $TARBALL
#rm $TARBALL
sed "s/^MOZ_APP_NAME\t.*/MOZ_APP_NAME\t\t:= abrowser/; s/firefox/abrowser/" debian/rules -i
#sed "s/^MOZ_APP_NAME\t.*/MOZ_APP_NAME\t\t:= abrowser/; s/firefox/abrowser/" debian/rules -i
sed '1s/^/\nMOZ_APP_NAME\t\t:= abrowser/' -i debian/build/mozbuild.mk
sed '1s/^/\nMOZ_PKG_NAME\t\t:= abrowser/' -i debian/build/mozbuild.mk
# Hack to avoid compilation to fail on 3.0x kernel
#cp mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux3.0.mk
......@@ -293,7 +296,6 @@ done
fi
exit 0 ' >> debian/abrowser.postinst.in
rm debian/control
debian/rules debian/control
changelog "Rebranded for Trisquel"
......
......@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
VERSION=2
. ./config
......@@ -55,7 +55,47 @@ replace "Enterprise Cloud" "Gamer" .
replace Ubuntu Trisquel .
sed /txt_option_free/d dia_fulloptions.inc -i
sed 's:\(.*\)120\(.*\):\181\2\n/timeout.time.x timeout.x 550 add def:' timeout.inc -i
#sed 's:\(.*\)120\(.*\):\181\2\n/timeout.time.x timeout.x 550 add def:' timeout.inc -i
cat << EOF | patch -p1
diff -ru gfxboot-theme-ubuntu-0.13.3.orig/common.inc gfxboot-theme-ubuntu-0.13.3/common.inc
--- gfxboot-theme-ubuntu-0.13.3.orig/common.inc 2012-05-14 23:53:21.000000000 +0000
+++ gfxboot-theme-ubuntu-0.13.3/common.inc 2012-11-10 22:00:04.000000000 +0000
@@ -431,6 +431,10 @@
"maybe-ubiquity " bc.cmd dup length add sprintf
} if
+ timeout.finished {
+ " access=v3 " bc.cmd dup length add sprintf
+ } if
+
bc.cmd dropspaces
debug 3 ge {
diff -ru gfxboot-theme-ubuntu-0.13.3.orig/timeout.inc gfxboot-theme-ubuntu-0.13.3/timeout.inc
--- gfxboot-theme-ubuntu-0.13.3.orig/timeout.inc 2012-05-14 23:53:21.000000000 +0000
+++ gfxboot-theme-ubuntu-0.13.3/timeout.inc 2012-11-10 23:17:37.000000000 +0000
@@ -24,6 +24,10 @@
timeout.time.x timeout.time.y moveto timeout.buf showright
} if
+
+ timeout.buf "0 s" eq {
+ /timeout.finished true def
+ } if
} def
@@ -38,6 +42,8 @@
/timeout.time.x timeout.x def
/timeout.time.y timeout.y 120 add def
+ /timeout.time.y timeout.y 81 add def
+ /timeout.time.x timeout.x 550 add def
} def
EOF
sed 's/gfxboot-theme-ubuntu/gfxboot-theme-trisquel/' debian/control -i
......
......@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
VERSION=2
COMPONENT=main
. ./config
......@@ -35,7 +35,7 @@ rm ./debian/patches/53_use_ubuntu_help.patch
sed /use_ubuntu_help/d -i debian/patches/series
# Add Trisquel to the hardcoded list of gtk3 themes
#sed 's/"Adwaita"/"Trisquel", "Adwaita"/' -i debian/patches/04_add_theme_selection.patch
sed 's/"Adwaita"/"Trisquel", "Adwaita"/' -i debian/patches/04_new_appearance_settings.patch
# Edit menu selections
cp $DATA/gnomecc.menu.in shell/gnomecc.menu.in
......
......@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
VERSION=3
COMPONENT=main
. ./config
......@@ -26,13 +26,13 @@ COMPONENT=main
#echo 99_trisquel_defaults.patch >> debian/patches/series
#sed -i 's/ubuntu-software-center/gnome-app-install/' debian/patches/09_app_install_entry.patch
for i in 03_kde-legacydirs.patch 05_debian_menu.patch 09_app_install_entry.patch 09_games-menu.patch 11_science-menu.patch
for i in 03_kde-legacydirs.patch 05_debian_menu.patch 09_app_install_entry.patch 09_games-menu.patch 11_science-menu.patch 08_settings-menus.patch
do
rm debian/patches/$i
sed /$i/d -i debian/patches/series
done
#cp $DATA/applications.menu layout/applications.menu
cp $DATA/applications.menu layout/applications.menu
changelog "Default layout adapted for Trisquel"
......
......@@ -17,12 +17,13 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=3
VERSION=5
. ./config
sed "105s/'none'/'color'/; s/rgba(255,255,255,.2)/rgba(000,000,000,.75)/" -i data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
#sed "105s/'none'/'image'/; 115s_''_'file:///usr/share/themes/Trisquel/gtk-3.0/panel-bg.png'_; s/rgba(255,255,255,.2)/rgba(000,000,000,.5)/" -i data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
#makes the panel translucid
#sed "105s/'none'/'color'/; s/rgba(255,255,255,.2)/rgba(000,000,000,.75)/" -i data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
#remove the arrot in the main menu button
sed 's/"tooltip", tooltip,/"tooltip", "Trisquel",/; s/"has-arrow", TRUE,/"has-arrow", FALSE,/' -i gnome-panel/panel-menu-button.c
#sed '/gnome-session /d' debian/control*
......@@ -63,11 +64,11 @@ pack-index=30
pack-type=start
toplevel-id=panel
[Object notification-area]
object-iid=NotificationAreaAppletFactory::NotificationArea
pack-index=20
pack-type=end
[Object indicators]
object-iid=IndicatorAppletFactory::IndicatorApplet
toplevel-id=panel
pack-type=end
pack-index=20
[Object clock]
object-iid=ClockAppletFactory::ClockApplet
......
......@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
VERSION=8
COMPONENT=main
QUILT=skip
......@@ -32,9 +32,47 @@ sed 's/unity.*/gnome-shell (>= 3.0),/' -i debian/control*
#% Replace gnome-classic session with gnome-fallback
cat << EOF > debian/gnome-session-fallback.install
debian/scripts/gnome-session-classic /usr/bin
debian/scripts/trisquel-wm /usr/bin
debian/scripts/trisquel-wm.desktop /usr/share/applications
debian/tmp/usr/share/xsessions/gnome-classic.desktop
debian/tmp/usr/share/gnome-session/sessions/gnome-classic.session
EOF
#% Add a wrapper for compiz
cat << EOF > debian/scripts/trisquel-wm
#!/bin/sh
WM=compiz
FALLBACK=openbox
which metacity && FALLBACK=metacity
which compiz || WM=\$FALLBACK
[ -f ~/.disable-compiz ] && WM=\$FALLBACK
grep access=v3 /proc/cmdline -q && WM=\$FALLBACK
[ \$(gsettings get org.gnome.desktop.a11y.applications screen-reader-enabled) = "true" ] && WM=\$FALLBACK
# Ugly hack to fix a hard to catch race condition
if gconftool --get /apps/metacity/general/titlebar_font |grep -q Cantarell
then
if ! [ -f /usr/share/fonts/opentype/cantarell/Cantarell-Bold.otf ]
then
echo The gconf db seems corrupted, saving at ~/.gconf.broken and cleaning it up
cp -a ~/.gconf ~/.gconf.broken
gconftool --recursive-unset /
fi
fi
/usr/lib/gnome-session/gnome-session-check-accelerated && exec \$WM || exec \$FALLBACK
EOF
chmod 755 debian/scripts/trisquel-wm
cat << EOF > debian/scripts/trisquel-wm.desktop
[Desktop Entry]
Type=Application
Name=trisquel-wm
Exec=trisquel-wm
NoDisplay=true
X-GNOME-Provides=windowmanager
EOF
mv debian/scripts/gnome-session-fallback debian/scripts/gnome-session-classic
sed s/fallback/classic/g debian/scripts/gnome-session-classic -i
cat << EOF > data/gnome-classic.session.desktop.in.in
......@@ -42,7 +80,7 @@ cat << EOF > data/gnome-classic.session.desktop.in.in
Name=Trisquel
RequiredComponents=gnome-panel;gnome-settings-daemon;
RequiredProviders=windowmanager;
DefaultProvider-windowmanager=metacity
DefaultProvider-windowmanager=trisquel-wm
DesktopName=GNOME
EOF
......
......@@ -26,8 +26,8 @@ sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' kopete/protocols/CMakeLists.
sed -i '/skype/d; /callto/d; /tel.protocol/d' debian/kopete.install
rm -rf kopete/protocols/skype
sed 's/, Skype//' -i ./doc/kopete/index.docbook
rm debian/patches/no_home_set.diff
sed /no_home_set/d debian/patches/series -i
#rm debian/patches/no_home_set.diff
#sed /no_home_set/d debian/patches/series -i
changelog "Compiled for Trisquel"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment