[Python-apps-commits] r5828 - in packages/canto/trunk/debian (4 files)

[vlegout-guest at users.alioth.debian.org]

    Date: Saturday, July 17, 2010 @ 12:32:04
  Author: vlegout-guest
Revision: 5828

Add debian/patches/02-use_system_feedparser.patch

Added:
  packages/canto/trunk/debian/patches/02-use_system_feedparser.patch
Modified:
  packages/canto/trunk/debian/changelog
  packages/canto/trunk/debian/patches/series
  packages/canto/trunk/debian/rules

Modified: packages/canto/trunk/debian/changelog
===================================================================
--- packages/canto/trunk/debian/changelog	2010-07-17 12:29:47 UTC (rev 5827)
+++ packages/canto/trunk/debian/changelog	2010-07-17 12:32:04 UTC (rev 5828)
@@ -13,6 +13,8 @@
   * debian/clean: Added
   * debian/rules: Install private modules and scripts in /usr/lib/canto.
     - Build-Depends on debhelper 7.0.50~ to use overrides
+  * debian/patches/02-use_system_feedparser.patch: Added. Use system
+    feedparser instead of the embedded copy
 
  -- Vincent Legout <vincent at legout.info>  Wed, 14 Jul 2010 14:00:16 +0200
 

Added: packages/canto/trunk/debian/patches/02-use_system_feedparser.patch
===================================================================
--- packages/canto/trunk/debian/patches/02-use_system_feedparser.patch	                        (rev 0)
+++ packages/canto/trunk/debian/patches/02-use_system_feedparser.patch	2010-07-17 12:32:04 UTC (rev 5828)
@@ -0,0 +1,38 @@
+Description: Use system feedparser
+Author: Vincent Legout <vincent at legout.info>
+
+Index: canto-0.7.9/canto/canto_inspect.py
+===================================================================
+--- canto-0.7.9.orig/canto/canto_inspect.py	2010-07-14 23:44:56.508004468 +0200
++++ canto-0.7.9/canto/canto_inspect.py	2010-07-14 23:45:39.184004470 +0200
+@@ -37,7 +37,7 @@
+ # anyone cares to do it, it would be dead simple to code a option to use the
+ # default pprint.
+ 
+-import feedparser_builtin as feedparser
++import feedparser
+ import codecs
+ import time
+ import sys
+Index: canto-0.7.9/canto/canto_fetch.py
+===================================================================
+--- canto-0.7.9.orig/canto/canto_fetch.py	2010-07-14 23:46:34.520004468 +0200
++++ canto-0.7.9/canto/canto_fetch.py	2010-07-14 23:50:09.012004471 +0200
+@@ -17,16 +17,13 @@
+ # main is only used when canto-fetch is called from the command line.
+ # run is used internally by canto when it needs to invoke an update.
+ 
+-import feedparser_builtin
+-
+-feedparser = feedparser_builtin
+-
+ from const import VERSION_TUPLE, GIT_SHA
+ from cfg.base import get_cfg
+ import utility
+ import args
+ 
+ from threading import Thread
++import feedparser
+ import traceback
+ import commands
+ import urlparse

Modified: packages/canto/trunk/debian/patches/series
===================================================================
--- packages/canto/trunk/debian/patches/series	2010-07-17 12:29:47 UTC (rev 5827)
+++ packages/canto/trunk/debian/patches/series	2010-07-17 12:32:04 UTC (rev 5828)
@@ -1 +1,2 @@
 01-fix_hyphen-used-as-minus-sign.patch
+02-use_system_feedparser.patch

Modified: packages/canto/trunk/debian/rules
===================================================================
--- packages/canto/trunk/debian/rules	2010-07-17 12:29:47 UTC (rev 5827)
+++ packages/canto/trunk/debian/rules	2010-07-17 12:32:04 UTC (rev 5828)
@@ -12,6 +12,7 @@
 	mv $(CURDIR)/debian/canto//usr/lib/canto/bin/canto-inspect \
 		$(CURDIR)/debian/canto/usr/lib/canto/canto-inspect
 	rm -rf $(CURDIR)/debian/canto/usr/lib/canto/bin
+	rm -rf $(CURDIR)/debian/canto/usr/lib/canto/canto/feedparser_builtin.py
 
 override_dh_link:
 	dh_link /usr/lib/canto/canto-bin /usr/bin/canto