diff -Nru btsync-2.0.0/debian/btsync.config btsync-2.0.0/debian/btsync.config --- btsync-2.0.0/debian/btsync.config 2015-03-15 16:35:10.000000000 +0000 +++ btsync-2.0.0/debian/btsync.config 2015-03-16 14:24:02.000000000 +0000 @@ -144,21 +144,26 @@ # start path handling (usally the home directory) -BTNEWHOME=$(getent passwd ${BTNEWUSER} | awk -F: '{printf $6}') -BTNEWUID=$(($(getent passwd ${BTNEWUSER} | awk -F: '{printf $3}'))) -if [ ${BTNEWUID} -eq 0 ]; then +case "${BTNEWUSER}" in +btsync) + # must be processed first, since this user perhaps does still not exist + BTNEWHOME="/mnt" + ;; +root) # if running as root it's OK to have / as default BTNEWHOME="/" -elif [ "${BTNEWUSER}" = "btsync" ]; then - BTNEWHOME="/mnt" -elif [ ${BTNEWUID} -ge 1000 ]; then - if [ -z ${BTNEWHOME} ] || [ ! -d "${BTNEWHOME}" ]; then + ;; +*) + BTNEWHOME=$(getent passwd ${BTNEWUSER} | awk -F: '{printf $6}') + BTNEWUID=$(($(getent passwd ${BTNEWUSER} | awk -F: '{printf $3}'))) + if [ ${BTNEWUID} -le 1000 ]; then + # not a regular user + BTNEWHOME="/mnt" + elif [ -z ${BTNEWHOME} ] || [ ! -d "${BTNEWHOME}" ]; then BTNEWHOME="/mnt" fi -else - BTNEWHOME="/mnt" -fi -db_subst btsync/directory_root startpath "${BTNEWHOME}" + ;; +esac db_get btsync/directory_root || RET="" if [ -z ${RET} ] || [ "${RET}" = "/" ]; then db_set btsync/directory_root ${BTNEWHOME} diff -Nru btsync-2.0.0/debian/btsync.templates btsync-2.0.0/debian/btsync.templates --- btsync-2.0.0/debian/btsync.templates 2015-03-15 21:25:01.000000000 +0000 +++ btsync-2.0.0/debian/btsync.templates 2015-03-16 12:08:28.000000000 +0000 @@ -188,7 +188,7 @@ Type: boolean Default: false _Description: Should BitTorrent Sync allow only SSL connections to the Web UI? - If enabled, only SSL (http) connections will be allowed to the Web UI. + If enabled, only SSL (https) connections will be allowed to the Web UI. Template: btsync/folder_defaults Type: boolean diff -Nru btsync-2.0.0/debian/changelog btsync-2.0.0/debian/changelog --- btsync-2.0.0/debian/changelog 2015-03-15 12:47:29.000000000 +0000 +++ btsync-2.0.0/debian/changelog 2015-03-16 14:55:11.000000000 +0000 @@ -1,3 +1,10 @@ +btsync (2.0.0-2) unstable; urgency=low + + * Fixed installation failure (Closes #179) + * Fixed typo in debconf string (Closes #175) + + -- Leo Moll Mon, 16 Dec 2015 15:54:51 +0100 + btsync (2.0.0-1) unstable; urgency=low * Update for new btsync 2.0 core package diff -Nru btsync-2.0.0/debian/po/ca.po btsync-2.0.0/debian/po/ca.po --- btsync-2.0.0/debian/po/ca.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/ca.po 2015-03-16 12:08:51.000000000 +0000 @@ -280,7 +280,7 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." msgstr "" #. Type: boolean diff -Nru btsync-2.0.0/debian/po/cs.po btsync-2.0.0/debian/po/cs.po --- btsync-2.0.0/debian/po/cs.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/cs.po 2015-03-16 12:08:58.000000000 +0000 @@ -281,8 +281,8 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." -msgstr "Při povolení, budou pro spojení s web. rozhraním povolena jen SSL (http) spojení." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." +msgstr "Při povolení, budou pro spojení s web. rozhraním povolena jen SSL (https) spojení." #. Type: boolean #. Description diff -Nru btsync-2.0.0/debian/po/de.po btsync-2.0.0/debian/po/de.po --- btsync-2.0.0/debian/po/de.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/de.po 2015-03-16 12:09:04.000000000 +0000 @@ -280,7 +280,7 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." msgstr "Falls aktiviert, lässt BitTorrent Sync nur mit SSL verschlüsselte Verbindungen zur Weboberfläche zu." #. Type: boolean diff -Nru btsync-2.0.0/debian/po/el.po btsync-2.0.0/debian/po/el.po --- btsync-2.0.0/debian/po/el.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/el.po 2015-03-16 12:09:07.000000000 +0000 @@ -281,7 +281,7 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." msgstr "" #. Type: boolean diff -Nru btsync-2.0.0/debian/po/es.po btsync-2.0.0/debian/po/es.po --- btsync-2.0.0/debian/po/es.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/es.po 2015-03-16 12:09:13.000000000 +0000 @@ -281,8 +281,8 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." -msgstr "Si se activa, solo se permitirán conexions SSL (http) al IU Web." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." +msgstr "Si se activa, solo se permitirán conexions SSL (https) al IU Web." #. Type: boolean #. Description diff -Nru btsync-2.0.0/debian/po/fr.po btsync-2.0.0/debian/po/fr.po --- btsync-2.0.0/debian/po/fr.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/fr.po 2015-03-16 12:09:17.000000000 +0000 @@ -280,7 +280,7 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." msgstr "Si activé, seules les connexion SSL (https) seront autorisées." #. Type: boolean diff -Nru btsync-2.0.0/debian/po/gl.po btsync-2.0.0/debian/po/gl.po --- btsync-2.0.0/debian/po/gl.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/gl.po 2015-03-16 12:09:25.000000000 +0000 @@ -280,8 +280,8 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." -msgstr "Se está activado, so se permitiran conexións SSL (http) coa interface web de usuario." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." +msgstr "Se está activado, so se permitiran conexións SSL (https) coa interface web de usuario." #. Type: boolean #. Description diff -Nru btsync-2.0.0/debian/po/hu.po btsync-2.0.0/debian/po/hu.po --- btsync-2.0.0/debian/po/hu.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/hu.po 2015-03-16 12:09:30.000000000 +0000 @@ -280,8 +280,8 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." -msgstr "Ha be van állítva, csak SSL (http) kapcsolattal lehet elérni a webes felületet." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." +msgstr "Ha be van állítva, csak SSL (https) kapcsolattal lehet elérni a webes felületet." #. Type: boolean #. Description diff -Nru btsync-2.0.0/debian/po/it.po btsync-2.0.0/debian/po/it.po --- btsync-2.0.0/debian/po/it.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/it.po 2015-03-16 12:09:35.000000000 +0000 @@ -280,7 +280,7 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." msgstr "Se impostato su true, solo connessioni cifrate via SSL saranno permesse all'interfaccia web." #. Type: boolean diff -Nru btsync-2.0.0/debian/po/nl.po btsync-2.0.0/debian/po/nl.po --- btsync-2.0.0/debian/po/nl.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/nl.po 2015-03-16 12:09:42.000000000 +0000 @@ -281,8 +281,8 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." -msgstr "Indien ingeschakeld, zullen alleen SSL (http) verbindingen de de Web UI worden toegestaan." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." +msgstr "Indien ingeschakeld, zullen alleen SSL (https) verbindingen de de Web UI worden toegestaan." #. Type: boolean #. Description diff -Nru btsync-2.0.0/debian/po/pl.po btsync-2.0.0/debian/po/pl.po --- btsync-2.0.0/debian/po/pl.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/pl.po 2015-03-16 12:09:47.000000000 +0000 @@ -280,7 +280,7 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." msgstr "Jeśli ustawiono, BitTorrent Sync będzię pozwalał tylko na szyfrowane (SSL) połączenia do interfejsu WEB." #. Type: boolean diff -Nru btsync-2.0.0/debian/po/ru.po btsync-2.0.0/debian/po/ru.po --- btsync-2.0.0/debian/po/ru.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/ru.po 2015-03-16 12:09:50.000000000 +0000 @@ -280,7 +280,7 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." msgstr "Если выбрано, то к Web-интерфейсу можно подключиться только через SSL соединение" #. Type: boolean diff -Nru btsync-2.0.0/debian/po/templates.pot btsync-2.0.0/debian/po/templates.pot --- btsync-2.0.0/debian/po/templates.pot 2015-03-15 22:08:30.000000000 +0000 +++ btsync-2.0.0/debian/po/templates.pot 2015-03-16 12:08:28.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: btsync\n" "Report-Msgid-Bugs-To: btsync@packages.debian.org\n" -"POT-Creation-Date: 2015-03-16 00:08+0200\n" +"POT-Creation-Date: 2015-03-16 12:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -363,7 +363,7 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." msgstr "" #. Type: boolean diff -Nru btsync-2.0.0/debian/po/zh_CN.po btsync-2.0.0/debian/po/zh_CN.po --- btsync-2.0.0/debian/po/zh_CN.po 2015-03-15 22:09:03.000000000 +0000 +++ btsync-2.0.0/debian/po/zh_CN.po 2015-03-16 12:09:56.000000000 +0000 @@ -280,7 +280,7 @@ #. Type: boolean #. Description #: ../btsync.templates:22001 -msgid "If enabled, only SSL (http) connections will be allowed to the Web UI." +msgid "If enabled, only SSL (https) connections will be allowed to the Web UI." msgstr "" #. Type: boolean