From: Wilfried Göesgens Date: Wed, 3 Jan 2007 12:42:42 +0000 (+0000) Subject: * purge TinyMCE, as there is a debian package out there. X-Git-Tag: v7.86~3714 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=80f8fa199191780da3f4d04e9ef4e3568499f4b6 * purge TinyMCE, as there is a debian package out there. * move our templates to /etc/citadel/www/ * use DESTDIR in Makefile.in * remove ucf from package * add po-debconf to Build-Depends * remove unneded files --- diff --git a/webcit/Makefile.in b/webcit/Makefile.in index 64d7c10c0..a40a2aad7 100644 --- a/webcit/Makefile.in +++ b/webcit/Makefile.in @@ -80,15 +80,15 @@ $(srcdir)/configure: $(srcdir)/configure.in cd $(srcdir) && $(AUTOCONF) install: - test -d $(root)$(prefix) || mkdir $(root)$(prefix) - test -d $(root)$(prefix)/static || mkdir $(root)$(prefix)/static + test -d $(DESTDIR)$(prefix) || mkdir $(DESTDIR)$(prefix) + test -d $(DESTDIR)$(prefix)/static || mkdir $(DESTDIR)$(prefix)/static for i in `find tiny_mce -type d | grep -v .svn` \ ; do \ - test -d $(root)$(prefix)/$$i || mkdir $(root)$(prefix)/$$i; \ + test -d $(DESTDIR)$(prefix)/$$i || mkdir $(DESTDIR)$(prefix)/$$i; \ done for i in `find locale -type d | grep -v .svn` \ ; do \ - test -d $(root)$(prefix)/$$i || mkdir $(root)$(prefix)/$$i; \ + test -d $(DESTDIR)$(prefix)/$$i || mkdir $(DESTDIR)$(prefix)/$$i; \ done for i in \ webserver \ @@ -97,7 +97,7 @@ install: `find tiny_mce -type f | grep -v .svn` \ `find locale -type f | grep -v .svn` \ ; do \ - $(INSTALL) $$i $(root)$(prefix)/$$i; \ + $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \ done TAGS clean-recursive distclean-recursive depend-recursive check-recursive \ diff --git a/webcit/debian/changelog b/webcit/debian/changelog index 4825b85b6..7e3ddf8ad 100644 --- a/webcit/debian/changelog +++ b/webcit/debian/changelog @@ -1,3 +1,12 @@ +webcit (7.02-3) unstable; urgency=high + + * purge TinyMCE, as there is a debian package out there. + * move our templates to /etc/citadel/www/ + * use DESTDIR + * remove ucf from package + * add po-debconf to Build-Depends + + -- Wilfried Goesgens Wed, 3 Jan 2007 21:09:00 +0100 webcit (7.02-2) unstable; urgency=low * update to actual Webcit SVN. many new features. see Packages changelog. diff --git a/webcit/debian/citadel-webcit.postinst b/webcit/debian/citadel-webcit.postinst index 8d104c549..75ea4bb28 100644 --- a/webcit/debian/citadel-webcit.postinst +++ b/webcit/debian/citadel-webcit.postinst @@ -1,122 +1,22 @@ #! /bin/sh -# postinst.skeleton -# Skeleton maintainer script showing all the possible cases. -# Written by Charles Briscoe-Smith, March-June 1998. Public Domain. - # Abort if any command returns an error value set -e . /usr/share/debconf/confmodule -# This script is called as the last step of the installation of the -# package. All the package's files are in place, dpkg has already done -# its automatic conffile handling, and all the packages we depend of -# are already fully installed and configured. - -# The following idempotent stuff doesn't generally need protecting -# against being run in the abort-* cases. +db_version 2.0 -#### Install info files into the dir file -###: install-info --quiet --section "section pattern" "Section Title" \ -###: --description="Name of the document" /usr/info/foo.info -### -#### Create stub directories under /usr/local -###: if test ! -d /usr/local/lib/foo; then -###: if test ! -d /usr/local/lib; then -###: if mkdir /usr/local/lib; then -###: chown root.staff /usr/local/lib || true -###: chmod 2775 /usr/local/lib || true -###: fi -###: fi -###: if mkdir /usr/local/lib/foo; then -###: chown root.staff /usr/local/lib/foo || true -###: chmod 2775 /usr/local/lib/foo || true -###: fi -###: fi -### -#### Ensure the menu system is updated -###: [ ! -x /usr/bin/update-menus ] || /usr/bin/update-menus -### -#### Arrange for a daemon to be started at system boot time -###: update-rc.d foo default >/dev/null -### case "$1" in configure) - # Configure this package. If the package must prompt the user for - # information, do it here. - - mkdir -p /var/lib/citadel/www/static - # Activate menu-methods script - #: chmod a+x /etc/menu-methods/foo - - # Update ld.so cache - #: ldconfig - - # Make our version of a program available - #: update-alternatives \ - #: --install /usr/bin/program program /usr/bin/alternative 50 \ - #: --slave /usr/share/man/man1/program.1.gz program.1.gz \ - #: /usr/share/man/man1/alternative.1.gz - - # Tell ucf that the file in /usr/share/foo is the latest - # maintainer version, and let it handle how to manage the real - # confuguration file in /etc. This is how a static configuration - # file can be handled: - rm -f /tmp/md5sums - touch /tmp/md5sums - cd /var/lib/citadel/www/; - for i in `find -type f `; do - md5sum "$i" >>/tmp/md5sums - done - - cd /usr/share/doc/citadel-webcit/examples/ - # if target dirs don't exist, create them. - for i in `find -type d` ; do - if test ! -d /var/lib/citadel/www/$i; then - mkdir -p /var/lib/citadel/www/$i - fi - done - - gunzip -c md5sums > /tmp/newsums - if diff /tmp/newsums /tmp/md5sums >/dev/null; then - echo ''>/dev/null - else - cd /usr/share/doc/citadel-webcit/examples/ - for i in `cat /tmp/newsums |sed "s;.* \./;;"`; do - if test -f $i.gz; then - j=`basename $i|sed -e "s;.gz;;" ` - gunzip -c "/usr/share/doc/citadel-webcit/examples$REL_PATH/$i" >"/tmp/$j" - i=`dirname $i`/$j - else - j=`basename $i` - cp "/usr/share/doc/citadel-webcit/examples/$i" "/tmp" - fi - if test -f /var/lib/citadel/www/$i; then - origsum=`grep "$i" /tmp/md5sums |sed "s; .*;;"` - newsum=`grep "$i" /tmp/newsums |sed "s; .*;;"` - if test -z "$origsum"; then - ucf "/tmp/$j" "/var/lib/citadel/www/$i" - else - if test "$origsum" != "$newsum"; then - ucf "/tmp/$j" "/var/lib/citadel/www/$i" - fi - fi - else - ucf "/tmp/$j" "/var/lib/citadel/www/$i" - fi - rm -f "/tmp/$j" - done - fi - rm -f /tmp/newsums /tmp/md5sums if test ! -d /var/lib/citadel/keys; then mkdir -p /var/lib/citadel/keys fi if test ! -d /var/run/citadel/keys; then mkdir -p /var/run/citadel/keys fi - + ln -sf /usr/share/tinymce/www /etc/citadel/www/tiny_mce db_get citadel/WebcitHttpPort && http_port="$RET" db_get citadel/WebcitHttpsPort && https_port="$RET" - set >/tmp/testfoo + echo "aplying your settings" echo " export WEBCIT_HTTP_PORT=$http_port @@ -129,57 +29,11 @@ export WEBCIT_LISTEN_IP=0.0.0.0 db_stop #DEBHELPER# - - #### There are three sub-cases: - ###if test "${2+set}" != set; then - ### # We're being installed by an ancient dpkg which doesn't remember - ### # which version was most recently configured, or even whether - ### # there is a most recently configured version. - ### : - ### - ###elif test -z "$2" -o "$2" = ""; then - ### # The package has not ever been configured on this system, or was - ### # purged since it was last configured. - ### : - ### - ###else - ### # Version $2 is the most recently configured version of this - ### # package. - ### : - ### - ###fi - ;; - abort-upgrade) - # Back out of an attempt to upgrade this package FROM THIS VERSION - # to version $2. Undo the effects of "prerm upgrade $2". - #: - ;; - abort-remove) - ###if test "$2" != in-favour; then - ### echo "$0: undocumented call to \`postinst $*'" 1>&2 - ### exit 0 - ###fi - #### Back out of an attempt to remove this package, which was due to - #### a conflict with package $3 (version $4). Undo the effects of - #### "prerm remove in-favour $3 $4". - ###: - - ;; - abort-deconfigure) - ###if test "$2" != in-favour -o "$5" != removing; then - ### echo "$0: undocumented call to \`postinst $*'" 1>&2 - ### exit 0 - ###fi - #### Back out of an attempt to deconfigure this package, which was - #### due to package $6 (version $7) which we depend on being removed - #### to make way for package $3 (version $4). Undo the effects of - #### "prerm deconfigure in-favour $3 $4 removing $6 $7". - ###: - + abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "$0: didn't understand being called with '$1'" 1>&2 - exit 0;; + exit 1;; esac exit 0 diff --git a/webcit/debian/citadel-webcit.postrm b/webcit/debian/citadel-webcit.postrm index 63e9d9fc7..4c7930f2f 100644 --- a/webcit/debian/citadel-webcit.postrm +++ b/webcit/debian/citadel-webcit.postrm @@ -1,107 +1,22 @@ #! /bin/sh -# postrm.skeleton -# Skeleton maintainer script showing all the possible cases. -# Written by Charles Briscoe-Smith, March-June 1998. Public Domain. - # Abort if any command returns an error value set -e . /usr/share/debconf/confmodule -# This script is called twice during the removal of the package; once -# after the removal of the package's files from the system, and as -# the final step in the removal of this package, after the package's -# conffiles have been removed. - -# Ensure the menu system is updated -: [ ! -x /usr/bin/update-menus ] || /usr/bin/update-menus - case "$1" in - remove) - # This package is being removed, but its configuration has not yet - # been purged. - # TODO: remove from inittab. - - # Remove diversion - #: dpkg-divert --package foo --remove --rename \ - #: --divert /usr/bin/other.real /usr/bin/other - - # ldconfig is NOT needed during removal of a library, only during - # installation - - ;; purge) - # This package has previously been removed and is now having - # its configuration purged from the system. - # remove the gunzipped setup executable. - # we mimic dpkg as closely as possible, so we remove configuration - # files with dpkg backup extensions too: - ### Some of the following is from Tore Anderson: - if test -d /var/lib/citadel/www/static; then - cd /var/lib/citadel/www/static; for i in *; do - i=`echo $i|sed "s;.gz;;"` - ucf --purge "/var/lib/citadel/www/static/$i" - rm -f "/var/lib/citadel/www/static/$i" - done - fi - #rmdir /var/lib/citadel/www/static - echo "/var/lib/citadel/www/keys not removed. " + echo "/etc/citadel/www/keys not removed. " db_purge 'citadel/WebcitHttpsPort' db_purge 'citadel/WebcitHttpPort' - db_purge 'citade/WebcitInstallnote' - ### TODO: remove citadel from inittab! + db_purge 'citadel/WebcitInstallnote' ;; disappear) if test "$2" != overwriter; then echo "$0: undocumented call to \`postrm $*'" 1>&2 exit 0 fi - # This package has been completely overwritten by package $3 - # (version $4). All our files are already gone from the system. - # This is a special case: neither "prerm remove" nor "postrm remove" - # have been called, because dpkg didn't know that this package would - # disappear until this stage. - : - ;; - upgrade) - # About to upgrade FROM THIS VERSION to version $2 of this package. - # "prerm upgrade" has been called for this version, and "preinst - # upgrade" has been called for the new version. Last chance to - # clean up. - : - - ;; - failed-upgrade) - # About to upgrade from version $2 of this package TO THIS VERSION. - # "prerm upgrade" has been called for the old version, and "preinst - # upgrade" has been called for this version. This is only used if - # the previous version's "postrm upgrade" couldn't handle it and - # returned non-zero. (Fix old postrm bugs here.) - : - - ;; - abort-install) - # Back out of an attempt to install this package. Undo the effects of - # "preinst install...". There are two sub-cases. - : - - if test "${2+set}" = set; then - # When the install was attempted, version $2's configuration - # files were still on the system. Undo the effects of "preinst - # install $2". - : - - else - # We were being installed from scratch. Undo the effects of - # "preinst install". - : - - fi ;; - abort-upgrade) - # Back out of an attempt to upgrade this package from version $2 - # TO THIS VERSION. Undo the effects of "preinst upgrade $2". - : - + remove|upgrade|failed-upgrade|abort-install|abort-upgrade) ;; *) echo "$0: didn't understand being called with \`$1'" 1>&2 exit 0;; diff --git a/webcit/debian/citadel-webcit.templates b/webcit/debian/citadel-webcit.templates index d8587f58f..7326103ac 100644 --- a/webcit/debian/citadel-webcit.templates +++ b/webcit/debian/citadel-webcit.templates @@ -1,20 +1,21 @@ Template: citadel/WebcitHttpPort Type: string Default: 8504 -Description: Webcit HTTP Port - Select the Port, which the plain HTTP webcit server should listen on. -1 to disable. +_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. Template: citadel/WebcitHttpsPort Type: string Default: 443 -Description: WebCit HTTPS port +_Description: WebCit HTTPS port Select the Port, which the SSL HTTP webcit server should listen on. -1 to disable. Template: citadel/WebcitInstallnote Type: note -Description: Citadel/UX +_Description: Citadel/UX Citadel-webcit will be running soon. Log into it with your citadel Administrator user, and do the fine setup. Log in as the user you specified as the Administrator, and diff --git a/webcit/debian/control b/webcit/debian/control index 0b42f4ac0..5fb1537c2 100644 --- a/webcit/debian/control +++ b/webcit/debian/control @@ -2,12 +2,14 @@ Source: webcit Section: unknown Priority: optional Maintainer: Wilfried Goesgens -Build-Depends: debhelper (>= 4.0.0), libical-dev, gettext +Build-Depends: debhelper (>= 4.0.0), po-debconf, + libical-dev, gettext Standards-Version: 3.6.1 Package: citadel-webcit Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, debconf +Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, + tinymce Suggests: citadel-server Description: Webcit, the Webfrontend to the Citadel. WebCit puts a web-based front end on Citadel, allowing diff --git a/webcit/debian/dirs b/webcit/debian/dirs deleted file mode 100644 index ca882bbb7..000000000 --- a/webcit/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/webcit/debian/files_preview b/webcit/debian/files_preview deleted file mode 100644 index 4f2802804..000000000 --- a/webcit/debian/files_preview +++ /dev/null @@ -1,2 +0,0 @@ -citadel-webcit_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb web optional -citadel-webcit-apache_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb web optional diff --git a/webcit/debian/po/POTFILES.in b/webcit/debian/po/POTFILES.in new file mode 100644 index 000000000..99ae7c8e0 --- /dev/null +++ b/webcit/debian/po/POTFILES.in @@ -0,0 +1,2 @@ +[type: gettext/rfc822deb] citadel-webcit.templates + diff --git a/webcit/debian/po/templates.pot b/webcit/debian/po/templates.pot new file mode 100644 index 000000000..5bdae06fa --- /dev/null +++ b/webcit/debian/po/templates.pot @@ -0,0 +1,63 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: citadel@outgesourced.org\n" +"POT-Creation-Date: 2007-01-03 13:33+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../citadel-webcit.templates:1001 +msgid "Webcit HTTP Port" +msgstr "" + +#. Type: string +#. Description +#: ../citadel-webcit.templates:1001 +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." +msgstr "" + +#. Type: string +#. Description +#: ../citadel-webcit.templates:2001 +msgid "WebCit HTTPS port" +msgstr "" + +#. Type: string +#. Description +#: ../citadel-webcit.templates:2001 +msgid "" +" Select the Port, which the SSL HTTP webcit server should listen on. -1 to " +"disable." +msgstr "" + +#. Type: note +#. Description +#: ../citadel-webcit.templates:3001 +msgid "Citadel/UX" +msgstr "" + +#. Type: note +#. Description +#: ../citadel-webcit.templates:3001 +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" +" specified as the Administrator, and\n" +" review the Points under the Administration menu. If you have further\n" +" questions review www.citadel.org, specialy the FAQ and Documentation\n" +" section." +msgstr "" diff --git a/webcit/debian/rules b/webcit/debian/rules index 61bb40a95..255050b29 100755 --- a/webcit/debian/rules +++ b/webcit/debian/rules @@ -9,6 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DESTDIR=$(CURDIR)/debian/citadel-webcit/ @@ -26,10 +27,10 @@ configure-stamp: CFLAGS="$(CFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/var/lib/citadel/www/ \ + --prefix=/etc/citadel/www/ \ --with-sysconfdir=/etc/citadel \ --with-spooldir=/var/spool/citadel \ - --with-datadir=/var/lib/citadel \ + --with-datadir=/etc/citadel \ --with-rundir=/var/run/citadel \ --with-ical --with-db --with-ldap \ --with-zlib --with-ssl --with-libiconf \ @@ -66,26 +67,19 @@ install: build dh_installdirs # Add here commands to install the package into debian/webcit. - root=$(CURDIR)/debian/webcit/ - mkdir -p $(CURDIR)/debian/webcit/var/lib/citadel/www/ - export root=$(CURDIR)/debian/webcit; $(MAKE) install DESTDIR=$(CURDIR)/debian/webcit/ - mkdir -p $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/examples - mkdir -p $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/contrib - mkdir -p $(CURDIR)/debian/citadel-webcit/usr/sbin - mkdir -p $(CURDIR)/debian/citadel-webcit/usr/lib/citadel-webcit/ - mv $(CURDIR)/debian/webcit/var/lib/citadel/www/static \ - $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/examples/ - mv $(CURDIR)/debian/webcit/var/lib/citadel/www/tiny_mce \ - $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/examples/ -# locale -> /usr/share/locale - mv $(CURDIR)/debian/webcit/var/lib/citadel/www/locale \ - $(CURDIR)/debian/citadel-webcit/usr/share/locale - cd $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/examples/; \ - md5sum `find -type f |grep -v md5sums `>md5sums; + $(MAKE) -C . install DESTDIR=$(DESTDIR) +# there are debian tinymce packages arround, so we don't ship it another time. + rm -rf $(DESTDIR)/etc/citadel/www/tiny_mce # we don't use the setup anymore, omit it. - rm -f $(CURDIR)/debian/webcit/var/lib/citadel/www/setup - mv $(CURDIR)/debian/webcit/var/lib/citadel/www/webserver \ - $(CURDIR)/debian/citadel-webcit/usr/sbin/ + rm -f $(DESTDIR)/etc/citadel/www/setup +# locale -> /usr/share/locale + mkdir -p $(DESTDIR)/usr/share/ + mv $(DESTDIR)/etc/citadel/www/locale \ + $(DESTDIR)/usr/share/locale + + mkdir -p $(DESTDIR)/usr/sbin + mv $(DESTDIR)/etc/citadel/www/webserver \ + $(DESTDIR)/usr/sbin/ # Build architecture-independent files here. diff --git a/webcit/debian/webcit.substvars b/webcit/debian/webcit.substvars deleted file mode 100644 index 3c1d1838c..000000000 --- a/webcit/debian/webcit.substvars +++ /dev/null @@ -1 +0,0 @@ -shlibs:Depends=libc6 (>= 2.3.2.ds1-21), libssl0.9.7, zlib1g (>= 1:1.2.1)