Commit 8be30a10 by 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
#!/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 ...@@ -23,7 +23,7 @@ COMPONENT=main
. ./config . ./config
sed -i "s:<default>'auto'</default>:<default>'file'</default>:" data/org.gnome.DejaDup.gschema.xml.in 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" changelog "Compiled for Trisquel"
......
...@@ -17,13 +17,14 @@ ...@@ -17,13 +17,14 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=1 VERSION=2
QUILT=skip
. ./config . ./config
rm debian/control
# Make ubufox mandatory # 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* sed 's/iceweasel,/iceweasel, firefox, icecat,/' -i debian/control*
# Remove extra firefox metapackages # Remove extra firefox metapackages
...@@ -59,7 +60,9 @@ sed "s/\(^MOZ_BUILD_UNOFFICIAL.*\)0/\1 1/; s/release$/$CODENAME/" -i debian/rule ...@@ -59,7 +60,9 @@ sed "s/\(^MOZ_BUILD_UNOFFICIAL.*\)0/\1 1/; s/release$/$CODENAME/" -i debian/rule
#TARBALL=$(ls *.tar.bz2) #TARBALL=$(ls *.tar.bz2)
#tar -jxf $TARBALL #tar -jxf $TARBALL
#rm $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 # Hack to avoid compilation to fail on 3.0x kernel
#cp mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux3.0.mk #cp mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux3.0.mk
...@@ -293,7 +296,6 @@ done ...@@ -293,7 +296,6 @@ done
fi fi
exit 0 ' >> debian/abrowser.postinst.in exit 0 ' >> debian/abrowser.postinst.in
rm debian/control
debian/rules debian/control debian/rules debian/control
changelog "Rebranded for Trisquel" changelog "Rebranded for Trisquel"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=1 VERSION=2
. ./config . ./config
...@@ -55,7 +55,47 @@ replace "Enterprise Cloud" "Gamer" . ...@@ -55,7 +55,47 @@ replace "Enterprise Cloud" "Gamer" .
replace Ubuntu Trisquel . replace Ubuntu Trisquel .
sed /txt_option_free/d dia_fulloptions.inc -i 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 sed 's/gfxboot-theme-ubuntu/gfxboot-theme-trisquel/' debian/control -i
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=1 VERSION=2
COMPONENT=main COMPONENT=main
. ./config . ./config
...@@ -35,7 +35,7 @@ rm ./debian/patches/53_use_ubuntu_help.patch ...@@ -35,7 +35,7 @@ rm ./debian/patches/53_use_ubuntu_help.patch
sed /use_ubuntu_help/d -i debian/patches/series sed /use_ubuntu_help/d -i debian/patches/series
# Add Trisquel to the hardcoded list of gtk3 themes # 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 # Edit menu selections
cp $DATA/gnomecc.menu.in shell/gnomecc.menu.in cp $DATA/gnomecc.menu.in shell/gnomecc.menu.in
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=1 VERSION=3
COMPONENT=main COMPONENT=main
. ./config . ./config
...@@ -26,13 +26,13 @@ COMPONENT=main ...@@ -26,13 +26,13 @@ COMPONENT=main
#echo 99_trisquel_defaults.patch >> debian/patches/series #echo 99_trisquel_defaults.patch >> debian/patches/series
#sed -i 's/ubuntu-software-center/gnome-app-install/' debian/patches/09_app_install_entry.patch #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 do
rm debian/patches/$i rm debian/patches/$i
sed /$i/d -i debian/patches/series sed /$i/d -i debian/patches/series
done done
#cp $DATA/applications.menu layout/applications.menu cp $DATA/applications.menu layout/applications.menu
changelog "Default layout adapted for Trisquel" changelog "Default layout adapted for Trisquel"
......
...@@ -17,12 +17,13 @@ ...@@ -17,12 +17,13 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=3 VERSION=5
. ./config . ./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 #makes the panel translucid
#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 #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 '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* #sed '/gnome-session /d' debian/control*
...@@ -63,11 +64,11 @@ pack-index=30 ...@@ -63,11 +64,11 @@ pack-index=30
pack-type=start pack-type=start
toplevel-id=panel toplevel-id=panel
[Object notification-area] [Object indicators]
object-iid=NotificationAreaAppletFactory::NotificationArea object-iid=IndicatorAppletFactory::IndicatorApplet
pack-index=20
pack-type=end
toplevel-id=panel toplevel-id=panel
pack-type=end
pack-index=20
[Object clock] [Object clock]
object-iid=ClockAppletFactory::ClockApplet object-iid=ClockAppletFactory::ClockApplet
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=1 VERSION=8
COMPONENT=main COMPONENT=main
QUILT=skip QUILT=skip
...@@ -32,9 +32,47 @@ sed 's/unity.*/gnome-shell (>= 3.0),/' -i debian/control* ...@@ -32,9 +32,47 @@ sed 's/unity.*/gnome-shell (>= 3.0),/' -i debian/control*
#% Replace gnome-classic session with gnome-fallback #% Replace gnome-classic session with gnome-fallback
cat << EOF > debian/gnome-session-fallback.install cat << EOF > debian/gnome-session-fallback.install
debian/scripts/gnome-session-classic /usr/bin 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/xsessions/gnome-classic.desktop
debian/tmp/usr/share/gnome-session/sessions/gnome-classic.session debian/tmp/usr/share/gnome-session/sessions/gnome-classic.session
EOF 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 mv debian/scripts/gnome-session-fallback debian/scripts/gnome-session-classic
sed s/fallback/classic/g debian/scripts/gnome-session-classic -i sed s/fallback/classic/g debian/scripts/gnome-session-classic -i
cat << EOF > data/gnome-classic.session.desktop.in.in cat << EOF > data/gnome-classic.session.desktop.in.in
...@@ -42,7 +80,7 @@ cat << EOF > data/gnome-classic.session.desktop.in.in ...@@ -42,7 +80,7 @@ cat << EOF > data/gnome-classic.session.desktop.in.in
Name=Trisquel Name=Trisquel
RequiredComponents=gnome-panel;gnome-settings-daemon; RequiredComponents=gnome-panel;gnome-settings-daemon;
RequiredProviders=windowmanager; RequiredProviders=windowmanager;
DefaultProvider-windowmanager=metacity DefaultProvider-windowmanager=trisquel-wm
DesktopName=GNOME DesktopName=GNOME
EOF EOF
......
...@@ -26,8 +26,8 @@ sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' kopete/protocols/CMakeLists. ...@@ -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 sed -i '/skype/d; /callto/d; /tel.protocol/d' debian/kopete.install
rm -rf kopete/protocols/skype rm -rf kopete/protocols/skype
sed 's/, Skype//' -i ./doc/kopete/index.docbook sed 's/, Skype//' -i ./doc/kopete/index.docbook
rm debian/patches/no_home_set.diff #rm debian/patches/no_home_set.diff
sed /no_home_set/d debian/patches/series -i #sed /no_home_set/d debian/patches/series -i
changelog "Compiled for Trisquel" 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