Merge lp:~gotwig/elementaryos/eBuild-dev into lp:elementaryos/0.1-jupiter

[Eduard Gotwig]

removed postler, which causes in the installation of packages a bug, changed lsb-release name from jupiter back to maverick so updating and upgrading will work out of the box, added a not-ubuntu splash.pcx ( Dan wanted that for now, until we have a isolinux design)

=== modified file 'build.sh'
--- build.sh	2011-02-18 22:20:09 +0000
+++ build.sh	2011-02-20 11:44:57 +0000
@@ -86,6 +86,7 @@
 
 # Remove ubuntu crap, and give it the last kick (first line uncommented for use in the future)
 # cp -t $BASE_ORIG_PATH/isolinux ./resources/acess.pcx ./resources/blank.pcx ./resources/splash.pcx ./resources/splash.png ./resources/16x16.fnt ./resources/back.jpg
+cp ./resources/splash.pcx $BASE_ORIG_PATH/isolinux
 cd $BASE_ORIG_PATH
 sed -i "s/Ubuntu/elementary/" boot/grub/loopback.cfg
 rm -r *.exe autorun.inf README.diskdefines pics ubuntu 
 
=== modified file 'conf.sh'
--- conf.sh	2011-02-18 22:20:09 +0000
+++ conf.sh	2011-02-20 11:44:57 +0000
@@ -154,7 +154,7 @@
 apt-get dist-upgrade -f -y --allow-unauthenticated
 
 # Install apps for elementary deskop --no-install-recommends
-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
+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 telepathy-salut ttf-droid ttf-unifont zeitgeist zeitgeist-fts-extension
 # Should be replaced by a simple 'apt-get install elementary-desktop'
 
 # Compiz
@@ -234,10 +234,10 @@
 
 # Set midori as default browser, and configure it
 $setconf string /desktop/gnome/applications/browser/exec midori
-echo -e '[settings] \n homepage=http://elementaryos.org' > /etc/xdg/midori/config
+echo -e '[settings]\nhomepage=http://elementaryos.org' > /etc/xdg/midori/config
 
 # elementary Standard Base (eSB) (LSB support)
-echo -e "DISTRIB_ID=elementary\nDISTRIB_RELEASE=$VERSION\nDISTRIB_CODENAME=jupiter\nDISTRIB_DESCRIPTION=""elementary $VERSION""" > /etc/lsb-release 
+echo -e "DISTRIB_ID=elementary\nDISTRIB_RELEASE=$VERSION\nDISTRIB_CODENAME=maverick\nDISTRIB_DESCRIPTION=""elementary $VERSION""" > /etc/lsb-release 
 
 # Add template file
 cp -r /usr/share/python-apt/templates/Ubuntu.info /usr/share/python-apt/templates/elementary.info
 
=== added file 'resources/splash.pcx'
 Binary files resources/splash.pcx	1970-01-01 00:00:00 +0000 and resources/splash.pcx	2011-02-20 11:44:57 +0000 differ