[Debian-eeepc-commits] [SCM] A live-helper based Debian live & installer image for the Eee PC. branch, master, updated. 1.0b1-26-ge9fa7d5

Sun Aug 2 18:43:15 UTC 2009

The following commit has been merged in the master branch:
commit 2e37c604cc0f8a5c43bb838a632b5027c8938f85
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Aug 2 15:42:02 2009 -0300

    Some substitutions of apps/media used for the demo

diff --git a/Changelog b/Changelog
index 094fc01..5e58a96 100644
--- a/Changelog
+++ b/Changelog
@@ -4,9 +4,8 @@
    media being as small as 241M instead of the reported 256M
    and to reserve some space for future addition of installer.
    * Removed packages: amsn, smplayer, tunapie, streamripper,
-     audacious, pidgin.
- * Add ayttm as a much smaller alternative to pidgin.
- * Add mozilla-noscript to improve user web experience.
+     audacious, pidgin, clive.
+ * Add irssi as a replacement messaging client.
  * Use acpid from undebian repo instead of from sid.
  * Turn on screenshots in mplayer.
  * Include images in UsersGuide for offine viewing.
@@ -15,9 +14,6 @@
  * Use standard package list instead of minimal, which disables
    stripping out man, as the space savings is not worth the
    loss of functionality.
- * Include patch for ayttm.desktop to put it in the Network
-   category.
- * Configure ayttm to autojoin #debian-eeepc.
  * Rebuild against panthera's 2.6.30 kernel backport.
  * Include non-free firmware-ralink for rt2860.
  * Add zenity for some demo dialogs.
diff --git a/config/chroot_local-includes/etc/iceweasel/profile/prefs.js b/config/chroot_local-includes/etc/iceweasel/profile/prefs.js
index c402f0a..d693dee 100644
--- a/config/chroot_local-includes/etc/iceweasel/profile/prefs.js
+++ b/config/chroot_local-includes/etc/iceweasel/profile/prefs.js
@@ -8,4 +8,4 @@
  * To make a manual change to preferences, you can visit the URL about:config
  * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
  */
-user_pref("browser.startup.homepage", "file:///usr/local/share/eeepc-live/wiki.debian.org/DebianEeePC/Live/UsersGuide.html");
+user_pref("browser.startup.homepage", "file:///usr/local/share/eeepc-live/wiki.debian.org/DebianEeePC/Live/UsersGuide.html#Abrieftour");
diff --git a/config/chroot_local-includes/etc/skel/.ayttm/accounts b/config/chroot_local-includes/etc/skel/.ayttm/accounts
deleted file mode 100755
index 34cd6b8..0000000
--- a/config/chroot_local-includes/etc/skel/.ayttm/accounts
+++ /dev/null
@@ -1,12 +0,0 @@
-# Ayttm's Local Account file
-# Edit only if you know what you're doing
-# Passwords are obfuscated, not encrypted
-
-<ACCOUNT IRC>
-	SCREEN_NAME="EeePCLive"
-	CONNECT="1"
-	irc_host="irc.oftc.net"
-	irc_port="6667"
-	enc_type="2"
-	password_encoded=""
-</ACCOUNT>
diff --git a/config/chroot_local-includes/etc/skel/.ayttm/chatroom_autoconnect b/config/chroot_local-includes/etc/skel/.ayttm/chatroom_autoconnect
deleted file mode 100644
index a5869eb..0000000
--- a/config/chroot_local-includes/etc/skel/.ayttm/chatroom_autoconnect
+++ /dev/null
@@ -1 +0,0 @@
-IRC	EeePCLive	#debian-eeepc	1	--
diff --git a/config/chroot_local-includes/etc/skel/.ayttm/chatroom_mru b/config/chroot_local-includes/etc/skel/.ayttm/chatroom_mru
deleted file mode 100644
index 167d716..0000000
--- a/config/chroot_local-includes/etc/skel/.ayttm/chatroom_mru
+++ /dev/null
@@ -1 +0,0 @@
-#debian-eeepc
diff --git a/config/chroot_local-includes/etc/skel/.ayttm/contact_actions_queue b/config/chroot_local-includes/etc/skel/.ayttm/contact_actions_queue
deleted file mode 100644
index e69de29..0000000
diff --git a/config/chroot_local-includes/etc/skel/.ayttm/contacts b/config/chroot_local-includes/etc/skel/.ayttm/contacts
deleted file mode 100755
index e69de29..0000000
diff --git a/config/chroot_local-includes/etc/skel/.ayttm/prefs b/config/chroot_local-includes/etc/skel/.ayttm/prefs
deleted file mode 100644
index bd1e0fe..0000000
--- a/config/chroot_local-includes/etc/skel/.ayttm/prefs
+++ /dev/null
@@ -1,166 +0,0 @@
-x_contact_window=441
-y_contact_window=144
-status_show_level=2
-do_typing_notify=1
-do_send_typing_notify=1
-do_escape_close=1
-do_convo_timestamp=0
-do_enter_send=1
-do_ignore_unknown=0
-do_multi_line=1
-do_raise_window=0
-do_smiley=1
-do_send_idle_time=0
-do_timestamp=0
-do_ignore_fore=1
-do_ignore_back=1
-do_ignore_font=1
-do_auto_complete=0
-do_smiley=1
-FontFace=helvetica
-do_logging=1
-do_strip_html=0
-do_restore_last_conv=0
-do_tabbed_chat=1
-do_tabbed_chat_orient=0
-accel_next_tab=<Control>Right
-accel_prev_tab=<Control>Left
-do_no_sound_when_away=0
-do_no_sound_for_ignore=1
-do_online_sound=1
-do_play_send=1
-do_play_first=1
-do_play_receive=1
-BuddyArriveFilename=/usr/share/ayttm/sounds/BuddyArrive.au
-BuddyAwayFilename=/usr/share/ayttm/sounds/BuddyLeave.au
-BuddyLeaveFilename=/usr/share/ayttm/sounds/BuddyLeave.au
-SendFilename=/usr/share/ayttm/sounds/Send.au
-ReceiveFilename=/usr/share/ayttm/sounds/Receive.au
-FirstMsgFilename=/usr/share/ayttm/sounds/Receive.au
-SoundVolume=0.000000
-do_ayttm_debug=0
-do_ayttm_debug_html=0
-do_plugin_debug=0
-do_version_check=0
-usercount_window_seen=0
-length_contact_window=256
-width_contact_window=202
-do_noautoresize=0
-do_show_tooltips=1
-use_alternate_browser=0
-alternate_browser=
-proxy_type=0
-proxy_host=
-proxy_port=3128
-do_proxy_auth=0
-proxy_user=
-proxy_password=
-use_recoding=0
-local_encoding=
-remote_encoding=
-last_warned_version=0.0.0
-modules_path=/usr/lib/ayttm
-plugins
-	/usr/lib/ayttm/import_everybuddy.la
-		load="1"
-	end
-	/usr/lib/ayttm/rainbow.la
-		doRainbow="0"
-		sstart_r="255"
-		sstart_g="0"
-		sstart_b="0"
-		send_r="0"
-		send_g="0"
-		send_b="255"
-		load="1"
-	end
-	/usr/lib/ayttm/msn2.la
-		msn_server="messenger.hotmail.com"
-		msn_port="1863"
-		do_guess_away="0"
-		do_check_connection="0"
-		do_reconnect="0"
-		do_rename_contacts="0"
-		do_msn_debug="0"
-		load="1"
-	end
-	/usr/lib/ayttm/aim-oscar.la
-		do_oscar_debug="0"
-		do_libfaim_debug="0"
-		load="1"
-	end
-	/usr/lib/ayttm/import_gaim.la
-		load="1"
-	end
-	/usr/lib/ayttm/custmsg.la
-		custom_away_msg=""
-		enable_plugin="0"
-		load="1"
-	end
-	/usr/lib/ayttm/video_capture.la
-		frame_grabber="/usr/bin/ayttm_streamer_wrapper.sh -d %d"
-		load="1"
-	end
-	/usr/lib/ayttm/jabber.la
-		jabber_server="jabber.com"
-		do_jabber_debug="0"
-		load="1"
-	end
-	/usr/lib/ayttm/aycryption.la
-		store_passphrase="0"
-		mykey=""
-		do_aycryption_debug="0"
-		load="1"
-	end
-	/usr/lib/ayttm/img2jpc.la
-		do_jpc_encoding="0"
-		load="1"
-	end
-	/usr/lib/ayttm/irc.la
-		do_irc_debug="0"
-		load="1"
-	end
-	/usr/lib/ayttm/middle.la
-		s_doLeet="0"
-		s_doExtremeLeet="0"
-		load="1"
-	end
-	/usr/lib/ayttm/import_gnomeicu.la
-		load="1"
-	end
-	/usr/lib/ayttm/smiley-themer.la
-		smiley_directory="/usr/share/ayttm/smileys"
-		last_selected=""
-		do_smiley_debug="0"
-		load="1"
-	end
-	/usr/lib/ayttm/yahoo2.la
-		pager_host="scs.msg.yahoo.com"
-		pager_port="5050"
-		filetransfer_host="filetransfer.msg.yahoo.com"
-		filetransfer_port="80"
-		webcam_host="webcam.yahoo.com"
-		webcam_port="5100"
-		conn_type="0"
-		do_prompt_save_file="1"
-		do_guess_away="0"
-		do_show_away_time="0"
-		do_yahoo_debug="0"
-		load="1"
-	end
-	/usr/lib/ayttm/importicq.la
-		load="1"
-	end
-	/usr/lib/ayttm/autotrans.la
-		doTrans="0"
-		myLanguage="0"
-		load="1"
-	end
-	/usr/lib/ayttm/importlicq.la
-		load="1"
-	end
-	/usr/lib/ayttm/notes.la
-		notes_editor="leafpad"
-		load="1"
-	end
-end
diff --git a/config/chroot_local-includes/etc/skel/Desktop/ed-eeepc.ogv b/config/chroot_local-includes/etc/skel/Desktop/ed-eeepc.ogv
deleted file mode 100644
index 50338fe..0000000
Binary files a/config/chroot_local-includes/etc/skel/Desktop/ed-eeepc.ogv and /dev/null differ
diff --git a/config/chroot_local-includes/usr/share/applications/ayttm.desktop b/config/chroot_local-includes/usr/share/applications/ayttm.desktop
deleted file mode 100644
index 976824d..0000000
--- a/config/chroot_local-includes/usr/share/applications/ayttm.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=ayttm
-Exec=/usr/bin/ayttm
-Icon=/usr/share/pixmaps/ayttm.png
-Comment="The GTK Unified Messaging Client"
-Terminal=0
-Type=Application
-Categories=Network;InstantMessaging;
diff --git a/config/chroot_local-packageslists/eeepc b/config/chroot_local-packageslists/eeepc
index 106b2fb..bd4b56b 100644
--- a/config/chroot_local-packageslists/eeepc
+++ b/config/chroot_local-packageslists/eeepc
@@ -3,6 +3,6 @@ eeepc-acpi-scripts firmware-ralink
 xserver-xorg-video-intel xserver-xorg-video-vesa xserver-xorg-input-all xorg
 menu nano libgl1-mesa-dri bash-completion
 lxde dhcp3-client wicd aosd-cat hal iceweasel alsa-base alsa-utils
-ayttm mplayer mozilla-noscript
+irssi mplayer
 gksu synaptic cpufrequtils acpi gparted netcat wget aptitude
-iputils-ping less ssh-client clive briquolo zenity gpe-screenshot
+iputils-ping less ssh-client briquolo zenity gpe-screenshot

-- 
A live-helper based Debian live & installer image for the Eee PC.

