elementary OS

Merge lp:~gotwig/elementaryos/devel into lp:elementaryos/0.1-jupiter

  1. devel
  2. Merge into eBuild
Proposed by Eduard Gotwig
Status: Merged
Merge reported by: Avi Romanoff
Merged at revision: not available
Proposed branch: lp:~gotwig/elementaryos/devel
Merge into: lp:elementaryos/0.1-jupiter
Diff against target: 25 lines (+3/-3)
1 file modified
conf.sh (+3/-3)
To merge this branch: bzr merge lp:~gotwig/elementaryos/devel
Reviewer Review Type Date Requested Status
Danielle Foré Pending
Review via email: mp+49565@code.launchpad.net

Description of the change

fixed midori bug, replaced apt-get upgrade with apt-get dist-upgrade, added postler.

To post a comment you must log in.
Revision history for this message
Eduard Gotwig (gotwig) wrote :

oh I also added this telephaty package, for IRC support in emphaty

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'conf.sh'
2--- conf.sh 2011-02-13 06:32:44 +0000
3+++ conf.sh 2011-02-13 20:40:29 +0000
4@@ -151,10 +151,10 @@
5
6 # Update
7 apt-get update -f -y
8-apt-get upgrade -f -y --allow-unauthenticated
9+apt-get dist-upgrade -f -y --allow-unauthenticated
10
11 # Install apps for elementary deskop --no-install-recommends
12-apt-get install -f -y --no-install-recommends --allow-unauthenticated abiword abiword-plugin-grammar bcmwl-kernel-source cups dexter dockmanager docky ease elementary-theme elementary-icon-theme elementary-wallpapers gdebi gdebi-core gloobus-preview gnumeric indicator-applet-complete indicator-datetime libgl1-mesa-dri-experimental midori nautilus ntp purple plymouth-theme-elementary-logo preload ttf-droid ttf-unifont zeitgeist zeitgeist-fts-extension
13+apt-get install -f -y --no-install-recommends --allow-unauthenticated abiword abiword-plugin-grammar bcmwl-kernel-source cups dexter dockmanager docky ease elementary-theme elementary-icon-theme elementary-wallpapers gdebi gdebi-core gloobus-preview gnumeric indicator-applet-complete indicator-datetime libgl1-mesa-dri-experimental midori nautilus ntp purple plymouth-theme-elementary-logo postler preload telepathy-salut ttf-droid ttf-unifont zeitgeist zeitgeist-fts-extension
14 # Should be replaced by a simple 'apt-get install elementary-desktop'
15
16 # Compiz
17@@ -234,7 +234,7 @@
18
19 # Set midori as default browser, and configure it
20 $setconf string /desktop/gnome/applications/browser/exec midori
21-echo -e '"homepage=http://elementaryos.org"' > /etc/xdg/midori/config
22+echo -e '[settings] \n homepage=http://elementaryos.org' > /etc/xdg/midori/config
23
24 # elementary Standard Base (eSB) (LSB support)
25 echo -e "DISTRIB_ID=elementary\nDISTRIB_RELEASE=$VERSION\nDISTRIB_CODENAME=jupiter\nDISTRIB_DESCRIPTION=""elementary $VERSION""" > /etc/lsb-release

Subscribers

People subscribed via source and target branches