diff -Nru zenbuntu-desktop-3.0.3/core-install zenbuntu-desktop-3.1/core-install --- zenbuntu-desktop-3.0.3/core-install 2012-12-19 14:26:14.000000000 +0000 +++ zenbuntu-desktop-3.1/core-install 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ -#!/bin/bash -x - -SOURCES_LIST=/etc/apt/sources.list -PPA_URL="http://ppa.launchpad.net/zentyal/3.0/ubuntu" -ZENTYAL_SOURCES="deb $PPA_URL precise main" -ARCHIVE_URL="http://archive.zentyal.org/zentyal" -ARCHIVE_SOURCES="deb $ARCHIVE_URL 3.0 main extra" -PKG_DIR=/var/tmp/zentyal-packages -LOCAL_SOURCES="deb file:$PKG_DIR ./" - -create_repository() -{ - # without this apt-ftparchive gives lots of "too many open files" errors - # for some reason this worked flawlessly in lucid but not now in precise - ulimit -n 30000 - - if ! [ -d $PKG_DIR ]; then - # temporal package directory does not exists, cannot create local repository - return - fi - pushd $PKG_DIR - apt-ftparchive packages . | gzip > Packages.gz - popd - - # Link .deb files to cache to avoid downloading them - pushd /var/cache/apt/archives - for i in $PKG_DIR/*.deb - do - ln -s $i . - done - popd - - # Update the package database with only the local repository - # just in case we are installing without internet connection - mv ${SOURCES_LIST} /tmp/sources.list.orig - echo ${LOCAL_SOURCES} > ${SOURCES_LIST} - apt-get update - # Restore the original sources.list - mv /tmp/sources.list.orig ${SOURCES_LIST} - - echo ${LOCAL_SOURCES} >> ${SOURCES_LIST} # add local sources -} - -update_if_network() -{ - # Check if we can connect to the PPA url - if $(wget -T 10 -t 1 $PPA_URL); then - echo "Updating package database from the network..." - apt-get update - else - echo "Warning: Can't connect to $PPA_URL. Updates won't be installed." - fi -} - -gen_locales() -{ - # load LANG variable with default locale - . /etc/default/locale - - # Append Zentyal support languages to generate to current supported - # locales - LOCALES_FILE=/var/lib/locales/supported.d/local - TMP=/tmp/local.tmp - cat /tmp/zentyal/locale.gen $LOCALES_FILE > $TMP - sort $TMP | uniq > $LOCALES_FILE - rm -f $TMP - - # Install language-pack-$LANG if exists - suffix=`echo $LANG | cut -d\. -f1 | tr '_' '-' | tr '[A-Z]' '[a-z]'` - apt-get install -y --force-yes language-pack-zentyal-$suffix - if [ $? -ne 0 ] - then - # Try with xx if xx-yy not exists - suffix=`echo $suffix | cut -d- -f1` - apt-get install -y --force-yes language-pack-zentyal-$suffix - fi - - # Regenerate locales to update the new messages from Zentyal - /usr/sbin/locale-gen -} - -create_repository # Set up local package repository - -if ! grep -q ${PPA_URL} ${SOURCES_LIST} -then - echo ${ZENTYAL_SOURCES} >> ${SOURCES_LIST} # add ppa sources -fi - -if ! grep -q ${ARCHIVE_URL} ${SOURCES_LIST} -then - echo ${ARCHIVE_SOURCES} >> ${SOURCES_LIST} # add zentyal archive sources -fi - -# install zentyal core and software -PACKAGES=zentyal - -update_if_network # apt-get update if we are connected to the internet - -gen_locales - -REGISTER_DATA=/var/lib/zinstaller-remote - -if [ -f $REGISTER_DATA/REGISTER_USERNAME ] -then - PACKAGES="$PACKAGES zentyal-remoteservices" -fi - -DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes $PACKAGES - -if [ -f /var/tmp/.zentyal-disaster-recovery ] -then - touch /var/lib/zentyal/.disaster-recovery -fi - -if [ -f $REGISTER_DATA/REGISTER_USERNAME ] -then - plymouth message --text="Registering your server... Please wait." - /usr/share/zenbuntu-desktop/remote-register -fi - -### CUSTOM_ACTION ### - -sync - -exit 0 diff -Nru zenbuntu-desktop-3.0.3/debian/changelog zenbuntu-desktop-3.1/debian/changelog --- zenbuntu-desktop-3.0.3/debian/changelog 2012-12-19 16:16:19.000000000 +0000 +++ zenbuntu-desktop-3.1/debian/changelog 2013-06-11 21:29:15.000000000 +0000 @@ -1,3 +1,9 @@ +zenbuntu-desktop (3.1) precise; urgency=low + + * Bump version to 3.1 + + -- José A. Calvo Tue, 11 Jun 2013 23:25:20 +0200 + zenbuntu-desktop (3.0.3) precise; urgency=low * Fixed touch of .disaster-recovery file @@ -39,4 +45,3 @@ * New upstream release -- José A. Calvo Thu, 14 Nov 2011 15:26:20 +0100 - diff -Nru zenbuntu-desktop-3.0.3/debian/control zenbuntu-desktop-3.1/debian/control --- zenbuntu-desktop-3.0.3/debian/control 2012-12-19 03:01:30.000000000 +0000 +++ zenbuntu-desktop-3.1/debian/control 2013-06-11 20:47:42.000000000 +0000 @@ -8,7 +8,7 @@ Package: zenbuntu-desktop Architecture: all -Depends: openssh-server, xorg, firefox, lxdm, lxde, xdg-user-dirs, gksu, libnss3-tools, nano, xscreensaver, evince, policykit-1, plymouth-theme-ubuntu-text, plymouth-theme-ubuntu-logo, acpid, ntp, gtk2-engines, wget +Depends: zenbuntu-core, xorg, firefox, lxdm, lxde, xdg-user-dirs, gksu, libnss3-tools, xscreensaver, evince, plymouth-theme-ubuntu-logo, gtk2-engines Description: Zentyal Desktop Environment for Ubuntu Server This package ships scripts and branding stuff included in the Zentyal installer to setup the Zentyal system. diff -Nru zenbuntu-desktop-3.0.3/debian/copyright zenbuntu-desktop-3.1/debian/copyright --- zenbuntu-desktop-3.0.3/debian/copyright 2012-12-03 08:08:21.000000000 +0000 +++ zenbuntu-desktop-3.1/debian/copyright 2013-06-11 20:47:42.000000000 +0000 @@ -1,7 +1,7 @@ Files: * -Upstream Author: eBox Technologies S.L. +Upstream Author: Zentyal S.L. -Copyright (C) 2011-2012 eBox Technologies S.L. +Copyright (C) 2011-2013 Zentyal S.L. License: This program is free software; you can redistribute it and/or modify diff -Nru zenbuntu-desktop-3.0.3/debian/install zenbuntu-desktop-3.1/debian/install --- zenbuntu-desktop-3.0.3/debian/install 2012-12-17 18:43:21.000000000 +0000 +++ zenbuntu-desktop-3.1/debian/install 2013-06-11 20:47:42.000000000 +0000 @@ -1,16 +1,9 @@ zentyal-session /usr/bin firefox-cert-override /usr/share/zenbuntu-desktop -rc.local /usr/share/zenbuntu-desktop -first-boot.sh /usr/share/zenbuntu-desktop -second-boot.sh /usr/share/zenbuntu-desktop -motd /usr/share/zenbuntu-desktop -core-install /usr/share/zenbuntu-desktop x11-setup /usr/share/zenbuntu-desktop +rc.local /usr/share/zenbuntu-desktop firefox-launcher /usr/share/zenbuntu-desktop -*.asc /usr/share/zenbuntu-desktop firefox-profile /usr/share/zenbuntu-desktop lxde /usr/share/zenbuntu-desktop lxdm /usr/share/zenbuntu-desktop -remote-register /usr/share/zenbuntu-desktop plymouth/* /lib/plymouth/themes/zentyal -plymouth-text/* /lib/plymouth/themes/zentyal-text diff -Nru zenbuntu-desktop-3.0.3/debian/postinst zenbuntu-desktop-3.1/debian/postinst --- zenbuntu-desktop-3.0.3/debian/postinst 2012-12-19 01:45:42.000000000 +0000 +++ zenbuntu-desktop-3.1/debian/postinst 2013-06-11 20:47:42.000000000 +0000 @@ -2,29 +2,10 @@ LOG=/var/tmp/zentyal-installer.log -# replace motd -cp /usr/share/zenbuntu-desktop/motd /etc/motd.tail - -# Import PPA keys to avoid warnings -apt-key add /usr/share/zenbuntu-desktop/zentyal-ppa.asc >> $LOG 2>&1 -apt-key add /usr/share/zenbuntu-desktop/zentyal-3.0-archive.asc >> $LOG 2>&1 - -cp /usr/share/zenbuntu-desktop/first-boot.sh /etc/rc.local - ln -sf /lib/plymouth/themes/zentyal/zentyal.plymouth /etc/alternatives/default.plymouth -ln -sf /lib/plymouth/themes/zentyal-text/zentyal-text.plymouth /etc/alternatives/text.plymouth ln -sf /lib/plymouth/themes/zentyal/zentyal.grub /etc/alternatives/default.plymouth.grub if ! grep -q zentyal-lxdm /etc/init/lxdm.conf then sed -i 's/start on/start on zentyal-lxdm and/' /etc/init/lxdm.conf fi - -if [ -f /etc/default/grub ] -then - if ! grep -q splash /etc/default/grub - then - sed -i 's/\(GRUB_CMDLINE_LINUX_DEFAULT=".*\)"/\1 splash"/' /etc/default/grub - update-grub - fi -fi diff -Nru zenbuntu-desktop-3.0.3/first-boot.sh zenbuntu-desktop-3.1/first-boot.sh --- zenbuntu-desktop-3.0.3/first-boot.sh 2012-12-19 02:01:49.000000000 +0000 +++ zenbuntu-desktop-3.1/first-boot.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#!/bin/bash - -LOG=/var/tmp/zentyal-installer.log - -plymouth message --text="Installing Zentyal core packages... Please wait." - -/usr/share/zenbuntu-desktop/core-install >> $LOG 2>&1 -if [ $? -ne 0 ] -then - plymouth message --text="Installation failed. Press to see details." - exit 1 -fi - -plymouth message --text="Core packages installed. Continuing first boot..." - -/usr/share/zenbuntu-desktop/x11-setup >> $LOG 2>&1 - -mv /usr/share/zenbuntu-desktop/second-boot.sh /etc/rc.local - -initctl emit zentyal-lxdm - -exit 0 diff -Nru zenbuntu-desktop-3.0.3/lxdm/index.theme zenbuntu-desktop-3.1/lxdm/index.theme --- zenbuntu-desktop-3.0.3/lxdm/index.theme 2012-12-03 08:08:21.000000000 +0000 +++ zenbuntu-desktop-3.1/lxdm/index.theme 2013-06-11 20:47:42.000000000 +0000 @@ -1,5 +1,5 @@ [LXDM Theme] Name=lxdm-zentyal Comment=lxdm-zentyal -Author=eBox Technologies +Author=Zentyal License=GPL diff -Nru zenbuntu-desktop-3.0.3/plymouth-text/zentyal-text.plymouth zenbuntu-desktop-3.1/plymouth-text/zentyal-text.plymouth --- zenbuntu-desktop-3.0.3/plymouth-text/zentyal-text.plymouth 2012-12-03 08:08:21.000000000 +0000 +++ zenbuntu-desktop-3.1/plymouth-text/zentyal-text.plymouth 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -[Plymouth Theme] -Name=Ubuntu Text -Description=Text mode theme based on ubuntu-logo theme -ModuleName=ubuntu-text - -[ubuntu-text] -title=Zentyal 3.0 -black=0x0b0b0b -white=0xffffff -brown=0xe1721e -blue=0x5faf21 diff -Nru zenbuntu-desktop-3.0.3/second-boot.sh zenbuntu-desktop-3.1/second-boot.sh --- zenbuntu-desktop-3.0.3/second-boot.sh 2012-12-19 04:24:09.000000000 +0000 +++ zenbuntu-desktop-3.1/second-boot.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -#!/bin/sh - -# If Zentyal is already installed... -if ! [ -f '/var/lib/zentyal/.first' ] -then - # Disable auto login once installation is done - sed -i "s/.*autologin=.*/# autologin=nobody/" /etc/lxdm/default.conf - - # Remove temporal local repository - sed -i "/deb file.*zentyal-packages/d" /etc/apt/sources.list - rm -rf /var/tmp/zentyal-packages - apt-get clean - - # Remove autosubscription data - rm -rf /var/lib/zinstaller-remote - - # Restore default rc.local - cp /usr/share/zenbuntu-desktop/rc.local /etc/rc.local -fi - -initctl emit zentyal-lxdm - -exit 0