[Python-apps-commits] r8817 - in packages/trac/trunk/debian (7 files)

Fri Jun 1 21:42:19 UTC 2012

Date: Friday, June 1, 2012 @ 21:42:16
  Author: debacle
Revision: 8817

New upload 0.12.3-1.

Added:
  packages/trac/trunk/debian/links
Modified:
  packages/trac/trunk/debian/README.Debian
  packages/trac/trunk/debian/changelog
  packages/trac/trunk/debian/control
  packages/trac/trunk/debian/patches/series
  packages/trac/trunk/debian/rules
Deleted:
  packages/trac/trunk/debian/patches/60_fix_trac_web_api_referer.patch

Modified: packages/trac/trunk/debian/README.Debian
===================================================================

--- packages/trac/trunk/debian/README.Debian	2012-06-01 05:31:00 UTC (rev 8816)
+++ packages/trac/trunk/debian/README.Debian	2012-06-01 21:42:16 UTC (rev 8817)
@@ -10,8 +10,7 @@
   Trac is written in the Python programming language and uses Genshi
 (python-genshi) as templating system and, optionally, Pygments
 (python-pygments) for source code syntax highlighting.
-  Trac uses SQLite (python-pysqlite2) as an embedded database, but
-can be configured to use PostgreSQL or MySQL instead.
+  Trac uses either PostgreSQL, MySQL, or SQLite as database.
 
 Creating a Project Environment
 ------------------------------
@@ -46,8 +45,21 @@
 a different user than "www-data".
 
 trac-admin will ask you some questions to setup the environment
-(defaults should be ok).
+(defaults should be ok). For using PostgreSQL, you need to enter
+the database string as postgres://USER:PASSWORD@localhost/PROJECT
+(see below).
 
+Configuring PostgreSQL
+======================
+
+PostgreSQL is probably the best option for Trac. The steps are
+basically:
+
+# apt-get install python-psycopg2 postgresql
+# su - postgres -c 'createuser -U postgres -S -D -R -E -P USER'
+# su - postgres -c 'createdb -U postgres -O USER -E UTF8 PROJECT'
+(replace USER and PROJECT with something useful)
+
 Configuring Apache Web Server
 =============================
 

Modified: packages/trac/trunk/debian/changelog
===================================================================
--- packages/trac/trunk/debian/changelog	2012-06-01 05:31:00 UTC (rev 8816)
+++ packages/trac/trunk/debian/changelog	2012-06-01 21:42:16 UTC (rev 8817)
@@ -1,11 +1,15 @@
-trac (0.12.2-2) UNRELEASED; urgency=low
+trac (0.12.3-1) unstable; urgency=low
 
+  * new upstream version (Closes: #658963)
+  * remove embedded jQuery copy, again (Closes: #645235)
+  * new policy version, no changes
+  * suggest python-psycopg2, add some hints about using Trac with
+    PostgreSQL in README.Debian
+  [ Daniel Kahn Gillmor <dkg at fifthhorseman.net> ]
   * add Build-Dep on python-babel so that translations will be shipped
     (Closes: #644401)
-  * fix trac.web.auth._referer() if more than one "referer" argument is
-    present (Closes: #634800)
 
- -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Mon, 05 Dec 2011 19:03:16 -0500
+ -- W. Martin Borgert <debacle at debian.org>  Thu, 31 May 2012 20:55:24 +0000
 
 trac (0.12.2-1) unstable; urgency=low
 

Modified: packages/trac/trunk/debian/control
===================================================================
--- packages/trac/trunk/debian/control	2012-06-01 05:31:00 UTC (rev 8816)
+++ packages/trac/trunk/debian/control	2012-06-01 21:42:16 UTC (rev 8817)
@@ -1,11 +1,11 @@
 Source: trac
 Section: web
 Priority: optional
-Build-Depends: python-genshi (>= 0.6), debhelper (>= 7.0.50~)
+Build-Depends: python-genshi (>= 0.6), debhelper (>= 7.0.50~), libjs-jquery
 Build-Depends-Indep: python (>= 2.6.6-3~), python-setuptools (>= 0.6), python-babel (>= 0.9.5)
 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.9.2
+Standards-Version: 3.9.3.1
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/trac/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/trac/trunk/
 X-Python-Version: >= 2.5
@@ -14,7 +14,7 @@
 Package: trac
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-setuptools (>= 0.6),
-         python-genshi (>= 0.6)
+         python-genshi (>= 0.6), libjs-jquery
 Recommends: apache2 | httpd, python-subversion, python-pygments (>= 0.6),
             python-tz, python-babel (>= 0.9.5), python-docutils (>= 0.3.9)
 Suggests: libapache2-mod-wsgi, python-textile (>= 2.0),
@@ -22,7 +22,7 @@
           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
+          trac-wikiprint, trac-ja-resource, python-psycopg2
 Description: Enhanced wiki and issue tracking system for software development projects
  Trac uses a minimalistic approach to web-based software project management.
  Its mission is to help developers write great software while staying out of

Added: packages/trac/trunk/debian/links
===================================================================
--- packages/trac/trunk/debian/links	                        (rev 0)
+++ packages/trac/trunk/debian/links	2012-06-01 21:42:16 UTC (rev 8817)
@@ -0,0 +1 @@
+/usr/share/javascript/jquery/jquery.min.js /usr/share/pyshared/trac/htdocs/js/jquery.js

Deleted: packages/trac/trunk/debian/patches/60_fix_trac_web_api_referer.patch
===================================================================
--- packages/trac/trunk/debian/patches/60_fix_trac_web_api_referer.patch	2012-06-01 05:31:00 UTC (rev 8816)
+++ packages/trac/trunk/debian/patches/60_fix_trac_web_api_referer.patch	2012-06-01 21:42:16 UTC (rev 8817)
@@ -1,18 +0,0 @@
-Author: Jamie McClelland <jm at mayfirst.org>
-Forwarded: http://trac.edgewall.org/ticket/10491
-Bug-Debian: http://bugs.debian.org/634800
-Reviewed-By: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Description: fix trac.web.auth _referer()
- avoid trac failures if more than one referer argument appears in a request
-
---- a/trac/web/auth.py	2011-12-04 23:20:37.000000000 -0500
-+++ b/trac/web/auth.py	2011-12-04 23:20:44.000000000 -0500
-@@ -238,7 +238,7 @@
-         req.redirect(referer or req.abs_href())
- 
-     def _referer(self, req):
--        return req.args.get('referer') or req.get_header('Referer')
-+        return req.args.getfirst('referer') or req.get_header('Referer')
- 
- 
- class HTTPAuthentication(object):

Modified: packages/trac/trunk/debian/patches/series
===================================================================
--- packages/trac/trunk/debian/patches/series	2012-06-01 05:31:00 UTC (rev 8816)
+++ packages/trac/trunk/debian/patches/series	2012-06-01 21:42:16 UTC (rev 8817)
@@ -1,4 +1,3 @@
 20_add_interpreter_line.patch
 30_default_charset_utf8.patch
 50_sqlitetopg_script.patch
-60_fix_trac_web_api_referer.patch

Modified: packages/trac/trunk/debian/rules
===================================================================
--- packages/trac/trunk/debian/rules	2012-06-01 05:31:00 UTC (rev 8816)
+++ packages/trac/trunk/debian/rules	2012-06-01 21:42:16 UTC (rev 8817)
@@ -13,3 +13,6 @@
 	find debian/trac/usr/share/pyshared/trac -type f -print0 2>/dev/null | xargs -0r chmod 644
 	chmod 755 debian/trac/usr/share/pyshared/trac/admin/templates/deploy_trac.*
 	chmod 755 debian/trac/usr/share/pyshared/trac/web/*_frontend.py
+
+override_dh_install:
+	dh_install --exclude=jquery.js


