--- planet-venus-0~bzr116.orig/debian/pyversions +++ planet-venus-0~bzr116/debian/pyversions @@ -0,0 +1 @@ +2.4- --- planet-venus-0~bzr116.orig/debian/manpages +++ planet-venus-0~bzr116/debian/manpages @@ -0,0 +1 @@ +planet.1 --- planet-venus-0~bzr116.orig/debian/dirs +++ planet-venus-0~bzr116/debian/dirs @@ -0,0 +1,5 @@ +usr/bin +usr/share/doc/planet-venus +usr/share/lintian/overrides +usr/share/planet-venus +usr/share/python-support/planet-venus --- planet-venus-0~bzr116.orig/debian/pycompat +++ planet-venus-0~bzr116/debian/pycompat @@ -0,0 +1 @@ +2 --- planet-venus-0~bzr116.orig/debian/copyright +++ planet-venus-0~bzr116/debian/copyright @@ -0,0 +1,159 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=180 +Upstream-Name: Planet Venus +Upstream-Maintainer: Sam Ruby +Upstream-Source: http://www.intertwingly.net/code/venus/ + +Files: * +Copyright: Copyright 2008, Sam Ruby + Copyright 2007, Scott James Remnant + Copyright 2007, Jeff Waugh + Copyright 2007, Eric van der Vlist +License: PSF-2 + PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 + -------------------------------------------- + . + 1. This LICENSE AGREEMENT is between the Python Software Foundation + ("PSF"), and the Individual or Organization ("Licensee") accessing and + otherwise using this software ("Python") in source or binary form and + its associated documentation. + . + 2. Subject to the terms and conditions of this License Agreement, PSF + hereby grants Licensee a nonexclusive, royalty-free, world-wide + license to reproduce, analyze, test, perform and/or display publicly, + prepare derivative works, distribute, and otherwise use Python + alone or in any derivative version, provided, however, that PSF's + License Agreement and PSF's notice of copyright, i.e., "Copyright (c) + 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights + Reserved" are retained in Python alone or in any derivative version + prepared by Licensee. + . + 3. In the event Licensee prepares a derivative work that is based on + or incorporates Python or any part thereof, and wants to make + the derivative work available to others as provided herein, then + Licensee hereby agrees to include in any such work a brief summary of + the changes made to Python. + . + 4. PSF is making Python available to Licensee on an "AS IS" + basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR + IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND + DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT + INFRINGE ANY THIRD PARTY RIGHTS. + . + 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON + FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS + A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, + OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + . + 6. This License Agreement will automatically terminate upon a material + breach of its terms and conditions. + . + 7. Nothing in this License Agreement shall be deemed to create any + relationship of agency, partnership, or joint venture between PSF and + Licensee. This License Agreement does not grant permission to use PSF + trademarks or trade name in a trademark sense to endorse or promote + products or services of Licensee, or any third party. + . + 8. By copying, installing or otherwise using Python, Licensee + agrees to be bound by the terms and conditions of this License + Agreement. + +Files: debian/* +Copyright: Copyright 2009, Noah Slater +License: GAP + Copying and distribution of this package, with or without modification, are + permitted in any medium without royalty provided the copyright notice and this + notice are preserved. + +Files: debian/patches/theme-diveintomark.patch +Copyright: Copyright 2008, Mark Pilgrim +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: planet/vendor/compat_logging/* +Copyright: Copyright 2002, Vinay Sajip +License: MIT + Permission to use, copy, modify, and distribute this software and its + documentation 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 name of Vinay Sajip + not be used in advertising or publicity pertaining to distribution + of the software without specific, written prior permission. + VINAY SAJIP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + VINAY SAJIP 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. + +Files: planet/vendor/feedparser.py +Copyright: Copyright 2007, Mark Pilgrim +License: MIT + 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. + . + 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. + +Files: planet/vendor/httplib2/* +Copyright: Copyright 2006, Joe Gregorio +License: MIT-any + Unspecified MIT style licence. + +Files: planet/vendor/htmltmpl.py +Copyright: Copyright 2004, Tomas Styblo +License: GPL-any + On Debian systems the full text of the GNU General Public License can be found + in the `/usr/share/common-licenses/GPL' file. + +Files: planet/vendor/timeoutsocket.py +Copyright: Copyright 2001, Timothy O'Malley +License: MIT + Permission to use, copy, modify, and distribute this software + and its documentation 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 name of + Timothy O'Malley not be used in advertising or publicity + pertaining to distribution of the software without specific, written + prior permission. + . + Timothy O'Malley DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS, IN NO EVENT SHALL Timothy O'Malley 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. --- planet-venus-0~bzr116.orig/debian/compat +++ planet-venus-0~bzr116/debian/compat @@ -0,0 +1 @@ +5 --- planet-venus-0~bzr116.orig/debian/planet.ini +++ planet-venus-0~bzr116/debian/planet.ini @@ -0,0 +1,35 @@ +# Example Planet Venus configuration file + +# Documenation: +# Examples: +# Filters: +# Themes: + +# Global configuration + +[Planet] + +name = Planet Example +link = http://planet.example.org/ +owner_name = Debian User +owner_email = nobody@localhost +output_theme = theme +cache_directory = cache +output_dir = output +feed_timeout = 20 +items_per_page = 60 +log_level = DEBUG + +# Subscription configuration + +[http://debaday.debian.net/feed/atom/] +name = Debian Package of the Day + +[http://www.debian-administration.org/atom.xml] +name = Debian Administration + +[http://times.debian.net/?format=rss20.xml] +name = Debian Times + +[http://blog.debconf.org/blog/index.rss11] +name = DebConf Organisers Blog --- planet-venus-0~bzr116.orig/debian/changelog +++ planet-venus-0~bzr116/debian/changelog @@ -0,0 +1,50 @@ +planet-venus (0~bzr116-1) unstable; urgency=high + + [ Piotr Ożarowski ] + * New upstream snapshot (Closes: #546179 - CVE-2009-2937) + * Add python-beautifulsoup to Recommends and python-lxml to Suggests + * Remove .py[oc] files in clean rule + * Standards-Version bumped to 3.8.3 (no changes needed) + + [ Noah Slater ] + * Updated debian/rules to use clean and cleanbuilddir targets. + * Updated patch for --help output to better satisfy GNU Coding Standards. + * Updated debian/control, updated Vcs-Browser. + * Updated debian/control, updated Build-Depends on debhelper to 7.2.11. + + -- Python Applications Packaging Team Thu, 01 Oct 2009 19:12:13 +0200 + +planet-venus (0~bzr95-2) unstable; urgency=medium + + * Added debian/README.source for upstream source information. + * Added Conflicts with plt-scheme. Closes: #484716 + * Updated Priority to extra per policy section 2.5 regarding Conflicts. + * Updated debian/binary.lintian-overrides to ignore line length warnings. + * Updated debian/copyright per latest proposed format. + * Updated debian/rules to make better use of CDBS variables. + + -- Noah Slater Thu, 07 Aug 2008 15:14:12 +0100 + +planet-venus (0~bzr95-1) unstable; urgency=medium + + * New upstream snapshot. + * Added drscheme to Conflicts. Closes: #484716 + * Updated formatting in debian/rules. + * Updated debian/copyright per latest proposed format. + * Updated Standards-Version to 3.8.0. + + -- Noah Slater Tue, 17 Jun 2008 23:18:51 +0100 + +planet-venus (0~bzr94-1) unstable; urgency=low + + * New upstream snapshot. + * Removed linda overrides. + * Updated debian/copyright per latest proposed format. + + -- Noah Slater Tue, 20 May 2008 15:19:48 +0100 + +planet-venus (0~bzr86-1) experimental; urgency=low + + * Initial release. Closes: #461883 + + -- Noah Slater Tue, 04 Mar 2008 22:47:49 +0000 --- planet-venus-0~bzr116.orig/debian/binary.lintian-overrides +++ planet-venus-0~bzr116/debian/binary.lintian-overrides @@ -0,0 +1,5 @@ +planet-venus binary: debian-copyright-line-too-long line 1 +planet-venus binary: debian-copyright-line-too-long line 74 +planet-venus binary: debian-copyright-line-too-long line 82 +planet-venus binary: debian-copyright-line-too-long line 108 +planet-venus binary: package-contains-empty-directory usr/share/planet-venus/theme/musings/images/ --- planet-venus-0~bzr116.orig/debian/links +++ planet-venus-0~bzr116/debian/links @@ -0,0 +1,2 @@ +/usr/share/planet-venus/theme/diveintomark /usr/share/planet-venus/theme/default +/usr/share/planet-venus/example/debian.ini /usr/share/planet-venus/example/default.ini --- planet-venus-0~bzr116.orig/debian/rules +++ planet-venus-0~bzr116/debian/rules @@ -0,0 +1,62 @@ +#!/usr/bin/make -f + +# Copyright 2009, Noah Slater + +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice and this +# notice are preserved. + +include /usr/share/cdbs/1/rules/buildcore.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_COMPRESS_EXCLUDE = .png .svg + +DEB_ORIG_URI = http://intertwingly.net/code/venus/ +DEB_ORIG_DIRECTORY = $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) +DEB_ORIG_FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz +DEB_REPOS_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r "s/.*~bzr//") + +# @@ workaround for #486848 +binary-arch binary-indep: build + +cleanbuilddir:: + sed -i -e "s/\"$(DEB_UPSTREAM_VERSION)\"/@version@/" planet.py + +post-patches:: + sed -i -e "s/@version@/\"$(DEB_UPSTREAM_VERSION)\"/" planet.py + +clean:: + find . -name '*\.py[co]' -delete + +# @@ The bundled feedparser.py is a pre-release version so we can't depend on +# @@ the standard packaged version. The other three bundled modules might be +# @@ nice as external packages. + +common-install-prehook-impl:: + chmod 755 planet.py + help2man -N -n "an aggregate feed generator" ./planet.py > planet.1 + cp -R docs debian/planet-venus/usr/share/doc/planet-venus/html + cp -R examples debian/planet-venus/usr/share/planet-venus/example + chmod 755 debian/planet-venus/usr/share/planet-venus/example/filters/guess-language/guess-language.py + chmod 755 debian/planet-venus/usr/share/planet-venus/example/filters/guess-language/trigram.py + cp -R filters debian/planet-venus/usr/share/planet-venus/filter + cp -R planet.py debian/planet-venus/usr/bin/planet + cp -R themes debian/planet-venus/usr/share/planet-venus/theme + rm -f debian/planet-venus/usr/share/planet-venus/theme/diveintomark/LICENCE + cp -R planet debian/planet-venus/usr/share/python-support/planet-venus + rm -fr debian/planet-venus/usr/share/python-support/planet-venus/planet/vendor/htmltmpl.py + rm -fr debian/planet-venus/usr/share/python-support/planet-venus/planet/vendor/html5lib + rm -fr debian/planet-venus/usr/share/python-support/planet-venus/planet/vendor/httplib2 + cp -R debian/planet.ini debian/planet-venus/usr/share/planet-venus/example/debian.ini + cp debian/binary.lintian-overrides debian/planet-venus/usr/share/lintian/overrides/planet-venus + +binary-install/planet-venus:: + dh_pysupport -pplanet-venus -X example -X filter + +# @@ only works from source directory, see #494141 +.PHONY: get-orig-source +get-orig-source: + bzr export -r $(DEB_REPOS_VERSION) $(DEB_ORIG_DIRECTORY) $(DEB_ORIG_URI) + tar -czf $(DEB_ORIG_FILENAME) $(DEB_ORIG_DIRECTORY) + rm -fr $(DEB_ORIG_DIRECTORY) --- planet-venus-0~bzr116.orig/debian/README.source +++ planet-venus-0~bzr116/debian/README.source @@ -0,0 +1,20 @@ +Source README +============= + +The upstream source can be downloaded with the following command: + + ./debian/rules get-orig-source + +You will need the following packages installed: + + bzr + +You can patch the upstream source with the following command: + + ./debian/rules patch + +You can add or edit patches using the following command: + + cdbs-edit-patch + + -- Noah Slater , Wed, 14 Jan 2009 16:45:09 +0000 --- planet-venus-0~bzr116.orig/debian/control +++ planet-venus-0~bzr116/debian/control @@ -0,0 +1,26 @@ +Source: planet-venus +Section: python +Priority: extra +Maintainer: Noah Slater +Uploaders: Python Applications Packaging Team +Standards-Version: 3.8.3 +Build-Depends: cdbs (>= 0.4.42), debhelper (>= 7.2.11) +Build-Depends-Indep: help2man, python-support (>= 0.6.4), python +Homepage: http://www.intertwingly.net/code/venus/ +Vcs-Svn: svn://svn.debian.org/python-apps/packages/planet-venus/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/planet-venus/trunk/ + +Package: planet-venus +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python-chardet, python-html5lib, + python-htmltmpl, python-httplib2, python-librdf, python-libxml2, + python-utidylib +Recommends: python-libxslt1, python-beautifulsoup +Suggests: python-django, python-genshi, python-lxml +Conflicts: drscheme, plt-scheme, planet +Description: aggregate feed generator + Planet Venus downloads news feeds published by web sites and + aggregates their content together into a single combined feed, latest + news first. + . + Planet Venus is a refactoring of Planet, also available in Debian. --- planet-venus-0~bzr116.orig/debian/patches/script-header.patch +++ planet-venus-0~bzr116/debian/patches/script-header.patch @@ -0,0 +1,18 @@ +diff -Nur planet-venus-20080213-1.orig/planet/csv_config.py planet-venus-20080213-1.orig.new/planet/csv_config.py +--- planet-venus-20080213-1.orig/planet/csv_config.py 2007-12-22 03:24:01.000000000 +0000 ++++ planet-venus-20080213-1.orig.new/planet/csv_config.py 2008-02-18 12:43:35.000000000 +0000 +@@ -1,3 +1,5 @@ ++#!/usr/bin/env python ++ + from ConfigParser import ConfigParser + import csv + +diff -Nur planet-venus-20080213-1.orig/planet/opml.py planet-venus-20080213-1.orig.new/planet/opml.py +--- planet-venus-20080213-1.orig/planet/opml.py 2007-12-22 03:24:01.000000000 +0000 ++++ planet-venus-20080213-1.orig.new/planet/opml.py 2008-02-18 12:43:35.000000000 +0000 +@@ -1,3 +1,5 @@ ++#!/usr/bin/env python ++ + from xml.sax import ContentHandler, make_parser, SAXParseException + from xml.sax.xmlreader import InputSource + from sgmllib import SGMLParser --- planet-venus-0~bzr116.orig/debian/patches/command-improvement.patch +++ planet-venus-0~bzr116/debian/patches/command-improvement.patch @@ -0,0 +1,137 @@ +diff -Nur planet-venus_0~bzr86.orig/planet.py planet-venus_0~bzr86.orig.new/planet.py +--- planet-venus_0~bzr86.orig/planet.py 2008-03-20 23:39:53.000000000 +0000 ++++ planet-venus_0~bzr86.orig.new/planet.py 2008-03-21 00:03:19.000000000 +0000 +@@ -13,30 +13,90 @@ + "Jeff Waugh " ] + __license__ = "Python" + ++import os, shutil, sys ++from os import path + +-import os, sys ++DEFAULT_CONFIGURATION_FILE_NAME = "/usr/share/planet-venus/example/default.ini" ++DEFAULT_THEME_DIRECTORY_NAME = "/usr/share/planet-venus/theme/default" + + if __name__ == "__main__": + config_file = "config.ini" + offline = 0 + verbose = 0 ++ debug = 0 + only_if_new = 0 + expunge = 0 + +- for arg in sys.argv[1:]: ++ def display_error(message): ++ print >> sys.stderr, message ++ print >> sys.stderr ++ print >> sys.stderr, "Try `planet --help' for more information." ++ sys.exit(1) ++ ++ for key, arg in enumerate(sys.argv[1:]): + if arg == "-h" or arg == "--help": +- print "Usage: planet [options] [CONFIGFILE]" +- print +- print "Options:" +- print " -v, --verbose DEBUG level logging during update" +- print " -o, --offline Update the Planet from the cache only" +- print " -h, --help Display this help message and exit" +- print " -n, --only-if-new Only spider new feeds" +- print " -x, --expunge Expunge old entries from cache" +- print ++ print """Usage: planet [OPTION]... [CONFIGURATION-FILE] ++ ++Planet Venus downloads news feeds published by web sites and aggregates their ++content together into a single combined feed, latest news first. ++ ++The exit status is 0 for success or 1 for failure. ++ ++Options: ++ ++ -h, --help display a short help message and exit ++ -V, --version display version information and exit ++ -v, --verbose verbose logging during update ++ -d, --debug debug logging during update ++ -o, --offline update from the cache only ++ -n, --only-if-new only spider new feeds ++ -x, --expunge expunge old entries from cache ++ -c, --create=DIRECTORY create a new planet in DIRECTORY ++ ++Examples: ++ ++You can create a default planet: ++ ++ planet --create example ++ ++You can build this default planet right away: ++ ++ cd example && planet --verbose planet.ini ++ ++You can test the results in your favourite browser: ++ ++ sensible-browser output/index.html ++ ++The configuration file has more details for customisation: ++ ++ sensible-editor planet.ini ++ ++Report bugs using the `reportbug' command.""" ++ sys.exit(0) ++ elif arg == "-V" or arg == "--version": ++ print """planet - Planet Venus @version@ ++ ++Copyright 2008, Sam Ruby ++ ++Licenced under the Python Software Foundation License Version 2. ++ ++Written by Sam Ruby .""" ++ sys.exit(0) ++ elif arg == "-c" or arg == "--create": ++ planet_directory_name = sys.argv[key + 2] ++ configuration_file_name = path.join(planet_directory_name, "planet.ini") ++ theme_directory_name = path.join(planet_directory_name, "theme") ++ if not path.exists(planet_directory_name): ++ os.makedirs(planet_directory_name) ++ if not path.exists(configuration_file_name): ++ shutil.copy(DEFAULT_CONFIGURATION_FILE_NAME, configuration_file_name) ++ if not path.exists(theme_directory_name): ++ shutil.copytree(DEFAULT_THEME_DIRECTORY_NAME, theme_directory_name) + sys.exit(0) + elif arg == "-v" or arg == "--verbose": + verbose = 1 ++ elif arg == "-d" or arg == "--debug": ++ debug = 1 + elif arg == "-o" or arg == "--offline": + offline = 1 + elif arg == "-n" or arg == "--only-if-new": +@@ -44,17 +104,27 @@ + elif arg == "-x" or arg == "--expunge": + expunge = 1 + elif arg.startswith("-"): +- print >>sys.stderr, "Unknown option:", arg +- sys.exit(1) ++ display_error("Unknown option: %s" % arg) + else: + config_file = arg + ++ if not config_file: ++ display_error("No configuration file specified.") ++ ++ if not path.exists(config_file): ++ display_error("The configuration file does not exist: %s" % config_file) ++ + from planet import config + config.load(config_file) + +- if verbose: +- import planet ++ import planet ++ ++ if debug: + planet.getLogger('DEBUG',config.log_format()) ++ elif verbose: ++ planet.getLogger('INFO',config.log_format()) ++ else: ++ planet.getLogger('WARNING',config.log_format()) + + if not offline: + from planet import spider --- planet-venus-0~bzr116.orig/debian/patches/processor-import.patch +++ planet-venus-0~bzr116/debian/patches/processor-import.patch @@ -0,0 +1,19 @@ +diff -Nur planet-venus-20080213-1.orig/planet/shell/__init__.py planet-venus-20080213-1.orig.new/planet/shell/__init__.py +--- planet-venus-20080213-1.orig/planet/shell/__init__.py 2007-12-22 03:24:02.000000000 +0000 ++++ planet-venus-20080213-1.orig.new/planet/shell/__init__.py 2008-02-18 12:42:16.000000000 +0000 +@@ -42,12 +42,12 @@ + + # Try loading module for processing this template, based on the extension + base,ext = os.path.splitext(os.path.basename(template_resolved)) +- module_name = ext[1:] ++ module_name = "planet.shell.%s" % ext[1:] + try: + try: +- module = __import__("_" + module_name) ++ module = __import__("_" + module_name, "", "", [""]) + except: +- module = __import__(module_name) ++ module = __import__(module_name, "", "", [""]) + except Exception, inst: + return log.error("Skipping %s '%s' after failing to load '%s': %s", + mode, template_resolved, module_name, inst) --- planet-venus-0~bzr116.orig/debian/patches/theme-diveintomark.patch +++ planet-venus-0~bzr116/debian/patches/theme-diveintomark.patch @@ -0,0 +1,84 @@ +diff -Nur planet-venus-20080213-1.orig/themes/diveintomark/config.ini planet-venus-20080213-1.orig.new/themes/diveintomark/config.ini +--- planet-venus-20080213-1.orig/themes/diveintomark/config.ini 1970-01-01 01:00:00.000000000 +0100 ++++ planet-venus-20080213-1.orig.new/themes/diveintomark/config.ini 2008-02-18 12:44:49.000000000 +0000 +@@ -0,0 +1,5 @@ ++[Planet] ++ ++template_files: atom.xml.xslt index.html.tmpl ++ ++template_directories: /usr/share/planet-venus/theme/common +diff -Nur planet-venus-20080213-1.orig/themes/diveintomark/index.html.tmpl planet-venus-20080213-1.orig.new/themes/diveintomark/index.html.tmpl +--- planet-venus-20080213-1.orig/themes/diveintomark/index.html.tmpl 1970-01-01 01:00:00.000000000 +0100 ++++ planet-venus-20080213-1.orig.new/themes/diveintomark/index.html.tmpl 2008-02-18 12:44:49.000000000 +0000 +@@ -0,0 +1,49 @@ ++ ++ ++ ++ ++ ++<TMPL_VAR name> ++ ++ ++ ++ ++

++
    ++ ++ ++
++

++
    ++ ++ lang=""> ++" title=""> href="" lang=""> ++
     ++ ++ ++
++
++ ++ ++ +diff -Nur planet-venus-20080213-1.orig/themes/diveintomark/LICENCE planet-venus-20080213-1.orig.new/themes/diveintomark/LICENCE +--- planet-venus-20080213-1.orig/themes/diveintomark/LICENCE 1970-01-01 01:00:00.000000000 +0100 ++++ planet-venus-20080213-1.orig.new/themes/diveintomark/LICENCE 2008-02-18 12:44:49.000000000 +0000 +@@ -0,0 +1,18 @@ ++Copyright (c) 2007-2008 Mark Pilgrim ++ ++Permission is hereby granted, free of charge, to any person obtaining a copy of ++this software and associated documentation files (the "Software"), to deal in ++the Software without restriction, including without limitation the rights to ++use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of ++the Software, and to permit persons to whom the Software is furnished to do so, ++subject to the following conditions: ++ ++The above copyright notice and this permission notice shall be included in all ++copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS ++FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR ++COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER ++IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.