--- albatross-1.36.orig/setup.py +++ albatross-1.36/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python # To use: # python setup.py install # --- albatross-1.36.orig/doc/Makefile +++ albatross-1.36/doc/Makefile @@ -1,11 +1,14 @@ PYTHON = python +MKHOWTO = /usr/lib/python2.3/doc/tools/mkhowto PYDIR=$(shell $(PYTHON) -c 'import os; print os.path.dirname(os.__file__)') DOC_ROOT = $(PYDIR)/doc MKHOWTO = $(DOC_ROOT)/tools/mkhowto ICONS = $(DOC_ROOT)/html/icons +MKHOWTO = /usr/lib/python2.5/doc/tools/mkhowto + .PHONY: html PAPER = a4 @@ -46,7 +49,7 @@ mkdir -p albatross/icons cp $(ICONS)/* albatross/icons/ # the iconserver option of mkhowto is broken since it writes -# it to the end if the init_file where they aren't useful anymore, +# it to the end of the init_file where they aren't useful anymore, # so we work around it: for f in `find albatross -type f`; do \ cat $$f | sed s/\.\.\\/icons/icons/g > $${f}2; \ @@ -72,9 +75,9 @@ # convert .obj images to .eps and then to .pdf # Some versions of dia require --export-to-format=eps-builtin, rather than # --filter=eps-builtin. +# In the Debian package, we use the short options. %.pdf: %.dia - dia --nosplash --filter=eps-builtin \ - --export=$(subst .dia,.eps,$<) $< + DISPLAY="" dia -e $(subst .dia,.eps,$<) -t eps-builtin -n -l $< epstopdf $(subst .dia,.eps,$<) clean: --- albatross-1.36.orig/debian/python-albatross-common.albatross.default +++ albatross-1.36/debian/python-albatross-common.albatross.default @@ -0,0 +1,10 @@ +# Defaults for Albatross session daemon. +# Sourced by albatross initscript + +# +# This is a POSIX shell fragment +# + +SESSION_ENABLE=0 # set to 1 to enable session daemon +SESSION_PORT=34343 # port to listen on +SESSION_DEBUG=0 # print debug messages in log file --- albatross-1.36.orig/debian/control +++ albatross-1.36/debian/control @@ -0,0 +1,56 @@ +Source: albatross +Section: python +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Fabian Fagerholm +Build-Depends: debhelper (>= 5.0.37.1), python (>= 2.3.5-7), python-all +Build-Depends-Indep: python-central (>= 0.5), docbook-to-man, texlive-base, texlive-fonts-recommended, texlive-extra-utils, texlive-latex-base, texlive-latex-extra, texlive-latex-recommended, texlive-font-utils, dia (>= 0.94.0), ghostscript, fakeroot, python-old-doctools +Standards-Version: 3.8.0 +XS-Python-Version: all +Homepage: http://www.object-craft.com.au/projects/albatross/ + +Package: python-albatross +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Suggests: python-albatross-common +Conflicts: python2.3-albatross (<< 1.33-3), python2.4-albatross (<< 1.33-3) +Replaces: python2.3-albatross (<< 1.33-3), python2.4-albatross (<< 1.33-3) +XB-Python-Version: ${python:Versions} +Description: Toolkit for Stateful Web Applications + Albatross is a small and flexible Python toolkit for developing highly + stateful web applications. It includes, among other things: + * An extensible HTML templating system similar to DTML that promotes + separation of presentation and implementation. + * The ability to place Python code for each page in a dynamically loaded + module, or to place each page in its own class. + * Optional sessions: browser-based or server-based. + * Deployment as CGI programs, mod_python modules or as standalone web + applications. + +Package: python-albatross-common +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python-albatross, adduser, lsb-base (>= 3.0-6) +XB-Python-Version: ${python:Versions} +Description: Toolkit for Stateful Web Applications (common files) + Albatross is a small and flexible Python toolkit for developing highly + stateful web applications. + . + This package contains the Albatross session server and standalone + web application server. + +Package: python-albatross-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Description: documentation for the Albatross Web Toolkit + Albatross is a small and flexible Python toolkit for developing highly + stateful web applications. It includes, among other things: + * An extensible HTML templating system similar to DTML that promotes + separation of presentation and implementation. + * The ability to place Python code for each page in a dynamically loaded + module, or to place each page in its own class. + * Optional sessions: browser-based or server-based. + * Deployment as CGI programs, mod_python modules or as standalone web + applications. + . + This package contains the Albatross documentation in PDF format. --- albatross-1.36.orig/debian/copyright +++ albatross-1.36/debian/copyright @@ -0,0 +1,37 @@ +This package was debianized by Fabian Fagerholm on +Fri, 16 May 2003 16:33:08 +0300. + +It was downloaded from http://www.object-craft.com.au/projects/albatross/ + +Upstream Authors: Object Craft + +Copyright: + +Copyright (C) 2002, 2003, Object Craft P/L, Melbourne, Australia. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name of Object Craft nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- albatross-1.36.orig/debian/python-albatross-common.albatross.logrotate +++ albatross-1.36/debian/python-albatross-common.albatross.logrotate @@ -0,0 +1,13 @@ +/var/log/albatross/*.log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 albatross adm + sharedscripts + postrotate + invoke-rc.d albatross restart >/dev/null + endscript +} --- albatross-1.36.orig/debian/changelog +++ albatross-1.36/debian/changelog @@ -0,0 +1,308 @@ +albatross (1.36-5.4ubuntu1) natty; urgency=low + + * doc/Makefile: Hard code path to mkhowto for natty's + python-old-doctools package. (LP: #747225) + + -- Barry Warsaw Tue, 05 Apr 2011 18:29:14 -0400 + +albatross (1.36-5.4) unstable; urgency=low + + * Non-maintainer upload. + * Python 2.6 support patch: __import__ now takes an optional level argument; + account for this in SessionBase.decode_session. (Closes: #582117). Thanks + to Colin Watson from Ubuntu for the patch. + * Shut down test server if tests fail (Closes: #582800) + + -- Stefano Rivera Sun, 23 May 2010 21:04:29 +0200 + +albatross (1.36-5.3) unstable; urgency=low + + * Non-maintainer upload. + * Build-depend on python-old-doctools (closes: #568044). Thanks to Matthias + Klose for the bug report. + * Build-depend on texlive-latex-recommended (closes: #568633). Thanks to + Michael Bienia for the bug report. + * Replace build-dependency on python-all-dev with python-all. + * Add Depends: ${misc:Depends} to all binary packages. + * Add dependency on $remote_fs to the init script; drop weak dependencies on + $local_fs as superfluous. + + -- Jakub Wilk Tue, 23 Feb 2010 14:39:43 +0100 + +albatross (1.36-5.2) unstable; urgency=low + + * Non-maintainer upload. + * Add texlive-font-utils to fix FTBS (Closes: #562333) + + -- Micah Anderson Sat, 30 Jan 2010 22:14:10 -0500 + +albatross (1.36-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Preparing for the upcoming Python 2.6 transition; thanks to Piotr Ożarowski + for the report and suggestions; Closes: #556146 + - debian/rules + + pass "--prefix=/usr" to setup.py call + + -- Sandro Tosi Mon, 16 Nov 2009 23:50:39 +0100 + +albatross (1.36-5) unstable; urgency=low + + * debian/control: Build-depend on ghostscript instead of obsolete gs-gpl. + * debian/control: Bump standards-version to 3.8.0. + + -- Fabian Fagerholm Sun, 06 Jul 2008 12:59:27 +0300 + +albatross (1.36-4) unstable; urgency=low + + * python-albatross-common.albatross.init: Remove bashism (Closes: #480611). + + -- Fabian Fagerholm Mon, 12 May 2008 19:58:51 +0300 + +albatross (1.36-3) unstable; urgency=low + + * Acknowledge NMU. Thanks to Kumar Appaiah for + the patch to fix #424092 and to Martin Zobel-Helas + for the NMU. + * debian/control: Bump standards-version to 3.7.3. + * debian/rules: Do nothing in binary-arch target to satisfy lintian. + * debian/control: Move python and python-all-dev to build-depends instead + of build-depends-indep. + * debian/control: Add Homepage header and remove the homepage line from + the individual package descriptions. + * debian/control: Change section to python. + + -- Fabian Fagerholm Mon, 07 Apr 2008 18:55:56 +0300 + +albatross (1.36-2.1) unstable; urgency=medium + + * Non-maintainer upload during the + credativ BSP 2008 + * FTBFS if built twice in a row (Closes: #424092) + * urgency medium because of RG + + -- Martin Zobel-Helas Sat, 05 Apr 2008 14:12:56 +0200 + +albatross (1.36-2) unstable; urgency=low + + * debian/control: use TeX Live instead of teTeX (Closes: #419756). + + -- Fabian Fagerholm Wed, 18 Apr 2007 10:20:30 +0300 + +albatross (1.36-1) unstable; urgency=low + + * New upstream release. + * debian/python-albatross-common.albatross.init: Use LSB output functions. + + -- Fabian Fagerholm Thu, 5 Apr 2007 19:13:53 +0300 + +albatross (1.35-2) unstable; urgency=low + + * doc/doctest/tags-value1: fix test to work on amd64 (Closes: #391866). + * debian/rules: don't run dh_pycentral on the -doc package. + * debian/rules: don't use dh_python anymore. + + -- Fabian Fagerholm Tue, 10 Oct 2006 18:03:59 +0300 + +albatross (1.35-1) unstable; urgency=low + + * New upstream release. + * Use eps-builtin export format in dia. + + -- Fabian Fagerholm Tue, 20 Jun 2006 14:30:19 +0300 + +albatross (1.33-3) unstable; urgency=low + + * debian/al-httpd.sgml: license change; email address update. + * debian/al-session-daemon.sgml: license change; email address update. + * debian/README.Debian: update instructions, include more information. + * debian/rules: update copyright, include explicit GPL copyright statement. + * debian/control, doc/Makefile: use short options for dia. (Closes: #373588) + * debian/control: new standards-version. + * debian/control: build-depend on debhelper (instead of build-depend-indep). + * Transition to new Python policy. (Closes: #373303) Specific changes below. + * debian/control: drop pythonX.Y-albatross binary packages. + * debian/control: replace/conflict with pythonX.Y-albatross. + * debian/control: build-depend on python-central. + * debian/control: update descriptions to reflect Python policy changes. + * debian/rules: revamp for Python policy transition. + * debian/rules: use python-central. + * debian/rules: no longer build separate pythonX.Y packages. + * debian/rules: small cleanups. + * debian/compat: use compat level 5. + + -- Fabian Fagerholm Thu, 15 Jun 2006 22:03:52 +0300 + +albatross (1.33-2) unstable; urgency=low + + * debian/control: add dependency on adduser for python-albatross-common + * debian/control: drop unneccessary ${shlibs:Depends} and ${misc:Depends} + * debian/rules: FTBFS - ensure the session server can start as non-root + when running the test suite at build time by specifying explicit + locations for pidfile and log (Closes: #347840) + * Thanks to Steve Kowalik for his patch. + + -- Fabian Fagerholm Fri, 13 Jan 2006 09:08:06 +0200 + +albatross (1.33-1) unstable; urgency=low + + * New upstream release + * debian/rules: run test suite after building (Closes: #233659) + * debian/python-albatross-common.conffiles: remove, debhelper takes + care of the conffiles now. + + -- Fabian Fagerholm Wed, 21 Dec 2005 18:48:21 +0200 + +albatross (1.32-2) unstable; urgency=low + + * debian/control: drop the python2.2 version (transition time!). + + -- Fabian Fagerholm Mon, 19 Dec 2005 08:14:46 +0200 + +albatross (1.32-1) unstable; urgency=low + + * New upstream release + * debian/control: update Standards-Version to latest policy. + * debian/control: build a python2.4 version (Closes: #305774). + + -- Fabian Fagerholm Sun, 18 Dec 2005 14:09:39 +0200 + +albatross (1.30-1) unstable; urgency=low + + * New upstream release + * Change section of doc package to doc instead of web. + * Update README.Debian and TODO.Debian. + * debian/control: change Maintainer field to my Debian email address. + * debian/control: update package description. + + -- Fabian Fagerholm Tue, 14 Jun 2005 11:47:23 +0300 + +albatross (1.20-1) unstable; urgency=low + + * New upstream release (Closes: #277117) + * Small change in short package descriptions to make lintian happy. + * Upload sponsored by Matthew Palmer + + -- Fabian Fagerholm Mon, 24 Jan 2005 22:51:23 +0200 + +albatross (1.10-10) unstable; urgency=low + + * debian/control: Acknowledge NMU; thanks to Christopher Cheney. + (Closes: #259113) + * debian/control, debian/rules: Enable building of PDF documentation + in new package python-albatross-doc. (Closes: #233658) + + -- Fabian Fagerholm Wed, 21 Jul 2004 09:31:47 +0300 + +albatross (1.10-9.1) unstable; urgency=low + + * NMU. + * Added python to Build-Depends. (Closes: #259113) + + -- Christopher L Cheney Wed, 14 Jul 2004 20:50:00 -0500 + +albatross (1.10-9) unstable; urgency=low + + * debian/control: build-depend on debhelper (>= 4.1.67) for dh_python. + * debian/control: bump standards-version to 3.6.1. + * Patch: use /usr/bin/python instead of /usr/bin/env python. + * python-albatross-common suggests python. + + -- Fabian Fagerholm Mon, 19 Apr 2004 18:28:48 +0300 + +albatross (1.10-8) unstable; urgency=low + + * Corrected dependency relationships between python-albatross-common, + python2.3-albatross and python2.2-albatross. + + -- Fabian Fagerholm Fri, 2 Apr 2004 13:14:42 +0300 + +albatross (1.10-7) unstable; urgency=low + + * debian/control: python-albatross depends on correct maximum version + of python; use dh_python. This also changes the default version to 2.3. + (Closes: #234325) + * Break out common files into a separate package. + * The 2.2 and 2.3 versions no longer conflict. + + -- Fabian Fagerholm Thu, 11 Mar 2004 18:04:30 +0200 + +albatross (1.10-6) unstable; urgency=low + + * Now the manpages are not only built but also included in the package. + * Appropriate files are marked as conffiles again. + * dh_installdocs is called correctly on all packages. + + -- Fabian Fagerholm Tue, 10 Feb 2004 11:27:14 +0200 + +albatross (1.10-5) unstable; urgency=low + + * A thorough cleanup of the package, in order to reduce the diff size + and to make better use of debhelper. + * Moved to using tla (GNU arch) for revision control. + * Folded back the session server package into the main package. It's + not big enough to warrant a separate package, and the server can be + enabled and disabled by user configuration. + + -- Fabian Fagerholm Sun, 8 Feb 2004 19:29:08 +0200 + +albatross (1.10-4) unstable; urgency=low + + * Disable documentation building because Dia is broken. + Documentation will be separately provided. + + -- Fabian Fagerholm Thu, 20 Nov 2003 22:57:41 +0200 + +albatross (1.10-3) unstable; urgency=low + + * Cleaned up cruft in debian/ (.ex files). + * Now both Python 2.2 and 2.3 packages are produced, and + the packaging should be according to Python policy. + * Cleaned up debian/rules. + * PostScript documentation dropped, now PDF and HTML only. + + -- Fabian Fagerholm Thu, 28 Aug 2003 19:00:50 +0300 + +albatross (1.10-2) unstable; urgency=low + + * Add man page for the session daemon. + * Added correct versioned build-dependency on debhelper. + * Several touch-ups based on lintian feedback. + + -- Fabian Fagerholm Thu, 7 Aug 2003 12:15:25 +0300 + +albatross (1.10-1) unstable; urgency=low + + * New upstream release + + -- Fabian Fagerholm Thu, 7 Aug 2003 10:27:31 +0300 + +albatross (1.01-4) unstable; urgency=low + + * Build-depend on dia (>= 0.91). + + -- Fabian Fagerholm Mon, 2 Jun 2003 10:36:24 +0300 + +albatross (1.01-3) unstable; urgency=low + + * This release brought to you by a needle and some straws of hay, all + arranged in a nice stack. + * Fixed HTML documentation generation. The source package now includes + some documentation-related tools from the python2.2 source package. + + -- Fabian Fagerholm Sat, 31 May 2003 18:12:55 +0300 + +albatross (1.01-2) unstable; urgency=low + + * Include the Albatross session server in a separate package. + * debian/rules: bump DH_COMPAT to 4. + + -- Fabian Fagerholm Thu, 29 May 2003 15:03:41 +0300 + +albatross (1.01-1) unstable; urgency=low + + * Initial Release. + * This release brought to you by Sleight of Hand (with apologies to + Pearl Jam). + + -- Fabian Fagerholm Fri, 16 May 2003 20:12:53 +0300 --- albatross-1.36.orig/debian/python-albatross.docs +++ albatross-1.36/debian/python-albatross.docs @@ -0,0 +1,2 @@ +PKG-INFO +TODO --- albatross-1.36.orig/debian/rules +++ albatross-1.36/debian/rules @@ -0,0 +1,111 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Based on "Sample debian/rules that uses debhelper". +# GNU copyright 1997 to 1999 by Joey Hess. +# Copyright 2003-2006 Fabian Fagerholm. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# The versions of python currently supported +PYVERS=$(shell pyversions -r debian/control) + +export MY_DIR=$(shell mktemp -d) + +# Targets for running unit tests +test-build: test-build-stamp +test-build-stamp: + dh_testdir + # run the session server + PYTHONPATH=`pwd` session-server/al-session-daemon -k $$MY_DIR/sess.pid -l $$MY_DIR/log start + # run the tests, stop the session server + make -C test all; \ + result=$$?; \ + PYTHONPATH=`pwd` session-server/al-session-daemon -k $$MY_DIR/sess.pid -l $$MY_DIR/log stop; \ + exit $$result + touch $@ + +# Targets for building different parts of the package +build: build-stamp test-build +build-stamp: $(PYVERS:%=build-ext-%) build-doc + /usr/bin/docbook-to-man debian/al-session-daemon.sgml > al-session-daemon.8 + /usr/bin/docbook-to-man debian/al-httpd.sgml > al-httpd.8 + touch $@ +build-ext-%: + dh_testdir + $* setup.py build + touch $@ +build-doc: build-doc-stamp +build-doc-stamp: + PYTHONPATH=`pwd` make -C doc pdf + touch $@ + +# Clean up everything +clean: + dh_testdir + dh_testroot + for python in $(PYVERS); do \ + $$python setup.py clean; \ + done + rm -rf *-stamp *-stamp-* build + rm -f al-session-daemon.8 al-httpd.8 + find debian -name '*.py[co]' -exec rm -f {} \; + find doc -name '*.py[co]' -exec rm -f {} \; + find doc -name '*.pdf' -exec rm -f {} \; + find doc -name '*.eps' -exec rm -f {} \; + find doc -name '*methods.tex' -exec rm -f {} \; + find test -name '*.py[co]' -exec rm -f {} \; + find albatross -name '*.py[co]' -exec rm -f {} \; + rm -f build-ext-python* install-ext-python* + rm -f doc/albatross.lof doc/albatross.tex2 doc/other.html + dh_clean + +# Install files in their correct locations +install: install-stamp +install-stamp: build-stamp $(PYVERS:%=install-ext-%) + dh_testdir + dh_testroot + dh_installdocs -ppython-albatross + rm -rf $(CURDIR)/debian/python-albatross/usr/bin + dh_installinit -ppython-albatross-common --name=albatross + dh_installlogrotate -ppython-albatross-common --name=albatross + dh_installman -ppython-albatross-common al-httpd.8 al-session-daemon.8 + dh_install -ppython-albatross-common \ + session-server/al-session-daemon \ + standalone-server/al-httpd usr/bin + dh_install -ppython-albatross-doc \ + doc/albatross.pdf \ + usr/share/doc/python-albatross-doc + touch $@ +install-ext-%: + $* setup.py install --root=$(CURDIR)/debian/python-albatross --prefix=/usr + touch $@ + +# Dummy target to satisfy policy. +binary-arch: + +# Build architecture-independent files here. +# Pass -i to debhelper commands in this target to reduce clutter. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installchangelogs ChangeLog -i + dh_installdocs -i + dh_compress -i + dh_pycentral -i -Npython-albatross-doc + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary: binary-indep +.PHONY: test-build build build-doc clean install binary-arch binary-indep binary --- albatross-1.36.orig/debian/python-albatross-common.postrm +++ albatross-1.36/debian/python-albatross-common.postrm @@ -0,0 +1,41 @@ +#! /bin/sh +# postrm script for albatross +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) + ;; + purge) + # Remove logs + rm -rf /var/log/albatross + ;; + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- albatross-1.36.orig/debian/README.Debian +++ albatross-1.36/debian/README.Debian @@ -0,0 +1,23 @@ +albatross for Debian +-------------------- + +This package is functionally identical to the upstream version. It is +split into smaller packages in a Debian-like way. Each of the +pythonX.X-albatross packages provide versions for the corresponding +Python version. The python-albatross package is a dummy package that +depends on the current default version. The python-albatross-common +package contains the session server and the standalone HTTP +daemon. The documentation is contained in python-albatross-doc. + +The home page for Albatross is +http://www.object-craft.com.au/projects/albatross/ + +There is also a Wiki with tips for Albatross users: +http://www.object-craft.com.au/projects/albatross/wiki + +See the file TODO.Debian for more details, as well as the Debian Bug Tracking +system. + +Have fun! + + -- Fabian Fagerholm , Sat, 21 Jan 2006 21:20:00 +0200 --- albatross-1.36.orig/debian/al-session-daemon.sgml +++ albatross-1.36/debian/al-session-daemon.sgml @@ -0,0 +1,172 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Fabian"> + Fagerholm"> + + Aug 7, 2003"> + + 8"> + fabbe@debian.org"> + + ALBATROSS"> + + + Debian"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + session daemon for Albatross web applications + + + + &dhpackage; + + + + + + + + + + + + command + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; command. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + &dhpackage; is a daemon that implements a + session server for Albatross web applications. It can store simple + pieces of information for later retrieval. With the help of this + daemon, you can distribute your Albatross web application across + several web servers and store the sessions in one place. + + + + OPTIONS + + A summary of options is included below. + + + + + + + + Write debugging to log. + + + + + + + + Display program help. + + + + + + + + Record server pid in pid-file, default is /var/run/al-session-daemon.pid. + + + + + + + + Listen on port, default is 34343. + + + + + + + + Write log to log-file, default is /var/log/al-session-daemon.log. + + + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to redistribute it and/or modify it under the terms of + the &gnu; General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at + your option) any later version. + + + + + + + --- albatross-1.36.orig/debian/compat +++ albatross-1.36/debian/compat @@ -0,0 +1 @@ +5 --- albatross-1.36.orig/debian/python-albatross-common.postinst +++ albatross-1.36/debian/python-albatross-common.postinst @@ -0,0 +1,61 @@ +#! /bin/sh +# postinst script for albatross +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + # Create albatross user + echo "Creating/updating albatross user account..." + adduser --system --ingroup adm --home /var/log/albatross \ + --shell /bin/sh --disabled-password \ + --gecos "Albatross Web Application Toolkit" albatross >/dev/null 2>&1 || { + if getent passwd | grep -s -q -E '^albatross:'; then + echo "Non-system user albatross found. I will not overwrite a non-system" >&2 + echo "user. Remove the user and reinstall python-albatross-session-server." >&2 + exit 1 + fi + # unknown adduser error, simply exit + exit 1 + } + + # Create log and pid directories + install -d -oalbatross -gadm -m2750 /var/log/albatross + install -d -oalbatross -m0700 /var/run/albatross + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- albatross-1.36.orig/debian/al-httpd.sgml +++ albatross-1.36/debian/al-httpd.sgml @@ -0,0 +1,133 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Fabian"> + Fagerholm"> + + Aug 7, 2003"> + + 8"> + fabbe@debian.org"> + + ALBATROSS"> + + + Debian"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + minimal HTTP daemon for Albatross web applications + + + + &dhpackage; + + + + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; command. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + &dhpackage; is a minimalistic HTTP daemon. + It can be used to deploy a CGI application as a standalone + BaseHTTPServer server. + + + + OPTIONS + + A summary of options is included below. + + + + + + Specify the application object. + + + + + + Specify the port to listen on. + + + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to redistribute it and/or modify it under the terms of + the &gnu; General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at + your option) any later version. + + + + + --- albatross-1.36.orig/debian/python-albatross-common.docs +++ albatross-1.36/debian/python-albatross-common.docs @@ -0,0 +1,2 @@ +PKG-INFO +TODO --- albatross-1.36.orig/debian/TODO +++ albatross-1.36/debian/TODO @@ -0,0 +1,9 @@ +To Do for Albatross +------------------- + +* Include html docs in the -doc package. This requires tools that are + non-free at this time. +* python-albatross-session-server -- should it run per-user? +* python-albatross-standalone-server -- should it run per-user? + + -- Fabian Fagerholm , Tue, 14 Jun 2005 10:51:01 +0200 --- albatross-1.36.orig/debian/watch +++ albatross-1.36/debian/watch @@ -0,0 +1,6 @@ +# watch control file for uscan +# Run the "uscan" command to check for upstream updates and more. +# Site Directory Pattern Version Script +version=2 +http://www.object-craft.com.au/projects/albatross/download/ \ + albatross-([0-9]+\.[0-9]+)\.tar\.gz debian uupdate --- albatross-1.36.orig/debian/python-albatross-common.albatross.init +++ albatross-1.36/debian/python-albatross-common.albatross.init @@ -0,0 +1,103 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: al-session-daemon +# Required-Start: $syslog $remote_fs +# Required-Stop: $syslog $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start Albatross Session Server Daemon +# Description: Start the Albatross Session Server Daemon +### END INIT INFO + +# albatross SysV init script for Albatross Session Server Daemon +# and Albatross Standalone Application Server +# +# Copyright 2003-2005 Fabian Fagerholm . +# +# Based on a skeletal version with the following credits: +# Written by Miquel van Smoorenburg . +# Modified for Debian GNU/Linux +# by Ian Murdock . +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +NAME=albatross +USER=albatross + +SESSION_SERVER=/usr/bin/al-session-daemon +SESSION_NAME=al-session-daemon +SESSION_LOGFILE=/var/log/albatross/albatross-session-daemon.log +SESSION_PIDFILE=/var/run/albatross/al-session-daemon.pid +SESSION_DESC="session server" + +# Define LSB functions +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# Source defaults or user configuration. +[ -r /etc/default/albatross ] && . /etc/default/albatross + +test -x $SESSION_SERVER || exit 0 + +if [ $SESSION_ENABLE -eq 0 ]; then + echo "Albatross session server not enabled." + exit 0 +fi + +set -e + +case "$1" in + start) + log_daemon_msg "Starting Albatross" "$SESSION_DESC" + + start-stop-daemon --start \ + --verbose \ + --exec $SESSION_SERVER \ + --pidfile $SESSION_PIDFILE \ + --user $USER \ + --name $SESSION_NAME \ + -- \ + --port=$SESSION_PORT \ + --log=$SESSION_LOGFILE \ + --pidfile=$SESSION_PIDFILE \ + start + + log_end_msg 0 + ;; + stop) + log_daemon_msg "Stopping Albatross" "$SESSION_DESC" + + start-stop-daemon --start \ + --verbose \ + --exec $SESSION_SERVER \ + --pidfile $SESSION_PIDFILE \ + --user $USER \ + --name $SESSION_NAME \ + -- \ + --port=$SESSION_PORT \ + --log=$SESSION_LOGFILE \ + --pidfile=$SESSION_PIDFILE \ + stop + + log_end_msg 0 + ;; + restart|force-reload) + $0 stop + $0 start + ;; + status) + if [ "`id -ru`" -ne "0" ] + then + log_failure_msg "You must be root to check the status." + exit 1 + fi + $SESSION_SERVER status + ;; + *) + N=/etc/init.d/$NAME + log_success_msg "Usage: $N {start|stop|restart|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 --- albatross-1.36.orig/standalone-server/al-httpd +++ albatross-1.36/standalone-server/al-httpd @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python # # Copyright 2003 by Object Craft P/L, Melbourne, Australia. # --- albatross-1.36.orig/albatross/context.py +++ albatross-1.36/albatross/context.py @@ -644,11 +644,11 @@ self.clear_locals() def decode_session(self, text): - def imp_hook(name, globals=None, locals=None, fromlist=None): + def imp_hook(name, globals=None, locals=None, fromlist=None, level=-1): if self.app.is_page_module(name): return self.app.load_page_module(self, name) else: - return real_imp(name, globals, locals, fromlist) + return real_imp(name, globals, locals, fromlist, level) real_imp, __builtin__.__import__ = __builtin__.__import__, imp_hook try: