[Python-apps-commits] r9507 - in packages/trac-codecomments/trunk/debian (4 files)

[debacle at users.alioth.debian.org]

    Date: Sunday, March 24, 2013 @ 20:28:33
  Author: debacle
Revision: 9507

Prepare package for upload.

Added:
  packages/trac-codecomments/trunk/debian/patches/10_ignore_unknown_columns.patch
  packages/trac-codecomments/trunk/debian/patches/20_fix_paths.patch
  packages/trac-codecomments/trunk/debian/patches/series
Modified:
  packages/trac-codecomments/trunk/debian/changelog

Modified: packages/trac-codecomments/trunk/debian/changelog
===================================================================
--- packages/trac-codecomments/trunk/debian/changelog	2013-03-24 13:42:04 UTC (rev 9506)
+++ packages/trac-codecomments/trunk/debian/changelog	2013-03-24 20:28:33 UTC (rev 9507)
@@ -1,6 +1,5 @@
 trac-codecomments (1.1.1+dfsg-1) unstable; urgency=low
 
   * First Debian package (Closes: #702066).
-    TODO: patch for trac-theme.css path
 
  -- W. Martin Borgert <debacle at debian.org>  Sat, 02 Mar 2013 16:32:20 +0000

Added: packages/trac-codecomments/trunk/debian/patches/10_ignore_unknown_columns.patch
===================================================================
--- packages/trac-codecomments/trunk/debian/patches/10_ignore_unknown_columns.patch	                        (rev 0)
+++ packages/trac-codecomments/trunk/debian/patches/10_ignore_unknown_columns.patch	2013-03-24 20:28:33 UTC (rev 9507)
@@ -0,0 +1,15 @@
+Author: <debacle at debian.org>
+Description: ignore unknown columns
+
+--- a/code_comments/comments.py	2013-03-24 20:55:34.145479940 +0100
++++ b/code_comments/comments.py	2013-03-24 20:57:21.741486233 +0100
+@@ -78,6 +78,9 @@
+         conditions = []
+         values = []
+         for name in args:
++            # ignore unknown columns
++            if not name in Comment.columns:
++                continue
+             if not name.endswith('__in') and not name.endswith('__prefix'):
+                 values.append(args[name])
+             if name.endswith('__gt'):

Added: packages/trac-codecomments/trunk/debian/patches/20_fix_paths.patch
===================================================================
--- packages/trac-codecomments/trunk/debian/patches/20_fix_paths.patch	                        (rev 0)
+++ packages/trac-codecomments/trunk/debian/patches/20_fix_paths.patch	2013-03-24 20:28:33 UTC (rev 9507)
@@ -0,0 +1,16 @@
+Author: <debacle at debian.org>
+Description: fix paths for Debian package
+
+--- a/code_comments/web.py	2013-03-24 21:10:24.941532037 +0100
++++ b/code_comments/web.py	2013-03-24 21:12:16.417538556 +0100
+@@ -90,8 +90,8 @@
+         add_script(req, 'code-comments/underscore-min.js')
+         add_script(req, 'code-comments/backbone-min.js')
+         # jQuery UI includes: UI Core, Interactions, Button & Dialog Widgets, Core Effects, custom theme
+-        add_script(req, 'code-comments/jquery-ui/jquery-ui.js')
+-        add_stylesheet(req, 'code-comments/jquery-ui/trac-theme.css')
++        add_script(req, 'code-comments/jquery-ui.js')
++        add_stylesheet(req, 'code-comments/trac-theme.css')
+         add_script(req, 'code-comments/jquery.ba-throttle-debounce.min.js')
+         add_script(req, 'code-comments/code-comments.js')
+         add_script_data(req, {'CodeComments': js_data})

Added: packages/trac-codecomments/trunk/debian/patches/series
===================================================================
--- packages/trac-codecomments/trunk/debian/patches/series	                        (rev 0)
+++ packages/trac-codecomments/trunk/debian/patches/series	2013-03-24 20:28:33 UTC (rev 9507)
@@ -0,0 +1,2 @@
+10_ignore_unknown_columns.patch
+20_fix_paths.patch