[Python-apps-commits] r5088 - in packages/trac/branches/lenny-backports/debian (15 files)
debacle at users.alioth.debian.org
debacle at users.alioth.debian.org
Thu Apr 8 08:57:00 UTC 2010
Date: Thursday, April 8, 2010 @ 08:56:58
Author: debacle
Revision: 5088
Prepare new backport.
Added:
packages/trac/branches/lenny-backports/debian/patches/70_cache_control_typo.dpatch
packages/trac/branches/lenny-backports/debian/patches/80_correct_plugin_names.dpatch
(from rev 5046, packages/trac/trunk/debian/patches/80_correct_plugin_names.dpatch)
packages/trac/branches/lenny-backports/debian/postinst
(from rev 5046, packages/trac/trunk/debian/postinst)
packages/trac/branches/lenny-backports/debian/prerm
(from rev 5046, packages/trac/trunk/debian/prerm)
packages/trac/branches/lenny-backports/debian/source/
Modified:
packages/trac/branches/lenny-backports/debian/README.Debian
packages/trac/branches/lenny-backports/debian/changelog
packages/trac/branches/lenny-backports/debian/control
packages/trac/branches/lenny-backports/debian/copyright
packages/trac/branches/lenny-backports/debian/patches/00list
packages/trac/branches/lenny-backports/debian/patches/30_default_charset_utf8.dpatch
packages/trac/branches/lenny-backports/debian/patches/40_timeline_author_filter.dpatch
packages/trac/branches/lenny-backports/debian/patches/50_sqlitetopg_script.dpatch
Deleted:
packages/trac/branches/lenny-backports/debian/patches/60_roadmap_dbx_cursor_fix.dpatch
packages/trac/branches/lenny-backports/debian/trac.links
Modified: packages/trac/branches/lenny-backports/debian/README.Debian
===================================================================
--- packages/trac/branches/lenny-backports/debian/README.Debian 2010-04-08 08:27:34 UTC (rev 5087)
+++ packages/trac/branches/lenny-backports/debian/README.Debian 2010-04-08 08:56:58 UTC (rev 5088)
@@ -169,7 +169,15 @@
3. A patch to use UTF-8 per default, as this is the default and
preferred encoding on Debian systems.
+jQuery version
+--------------
+Note, that Trac 0.11 ships with jQuery 1.2, while Debian ships
+with jQuery 1.4 at the moment. This might lead to problems with
+certain Trac plugins that use jQuery functions that are not
+present any more. See http://bugs.debian.org/562859 for details.
+Sorry for any inconvenience.
+
Enjoy!
/The Trac Team
Modified: packages/trac/branches/lenny-backports/debian/changelog
===================================================================
--- packages/trac/branches/lenny-backports/debian/changelog 2010-04-08 08:27:34 UTC (rev 5087)
+++ packages/trac/branches/lenny-backports/debian/changelog 2010-04-08 08:56:58 UTC (rev 5088)
@@ -1,10 +1,46 @@
-trac (0.11.6-1~bpo50+1) lenny-backports; urgency=low
-
+trac (0.11.7-2~bpo50+1) lenny-backports; urgency=low
+
* Rebuild for lenny-backports.
* One line change in debian/rules to prevent Build-Depends on new python.
- -- W. Martin Borgert <debacle at debian.org> Thu, 17 Dec 2009 14:10:40 +0000
+ -- W. Martin Borgert <debacle at debian.org> Thu, 08 Apr 2010 08:40:32 +0000
+trac (0.11.7-2) unstable; urgency=low
+
+ * Removed Luis and Jesus from uploaders. Thanks for your work!
+ * Create symlink for jquery.js (Closes: #495053). Thanks to
+ Max V. Stotsky" <ms at pereslavl.ru>.
+
+ -- W. Martin Borgert <debacle at debian.org> Thu, 08 Apr 2010 08:25:08 +0000
+
+trac (0.11.7-1) unstable; urgency=low
+
+ * New upstream release (Closes: #573260).
+ * Added more Trac plugins as suggestions.
+ * Removed obsolete patches.
+
+ -- W. Martin Borgert <debacle at debian.org> Wed, 17 Feb 2010 08:38:41 +0100
+
+trac (0.11.6-3) unstable; urgency=low
+
+ [ Jakub Wilk ]
+ * Replace deprecated > operator with >=.
+ [ W. Martin Borgert ]
+ * Fix problem with wrong plugin names (Closes: #562963). Thanks to
+ Anatoly Techtonik <techtonik at gmail.com> for providing the patch.
+ * Added some Trac plugins as suggestions.
+
+ -- W. Martin Borgert <debacle at debian.org> Sun, 07 Feb 2010 13:06:32 +0000
+
+trac (0.11.6-2) unstable; urgency=low
+
+ * Create jQuery symlink at install time, as the file might not
+ exist at that moment. (Closes: #562145). Thanks, Clint Adams.
+ * Fix a typo in tracd HTTP header, thanks to Sebastien Couret
+ for fixing. (Closes: #561406).
+
+ -- W. Martin Borgert <debacle at debian.org> Thu, 24 Dec 2009 08:43:08 +0000
+
trac (0.11.6-1) unstable; urgency=low
* New upstream release (Closes: #558976).
Modified: packages/trac/branches/lenny-backports/debian/control
===================================================================
--- packages/trac/branches/lenny-backports/debian/control 2010-04-08 08:27:34 UTC (rev 5087)
+++ packages/trac/branches/lenny-backports/debian/control 2010-04-08 08:56:58 UTC (rev 5088)
@@ -1,11 +1,11 @@
Source: trac
Section: web
Priority: optional
-Build-Depends-Indep: python-setuptools (> 0.5)
-Build-Depends: python-genshi (>= 0.5), python-central, python-all-dev, debhelper (>= 7), dpatch
+Build-Depends-Indep: python-setuptools (>= 0.5)
+Build-Depends: python-genshi (>= 0.5), python-central, python-all-dev (>= 2.5.4), debhelper (>= 7), dpatch
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Uploaders: Otavio Salvador <otavio 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
+Uploaders: Otavio Salvador <otavio at debian.org>, W. Martin Borgert <debacle at debian.org>
+Standards-Version: 3.8.4
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
@@ -15,7 +15,7 @@
Architecture: all
Depends: ${python:Depends}, python-setuptools, python (>= 2.5) | python-pysqlite2 (>= 2.3.2) | python-psycopg2 (>= 1.2.1) | python-mysqldb, python-genshi (>= 0.5)
Recommends: apache2 | httpd, python-subversion, libjs-jquery, python-pygments (>= 0.6) | enscript, python-tz
-Suggests: python-docutils, libapache2-mod-wsgi | libapache2-mod-python, python-textile (>= 2.0), trac-git, trac-spamfilter, trac-bzr (>= 0.2+bzr45), trac-mercurial (>= 0.11.0.4), trac-accountmanager, trac-email2trac
+Suggests: python-docutils, libapache2-mod-wsgi | libapache2-mod-python, python-textile (>= 2.0), trac-git, trac-spamfilter, trac-bzr (>= 0.2+bzr45), trac-mercurial (>= 0.11.0.4), trac-accountmanager, trac-email2trac, trac-xmlrpc, trac-wysiwyg, trac-mastertickets, trac-customfieldadmin, trac-bitten, trac-authopenid, trac-graphviz, trac-wikirename, trac-wikiprint, trac-ja-resource
Conflicts: libapache2-mod-python2.3 (<< 3.2.8-3)
Description: Enhanced wiki and issue tracking system for software development projects
Trac uses a minimalistic approach to web-based software project management.
Modified: packages/trac/branches/lenny-backports/debian/copyright
===================================================================
--- packages/trac/branches/lenny-backports/debian/copyright 2010-04-08 08:27:34 UTC (rev 5087)
+++ packages/trac/branches/lenny-backports/debian/copyright 2010-04-08 08:56:58 UTC (rev 5088)
@@ -31,8 +31,22 @@
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
The SqliteToPg script is copyright by
John Hampton <pacopablo at pacopablo.com>,
licensed under the same conditions as Trac.
It has been downloaded from
http://trac-hacks.org/wiki/SqliteToPgScript
+
+
+The file jquery.js (only in the source package) is
+Copyright (c) 2005-2008 by John Resig, Brandon Aaron & Jörn Zaefferer.
+For more details on developers please see :
+ http://docs.jquery.com/Contributors
+This program is free software; you can redistribute it and/or modify
+it under the terms of either:
+ a) the GNU General Public License as published by the Free Software
+ Foundation; version 2.
+ b) the MIT license.
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'
Modified: packages/trac/branches/lenny-backports/debian/patches/00list
===================================================================
--- packages/trac/branches/lenny-backports/debian/patches/00list 2010-04-08 08:27:34 UTC (rev 5087)
+++ packages/trac/branches/lenny-backports/debian/patches/00list 2010-04-08 08:56:58 UTC (rev 5088)
@@ -3,4 +3,5 @@
30_default_charset_utf8.dpatch
40_timeline_author_filter.dpatch
50_sqlitetopg_script.dpatch
-60_roadmap_dbx_cursor_fix.dpatch
+70_cache_control_typo.dpatch
+80_correct_plugin_names.dpatch
Modified: packages/trac/branches/lenny-backports/debian/patches/30_default_charset_utf8.dpatch
===================================================================
--- packages/trac/branches/lenny-backports/debian/patches/30_default_charset_utf8.dpatch 2010-04-08 08:27:34 UTC (rev 5087)
+++ packages/trac/branches/lenny-backports/debian/patches/30_default_charset_utf8.dpatch 2010-04-08 08:56:58 UTC (rev 5088)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_default_charset_utf8.dpatch by <wmb at beron.tangosoft.com>
+## 30_default_charset_utf8.dpatch by <debacle at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use UTF-8 as default charset
Modified: packages/trac/branches/lenny-backports/debian/patches/40_timeline_author_filter.dpatch
===================================================================
--- packages/trac/branches/lenny-backports/debian/patches/40_timeline_author_filter.dpatch 2010-04-08 08:27:34 UTC (rev 5087)
+++ packages/trac/branches/lenny-backports/debian/patches/40_timeline_author_filter.dpatch 2010-04-08 08:56:58 UTC (rev 5088)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_timeline_author_filter.dpatch by <wmb at beron.tangosoft.com>
+## 40_timeline_author_filter.dpatch by <debacle at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: add author filter to timeline
Modified: packages/trac/branches/lenny-backports/debian/patches/50_sqlitetopg_script.dpatch
===================================================================
--- packages/trac/branches/lenny-backports/debian/patches/50_sqlitetopg_script.dpatch 2010-04-08 08:27:34 UTC (rev 5087)
+++ packages/trac/branches/lenny-backports/debian/patches/50_sqlitetopg_script.dpatch 2010-04-08 08:56:58 UTC (rev 5088)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_sqlitetopostgresql_script.dpatch by <wmb at beron.tangosoft.com>
+## 50_sqlitetopostgresql_script.dpatch by <debacle at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: add script to migrate from SQlite to PostgreSQL
Deleted: packages/trac/branches/lenny-backports/debian/patches/60_roadmap_dbx_cursor_fix.dpatch
===================================================================
--- packages/trac/branches/lenny-backports/debian/patches/60_roadmap_dbx_cursor_fix.dpatch 2010-04-08 08:27:34 UTC (rev 5087)
+++ packages/trac/branches/lenny-backports/debian/patches/60_roadmap_dbx_cursor_fix.dpatch 2010-04-08 08:56:58 UTC (rev 5088)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_roadmap_dbx_cursor_fix.dpatch by <wmb at wmbmobil.Ammonoidea.Ammonit.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix a potential sqlite cursor problem
-
- at DPATCH@
-
-diff --git a/trac/ticket/roadmap.py b/trac/ticket/roadmap.py
-index d2684f1..57eb6a5 100644
---- a/trac/ticket/roadmap.py
-+++ b/trac/ticket/roadmap.py
-@@ -195,7 +195,8 @@ class DefaultTicketGroupStatsProvider(Component):
- for s in all_statuses:
- status_cnt[s] = 0
- if total_cnt:
-- cursor = self.env.get_db_cnx().cursor()
-+ db = self.env.get_db_cnx()
-+ cursor = db.cursor()
- str_ids = [str(x) for x in sorted(ticket_ids)]
- cursor.execute("SELECT status, count(status) FROM ticket "
- "WHERE id IN (%s) GROUP BY status" %
Added: packages/trac/branches/lenny-backports/debian/patches/70_cache_control_typo.dpatch
===================================================================
--- packages/trac/branches/lenny-backports/debian/patches/70_cache_control_typo.dpatch (rev 0)
+++ packages/trac/branches/lenny-backports/debian/patches/70_cache_control_typo.dpatch 2010-04-08 08:56:58 UTC (rev 5088)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_cache_control_typo.dpatch by Sebastien COURET <10function at neuf.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes a typo in tracd HTTP code
+
+ at DPATCH@
+
+--- orig/trac/web/api.py 2009-12-16 21:39:06.000000000 +0000
++++ patch/trac/web/api.py 2009-12-16 21:51:20.000000000 +0000
+@@ -321,7 +321,7 @@
+ self.send_header('Content-Type', 'text/plain')
+ self.send_header('Content-Length', 0)
+ self.send_header('Pragma', 'no-cache')
+- self.send_header('Cache-control', 'no-cache')
++ self.send_header('Cache-Control', 'no-cache')
+ self.send_header('Expires', 'Fri, 01 Jan 1999 00:00:00 GMT')
+ self.end_headers()
+
+@@ -350,7 +350,7 @@
+
+ def send(self, content, content_type='text/html', status=200):
+ self.send_response(status)
+- self.send_header('Cache-control', 'must-revalidate')
++ self.send_header('Cache-Control', 'must-revalidate')
+ self.send_header('Content-Type', content_type + ';charset=utf-8')
+ self.send_header('Content-Length', len(content))
+ self.end_headers()
+@@ -386,7 +386,7 @@
+
+ self.send_response(status)
+ self._outheaders = []
+- self.send_header('Cache-control', 'must-revalidate')
++ self.send_header('Cache-Control', 'must-revalidate')
+ self.send_header('Expires', 'Fri, 01 Jan 1999 00:00:00 GMT')
+ self.send_header('Content-Type', content_type + ';charset=utf-8')
+ self.send_header('Content-Length', len(data))
Property changes on: packages/trac/branches/lenny-backports/debian/patches/70_cache_control_typo.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Copied: packages/trac/branches/lenny-backports/debian/patches/80_correct_plugin_names.dpatch (from rev 5046, packages/trac/trunk/debian/patches/80_correct_plugin_names.dpatch)
===================================================================
--- packages/trac/branches/lenny-backports/debian/patches/80_correct_plugin_names.dpatch (rev 0)
+++ packages/trac/branches/lenny-backports/debian/patches/80_correct_plugin_names.dpatch 2010-04-08 08:56:58 UTC (rev 5088)
@@ -0,0 +1,141 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_correct_plugin_names.dpatch by Anatoly Techtonik <techtonik at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes problem with wrong plugin names
+
+ at DPATCH@
+
+Index: trac/mimeview/pygments.py
+===================================================================
+--- orig/trac/mimeview/pygments.py (revision 9000)
++++ patch/trac/mimeview/pygments.py (working copy)
+@@ -21,7 +21,7 @@
+ from trac.config import ListOption, Option
+ from trac.mimeview.api import IHTMLPreviewRenderer, Mimeview
+ from trac.prefs import IPreferencePanelProvider
+-from trac.util import get_module_path, get_pkginfo
++from trac.util import get_pkginfo
+ from trac.util.datefmt import http_date, localtz
+ from trac.util.translation import _
+ from trac.web import IRequestHandler
+Index: trac/admin/web_ui.py
+===================================================================
+--- orig/trac/admin/web_ui.py (revision 9000)
++++ patch/trac/admin/web_ui.py (working copy)
+@@ -28,7 +28,7 @@
+ from trac.admin.api import IAdminPanelProvider
+ from trac.core import *
+ from trac.perm import PermissionSystem, IPermissionRequestor
+-from trac.util import get_pkginfo, get_module_path
++from trac.util import get_pkginfo, get_package_path
+ from trac.util.compat import partial
+ from trac.util.text import exception_to_unicode, to_unicode
+ from trac.util.translation import _
+@@ -394,9 +394,6 @@
+ 'Environment', 'EnvironmentSetup', 'PermissionSystem',
+ 'RequestDispatcher', 'Mimeview', 'Chrome')
+
+- def __init__(self):
+- self.trac_path = get_module_path(sys.modules['trac.core'])
+-
+ # IAdminPanelProvider methods
+
+ def get_admin_panels(self, req):
+@@ -589,15 +586,28 @@
+ return 'admin_plugins.html', data
+
+ def _find_distribution(self, module):
+- path = get_module_path(module)
+- if path == self.trac_path:
+- return pkg_resources.Distribution(project_name='Trac',
+- version=TRAC_VERSION,
+- location=path)
+- for dist in pkg_resources.find_distributions(path, only=True):
++ """Trac plugins are either modules that are imported from trac.plugins
++ entrypoint with pkg_resources, or modules that are located directly
++ inside "plugins" folder in environment.
++ """
++ entrypoints = list(pkg_resources.iter_entry_points("trac.plugins"))
++ ep_modules = [ep.module_name for ep in entrypoints]
++ module_name = module.__name__
++
++ while module_name not in ep_modules and "." in module_name:
++ module_name = module_name.rsplit('.',1)[0]
++ if module_name in ep_modules:
++ return entrypoints[ep_modules.index(module_name)].dist
++ # if exact entrypoint is not found - attempt to get Distribution
++ # for the parent package (works for Trac components)
++ package = get_package_path(module)
++ try:
++ dist = pkg_resources.get_distribution(os.path.basename(package))
+ return dist
+- else:
+- # This is a plain Python source file, not an egg
+- return pkg_resources.Distribution(project_name=module.__name__,
++ except pkg_resources.DistributionNotFound:
++ pass
++ # Plain Python import
++ return pkg_resources.Distribution(project_name=module.__name__,
+ version='',
+ location=module.__file__)
++
+Index: trac/web/chrome.py
+===================================================================
+--- orig/trac/web/chrome.py (revision 9000)
++++ patch/trac/web/chrome.py (working copy)
+@@ -39,7 +39,7 @@
+ from trac.mimeview import get_mimetype, Context
+ from trac.resource import *
+ from trac.util import compat, get_reporter_id, presentation, get_pkginfo, \
+- get_module_path, translation
++ translation
+ from trac.util.compat import partial, set
+ from trac.util.html import escape, plaintext
+ from trac.util.text import pretty_size, obfuscate_email_address, \
+Index: trac/util/__init__.py
+===================================================================
+--- orig/trac/util/__init__.py (revision 9000)
++++ patch/trac/util/__init__.py (working copy)
+@@ -350,8 +350,17 @@
+
+ # -- setuptools utils
+
+-def get_module_path(module):
+- # Determine the plugin that this component belongs to
++def get_package_path(module):
++ """
++ Determine root path of the top level package the module belongs to
++
++ >>> trac_path = os.path.dirname(sys.modules['trac'].__file__)
++ >>> get_package_path(sys.modules['trac.util.compat']) == trac_path
++ True
++ >>> get_package_path(sys.modules['trac']) == trac_path
++ True
++ >>> trac_path
++ """
+ path = module.__file__
+ module_name = module.__name__
+ if path.endswith('.pyc') or path.endswith('.pyo'):
+@@ -360,10 +369,10 @@
+ path = os.path.dirname(path)
+ base_path = os.path.splitext(path)[0]
+ while base_path.replace(os.sep, '.').endswith(module_name):
++ if "." not in module_name:
++ break
+ base_path = os.path.dirname(base_path)
+ module_name = '.'.join(module_name.split('.')[:-1])
+- if not module_name:
+- break
+ return base_path
+
+ def get_pkginfo(dist):
+@@ -381,7 +390,7 @@
+ try:
+ from pkg_resources import find_distributions
+ module = dist
+- module_path = get_module_path(module)
++ module_path = os.path.dirname(get_package_path(module))
+ for dist in find_distributions(module_path, only=True):
+ if os.path.isfile(module_path) or \
+ dist.key == module.__name__.lower():
Copied: packages/trac/branches/lenny-backports/debian/postinst (from rev 5046, packages/trac/trunk/debian/postinst)
===================================================================
--- packages/trac/branches/lenny-backports/debian/postinst (rev 0)
+++ packages/trac/branches/lenny-backports/debian/postinst 2010-04-08 08:56:58 UTC (rev 5088)
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+# create link(s), even if original file does not exist (yet)
+for d in /usr/share/pyshared/trac/htdocs/js \
+ /usr/lib/python*/site-packages/trac/htdocs/js; do
+ cd $d
+ ln -sf /usr/share/javascript/jquery/jquery.min.js jquery.js
+done
+
+#DEBHELPER#
+
+exit 0
Copied: packages/trac/branches/lenny-backports/debian/prerm (from rev 5046, packages/trac/trunk/debian/prerm)
===================================================================
--- packages/trac/branches/lenny-backports/debian/prerm (rev 0)
+++ packages/trac/branches/lenny-backports/debian/prerm 2010-04-08 08:56:58 UTC (rev 5088)
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+rm -f /usr/share/pyshared/trac/htdocs/js/jquery.js \
+ /usr/lib/python*/site-packages/trac/htdocs/js/jquery.js
+
+#DEBHELPER#
Deleted: packages/trac/branches/lenny-backports/debian/trac.links
===================================================================
--- packages/trac/branches/lenny-backports/debian/trac.links 2010-04-08 08:27:34 UTC (rev 5087)
+++ packages/trac/branches/lenny-backports/debian/trac.links 2010-04-08 08:56:58 UTC (rev 5088)
@@ -1,2 +0,0 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/pyshared/trac/htdocs/js/jquery.js
-
More information about the Python-apps-commits
mailing list