From: Wilfried Göesgens Date: Mon, 23 Feb 2009 23:10:47 +0000 (+0000) Subject: * resynced some functionality with pkg-citadel X-Git-Tag: v7.86~1413 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=1cb8a277add83b4e21bd4c2fbe65c2649b4b7089 * resynced some functionality with pkg-citadel * added choose force-locale dialog. --- diff --git a/webcit/debian/citadel-webcit.config b/webcit/debian/citadel-webcit.config index ab2fe81e5..b266d2cb6 100755 --- a/webcit/debian/citadel-webcit.config +++ b/webcit/debian/citadel-webcit.config @@ -30,15 +30,13 @@ if test "$DO_CONFIGURE" = "yes"; then export WEBCIT_CITADEL_PORT=504 fi STATE=1 - LASTSTATE=4 + LASTSTATE=5 while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do case "$STATE" in 1) - echo aou $STATE>>/tmp/bla db_input high citadel/WebcitApacheIntegration || true db_go - echo aou $STATE>>/tmp/bla ;; 2) db_get citadel/WebcitApacheIntegration @@ -59,6 +57,10 @@ if test "$DO_CONFIGURE" = "yes"; then fi ;; 4) + db_input high citadel/WebcitOfferLang || true + db_go + ;; + 5) db_input high citadel/WebcitInstallnote||true ;; esac @@ -73,6 +75,7 @@ if test "$DO_CONFIGURE" = "yes"; then 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 diff --git a/webcit/debian/citadel-webcit.links b/webcit/debian/citadel-webcit.links new file mode 100644 index 000000000..2edfc8ca6 --- /dev/null +++ b/webcit/debian/citadel-webcit.links @@ -0,0 +1,3 @@ +/usr/share/icons/gnome/24x24/mimetypes /usr/share/citadel-webcit/static/icons +/usr/share/javascript/prototype/prototype.js /usr/share/citadel-webcit/static/prototype.js +/usr/share/javascript/scriptaculous/scriptaculous.js /usr/share/citadel-webcit/static/scriptaculous.js diff --git a/webcit/debian/citadel-webcit.postinst b/webcit/debian/citadel-webcit.postinst index e836598d5..fcc3a08b2 100644 --- a/webcit/debian/citadel-webcit.postinst +++ b/webcit/debian/citadel-webcit.postinst @@ -16,31 +16,22 @@ case "$1" in db_get citadel/WebcitApacheIntegration &&WWWTYPE="$RET" db_stop -# Hack: make webcit use gnome icons. roll your own if wanted. - if test ! -L /usr/share/citadel-webcit/static/icons; then - ln -sf /usr/share/icons/gnome/24x24/mimetypes /usr/share/citadel-webcit/static/icons || true - fi + #DEBHELPER# - if test ! -L /usr/share/citadel-webcit/static/; then - if test -d /usr/share/prototypejs; then - ln -sf /usr/share/prototypejs/prototype.js /usr/share/citadel-webcit/static/ - else - ln -sf /usr/share/javascript/prototype/prototype.js /usr/share/citadel-webcit/static/ - fi - fi + # update the webserver, if needed case "$WWWTYPE" in "Apache") webservers="apache" - /usr/sbin/aenmod proxy||true + aenmod proxy||true ;; "Apache-SSL") webservers="apache-ssl" ;; "Apache2") webservers="apache2" - /usr/sbin/a2enmod proxy||true - /usr/sbin/a2enmod proxy_http||true + a2enmod proxy||true + a2enmod proxy_http||true ;; "All") webservers="apache apache-ssl apache2" @@ -51,7 +42,7 @@ case "$1" in esac for server in $webservers; do if [ -d "/etc/${server}/conf.d" ]; then - if [ ! -e "/etc/${server}/conf.d/webcit-citadel" ] ; then + if [ ! -e "/etc/${server}/conf.d/webcit.conf" ] ; then ln -sf /etc/citadel/webcit.conf "/etc/${server}/conf.d/webcit.conf" fi invoke-rc.d $server reload || true diff --git a/webcit/debian/citadel-webcit.postrm b/webcit/debian/citadel-webcit.postrm index 4c1b672fa..24fb4ea2c 100644 --- a/webcit/debian/citadel-webcit.postrm +++ b/webcit/debian/citadel-webcit.postrm @@ -8,7 +8,15 @@ set -e case "$1" in purge) echo "/etc/citadel/www/keys not removed. " + for server in apache apache-ssl apache2; do + if [ -h "/etc/${server}/conf.d/webcit.conf" ]; then + rm -f "/etc/${server}/conf.d/webcit.conf" + invoke-rc.d $server reload || true + fi + done + rm -f /etc/default/webcit + db_purge 'citadel/WebcitHttpsPort' || true db_purge 'citadel/WebcitHttpPort' || true db_purge 'citadel/WebcitApacheIntegration' ||true diff --git a/webcit/debian/citadel-webcit.templates b/webcit/debian/citadel-webcit.templates index e001d4ea2..93f3124d9 100644 --- a/webcit/debian/citadel-webcit.templates +++ b/webcit/debian/citadel-webcit.templates @@ -1,26 +1,35 @@ Template: citadel/WebcitApacheIntegration Type: select -_Choices: Apache, Apache-SSL, Apache2, All, Internal +_Choices: Apache2, Internal Default: Internal -_Description: Should Webcit be integrated in your Apache? - If you want Webcit to run alongside with one of your other installed - Apache Webservers, select it from the list, else use Internal to make - Webcit use its own HTTP Server Facilities. - +_Description: Integration with Apache webservers: + If you want Webcit to run alongside with one of your other installed + Apache webservers, select it from the list, else use Internal to make + Webcit use its own HTTP server facilities. Template: citadel/WebcitHttpPort Type: string Default: 8504 -_Description: Webcit HTTP Port - Select the Port, which the plain HTTP webcit server should listen on. - Select Port 80 if you don't have another webserver running.-1 to disable. - +_Description: Webcit HTTP port: + Select the port which the plain HTTP Webcit server should listen on. + Use port 80 if you don't have another webserver running or enter -1 to disable + it. Template: citadel/WebcitHttpsPort Type: string Default: 443 -_Description: WebCit HTTPS port - Select the Port, which the SSL HTTP webcit server should listen on. -1 to disable. +_Description: Webcit HTTPS port: + 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 Template: citadel/WebcitInstallnote diff --git a/webcit/debian/control b/webcit/debian/control index 04e26e504..5c14567cf 100644 --- a/webcit/debian/control +++ b/webcit/debian/control @@ -1,10 +1,10 @@ Source: webcit Section: web -Priority: optional +Priority: extra Maintainer: Wilfried Goesgens Build-Depends: debhelper (>= 4), po-debconf, libical-dev (>=0.30), gettext, locales, - libcitadel-dev -Standards-Version: 3.7.2 + libcitadel-dev (>= 7.37), quilt (>= 0.40), autotools-dev, libssl-dev +Standards-Version: 3.8.0 Package: citadel-webcit Architecture: any diff --git a/webcit/debian/copyright b/webcit/debian/copyright index 60df9813d..8b227b7b9 100644 --- a/webcit/debian/copyright +++ b/webcit/debian/copyright @@ -101,8 +101,23 @@ Nifty Corners Cube and WebCit license: along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +* In addition, as a special exception, the copyright holders give +* permission to link the code of portions of this program with the +* OpenSSL library under certain conditions as described in each +* individual source file, and distribute linked combinations +* including the two. +* You must obey the GNU General Public License in all respects +* for all of the code used other than OpenSSL. If you modify +* file(s) with this exception, you may extend this exception to your +* version of the file(s), but you are not obligated to do so. If you +* do not wish to do so, delete this exception statement from your +* version. If you delete this exception statement from all source +* files in the program, then also delete it here. + On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. -The Debian packaging is (C) 2006, Fathi Boudra and +static/util.js is mostly Copyright (c) 2005, Michael Schuerig, michael@schuerig.de and distributed under the LGPL. + +The Debian packaging is (C) 2006-2008, Debian Citadel Team and is licensed under the GPL, see above. diff --git a/webcit/debian/po/templates.pot b/webcit/debian/po/templates.pot index 2117bf465..cbbf7dc09 100644 --- a/webcit/debian/po/templates.pot +++ b/webcit/debian/po/templates.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: w.goesgens@outgesourced.org\n" -"POT-Creation-Date: 2007-05-17 21:33+0200\n" +"Report-Msgid-Bugs-To: webcit@packages.debian.org\n" +"POT-Creation-Date: 2009-02-23 23:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,61 +19,83 @@ msgstr "" #. Type: select #. Choices #: ../citadel-webcit.templates:1001 -msgid "Apache, Apache-SSL, Apache2, All, Internal" +msgid "Apache2, Internal" msgstr "" #. Type: select #. Description #: ../citadel-webcit.templates:1002 -msgid "Should Webcit be integrated in your Apache?" +msgid "Integration with Apache webservers:" msgstr "" #. Type: select #. Description #: ../citadel-webcit.templates:1002 msgid "" -" If you want Webcit to run alongside with one of your other installed\n" -" Apache Webservers, select it from the list, else use Internal to make\n" -" Webcit use its own HTTP Server Facilities." +"If you want Webcit to run alongside with one of your other installed Apache " +"webservers, select it from the list, else use Internal to make Webcit use " +"its own HTTP server facilities." msgstr "" #. Type: string #. Description #: ../citadel-webcit.templates:2001 -msgid "Webcit HTTP Port" +msgid "Webcit HTTP port:" msgstr "" #. Type: string #. Description #: ../citadel-webcit.templates:2001 msgid "" -" Select the Port, which the plain HTTP webcit server should listen on.\n" -" Select Port 80 if you don't have another webserver running.-1 to disable." +"Select the port which the plain HTTP Webcit server should listen on. Use " +"port 80 if you don't have another webserver running or enter -1 to disable " +"it." msgstr "" #. Type: string #. Description #: ../citadel-webcit.templates:3001 -msgid "WebCit HTTPS port" +msgid "Webcit HTTPS port:" msgstr "" #. Type: string #. Description #: ../citadel-webcit.templates:3001 msgid "" -" Select the Port, which the SSL HTTP webcit server should listen on. -1 to " -"disable." +"Select the port which the SSL HTTP Webcit server should listen on or enter -" +"1 to disable it." +msgstr "" + +#. Type: string +#. Choices +#: ../citadel-webcit.templates:4001 +msgid "UNLIMITED, da_DA, de_DE, en_GB, es_ES, fr_FR, it_IT, nl_NL, pt_BR" +msgstr "" + +#. Type: string +#. Description +#: ../citadel-webcit.templates:4002 +msgid "Limit Webcits Login language selection" +msgstr "" + +#. Type: string +#. Description +#: ../citadel-webcit.templates:4002 +msgid "" +"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)" msgstr "" #. Type: note #. Description -#: ../citadel-webcit.templates:4001 +#: ../citadel-webcit.templates:5001 msgid "Citadel/UX" msgstr "" #. Type: note #. Description -#: ../citadel-webcit.templates:4001 +#: ../citadel-webcit.templates:5001 msgid "" " Citadel-webcit will be running soon. Log into it with your citadel\n" " Administrator user, and do the fine setup. Log in as the user you\n" diff --git a/webcit/debian/rules b/webcit/debian/rules index cea5888c3..d4109e17e 100755 --- a/webcit/debian/rules +++ b/webcit/debian/rules @@ -9,6 +9,10 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/quilt/quilt.make + +upstreamversion := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p') + DESTDIR=$(CURDIR)/debian/citadel-webcit EXTRA_ARGS= @@ -29,9 +33,15 @@ ifneq (,$(findstring urldebug,$(DEB_BUILD_OPTIONS))) CFLAGS += -D DEBUG_URLSTRINGS endif -configure: configure-stamp +configure: patch configure-stamp configure-stamp: dh_testdir +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif CFLAGS="$(CFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ @@ -52,12 +62,11 @@ configure-stamp: build: build-stamp -build-stamp: configure-stamp +build-stamp: configure dh_testdir # Add here commands to compile the package. $(MAKE) -#docbook-to-man debian/webcit.sgml > webcit.1 touch build-stamp @@ -67,7 +76,8 @@ clean: rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) clean + [ ! -f Makefile ] || $(MAKE) clean + debconf-updatepo dh_clean @@ -94,23 +104,13 @@ binary-arch: build install dh_installdocs dh_installexamples dh_install -# dh_installmenu dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime dh_installinit --name=webcit -# dh_installcron -# dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol diff --git a/webcit/debian/webcit.init b/webcit/debian/webcit.init index 123d096c0..e237ac867 100644 --- a/webcit/debian/webcit.init +++ b/webcit/debian/webcit.init @@ -24,10 +24,6 @@ DEFAULT=/etc/default/webcit 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 @@ if test -f $DEFAULT; then . $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`