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

debacle at users.alioth.debian.org debacle at users.alioth.debian.org
Mon Sep 28 20:38:31 UTC 2009 

    Date: Monday, September 28, 2009 @ 20:38:30
  Author: debacle
Revision: 3860

This is 0.11.5-3, fixed bugs etc. see debian/changelog.

Added:
  packages/trac/trunk/debian/patches/30_default_charset_utf8.dpatch
Modified:
  packages/trac/trunk/debian/README.Debian
  packages/trac/trunk/debian/changelog
  packages/trac/trunk/debian/control
  packages/trac/trunk/debian/patches/00list
  packages/trac/trunk/debian/rules

Modified: packages/trac/trunk/debian/README.Debian
===================================================================
--- packages/trac/trunk/debian/README.Debian	2009-09-28 19:55:02 UTC (rev 3859)
+++ packages/trac/trunk/debian/README.Debian	2009-09-28 20:38:30 UTC (rev 3860)
@@ -1,5 +1,6 @@
 Configuring Trac on Debian
 ==========================
+
   Trac is a web-based project management tool. It can be run as a
 standalone daemon (tracd) or together with a web server, such as
 Apache.
@@ -14,6 +15,7 @@
 
 Creating a Project Environment
 ------------------------------
+
   Trac Environment is the backend storage that contains information
 related to specific project like settings, wiki pages, tickets,
 templates, etc. 
@@ -83,6 +85,7 @@
 
 Configuring to use Apache with ModPython
 ----------------------------------------
+
 For Modpython just use the following:
 
 #Extra info https://coderanger.net/~coderanger/tracdoc/install/mod_python.html
@@ -114,6 +117,7 @@
 
 Using Trac
 ----------
+
 You should now have a working Trac installation at:
 
 http://<yourhostname>/trac
@@ -129,6 +133,20 @@
 [1] https://coderanger.net/~coderanger/tracdoc/
 
 
+Notes for users upgrading from Trac 0.10.x to 0.11.x
+====================================================
+
+SQLite
+------
+
+Wookey at toby-churchill.com came across the issue, that the
+SQLite format between Trac 0.10.x (SQLite v2) and 0.11.x (SQLite
+v3) has changed. If you happen to use SQLite, use the following
+update routine by Wookey:
+$ sqlite db/trac.db .dump | sqlite3 db/trac.db3
+With the new file you should be able to run Trac as expected.
+See http://bugs.debian.org/501338 for details.
+
 Enjoy!
 
 /The Trac Team

Modified: packages/trac/trunk/debian/changelog
===================================================================
--- packages/trac/trunk/debian/changelog	2009-09-28 19:55:02 UTC (rev 3859)
+++ packages/trac/trunk/debian/changelog	2009-09-28 20:38:30 UTC (rev 3860)
@@ -3,6 +3,16 @@
   [ W. Martin Borgert ]
   * Improved package description.
   * Fixed another lintian.
+  * Use python.mk and its macros py_setup_install_args and py_libdir_sh
+    for Python 2.6, thanks to Chris Coulson <chrisccoulson at ubuntu.com>
+    for the patch (Closes: #547865).
+  * Relax dependencies on JQuery and Subversion (Closes: #547450).
+  * Depend on python-pkg-resources instead of python-setuptools
+    (Closes: #546426).
+  * Add suggestions for trac-accountmanager and trac-email2trac.
+  * Add some words about sqlite upgrade to README.Debian
+    (Closes: #501338).
+  * Use UTF-8 as default charset instead of ISO-8859-15.
 
   [ anatoly techtonik ]
   * README.Debian update for 0.11.x
@@ -10,7 +20,7 @@
     - warn that CGI setup is sluggish
     - other minor edits
 
- -- W. Martin Borgert <debacle at debian.org>
+ -- W. Martin Borgert <debacle at debian.org>  Mon, 28 Sep 2009 20:27:54 +0000
 
 trac (0.11.5-2) unstable; urgency=low
 

Modified: packages/trac/trunk/debian/control
===================================================================
--- packages/trac/trunk/debian/control	2009-09-28 19:55:02 UTC (rev 3859)
+++ packages/trac/trunk/debian/control	2009-09-28 20:38:30 UTC (rev 3860)
@@ -13,9 +13,9 @@
 
 Package: trac
 Architecture: all
-Depends: ${python:Depends}, python-setuptools (> 0.5), python (>= 2.5) | python-pysqlite2 (>= 2.3.2) | python-psycopg2 (>= 1.2.1) | python-mysqldb, 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-textile (>= 2.0), trac-git, trac-spamfilter, trac-bzr (>= 0.2+bzr45), trac-mercurial (>= 0.11.0.4)
+Depends: ${python:Depends}, python-pkg-resources, 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
 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/trunk/debian/patches/00list
===================================================================
--- packages/trac/trunk/debian/patches/00list	2009-09-28 19:55:02 UTC (rev 3859)
+++ packages/trac/trunk/debian/patches/00list	2009-09-28 20:38:30 UTC (rev 3860)
@@ -1,2 +1,3 @@
 15_remove_jquery_file.dpatch
 20_add_interpreter_line.dpatch
+30_default_charset_utf8.dpatch

Added: packages/trac/trunk/debian/patches/30_default_charset_utf8.dpatch
===================================================================
--- packages/trac/trunk/debian/patches/30_default_charset_utf8.dpatch	                        (rev 0)
+++ packages/trac/trunk/debian/patches/30_default_charset_utf8.dpatch	2009-09-28 20:38:30 UTC (rev 3860)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_default_charset_utf8.dpatch by  <wmb at beron.tangosoft.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use UTF-8 as default charset
+
+ at DPATCH@
+
+diff -uraN trac-0.11.5.orig/trac/mimeview/api.py trac-0.11.5/trac/mimeview/api.py
+--- trac-0.11.5.orig/trac/mimeview/api.py	2009-06-30 21:18:58.000000000 +0200
++++ trac-0.11.5/trac/mimeview/api.py	2009-09-28 22:02:35.000000000 +0200
+@@ -579,7 +579,7 @@
+     annotators = ExtensionPoint(IHTMLPreviewAnnotator)
+     converters = ExtensionPoint(IContentConverter)
+ 
+-    default_charset = Option('trac', 'default_charset', 'iso-8859-15',
++    default_charset = Option('trac', 'default_charset', 'utf-8',
+         """Charset to be used when in doubt.""")
+ 
+     tab_width = IntOption('mimeviewer', 'tab_width', 8,


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

Modified: packages/trac/trunk/debian/rules
===================================================================
--- packages/trac/trunk/debian/rules	2009-09-28 19:55:02 UTC (rev 3859)
+++ packages/trac/trunk/debian/rules	2009-09-28 20:38:30 UTC (rev 3860)
@@ -2,6 +2,7 @@
 
 PYVER=$(shell python -c 'import sys; print sys.version[:3]')
 include /usr/share/dpatch/dpatch.make
+include /usr/share/python/python.mk
 
 clean: unpatch 
 	dh_testdir
@@ -23,11 +24,12 @@
 	dh_installdirs
 	python setup.py install \
 		--root=$(CURDIR)/debian/trac \
-		--single-version-externally-managed
-	chmod +x $(CURDIR)/debian/trac/usr/lib/python$(PYVER)/site-packages/trac/admin/templates/deploy_trac.wsgi
-	chmod +x $(CURDIR)/debian/trac/usr/lib/python$(PYVER)/site-packages/trac/admin/templates/deploy_trac.fcgi
-	chmod +x $(CURDIR)/debian/trac/usr/lib/python$(PYVER)/site-packages/trac/admin/templates/deploy_trac.cgi
-	chmod +x $(CURDIR)/debian/trac/usr/lib/python$(PYVER)/site-packages/trac/web/*_frontend.py
+		--single-version-externally-managed \
+		$(py_setup_install_args)
+	chmod +x $(CURDIR)/debian/trac/$(py_libdir_sh)/trac/admin/templates/deploy_trac.wsgi
+	chmod +x $(CURDIR)/debian/trac/$(py_libdir_sh)/trac/admin/templates/deploy_trac.fcgi
+	chmod +x $(CURDIR)/debian/trac/$(py_libdir_sh)/trac/admin/templates/deploy_trac.cgi
+	chmod +x $(CURDIR)/debian/trac/$(py_libdir_sh)/trac/web/*_frontend.py
 
 binary-indep: build install
 	dh_testdir

More information about the Python-apps-commits mailing list