[Trisquel-devel] Rev 43: Updated oneiric's firefox and update-manager in file:///home/bzr/package-helpers/trunk/
Ruben Rodriguez
ruben at trisquel.info
Thu Mar 15 01:04:52 CET 2012
At file:///home/bzr/package-helpers/trunk/
------------------------------------------------------------
revno: 43
revision-id: ruben en trisquel.info-20120315000450-kxdbhznihp6lfi79
parent: ruben en trisquel.info-20120313180819-mk0q46i2xjvdr5x5
committer: Ruben Rodriguez <ruben en trisquel.info>
branch nick: trunk
timestamp: Thu 2012-03-15 01:04:50 +0100
message:
Updated oneiric's firefox and update-manager
------------ pr�xima parte ------------
=== modified file 'helpers/oneiric/make-firefox'
--- a/helpers/oneiric/make-firefox 2012-03-12 02:26:50 +0000
+++ b/helpers/oneiric/make-firefox 2012-03-15 00:04:50 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=3
+VERSION=5
QUILT=skip
. ./config
@@ -84,6 +84,10 @@
replace PACKAGES/abrowser PACKAGES/firefox .
sed s/Trisquel/Mozilla/ debian/compare-locales/scripts/compare-locales debian/compare-locales/scripts/test-locales -i
replace "iceweasel, abrowser" "iceweasel, firefox" .
+replace "Replaces: abrowser" "Replaces: firefox" .
+sed s/Ubuntu/Trisquel/g debian/rules -i
+sed s/ubuntu/trisquel/g debian/distribution.ini debian/mozconfig.in debian/config/mozconfig.in -i
+sed 's/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel 4.0/; s/1010/40/' -i debian/abrowser.postinst.in
# Redirect feedback menu
sed s:input.mozilla.com/feedback:trisquel.info/contact: -i mozilla/browser/base/content/utilityOverlay.js
@@ -217,6 +221,9 @@
pref("general.useragent.vendorComment", "$CODENAME");
pref("general.useragent.vendorSub", "$REVISION");
+// Set useragent to Firefox compatible
+pref("general.useragent.compatMode.abrowser",true);
+
pref ("browser.startup.page" , 3);
//user_pref ("browser.startup.homepage" , "http://trisquel.info");
user_pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
@@ -324,6 +331,9 @@
replace "Trisquel Corporation" "Mozilla Corporation" .
sed -i 's/iceweasel, abrowser, icecat,/iceweasel, firefox, icecat,/g' debian/control*
+# Restore useragent to Firefox
+sed '/MOZ_UA_ABROWSER_VERSION/ s:Abrowser/:Firefox/:;' -i mozilla/netwerk/protocol/http/nsHttpHandler.cpp
+
tar -cjf $TARBALL mozilla
rm mozilla -rf
#cp $DATA/control debian/control
=== modified file 'helpers/oneiric/make-update-manager'
--- a/helpers/oneiric/make-update-manager 2012-03-13 18:08:19 +0000
+++ b/helpers/oneiric/make-update-manager 2012-03-15 00:04:50 +0000
@@ -21,7 +21,7 @@
# gpg -ba release_name.tar.gz
# Also, don't forget to update the meta-release files at archive and packages.t.i
-VERSION=2
+VERSION=3
. ./config
@@ -229,7 +229,7 @@
ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
# hints for for stuff that should be done early
PostUpgradePurge=ltsp-client, ltspfsd
-PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp
+PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp, gdm, gnome-session gnome-shell abrowser-globalmenu appmenu-gtk3 appmenu-gtk
PostUpgradeUpgrade=brasero
#PostUpgradeInstall=apt
PostInstallScripts=./trisquel-postinstall.sh
@@ -247,9 +247,9 @@
# information about the individual meta-pkgs
[trisquel]
-KeyDependencies=gdm, trisquel-gtk-theme, trisquel-sounds
+KeyDependencies=lightdm, trisquel-gtk-theme, trisquel-sounds
# those pkgs will be marked remove right after the distUpgrade in the cache
-PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
+PostUpgradeRemove=gdm, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner,
ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount
[trisquel-mini]
@@ -302,7 +302,7 @@
sed -i 's:/archive.trisquel.info/:/es.archive.trisquel.info/:g; s/extras//g;' /etc/apt/sources.list
-[ -f /boot/grub/menu.lst ] && sed 's/Trisquel 4.5,/Trisquel 5.0,/g' /boot/grub/menu.lst -i
+[ -f /boot/grub/menu.lst ] && sed 's/Trisquel.*,/Trisquel 5.5,/g' /boot/grub/menu.lst -i
if ! [ -f /etc/grub.d/01_PASSWORD ]; then
cat << EOF > /etc/grub.d/01_PASSWORD
@@ -315,6 +315,13 @@
echo password grub \$(bash -c 'echo \$RANDOM')
EOF
fi
+chmod 700 /etc/grub.d/01_PASSWORD
+
+# Let's do some extra purging
+export DEBIAN_FRONTEND=noninteractive
+apt-get -y --force-yes remove gdm gnome-session gnome-shell abrowser-globalmenu appmenu-gtk3 appmenu-gtk gnome-screensaver
+dpkg -l trisquel |grep ii -q && apt-get -y --force-yes install trisquel-recommended
+dpkg -l trisquel-mini |grep ii -q && apt-get -y --force-yes install trisquel-mini-recommended
update-initramfs -u
update-grub
=== modified file 'makepackage'
--- a/makepackage 2012-03-12 02:26:50 +0000
+++ b/makepackage 2012-03-15 00:04:50 +0000
@@ -153,8 +153,23 @@
fi
}
+tmpumount(){
+[ $PACKAGE = "linux" ] && return
+ umount jails/$DISTRO-$ARCH/tmp && return
+ fuser -k -m jails/$DISTRO-$ARCH/tmp
+ umount jails/$DISTRO-$ARCH/tmp && return
+ echo ERROR: could not umount tmpfs at jails/$DISTRO-$ARCH/tmp
+ exit 1
+}
+tmpmount(){
+[ $PACKAGE = "linux" ] && return
+ grep jails/$DISTRO-$ARCH/tmp /proc/mounts -q && tmpumount
+ mount -t tmpfs -o size=15G none jails/$DISTRO-$ARCH/tmp
+}
+
compile(){
[ -d jails/$DISTRO-$ARCH/$WORKDIR ] && rm -rf jails/$DISTRO-$ARCH/$WORKDIR/
+tmpmount
cp -a helpers/$DISTRO/ jails/$DISTRO-$ARCH/$WORKDIR/
cat << EOF > jails/$DISTRO-$ARCH/usr/local/sbin/makepackage-handler
@@ -200,6 +215,7 @@
exit 1
fi
find jails/$DISTRO-$ARCH/$WORKDIR/PACKAGES/$PACKAGE/ -maxdepth 1 -type f -exec cp {} $REPOSITORY/incoming/ \;
+tmpumount
}
ARCH=i386 prepare
More information about the Trisquel-devel
mailing list