[Pkg-citadel-commit] r214 - webcit/trunk/debian

[dothebart-guest at alioth.debian.org]

Author: dothebart-guest
Date: 2009-02-23 23:12:32 +0000 (Mon, 23 Feb 2009)
New Revision: 214

Modified:
   webcit/trunk/debian/citadel-webcit.config
   webcit/trunk/debian/citadel-webcit.templates
   webcit/trunk/debian/rules
   webcit/trunk/debian/webcit.init
Log:
* add lang question dialog. seems as if this will need some more patching in webcit, because of some limitation went away...


Modified: webcit/trunk/debian/citadel-webcit.config
===================================================================
--- webcit/trunk/debian/citadel-webcit.config	2009-02-23 13:30:19 UTC (rev 213)
+++ webcit/trunk/debian/citadel-webcit.config	2009-02-23 23:12:32 UTC (rev 214)
@@ -54,6 +54,10 @@
 		    export WEBCIT_LISTEN_IP=127.0.0.1
 		fi
 		;;
+	    4)
+		db_input high citadel/WebcitOfferLang || true
+		db_go
+		;;
 	esac
 	if db_go; then
 	    STATE=$(($STATE + 1))
@@ -66,6 +70,7 @@
     db_get citadel/WebcitHttpPort && WEBCIT_HTTP_PORT="$RET"
     db_get citadel/WebcitHttpsPort && WEBCIT_HTTPS_PORT="$RET"
     db_get citadel/WebcitBindIp && WEBCIT_LISTEN_IP="$RET"
+    db_get citadel/WebcitOfferLang && WEBCIT_LANG="$RET"
     
     db_get ciatdel/WebcitWebserver &&WWWTYPE="$RET"
     if test "$WWWTYPE" = "Internal"; then

Modified: webcit/trunk/debian/citadel-webcit.templates
===================================================================
--- webcit/trunk/debian/citadel-webcit.templates	2009-02-23 13:30:19 UTC (rev 213)
+++ webcit/trunk/debian/citadel-webcit.templates	2009-02-23 23:12:32 UTC (rev 214)
@@ -22,3 +22,11 @@
  Select the port which the SSL HTTP Webcit server should listen on or enter -1
  to disable it.
 
+Template: citadel/WebcitOfferLang
+Type: select
+_Choices: UNLIMITED, da_DA, de_DE, en_GB, es_ES, fr_FR, it_IT, nl_NL, pt_BR
+Default: UNLIMITED
+_Description: Limit Webcits Login language selection
+ Select language for the Webcit should run in; select UNLIMITED 
+ to leave this choice to your user at the login prompt. 
+ hint: localeconf has to enable the locale so webcit can use it

Modified: webcit/trunk/debian/rules
===================================================================
--- webcit/trunk/debian/rules	2009-02-23 13:30:19 UTC (rev 213)
+++ webcit/trunk/debian/rules	2009-02-23 23:12:32 UTC (rev 214)
@@ -28,6 +28,9 @@
 else
 	CFLAGS += -O2
 endif
+ifneq (,$(findstring urldebug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -D DEBUG_URLSTRINGS
+endif
 
 configure: patch configure-stamp
 configure-stamp:
@@ -48,7 +51,7 @@
 		--with-rundir=/var/run/citadel \
 		--with-ical --with-db --with-ldap \
                 --with-ssldir=/etc/ssl/webcit/ \
-		--with-zlib --with-ssl --with-libiconf \
+		--with-ssl --with-libiconf \
 		--with-newt --with-included-gettext \
 		--with-datadir=/var/run/citadel \
 		--enable-debug $(EXTRA_ARGS) $(PROFILE_ARGS)

Modified: webcit/trunk/debian/webcit.init
===================================================================
--- webcit/trunk/debian/webcit.init	2009-02-23 13:30:19 UTC (rev 213)
+++ webcit/trunk/debian/webcit.init	2009-02-23 23:12:32 UTC (rev 214)
@@ -24,10 +24,6 @@
 LOGDIR=/var/log/webcit/
 
 
-unset LANG
-unset LANGUAGE
-unset LC_ALL
-unset LOCALE
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 
@@ -53,6 +49,14 @@
   . $DEFAULT
 fi
 
+unset LANG
+unset LANGUAGE
+unset LC_ALL
+unset LOCALE
+if test -n "$WEBCIT_LANG" -a "$WEBCIT_LANG" != "UNLIMITED"; then
+    export LANG=$WEBCIT_LANG
+fi 
+
 if test -z "$TZ"; then
 	if test -e /etc/timezone; then
 		TZ=`cat /etc/timezone`