--- cheetah-2.0.1.orig/debian/pycompat +++ cheetah-2.0.1/debian/pycompat @@ -0,0 +1 @@ +2 --- cheetah-2.0.1.orig/debian/manpages +++ cheetah-2.0.1/debian/manpages @@ -0,0 +1 @@ +debian/cheetah.1 --- cheetah-2.0.1.orig/debian/README.Debian +++ cheetah-2.0.1/debian/README.Debian @@ -0,0 +1,39 @@ +Cheetah on Debian +================= + +Cheetah is a developer-centric library, and as such, it is important +to provide multiple Python version-specific packages. In most cases, +Python is backwards-compatible for language syntax. That same +"guarantee" does not exist for the byte-compiled code, therefore, the +cheetah software on Debian uses python-support to provide byte-compiled +files for all supported Python versions. + +Code Incompatibility between 1.0 and 0.9.16 +============================================== +Once again, the structure of the compiled templates has changed. Make +sure you recompile static templates and clear the cache saved for +dynamic templates. + +Code Incompatibility between 0.9.15 and 0.9.16 +============================================== +From http://sourceforge.net/mailarchive/message.php?msg_id=10636026:: + + From: Tavis Rudd + important note about upgrading to / testing 0.9.16 + 2005-01-23 12:35 + + The new release outputs significantly different python code. Thus, if you + have a set of .tmpl files you compile statically you should recompile them + when upgrading, or more importantly, when downgrading if you run into + problems with the new release. Tavis + + +Additional References and Documentation +======================================= +Developer and User reference guides [1]_ are provided by the Cheetah +Development Team at their website. [2]_ They are released under the +Open Publication License, and as such may be eligable for packaging +and distributing in Debian. + +.. [1] http://cheetahtemplate.org/learn.html +.. [2] http://cheetahtemplate.sourceforge.net --- cheetah-2.0.1.orig/debian/cheetah.1 +++ cheetah-2.0.1/debian/cheetah.1 @@ -0,0 +1,138 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH CHEETAH 1 "2005 Apr 04" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +cheetah \- Python template command-line tool +.SH SYNOPSIS +.B cheetah, cheetah-compile +.PP +.B cheetah COMMAND +.RI [ options ] " FILE" ... +.br +.B cheetah-compile +.RI [ options ] " FILE" ... +.SH DESCRIPTION +This manual page documents briefly the +\fBcheetah\fP command-line tool. This manual page was written for the Debian +distribution because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBcheetah\fP is a Python-powered template engine and code generator. It can be +used as a standalone utility or it can be combined with other tools. Cheetah +has many potential uses, but web developers looking for a viable alternative to +ASP, JSP, PHP and PSP are expected to be its principle user group. +.PP +The \fBcheetah\fP command-line tool is the standalone utility portion of the +software suite. \fBcheetah-compile\fP is a convenience script that for the +"\fBcheetah compile ...\fP" command. The utility accepts a single command +possible options and a list of files. If \fBFILE\fP is a single "-", read +standard input and write standard output. +.SH COMMANDS +.\" cheetah compile [options] [FILES ...] : Compile template definitions +.\" cheetah fill [options] [FILES ...] : Fill template definitions +.\" cheetah help : Print this help message +.\" cheetah options : Print options help message +.\" cheetah test : Run Cheetah's regression tests +.\" cheetah version : Print Cheetah version number +The possible \fBcheetah\fP commands are listed below. You may abbreviate the +command to the first letter; e.g., 'h' == 'help'. +.TP +.B compile +Compile template definitions +.TP +.B fill +Fill template definitions +.TP +.B help +Print commands help message +.TP +.B options +Print options help message for compile and fill commands +.TP +.B test +Run regression tests +.TP +.B version +Print version number +.\".B +.SH OPTIONS +.\" --idir DIR, --odir DIR : input/output directories (default: current dir) +.\" --iext EXT, --oext EXT : input/output filename extensions +.\" (default for compile: tmpl/py, fill: tmpl/html) +.\" -R : recurse subdirectories looking for input files +.\" --debug : print lots of diagnostic output to standard error +.\" --env : put the environment in the searchList +.\" --flat : no destination subdirectories +.\" --nobackup : don't make backups +.\" --pickle FILE : unpickle FILE and put that object in the searchList +.\" --stdout, -p : output to standard output (pipe) +The options for +.B cheetah +apply to the +.B compile +and +.B fill +commands. A summary of options is included below. +.TP +.B \-\-idir DIR +Input directories(default: current dir) +.TP +.B \-\-odir ODIR +Output directories (default: current dir) +.TP +.B \-\-iext IEXT +Input extension. The default input extension for both the +\fBcompile\fP and \fBfill\fP commands is "\fBtmpl\fP". +.TP +.B \-\-oext OEXT +Output extension. The default output extension for the +\fBcompile\fP command is "\fBpy\fP". The default output extension for \fBfill\fP +is "\fBhtml\fB". +.TP +.B \-R +Recurse subdirectories looking for input files +.TP +.B \-\-debug +Print lots of diagnostic output to the standard error file descriptor +.TP +.B \-\-env +Print the environment in the searchList +.TP +.B \-\-flat +No destination subdirectories +.TP +.B \-\-nobackup +Do not make backups +.TP +.B \-\-pickle FILE +unpickle FILE and put that output in the searchList +.TP +.B \-\-stdout, \-p +Output to standard output file descriptor (pipe) +.SH SEE ALSO +.BR pydoc(1) +.br +The programs are documented fully on the project website +.IR http://cheetahtemplate.sourceforge.net. +You can also browse the Python library files and their docstring descriptions +by using the standard pydoc utility. +.SH AUTHOR +This manual page was written by Chad C. Walstrom , +for the Debian project and is dedicated to the Public Domain. + --- cheetah-2.0.1.orig/debian/pyversions +++ cheetah-2.0.1/debian/pyversions @@ -0,0 +1 @@ +2.3- --- cheetah-2.0.1.orig/debian/NEWS +++ cheetah-2.0.1/debian/NEWS @@ -0,0 +1,64 @@ +cheetah (1.0-1) unstable; urgency=high + + New upstream version. Make sure you RECOMPILE your templates/cache! Read the + upstream changelog for more information on feature enhancements and bug fixes. + + NOTE: python2.2-cheetah DROPPED. Debian no longer ships with Python 2.2. + + -- Chad Walstrom Fri, 3 Feb 2006 13:50:19 -0600 + +cheetah (0.9.16-1) unstable; urgency=high + + This version fixes a grave security problem with the template + engine, allowing arbitrary code to be injected through the /tmp + directory. This patch removes the use of temporary files + completely. + + The thread of discussion is found at: + + http://sourceforge.net/mailarchive/forum.php?thread_id=7070332&forum_id=1542 + + -- Chad Walstrom Sat, 21 May 2005 11:55:03 -0500 + +cheetah (0.9.16-0) unstable; urgency=low + + CAUTION: http://sourceforge.net/mailarchive/message.php?msg_id=10636026 + + From: Tavis Rudd + important note about upgrading to / testing 0.9.16 + 2005-01-23 12:35 + + The new release outputs significantly different python code. Thus, if + you have a set of .tmpl files you compile statically you should recompile + them when upgrading, or more importantly, when downgrading if you run into + problems with the new release. + Tavis + + There have been **lots** of changes to the source code between 0.9.15 and + 0.9.16. Be sure to read the upstream changelog. + + NOTE: python2.1-cheetah DROPPED. Upstream no longer supports it. + + -- Chad Walstrom Tue, 5 Apr 2005 15:20:44 -0500 + +cheetah (0.9.15-5) unstable; urgency=low + + * First unstable release! + + -- Chad Walstrom Mon, 15 Mar 2004 15:56:19 -0600 + +cheetah (0.9.15-3) experimental; urgency=low + + * A new package was created, cheetah-common, to contain the examples and a + manpage for the cheetah scripts. Manpage links were created in each of + the pythonX.Y-cheetah packages to point back to the common package. + + This separate package was created to keep the dependency tree simple, + avoiding gratuitous use of virtual packages and circular dependencies in a + repurposed python-cheetah. See the README.Debian file for more + information. + + * I intend this to be the last "experimental" upload. Please test and send + bug reports to the BTS! + + -- Chad Walstrom Mon, 15 Mar 2004 15:56:19 -0600 --- cheetah-2.0.1.orig/debian/changelog +++ cheetah-2.0.1/debian/changelog @@ -0,0 +1,193 @@ +cheetah (2.0.1-2ubuntu1) jaunty; urgency=low + + * Rebuild for python2.6 transition. + + -- Chuck Short Sun, 01 Mar 2009 18:26:56 -0500 + +cheetah (2.0.1-2) unstable; urgency=low + + [ Arnaud Fontaine ] + * New email address. + * debian/control: + + Update Standards-Version to 3.7.3. No changes needed. + + Change Section field from text to python (python extension). + + Build-Depends on at least python-setuptools 0.6b3 instead of + 0.6b3-1 in order to facilitate backporting. + + [ Sandro Tosi ] + * debian/control + + Uniforming Vcs-Browser field. + + -- Arnaud Fontaine Sat, 23 Feb 2008 12:40:22 +0000 + +cheetah (2.0.1-1) unstable; urgency=low + + [ Arnaud Fontaine ] + * New upstream release. Closes: #451766. + + Update debian/patches/02_clean_modules.patch. + * debian/NEWS: + + Fix lintian warning on the first changelog entry. + * debian/watch: + + Fix uversionmangle regex for stable versions. + * debian/copyright: + + Add package license. + + [ Piotr Ożarowski ] + * debian/control: + + Add Homepage field. + + Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now). + + -- Arnaud Fontaine Sun, 18 Nov 2007 14:59:06 +0000 + +cheetah (2.0~rc8-1) unstable; urgency=low + + [ Arnaud Fontaine ] + * New upstream release. + * Add debian/watch file. + * debian/copyright: + + Update years and maintainer. + * debian/control*: + + Add Homepage field. + + Add XS-Vcs-Browser field. + + Build-Depends on python-support >= 0.6.4. + + Add DPMT as uploaders. + * debian/rules: + + Remove egg stuff. + + [ Piotr Ozarowski ] + * debian/control: + + Add XS-Vcs-Svn field. + + -- Arnaud Fontaine Wed, 11 Jul 2007 14:45:50 +0200 + +cheetah (2.0~rc7-1) unstable; urgency=low + + * New upstream release. + * Remove the interpreter line from all modules. + * New maintainer. Closes: #376189. + * Acknowledge NMU. Closes: #373265, #366759. + * Add debian/control.in and regenerates debian/control. + + -- Arnaud Fontaine Wed, 26 Jul 2006 22:03:15 +0200 + +cheetah (1.0-1.1) unstable; urgency=low + + [ Arnaud Fontaine ] + * Non-maintainer upload. + * Update Standards-Version to 3.7.2. No changes needed. + * Remove cheetah-common package. + * Add egg support. Thanks to Piotr Ozarowski + . Closes: #366759. + * Remove alternatives which are no more needed since pythonX.Y-cheetah + are folded into python-cheetah. + + Remove pythonX.Y-cheetah.postinst.in and pythonX.Y-cheetah.prerm.in + in debian/. + + Remove *.links files in favor of debian/links. + + Remove *.manpages files in favor of debian/manpages. + + Clean debian/rules. + * New Python policy changes. Closes: #373265. + + Update debian/cheetah.1 and debian/README.Debian: + + Add debian/pyversions and debian/pycompat. + + debian/compat: + - Update debhelper compatibility to 5. + + debian/rules: + - Add DEB_PYTHON_SYSTEM=pysupport. + + debian/control: + - Update Build-Depends. + - Add XB-Python-Version for binary package. + - Add Conflicts and Replaces fields against previous revisions. + + [ Raphael Hertzog ] + * Sponsoring upload. + * Improvements in the rules file. Rename egg-info directory soon enough so + that dh_pysupport can decide to share it. + * Updated README.Debian. + + -- Raphael Hertzog Fri, 30 Jun 2006 19:11:25 +0200 + +cheetah (1.0-1) unstable; urgency=low + + * New upstream version. Closes: #344977 + * debian/NEWS, debian/README.Debian: Updated to reflect new info. + * debian/control, debian/rules: Dropped build support for python2.2-cheetah + package. Closes: #351120 + + -- Chad Walstrom Fri, 3 Feb 2006 13:50:19 -0600 + +cheetah (0.9.16-1) unstable; urgency=high + + * debian/rules, debian/patches: Added simple-patchsys so we can + apply security patches. + * debian/patches/309648-tmpfix.patch: Kenshi Muto grabbed this one + from the cheetahtemplate CVS. Upstream rewrote how imports were + handled, removing the need to use temp files and eliminating this + security breech. Closes: #309648 + * debian/control: Added version dependency for cdbs, required to support + Python 2.4. + + -- Chad Walstrom Sat, 21 May 2005 12:40:10 -0500 + +cheetah (0.9.16-0) unstable; urgency=low + + * New upstream. Closes: #295957 + * debian/cheetah.1: Dedicated the manpage to the Public Domain. + * debian/NEWS: Noted code incompatibility between 0.9.15 and 0.9.16. + * debian/pythonX.Y-cheetah.*: Replaced maintainer scripts with sed templates + * debian/control, debian/rules: Added python2.4-cheetah package. + Dropped python2.1-cheetah package. + + -- Chad Walstrom Tue, 5 Apr 2005 17:03:44 -0500 + +cheetah (0.9.15-5) unstable; urgency=low + + * First unstable release! + * debian/rules: + - Removed all traces of incorrect linking for python-cheetah. + - Excluded .arch-ids directories from cheetah-common examples + - Replaced entire first line of cheetah and cheetah-compile scripts + instead of selectively appending python version. + * debian/control: + - Cleaned up package descriptions to follow the control file style guide + more closely. + - Removed ${python:Depends}. Causing incorrect dependencies on multiple + versions of Python. You could install python2.1-cheetah only if python + >= 2.3 was installed. + + -- Chad Walstrom Tue, 30 Mar 2004 18:47:41 -0600 + +cheetah (0.9.15-4) experimental; urgency=low + + * The "I was sleeping on the job" release. + * Moved debian/python-cheetah.manpages to debian/cheetah-common.manpages. + Manpages installed in wrong package. + * debian/rules: Install examples in cheetah-common. No, really! I mean it + this time! + + -- Chad Walstrom Wed, 17 Mar 2004 22:22:55 -0600 + +cheetah (0.9.15-3) experimental; urgency=low + + * Last experimental upload! Please test and report bugs to the BTS! + * debian/control: (NEW) cheetah-common package for common docs, manpages, + and examples. Versioned dependencies for cheetah-common were added to + pythonX.Y-cheetah packages. + * debian/rules: Cleaned up per package post-install targets. Added linking + scripts for manpages and examples directories. + * cheetah.1: (NEW) Debian manpage for cheetah and cheetah-compile. + * examples directory included in cheetah-common package. + + -- Chad Walstrom Tue, 16 Mar 2004 12:38:08 -0600 + +cheetah (0.9.15-2) experimental; urgency=low + + * Moved update-alternatives call to *.prerm. + + -- Chad Walstrom Thu, 5 Feb 2004 09:46:25 -0600 + +cheetah (0.9.15-1) experimental; urgency=low + + * Initial Release. + * Answers the call to package cheetah-template. Closes: #135456 + + -- Chad Walstrom Fri, 23 Jan 2004 23:54:05 -0600 + --- cheetah-2.0.1.orig/debian/control +++ cheetah-2.0.1/debian/control @@ -0,0 +1,44 @@ +Source: cheetah +Section: python +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Orginal-Maintainer: Arnaud Fontaine +Uploaders: Debian Python Modules Team +Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4), patchutils (>= 0.2.25), python-setuptools (>= 0.6b3) +Standards-Version: 3.7.3 +Homepage: http://www.cheetahtemplate.org/ +Vcs-Svn: svn://svn.debian.org/python-modules/packages/cheetah/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/cheetah/trunk/?op=log + +Package: python-cheetah +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends} +Replaces: python2.3-cheetah (<< 1.0-1.1), python2.4-cheetah (<< 1.0-1.1), cheetah-common (<< 1.0-1.1) +Conflicts: python2.3-cheetah (<< 1.0-1.1), python2.4-cheetah (<< 1.0-1.1), cheetah-common (<< 1.0-1.1) +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: text-based template engine and Python code generator + Cheetah can be used as a standalone templating utility or referenced as a + library from other Python applications. It has many potential uses, but web + developers looking for a viable alternative to ASP, JSP, PHP and PSP are + expected to be its principle user group. + . + Features: + * Generates HTML, SGML, XML, SQL, Postscript, form email, LaTeX, or any other + text-based format. + * Cleanly separates content, graphic design, and program code. + * Blends the power and flexibility of Python with a simple template language + that non-programmers can understand. + * Gives template writers full access to any Python data structure, module, + function, object, or method in their templates. + * Makes code reuse easy by providing an object-orientated interface to + templates that is accessible from Python code or other Cheetah templates. + One template can subclass another and selectively reimplement sections of + it. + * Provides a simple, yet powerful, caching mechanism that can dramatically + improve the performance of a dynamic website. + * Compiles templates into optimized, yet readable, Python code. + . + Cheetah integrates tightly with Webware for Python + (http://webware.sourceforge.net/): a Python application server and persistent + servlet framework. --- cheetah-2.0.1.orig/debian/links +++ cheetah-2.0.1/debian/links @@ -0,0 +1 @@ +usr/share/man/man1/cheetah.1.gz usr/share/man/man1/cheetah-compile.1.gz --- cheetah-2.0.1.orig/debian/docs +++ cheetah-2.0.1/debian/docs @@ -0,0 +1,2 @@ +debian/NEWS +debian/README.Debian --- cheetah-2.0.1.orig/debian/watch +++ cheetah-2.0.1/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/([a-zA-Z]+)/~$1/ \ + http://qa.debian.org/watch/sf.php/cheetahtemplate/ Cheetah-([\d.\w]*).tar.gz --- cheetah-2.0.1.orig/debian/rules +++ cheetah-2.0.1/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Debian rules file for cheetah +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_PYTHON_SYSTEM=pysupport + +################################################################################ +# CDBS File Inclusions and Variable Declarations +################################################################################ +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +# Install egg-info directories +DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed +DEB_UPSTREAM_VERSION := $$(echo $(DEB_UPSTREAM_VERSION) | sed 's/~//') + +install/$(DEB_PYTHON_MODULE_PACKAGE):: + sed -i 's#\#!/usr/bin/python[0-9].[0-9]#\#!/usr/bin/python#' \ + debian/python-cheetah/usr/bin/* + +clean:: + -rm -rf Cheetah.egg-info --- cheetah-2.0.1.orig/debian/compat +++ cheetah-2.0.1/debian/compat @@ -0,0 +1 @@ +5 --- cheetah-2.0.1.orig/debian/copyright +++ cheetah-2.0.1/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Chad Walstrom on +Fri, 23 Jan 2004 23:47:52 -0600. It is now maintained by Arnaud +Fontaine . + +It was downloaded from SourceForge at +http://prdownloads.sourceforge.net/cheetahtemplate/ + +Copyright: + + Copyright 2001-2007, The Cheetah Development Team: Tavis Rudd, Mike + Orr, Chuck Esterbrook, Ian Bicking. + +License: + + Permission to use, copy, modify, and distribute this software for + any purpose and without fee is hereby granted, provided that the + above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the names of the authors not be used in + advertising or publicity pertaining to distribution of the software + without specific, written prior permission. + + THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN + NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +The Debian packaging is (C) 2006-2007, Arnaud Fontaine + and is licensed under the GPL. On Debian systems, +the complete text of the GNU General Public License can be found in +`/usr/share/common-licenses/GPL'. --- cheetah-2.0.1.orig/debian/control.in +++ cheetah-2.0.1/debian/control.in @@ -0,0 +1,43 @@ +Source: cheetah +Section: text +Priority: optional +Maintainer: Arnaud Fontaine +Uploaders: Debian Python Modules Team +Build-Depends: @cdbs@, python-setuptools (>= 0.6b3-1) +Standards-Version: 3.7.3 +Homepage: http://www.cheetahtemplate.org/ +Vcs-Svn: svn://svn.debian.org/python-modules/packages/cheetah/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/cheetah/?op=log + +Package: python-cheetah +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends} +Replaces: python2.3-cheetah (<< 1.0-1.1), python2.4-cheetah (<< 1.0-1.1), cheetah-common (<< 1.0-1.1) +Conflicts: python2.3-cheetah (<< 1.0-1.1), python2.4-cheetah (<< 1.0-1.1), cheetah-common (<< 1.0-1.1) +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: text-based template engine and Python code generator + Cheetah can be used as a standalone templating utility or referenced as a + library from other Python applications. It has many potential uses, but web + developers looking for a viable alternative to ASP, JSP, PHP and PSP are + expected to be its principle user group. + . + Features: + * Generates HTML, SGML, XML, SQL, Postscript, form email, LaTeX, or any other + text-based format. + * Cleanly separates content, graphic design, and program code. + * Blends the power and flexibility of Python with a simple template language + that non-programmers can understand. + * Gives template writers full access to any Python data structure, module, + function, object, or method in their templates. + * Makes code reuse easy by providing an object-orientated interface to + templates that is accessible from Python code or other Cheetah templates. + One template can subclass another and selectively reimplement sections of + it. + * Provides a simple, yet powerful, caching mechanism that can dramatically + improve the performance of a dynamic website. + * Compiles templates into optimized, yet readable, Python code. + . + Cheetah integrates tightly with Webware for Python + (http://webware.sourceforge.net/): a Python application server and persistent + servlet framework. --- cheetah-2.0.1.orig/debian/patches/01_eggify.patch +++ cheetah-2.0.1/debian/patches/01_eggify.patch @@ -0,0 +1,11 @@ +--- setup.py.old 2006-06-30 17:05:26.000000000 +0200 ++++ setup.py 2006-06-30 17:05:38.000000000 +0200 +@@ -6,6 +6,8 @@ + os.remove('MANIFEST') # to avoid those bloody out-of-date manifests!! + except: + pass ++ ++from setuptools import setup + + import SetupTools + import SetupConfig --- cheetah-2.0.1.orig/debian/patches/02_clean_modules.patch +++ cheetah-2.0.1/debian/patches/02_clean_modules.patch @@ -0,0 +1,280 @@ +diff -urN src/CheetahWrapper.py.old src/CheetahWrapper.py +--- src/CheetahWrapper.py.old 2006-02-04 01:59:46.000000000 +0100 ++++ src/CheetahWrapper.py 2006-08-21 12:51:56.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: CheetahWrapper.py,v 1.26 2007/10/02 01:22:04 tavis_rudd Exp $ + """Cheetah command-line interface. + +diff -urN src/Compiler.py src/Compiler.py +--- src/Compiler.py.old 2006-06-22 02:18:22.000000000 +0200 ++++ src/Compiler.py 2006-08-21 12:51:58.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: Compiler.py,v 1.156 2007/10/30 20:17:09 tavis_rudd Exp $ + """Compiler classes for Cheetah: + ModuleCompiler aka 'Compiler' +diff -urN src/DummyTransaction.py src/DummyTransaction.py +--- src/DummyTransaction.py.old 2006-01-31 06:06:34.000000000 +0100 ++++ src/DummyTransaction.py 2006-08-21 12:52:00.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: DummyTransaction.py,v 1.13 2005/11/13 01:12:13 tavis_rudd Exp $ + + """Provides dummy Transaction and Response classes is used by Cheetah in place +diff -urN src/ErrorCatchers.py src/ErrorCatchers.py +--- src/ErrorCatchers.py.old 2005-01-03 20:59:07.000000000 +0100 ++++ src/ErrorCatchers.py 2006-08-21 12:52:04.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: ErrorCatchers.py,v 1.7 2005/01/03 19:59:07 tavis_rudd Exp $ + """ErrorCatcher class for Cheetah Templates + +diff -urN src/FileUtils.py src/FileUtils.py +--- src/FileUtils.py.old 2005-11-02 23:26:07.000000000 +0100 ++++ src/FileUtils.py 2006-08-21 12:52:06.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: FileUtils.py,v 1.12 2005/11/02 22:26:07 tavis_rudd Exp $ + """File utitilies for Python: + +diff -urN src/Filters.py src/Filters.py +--- src/Filters.py.old 2006-06-22 02:03:07.000000000 +0200 ++++ src/Filters.py 2006-08-21 12:52:07.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: Filters.py,v 1.32 2007/03/29 19:31:15 tavis_rudd Exp $ + """Filters for the #filter directive; output filters Cheetah's $placeholders . + +diff -urN src/ImportHooks.py src/ImportHooks.py +--- src/ImportHooks.py.old 2006-06-20 21:23:27.000000000 +0200 ++++ src/ImportHooks.py 2006-08-21 12:52:09.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: ImportHooks.py,v 1.27 2007/11/16 18:28:47 tavis_rudd Exp $ + + """Provides some import hooks to allow Cheetah's .tmpl files to be imported +diff -urN src/ImportManager.py src/ImportManager.py +--- src/ImportManager.py.old 2006-01-27 20:00:20.000000000 +0100 ++++ src/ImportManager.py 2006-08-21 12:52:12.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: ImportManager.py,v 1.6 2007/04/03 01:56:24 tavis_rudd Exp $ + + """Provides an emulator/replacement for Python's standard import system. +diff -urN src/NameMapper.py src/NameMapper.py +--- src/NameMapper.py.old 2006-01-15 21:27:42.000000000 +0100 ++++ src/NameMapper.py 2006-08-21 12:52:23.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: NameMapper.py,v 1.30 2007/04/03 01:58:20 tavis_rudd Exp $ + + """This module supports Cheetah's optional NameMapper syntax. +diff -urN src/Parser.py src/Parser.py +--- src/Parser.py.old 2006-06-22 01:49:14.000000000 +0200 ++++ src/Parser.py 2006-08-21 12:52:25.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: Parser.py,v 1.135 2007/11/16 18:26:01 tavis_rudd Exp $ + """Parser classes for Cheetah's Compiler + +diff -urN src/Servlet.py src/Servlet.py +--- src/Servlet.py.old 2006-02-05 00:06:15.000000000 +0100 ++++ src/Servlet.py 2006-08-21 12:52:27.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: Servlet.py,v 1.41 2007/04/04 00:55:27 tavis_rudd Exp $ + """Provides an abstract Servlet baseclass for Cheetah's Template class + +diff -urN src/SettingsManager.py src/SettingsManager.py +--- src/SettingsManager.py.old 2006-01-29 08:19:12.000000000 +0100 ++++ src/SettingsManager.py 2006-08-21 12:52:31.000000000 +0200 +@@ -1,5 +1,3 @@ +-#!/usr/bin/env python +- + """Provides a mixin/base class for collecting and managing application settings + + Meta-Data +diff -urN src/SourceReader.py src/SourceReader.py +--- src/SourceReader.py.old 2006-02-05 03:10:30.000000000 +0100 ++++ src/SourceReader.py 2006-08-21 12:52:33.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: SourceReader.py,v 1.15 2007/04/03 01:57:42 tavis_rudd Exp $ + """SourceReader class for Cheetah's Parser and CodeGenerator + +diff -urN src/Template.py src/Template.py +--- src/Template.py.old 2006-07-05 01:09:35.000000000 +0200 ++++ src/Template.py 2006-08-21 12:52:34.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: Template.py,v 1.185 2007/10/02 01:36:26 tavis_rudd Exp $ + """Provides the core API for Cheetah. + +diff -urN src/TemplateCmdLineIface.py src/TemplateCmdLineIface.py +--- src/TemplateCmdLineIface.py.old 2006-01-10 21:34:35.000000000 +0100 ++++ src/TemplateCmdLineIface.py 2006-08-21 12:52:36.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: TemplateCmdLineIface.py,v 1.13 2006/01/10 20:34:35 tavis_rudd Exp $ + + """Provides a command line interface to compiled Cheetah template modules. +diff -urN src/Templates/SkeletonPage.py src/Templates/SkeletonPage.py +--- src/Templates/SkeletonPage.py.old 2006-02-05 03:52:34.000000000 +0100 ++++ src/Templates/SkeletonPage.py 2006-08-21 12:52:42.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + + """A Skeleton HTML page template, that provides basic structure and utility methods. +diff -urN src/Templates/_SkeletonPage.py src/Templates/_SkeletonPage.py +--- src/Templates/_SkeletonPage.py.old 2006-01-07 08:18:28.000000000 +0100 ++++ src/Templates/_SkeletonPage.py 2006-08-21 12:52:49.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: _SkeletonPage.py,v 1.13 2002/10/01 17:52:02 tavis_rudd Exp $ + """A baseclass for the SkeletonPage template + +diff -urN src/Templates/__init__.py src/Templates/__init__.py +--- src/Templates/__init__.py.old 2001-06-13 05:50:40.000000000 +0200 ++++ src/Templates/__init__.py 2006-08-21 12:52:52.000000000 +0200 +@@ -1 +1 @@ +-#!/usr/bin/env python ++ +diff -urN src/Tests/CheetahWrapper.py src/Tests/CheetahWrapper.py +--- src/Tests/CheetahWrapper.py.old 2006-01-29 03:51:10.000000000 +0100 ++++ src/Tests/CheetahWrapper.py 2006-08-21 12:52:57.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: CheetahWrapper.py,v 1.6 2007/03/28 16:17:41 tavis_rudd Exp $ + """Tests for the 'cheetah' command. + +diff -urN src/Tests/FileRefresh.py src/Tests/FileRefresh.py +--- src/Tests/FileRefresh.py.old 2002-10-01 19:52:03.000000000 +0200 ++++ src/Tests/FileRefresh.py 2006-08-21 12:53:00.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: FileRefresh.py,v 1.6 2002/10/01 17:52:03 tavis_rudd Exp $ + """Tests to make sure that the file-update-monitoring code is working properly + +diff -urN src/Tests/NameMapper.py src/Tests/NameMapper.py +--- src/Tests/NameMapper.py.old 2006-01-15 21:45:22.000000000 +0100 ++++ src/Tests/NameMapper.py 2006-08-21 12:53:05.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: NameMapper.py,v 1.11 2006/01/15 20:45:22 tavis_rudd Exp $ + """NameMapper Tests + +diff -urN src/Tests/SyntaxAndOutput.py src/Tests/SyntaxAndOutput.py +--- src/Tests/SyntaxAndOutput.py.old 2006-06-22 01:48:19.000000000 +0200 ++++ src/Tests/SyntaxAndOutput.py 2006-08-21 12:53:08.000000000 +0200 +@@ -1,5 +1,4 @@ +-#!/usr/bin/env python + # -*- coding: latin-1 -*- + # $Id: SyntaxAndOutput.py,v 1.109 2007/04/04 00:28:21 tavis_rudd Exp $ + """Syntax and Output tests. + +diff -urN src/Tests/Template.py src/Tests/Template.py +--- src/Tests/Template.py.old 2006-02-03 22:05:50.000000000 +0100 ++++ src/Tests/Template.py 2006-08-21 12:53:10.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: Template.py,v 1.16 2006/02/03 21:05:50 tavis_rudd Exp $ + """Tests of the Template class API + +diff -urN src/Tests/Test.py src/Tests/Test.py +--- src/Tests/Test.py.old 2006-01-15 21:45:10.000000000 +0100 ++++ src/Tests/Test.py 2006-08-21 12:53:13.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: Test.py,v 1.44 2006/01/15 20:45:10 tavis_rudd Exp $ + """Core module of Cheetah's Unit-testing framework + +diff -urN src/Tests/unittest_local_copy.py src/Tests/unittest_local_copy.py +--- src/Tests/unittest_local_copy.py.old 2006-01-07 00:33:13.000000000 +0100 ++++ src/Tests/unittest_local_copy.py 2006-08-21 12:53:19.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """ This is a hacked version of PyUnit that extends its reporting capabilities + with optional meta data on the test cases. It also makes it possible to + separate the standard and error output streams in TextTestRunner. +diff -urN src/Tools/CGITemplate.py src/Tools/CGITemplate.py +--- src/Tools/CGITemplate.py.old 2006-01-29 03:09:59.000000000 +0100 ++++ src/Tools/CGITemplate.py 2006-08-21 12:53:26.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: CGITemplate.py,v 1.6 2006/01/29 02:09:59 tavis_rudd Exp $ + """A subclass of Cheetah.Template for use in CGI scripts. + +diff -urN src/Tools/MondoReport.py src/Tools/MondoReport.py +--- src/Tools/MondoReport.py.old 2005-01-02 19:47:42.000000000 +0100 ++++ src/Tools/MondoReport.py 2006-08-21 12:53:31.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """ + @@TR: This code is pretty much unsupported. + +diff -urN src/Tools/RecursiveNull.py src/Tools/RecursiveNull.py +--- src/Tools/RecursiveNull.py.old 2001-07-19 04:47:38.000000000 +0200 ++++ src/Tools/RecursiveNull.py 2006-08-21 12:53:37.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """Nothing, but in a friendly way. Good for filling in for objects you want to + hide. If $form.f1 is a RecursiveNull object, then + $form.f1.anything["you"].might("use") will resolve to the empty string. +diff -urN src/Tools/SiteHierarchy.py src/Tools/SiteHierarchy.py +--- src/Tools/SiteHierarchy.py.old 2001-10-11 05:25:54.000000000 +0200 ++++ src/Tools/SiteHierarchy.py 2006-08-21 12:53:39.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: SiteHierarchy.py,v 1.1 2001/10/11 03:25:54 tavis_rudd Exp $ + """Create menus and crumbs from a site hierarchy. + +diff -urN src/Utils/Indenter.py src/Utils/Indenter.py +--- src/Utils/Indenter.py.old 2006-01-08 02:09:30.000000000 +0100 ++++ src/Utils/Indenter.py 2006-08-21 12:53:48.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: Indenter.py,v 1.7 2006/01/08 01:09:30 tavis_rudd Exp $ + """Indentation maker. + @@TR: this code is unsupported and largely undocumented ... +diff -urN src/Utils/Misc.py src/Utils/Misc.py +--- src/Utils/Misc.py.old 2005-11-02 23:26:08.000000000 +0100 ++++ src/Utils/Misc.py 2006-08-21 12:53:52.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: Misc.py,v 1.8 2005/11/02 22:26:08 tavis_rudd Exp $ + """Miscellaneous functions/objects used by Cheetah but also useful standalone. + +diff -urN src/Utils/VerifyType.py src/Utils/VerifyType.py +--- src/Utils/VerifyType.py.old 2005-11-02 23:26:08.000000000 +0100 ++++ src/Utils/VerifyType.py 2006-08-21 12:53:57.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: VerifyType.py,v 1.4 2005/11/02 22:26:08 tavis_rudd Exp $ + """Functions to verify an argument's type + +diff -urN src/Utils/WebInputMixin.py src/Utils/WebInputMixin.py +--- src/Utils/WebInputMixin.py.old 2006-01-06 22:56:54.000000000 +0100 ++++ src/Utils/WebInputMixin.py 2006-08-21 12:54:00.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: WebInputMixin.py,v 1.10 2006/01/06 21:56:54 tavis_rudd Exp $ + """Provides helpers for Template.webInput(), a method for importing web + transaction variables in bulk. See the docstring of webInput for full details. +diff -urN src/Utils/memcache.py src/Utils/memcache.py +--- src/Utils/memcache.py.old 2006-01-28 04:18:45.000000000 +0100 ++++ src/Utils/memcache.py 2006-08-21 12:54:09.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + """ + client module for memcached (memory cache daemon) +diff -urN src/__init__.py src/__init__.py +--- src/__init__.py.old 2006-01-14 05:44:07.000000000 +0100 ++++ src/__init__.py 2006-08-21 12:54:27.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # $Id: __init__.py,v 1.10 2006/01/14 04:44:07 tavis_rudd Exp $ + + """Cheetah is an open source template engine and code generation tool.