[Python-apps-commits] r3733 - in packages/trac/trunk/debian (8 files)
debacle at users.alioth.debian.org
debacle at users.alioth.debian.org
Mon Sep 14 23:18:45 UTC 2009
Date: Monday, September 14, 2009 @ 23:18:44
Author: debacle
Revision: 3733
Prepare 0.11.5-1 package.
Added:
packages/trac/trunk/debian/install
Modified:
packages/trac/trunk/debian/changelog
packages/trac/trunk/debian/control
packages/trac/trunk/debian/patches/00list
packages/trac/trunk/debian/rules
Deleted:
packages/trac/trunk/debian/patches/10_remove_trac_suffix_from_title.dpatch
packages/trac/trunk/debian/patches/16_install_contrib_dir.dpatch
packages/trac/trunk/debian/patches/17_SA32652.dpatch
Modified: packages/trac/trunk/debian/changelog
===================================================================
--- packages/trac/trunk/debian/changelog 2009-09-14 22:24:00 UTC (rev 3732)
+++ packages/trac/trunk/debian/changelog 2009-09-14 23:18:44 UTC (rev 3733)
@@ -1,3 +1,20 @@
+trac (0.11.5-1) unstable; urgency=low
+
+ * New upstream release (Closes: #521513).
+ * Fixed pysqlite dependency (Closes: #518560), thanks to Alban
+ Browaeys for the patch.
+ * Fixed missing contrib files (Closes: #495019), thanks to Alexander
+ Gerasiov for the patch.
+ * Maintenance goes to python apps team. The pre-history is here:
+ VCS-Git: git://git.debian.org/git/pkg-trac/trac.git
+ VCS-Browser: http://git.debian.org/?p=pkg-trac/trac.git
+ * Removed patches/10_remove_trac_suffix_from_title - it seems that
+ the string "Trac" only is used now when no project name is set.
+ * Removed patches/17_SA32652.dpatch - this fix was already a back
+ port of an upstream change.
+
+ -- W. Martin Borgert <debacle at debian.org> Tue, 15 Sep 2009 00:11:31 +0000
+
trac (0.11.1-2.1) unstable; urgency=high
* Non-maintainer upload.
Modified: packages/trac/trunk/debian/control
===================================================================
--- packages/trac/trunk/debian/control 2009-09-14 22:24:00 UTC (rev 3732)
+++ packages/trac/trunk/debian/control 2009-09-14 23:18:44 UTC (rev 3733)
@@ -3,17 +3,17 @@
Priority: optional
Build-Depends-Indep: python-setuptools (> 0.5)
Build-Depends: python-genshi (>= 0.5), python-central, python-all-dev, debhelper (>= 6.0.7), dpatch
-Maintainer: Debian Trac Team <pkg-trac-devel at lists.alioth.debian.org>
-Uploaders: Otavio Salvador <otavio at debian.org>, Andres Salomon <dilinger at debian.org>, Jesus Climent <jesus.climent at hispalinux.es>, Luis Matos <gass at otiliamatos.ath.cx>
-Standards-Version: 3.8.0
-VCS-Git: git://git.debian.org/git/pkg-trac/trac.git
-VCS-Browser: http://git.debian.org/?p=pkg-trac/trac.git
+Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Uploaders: Otavio Salvador <otavio at debian.org>, Andres Salomon <dilinger at debian.org>, Jesus Climent <jesus.climent at hispalinux.es>, Luis Matos <gass at otiliamatos.ath.cx>, W. Martin Borgert <debacle at debian.org>
+Standards-Version: 3.8.3
+Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/trac/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/trac/trunk/
XS-Python-Version: all
Homepage: http://trac.edgewall.com
Package: trac
Architecture: all
-Depends: ${python:Depends}, python-setuptools (> 0.5), python-pysqlite2 (>= 2.3.2), python-subversion, subversion (>= 1.0.1), python-genshi (>= 0.5), libjs-jquery
+Depends: ${python:Depends}, python-setuptools (> 0.5), python (>= 2.5) | python-pysqlite2 (>= 2.3.2), python-subversion, subversion (>= 1.0.1), python-genshi (>= 0.5), libjs-jquery
Recommends: apache2 | httpd, python-pygments (>= 0.6) | enscript, python-tz
Suggests: python-docutils, libapache2-mod-wsgi | libapache2-mod-python, python-psycopg2, python-mysqldb (>= 1.2.1), python-textile (>= 2.0), trac-git, trac-spamfilter, trac-bzr (>= 0.2+bzr45), trac-mercurial (>= 0.11.0.4)
Conflicts: libapache2-mod-python2.3 (<< 3.2.8-3)
Added: packages/trac/trunk/debian/install
===================================================================
--- packages/trac/trunk/debian/install (rev 0)
+++ packages/trac/trunk/debian/install 2009-09-14 23:18:44 UTC (rev 3733)
@@ -0,0 +1 @@
+contrib usr/share/doc/trac
Modified: packages/trac/trunk/debian/patches/00list
===================================================================
--- packages/trac/trunk/debian/patches/00list 2009-09-14 22:24:00 UTC (rev 3732)
+++ packages/trac/trunk/debian/patches/00list 2009-09-14 23:18:44 UTC (rev 3733)
@@ -1,4 +1 @@
-10_remove_trac_suffix_from_title.dpatch
15_remove_jquery_file.dpatch
-16_install_contrib_dir.dpatch
-17_SA32652.dpatch
Deleted: packages/trac/trunk/debian/patches/10_remove_trac_suffix_from_title.dpatch
===================================================================
--- packages/trac/trunk/debian/patches/10_remove_trac_suffix_from_title.dpatch 2009-09-14 22:24:00 UTC (rev 3732)
+++ packages/trac/trunk/debian/patches/10_remove_trac_suffix_from_title.dpatch 2009-09-14 23:18:44 UTC (rev 3733)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_remove_trac_suffix_from_title.dpatch by Sam Hocevar <sam at zoy.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove "- Trac" suffix from page titles to reduce search engine
-## DP: pollution.
-
- at DPATCH@
-
-diff --git a/trac/templates/layout.html b/trac/templates/layout.html
-index 384efdb..e5f3603 100644
---- a/trac/templates/layout.html
-+++ b/trac/templates/layout.html
-@@ -9,7 +9,7 @@
- <py:match path="head" once="true"><head>
- <title py:with="title = list(select('title/text()'))">
- <py:if test="title">${title} –</py:if>
-- ${' – '.join(filter(None, [project.name, 'Trac']))}
-+ ${' – '.join(filter(None, [project.name]))}
- </title>
- <py:if test="chrome.links">
- <py:for each="rel, links in chrome.links.items()">
Deleted: packages/trac/trunk/debian/patches/16_install_contrib_dir.dpatch
===================================================================
--- packages/trac/trunk/debian/patches/16_install_contrib_dir.dpatch 2009-09-14 22:24:00 UTC (rev 3732)
+++ packages/trac/trunk/debian/patches/16_install_contrib_dir.dpatch 2009-09-14 23:18:44 UTC (rev 3733)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 16_install_contrib_dir.dpatch by <gass at otiliamatos.ath.cx>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Installs the contrib directory from trac source
-
- at DPATCH@
-
-diff --git a/setup.py b/setup.py
-index 37e61fb..c1334c6 100755
---- a/setup.py
-+++ b/setup.py
-@@ -13,6 +13,9 @@
- # history and logs, available at http://trac.edgewall.org/log/.
-
- from setuptools import setup, find_packages
-+from glob import glob
-+
-+
-
- setup(
- name = 'Trac',
-@@ -48,7 +51,10 @@ facilities.
- 'trac.wiki': ['default-pages/*'],
- 'trac.ticket': ['workflows/*.ini'],
- },
--
-+ data_files=[(('/usr/share/doc/trac/contrib/'), glob('contrib/*.*')),
-+ (('/usr/share/doc/trac/contrib/workflow/'), glob('contrib/workflow/*')),
-+ (('/usr/share/doc/trac/contrib/rpm/'), glob('contrib/rpm/*'))
-+ ],
- test_suite = 'trac.test.suite',
- zip_safe = False,
-
Deleted: packages/trac/trunk/debian/patches/17_SA32652.dpatch
===================================================================
--- packages/trac/trunk/debian/patches/17_SA32652.dpatch 2009-09-14 22:24:00 UTC (rev 3732)
+++ packages/trac/trunk/debian/patches/17_SA32652.dpatch 2009-09-14 23:18:44 UTC (rev 3733)
@@ -1,152 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17_SA32652.dpatch by Giuseppe Iuculano <giuseppe at iuculano.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Backported patch to fix SA32652
-
- at DPATCH@
-diff -urNad trac-0.11.1~/trac/util/html.py trac-0.11.1/trac/util/html.py
---- trac-0.11.1~/trac/util/html.py 2008-08-07 03:00:20.000000000 +0200
-+++ trac-0.11.1/trac/util/html.py 2008-11-16 18:22:50.000000000 +0100
-@@ -14,10 +14,74 @@
- import re
-
- from genshi import Markup, escape, unescape
--from genshi.core import stripentities, striptags
-+from genshi.core import stripentities, striptags, START, END
- from genshi.builder import Element, ElementFactory, Fragment
-+from genshi.filters.html import HTMLSanitizer
-
--__all__ = ['escape', 'unescape', 'html', 'plaintext']
-+__all__ = ['escape', 'unescape', 'html', 'plaintext', 'TracHTMLSanitizer']
-+
-+
-+class TracHTMLSanitizer(HTMLSanitizer):
-+
-+ UNSAFE_CSS = ['position']
-+
-+ def __init__(self):
-+ safe_attrs = HTMLSanitizer.SAFE_ATTRS | set(['style'])
-+ super(TracHTMLSanitizer, self).__init__(safe_attrs=safe_attrs)
-+
-+ def sanitize_css(self, text):
-+ decls = []
-+ text = self._strip_css_comments(self._replace_unicode_escapes(text))
-+ for decl in filter(None, text.split(';')):
-+ decl = decl.strip()
-+ if not decl:
-+ continue
-+ try:
-+ prop, value = decl.split(':', 1)
-+ except ValueError:
-+ continue
-+ if not self.is_safe_css(prop.strip().lower(), value.strip()):
-+ continue
-+ is_evil = False
-+ if 'expression' in decl:
-+ is_evil = True
-+ for match in re.finditer(r'url\s*\(([^)]+)', decl):
-+ if not self.is_safe_uri(match.group(1)):
-+ is_evil = True
-+ break
-+ if not is_evil:
-+ decls.append(decl.strip())
-+ return decls
-+
-+ def __call__(self, stream):
-+ """Remove input type="password" elements from the stream
-+ """
-+ suppress = False
-+ for kind, data, pos in super(TracHTMLSanitizer, self).__call__(stream):
-+ if kind is START:
-+ tag, attrs = data
-+ if (tag == 'input' and
-+ attrs.get('type', '').lower() == 'password'):
-+ suppress = True
-+ else:
-+ yield kind, data, pos
-+ elif kind is END:
-+ if not suppress:
-+ yield kind, data, pos
-+ suppress = False
-+ else:
-+ yield kind, data, pos
-+
-+ def is_safe_css(self, prop, value):
-+ """Determine whether the given css property declaration is to be
-+ considered safe for inclusion in the output.
-+ """
-+ if prop in self.UNSAFE_CSS:
-+ return False
-+ # Negative margins can be used for phishing
-+ elif prop.startswith('margin') and '-' in value:
-+ return False
-+ return True
-
-
- class Deuglifier(object):
-diff -urNad trac-0.11.1~/trac/wiki/formatter.py trac-0.11.1/trac/wiki/formatter.py
---- trac-0.11.1~/trac/wiki/formatter.py 2008-08-07 03:00:20.000000000 +0200
-+++ trac-0.11.1/trac/wiki/formatter.py 2008-11-16 18:22:50.000000000 +0100
-@@ -26,7 +26,6 @@
-
- from genshi.builder import tag, Element
- from genshi.core import Stream, Markup, escape
--from genshi.filters import HTMLSanitizer
- from genshi.input import HTMLParser, ParseError
- from genshi.util import plaintext
-
-@@ -38,6 +37,7 @@
- from trac.wiki.parser import WikiParser
- from trac.util.text import shorten_line, to_unicode, \
- unicode_quote, unicode_quote_plus
-+from trac.util.html import TracHTMLSanitizer
- from trac.util.translation import _
-
- __all__ = ['wiki_to_html', 'wiki_to_oneliner', 'wiki_to_outline',
-@@ -86,8 +86,7 @@
- 'span': self._span_processor,
- 'Span': self._span_processor}
-
-- self._sanitizer = HTMLSanitizer(safe_attrs=HTMLSanitizer.SAFE_ATTRS |
-- set(['style']))
-+ self._sanitizer = TracHTMLSanitizer()
-
- self.processor = builtin_processors.get(name)
- if not self.processor:
-diff -urNad trac-0.11.1~/trac/wiki/parser.py trac-0.11.1/trac/wiki/parser.py
---- trac-0.11.1~/trac/wiki/parser.py 2008-08-07 03:00:20.000000000 +0200
-+++ trac-0.11.1/trac/wiki/parser.py 2008-11-16 18:23:51.000000000 +0100
-@@ -98,9 +98,10 @@
- # * list
- r"(?P<list>^(?P<ldepth>\s+)(?:[-*]|\d+\.|[a-zA-Z]\.|[ivxIVX]{1,5}\.) )",
- # definition::
-- r"(?P<definition>^\s+((?:%s[^%s]*%s|%s.*?%s|[^%s%s:]|:[^:])+::)(?:\s+|$))"
-+ r"(?P<definition>^\s+((?:%s[^%s]*%s|%s(?:%s{,2}[^%s])*?%s|[^%s%s:]|:[^:])+::)(?:\s+|$))"
- % (INLINE_TOKEN, INLINE_TOKEN, INLINE_TOKEN,
-- STARTBLOCK_TOKEN, ENDBLOCK_TOKEN, INLINE_TOKEN, STARTBLOCK[0]),
-+ STARTBLOCK_TOKEN, ENDBLOCK[0], ENDBLOCK[0], ENDBLOCK_TOKEN,
-+ INLINE_TOKEN, STARTBLOCK[0]),
- # (leading space)
- r"(?P<indent>^(?P<idepth>\s+)(?=\S))",
- # || table ||
-diff -urNad trac-0.11.1~/trac/wiki/tests/wiki-tests.txt trac-0.11.1/trac/wiki/tests/wiki-tests.txt
---- trac-0.11.1~/trac/wiki/tests/wiki-tests.txt 2008-08-07 03:00:20.000000000 +0200
-+++ trac-0.11.1/trac/wiki/tests/wiki-tests.txt 2008-11-16 18:23:51.000000000 +0100
-@@ -1034,6 +1034,16 @@
- </blockquote>
- ------------------------------
- term::definition
-+============================== Pathological definition list counter example with block quotes
-+ {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}} {{{a}}}
-+------------------------------
-+<blockquote>
-+<p>
-+<tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt>
-+</p>
-+</blockquote>
-+------------------------------
-+<tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt> <tt>a</tt>
- ============================== Definition list + escaped definition list
- complex topic:: multiline
- `not:: a dl`
Modified: packages/trac/trunk/debian/rules
===================================================================
--- packages/trac/trunk/debian/rules 2009-09-14 22:24:00 UTC (rev 3732)
+++ packages/trac/trunk/debian/rules 2009-09-14 23:18:44 UTC (rev 3733)
@@ -33,6 +33,7 @@
dh_testroot
dh_installchangelogs
dh_installdocs
+ dh_install
dh_installman
dh_link
dh_lintian
More information about the Python-apps-commits
mailing list