[Python-apps-commits] r5962 - in packages/trac/trunk/debian (6 files)

[debacle at users.alioth.debian.org]

    Date: Wednesday, August 4, 2010 @ 20:41:59
  Author: debacle
Revision: 5962

Prepare new version, fixing some bugs.

Added:
  packages/trac/trunk/debian/patches/60_fix_nameerror.dpatch
Modified:
  packages/trac/trunk/debian/changelog
  packages/trac/trunk/debian/control
  packages/trac/trunk/debian/patches/00list
  packages/trac/trunk/debian/postinst
  packages/trac/trunk/debian/prerm

Modified: packages/trac/trunk/debian/changelog
===================================================================
--- packages/trac/trunk/debian/changelog	2010-08-04 19:20:34 UTC (rev 5961)
+++ packages/trac/trunk/debian/changelog	2010-08-04 20:41:59 UTC (rev 5962)
@@ -1,3 +1,14 @@
+trac (0.11.7-4) unstable; urgency=low
+
+  * No longer reference site-packages (Closes: #588136, #591593).
+    Thanks to Ara Pulido <ara at ubuntu.com> for reporting and patch.
+  * Use changeset 9403, missing imports (Closes: #583154).
+    Thanks to Anatoly <techtonik at php.net>.
+  * Lintian cleanups in debian/control.
+  * New policy version, no changes.
+
+ -- W. Martin Borgert <debacle at debian.org>  Wed, 04 Aug 2010 20:26:31 +0000
+
 trac (0.11.7-3) unstable; urgency=low
 
   * Correced accidently moved DEBHELPER line (Closes: #576988).

Modified: packages/trac/trunk/debian/control
===================================================================
--- packages/trac/trunk/debian/control	2010-08-04 19:20:34 UTC (rev 5961)
+++ packages/trac/trunk/debian/control	2010-08-04 20:41:59 UTC (rev 5962)
@@ -2,10 +2,10 @@
 Section: web
 Priority: optional
 Build-Depends-Indep: python-setuptools (>= 0.5)
-Build-Depends: python-genshi (>= 0.5), python-central, python-all-dev (>= 2.5.4), debhelper (>= 7), dpatch 
+Build-Depends: python-genshi (>= 0.5), python-central, python-all (>= 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>, W. Martin Borgert <debacle at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 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
@@ -13,7 +13,7 @@
 
 Package: trac
 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)
+Depends: ${misc: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, 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)

Modified: packages/trac/trunk/debian/patches/00list
===================================================================
--- packages/trac/trunk/debian/patches/00list	2010-08-04 19:20:34 UTC (rev 5961)
+++ packages/trac/trunk/debian/patches/00list	2010-08-04 20:41:59 UTC (rev 5962)
@@ -3,5 +3,6 @@
 30_default_charset_utf8.dpatch
 40_timeline_author_filter.dpatch
 50_sqlitetopg_script.dpatch
+60_fix_nameerror.dpatch
 70_cache_control_typo.dpatch
 80_correct_plugin_names.dpatch

Added: packages/trac/trunk/debian/patches/60_fix_nameerror.dpatch
===================================================================
--- packages/trac/trunk/debian/patches/60_fix_nameerror.dpatch	                        (rev 0)
+++ packages/trac/trunk/debian/patches/60_fix_nameerror.dpatch	2010-08-04 20:41:59 UTC (rev 5962)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_fix_nameerror.dpatch by  <debacle at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix missing imports
+
+ at DPATCH@
+
+--- trac/web/api.py.orig	2010-08-04 22:33:12.000000000 +0200
++++ trac/web/api.py	2010-08-04 22:33:38.000000000 +0200
+@@ -18,9 +18,11 @@
+ from Cookie import CookieError, BaseCookie, SimpleCookie
+ import cgi
+ from datetime import datetime
++import errno
+ import new
+ import mimetypes
+ import os
++import socket
+ from StringIO import StringIO
+ import sys
+ import urlparse


Property changes on: packages/trac/trunk/debian/patches/60_fix_nameerror.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/trac/trunk/debian/postinst
===================================================================
--- packages/trac/trunk/debian/postinst	2010-08-04 19:20:34 UTC (rev 5961)
+++ packages/trac/trunk/debian/postinst	2010-08-04 20:41:59 UTC (rev 5962)
@@ -6,7 +6,7 @@
 
 # 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
+        /usr/lib/python*/*-packages/trac/htdocs/js; do
     cd $d
     ln -sf /usr/share/javascript/jquery/jquery.min.js jquery.js
 done

Modified: packages/trac/trunk/debian/prerm
===================================================================
--- packages/trac/trunk/debian/prerm	2010-08-04 19:20:34 UTC (rev 5961)
+++ packages/trac/trunk/debian/prerm	2010-08-04 20:41:59 UTC (rev 5962)
@@ -1,6 +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
+    /usr/lib/python*/*-packages/trac/htdocs/js/jquery.js
 
 #DEBHELPER#