[Python-apps-commits] r4885 - in packages/ibid/trunk/debian (6 files)

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

    Date: Wednesday, March 3, 2010 @ 10:25:23
  Author: stefanor-guest
Revision: 4885

Add patch for fortune location, refresh patches

Added:
  packages/ibid/trunk/debian/patches/fortune-path.diff
Modified:
  packages/ibid/trunk/debian/changelog
  packages/ibid/trunk/debian/patches/docs.diff
  packages/ibid/trunk/debian/patches/separate-data.diff
  packages/ibid/trunk/debian/patches/series
  packages/ibid/trunk/debian/patches/tac-not-needed.diff

Modified: packages/ibid/trunk/debian/changelog
===================================================================
--- packages/ibid/trunk/debian/changelog	2010-03-02 22:00:12 UTC (rev 4884)
+++ packages/ibid/trunk/debian/changelog	2010-03-03 10:25:23 UTC (rev 4885)
@@ -5,8 +5,10 @@
     much simpler and less invasive.
   * Run test suite with all python interpretors.
   * Respect nocheck in DEB_BUILD_OPTIONS.
+  * Add fortune-path.diff: Change fortune's default location to be absolute
+    path /usr/games/fortune.
 
- -- Stefano Rivera <stefano at rivera.za.net>  Tue, 02 Mar 2010 22:51:57 +0200
+ -- Stefano Rivera <stefano at rivera.za.net>  Wed, 03 Mar 2010 12:20:43 +0200
 
 ibid (0+bzr881+dfsg-1) experimental; urgency=low
 

Modified: packages/ibid/trunk/debian/patches/docs.diff
===================================================================
--- packages/ibid/trunk/debian/patches/docs.diff	2010-03-02 22:00:12 UTC (rev 4884)
+++ packages/ibid/trunk/debian/patches/docs.diff	2010-03-03 10:25:23 UTC (rev 4885)
@@ -5,7 +5,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
          'http://ibid.omnia.za.net/eggs/',
          'http://wokkel.ik.nu/downloads',
      ],

Added: packages/ibid/trunk/debian/patches/fortune-path.diff
===================================================================
--- packages/ibid/trunk/debian/patches/fortune-path.diff	                        (rev 0)
+++ packages/ibid/trunk/debian/patches/fortune-path.diff	2010-03-03 10:25:23 UTC (rev 4885)
@@ -0,0 +1,18 @@
+Description: fortune is in /usr/games on Debian, which won't necessarily be in
+ the user's path. Change the default location to an absolute path.
+Author: Stefano Rivera <stefano at rivera.za.net>
+Forwarded: not-needed
+Last-Update: 2010-03-03
+
+--- a/ibid/plugins/quotes.py
++++ b/ibid/plugins/quotes.py
+@@ -29,7 +29,8 @@
+     usage = u'fortune'
+     feature = ('fortune',)
+ 
+-    fortune = Option('fortune', 'Path of the fortune executable', 'fortune')
++    fortune = Option('fortune', 'Path of the fortune executable',
++                     '/usr/games/fortune')
+ 
+     def __init__(self, name):
+         super(Fortune, self).__init__(name)

Modified: packages/ibid/trunk/debian/patches/separate-data.diff
===================================================================
--- packages/ibid/trunk/debian/patches/separate-data.diff	2010-03-02 22:00:12 UTC (rev 4884)
+++ packages/ibid/trunk/debian/patches/separate-data.diff	2010-03-03 10:25:23 UTC (rev 4885)
@@ -23,7 +23,7 @@
  include COPYING
 --- a/ibid/utils/__init__.py
 +++ b/ibid/utils/__init__.py
-@@ -18,7 +18,6 @@
+@@ -19,7 +19,6 @@
  from subprocess import Popen, PIPE
  
  from dateutil.tz import tzlocal, tzutc
@@ -31,7 +31,7 @@
  
  import ibid
  from ibid.compat import defaultdict, json
-@@ -237,9 +236,11 @@
+@@ -267,9 +266,11 @@
      ))
      if os.path.exists(fspath):
          return fspath

Modified: packages/ibid/trunk/debian/patches/series
===================================================================
--- packages/ibid/trunk/debian/patches/series	2010-03-02 22:00:12 UTC (rev 4884)
+++ packages/ibid/trunk/debian/patches/series	2010-03-03 10:25:23 UTC (rev 4885)
@@ -1,3 +1,4 @@
 tac-not-needed.diff
 docs.diff
 separate-data.diff
+fortune-path.diff

Modified: packages/ibid/trunk/debian/patches/tac-not-needed.diff
===================================================================
--- packages/ibid/trunk/debian/patches/tac-not-needed.diff	2010-03-02 22:00:12 UTC (rev 4884)
+++ packages/ibid/trunk/debian/patches/tac-not-needed.diff	2010-03-03 10:25:23 UTC (rev 4885)
@@ -5,7 +5,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -66,7 +66,6 @@
+@@ -67,7 +67,6 @@
          'scripts/ibid-pb-client',
          'scripts/ibid-plugin',
          'scripts/ibid-setup',