[Python-apps-commits] r7300 - in packages/trac/trunk/debian (9 files)

adejong at users.alioth.debian.org adejong at users.alioth.debian.org
Sun Jul 10 16:13:07 UTC 2011 

    Date: Sunday, July 10, 2011 @ 16:13:05
  Author: adejong
Revision: 7300

  * Bump standards-version to 3.9.2; no changes required.
  * No longer include empty /etc/trac directory.
  * Re-organise dependencies, removing deprecated things and adding things
    for Trac 0.12.
  * Make package lintian clean.
  * Update debian/copyright file.
  * Make chmod invocation explicit to not be dependent on umask.
  * Remove execute bits from installed files.
  * Add Trac upgrading instructions pointers to README.Debian.
  * Clean up some files that should have been removed in r7288.

Modified:
  packages/trac/trunk/debian/README.Debian
  packages/trac/trunk/debian/changelog
  packages/trac/trunk/debian/control
  packages/trac/trunk/debian/copyright
  packages/trac/trunk/debian/lintian-overrides
  packages/trac/trunk/debian/rules
Deleted:
  packages/trac/trunk/debian/dirs
  packages/trac/trunk/debian/pycompat
  packages/trac/trunk/debian/pyversions

Modified: packages/trac/trunk/debian/README.Debian
===================================================================
--- packages/trac/trunk/debian/README.Debian	2011-07-10 15:51:31 UTC (rev 7299)
+++ packages/trac/trunk/debian/README.Debian	2011-07-10 16:13:05 UTC (rev 7300)
@@ -136,6 +136,9 @@
 Notes for users upgrading Trac
 ==============================
 
+Information on how to upgrade Trac can be found in the Trac wiki:
+http://trac.edgewall.org/wiki/TracUpgrade
+
 Running Trac via WSGI etc.
 --------------------------
 

Modified: packages/trac/trunk/debian/changelog
===================================================================
--- packages/trac/trunk/debian/changelog	2011-07-10 15:51:31 UTC (rev 7299)
+++ packages/trac/trunk/debian/changelog	2011-07-10 16:13:05 UTC (rev 7300)
@@ -1,5 +1,6 @@
 trac (0.12.2-1) UNRELEASED; urgency=low
 
+  * Team upload.
   * New upstream release (Closes: #563391) (LP: #696284)
     - fixes search highlighting (Closes: #621488)
   * Drop 15_remove_jquery_file.dpatch because Trac requires a specific
@@ -16,8 +17,14 @@
   * Dropped conflicts on libapache2-mod-python2.3 because that package was
     removed before the lenny release.
   * Switch to dh-style debian/rules.
+  * Bump standards-version to 3.9.2; no changes required.
+  * No longer include empty /etc/trac directory.
+  * Re-organise dependencies, removing deprecated things and adding things
+    for Trac 0.12.
+  * Make package lintian clean.
+  * Update debian/copyright file.
 
- -- Arthur de Jong <adejong at debian.org>  Sun, 10 Jul 2011 12:30:00 +0200
+ -- Arthur de Jong <adejong at debian.org>  Sun, 10 Jul 2011 18:00:00 +0200
 
 trac (0.11.7-4) unstable; urgency=low
 

Modified: packages/trac/trunk/debian/control
===================================================================
--- packages/trac/trunk/debian/control	2011-07-10 15:51:31 UTC (rev 7299)
+++ packages/trac/trunk/debian/control	2011-07-10 16:13:05 UTC (rev 7300)
@@ -5,7 +5,7 @@
 Build-Depends-Indep: python (>= 2.6.6-3~), python-setuptools (>= 0.6)
 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.1
+Standards-Version: 3.9.2
 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
@@ -13,9 +13,16 @@
 
 Package: trac
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-setuptools (>= 0.6), python-genshi (>= 0.6)
-Recommends: apache2 | httpd, python-subversion, 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
+Depends: ${misc:Depends}, ${python:Depends}, python-setuptools (>= 0.6),
+         python-genshi (>= 0.6)
+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),
+          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
 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

Modified: packages/trac/trunk/debian/copyright
===================================================================
--- packages/trac/trunk/debian/copyright	2011-07-10 15:51:31 UTC (rev 7299)
+++ packages/trac/trunk/debian/copyright	2011-07-10 16:13:05 UTC (rev 7300)
@@ -1,4 +1,4 @@
-Trac is Copyright (C) 2003-2009 Edgewall Software
+Trac is Copyright (C) 2003-2011 Edgewall Software
 
 Trac can be downloaded from:
 http://projects.edgewall.com/trac/wiki/TracDownload
@@ -39,14 +39,15 @@
 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.
+The file jquery.js is
+Copyright 2010, John Resig
+Dual licensed under the MIT or GPL Version 2 licenses.
+http://jquery.org/license
+
+Includes Sizzle.js
+http://sizzlejs.com/
+Copyright 2010, The Dojo Foundation
+Released under the MIT, BSD, and GPL Licenses.
+
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'

Deleted: packages/trac/trunk/debian/dirs
===================================================================
--- packages/trac/trunk/debian/dirs	2011-07-10 15:51:31 UTC (rev 7299)
+++ packages/trac/trunk/debian/dirs	2011-07-10 16:13:05 UTC (rev 7300)
@@ -1,2 +0,0 @@
-etc/trac/
-usr/share/man/man1/

Modified: packages/trac/trunk/debian/lintian-overrides
===================================================================
--- packages/trac/trunk/debian/lintian-overrides	2011-07-10 15:51:31 UTC (rev 7299)
+++ packages/trac/trunk/debian/lintian-overrides	2011-07-10 16:13:05 UTC (rev 7300)
@@ -1,9 +1,12 @@
-#make scripts generated by "deploy" command use sys.executable instead of hardcoding /usr/bin/python so that they work in virtualenv or other setups
+# Make scripts generated by "deploy" command use sys.executable instead of
+# hard-coding /usr/bin/python so that they work in virtualenv or other setups.
+trac: interpreter-not-absolute usr/share/pyshared/trac/admin/templates/deploy_trac.cgi #!${executable}
+trac: unusual-interpreter usr/share/pyshared/trac/admin/templates/deploy_trac.cgi #!${executable}
+trac: interpreter-not-absolute usr/share/pyshared/trac/admin/templates/deploy_trac.fcgi #!${executable}
+trac: unusual-interpreter usr/share/pyshared/trac/admin/templates/deploy_trac.fcgi #!${executable}
+trac: interpreter-not-absolute usr/share/pyshared/trac/admin/templates/deploy_trac.wsgi #!${executable}
+trac: unusual-interpreter usr/share/pyshared/trac/admin/templates/deploy_trac.wsgi #!${executable}
 
-trac: interpreter-not-absolute ./usr/share/pyshared/trac/admin/templates/deploy_trac.cgi #!${executable}
-trac: unusual-interpreter ./usr/share/pyshared/trac/admin/templates/deploy_trac.cgi #!${executable}
-trac: interpreter-not-absolute ./usr/share/pyshared/trac/admin/templates/deploy_trac.fcgi #!${executable}
-trac: unusual-interpreter ./usr/share/pyshared/trac/admin/templates/deploy_trac.fcgi #!${executable}
-trac: interpreter-not-absolute ./usr/share/pyshared/trac/admin/templates/deploy_trac.wsgi #!${executable}
-trac: unusual-interpreter ./usr/share/pyshared/trac/admin/templates/deploy_trac.wsgi #!${executable}
- 
+# We ship the upstream version of jQuery because Trac and plugins tend to
+# depend on the specific version.
+trac: embedded-javascript-library usr/share/pyshared/trac/htdocs/js/jquery.js

Deleted: packages/trac/trunk/debian/pycompat
===================================================================
--- packages/trac/trunk/debian/pycompat	2011-07-10 15:51:31 UTC (rev 7299)
+++ packages/trac/trunk/debian/pycompat	2011-07-10 16:13:05 UTC (rev 7300)
@@ -1 +0,0 @@
-2

Deleted: packages/trac/trunk/debian/pyversions
===================================================================
--- packages/trac/trunk/debian/pyversions	2011-07-10 15:51:31 UTC (rev 7299)
+++ packages/trac/trunk/debian/pyversions	2011-07-10 16:13:05 UTC (rev 7300)
@@ -1 +0,0 @@
-2.3-

Modified: packages/trac/trunk/debian/rules
===================================================================
--- packages/trac/trunk/debian/rules	2011-07-10 15:51:31 UTC (rev 7299)
+++ packages/trac/trunk/debian/rules	2011-07-10 16:13:05 UTC (rev 7300)
@@ -10,5 +10,6 @@
 
 override_dh_fixperms:
 	dh_fixperms
-	chmod +x debian/trac/usr/share/pyshared/trac/admin/templates/deploy_trac.*
-	chmod +x debian/trac/usr/share/pyshared/trac/web/*_frontend.py
+	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

More information about the Python-apps-commits mailing list