[Python-modules-commits] r16196 - in packages/tweepy/trunk (9 files)

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

    Date: Wednesday, March 23, 2011 @ 21:59:02
  Author: nomadium-guest
Revision: 16196

* Set mergeWithUpstream property.
* Remove bundled copy of python-oauth and add a Depends on it.
* Add a Suggests on python-tweepy-doc for python-tweepy.
* Update copyright dates.
* Remove useless parameters in sphinx-build invocation.
* Add README.Debian.

Added:
  packages/tweepy/trunk/debian/README.Debian
  packages/tweepy/trunk/debian/patches/
  packages/tweepy/trunk/debian/patches/01_use_python_oauth.diff
  packages/tweepy/trunk/debian/patches/series
Modified:
  packages/tweepy/trunk/debian/	(properties)
  packages/tweepy/trunk/debian/control
  packages/tweepy/trunk/debian/copyright
  packages/tweepy/trunk/debian/python-tweepy.install
  packages/tweepy/trunk/debian/rules


Property changes on: packages/tweepy/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: packages/tweepy/trunk/debian/README.Debian
===================================================================
--- packages/tweepy/trunk/debian/README.Debian	                        (rev 0)
+++ packages/tweepy/trunk/debian/README.Debian	2011-03-23 21:59:02 UTC (rev 16196)
@@ -0,0 +1,8 @@
+Tweepy for Debian
+------------------
+
+A bundled copy of python-oauth module from Leah Culver was removed.
+Users relying on this copy when using Tweepy must install python-oauth
+instead.
+ 
+ -- Miguel Landaeta <miguel at miguel.cc>  Wed, 23 Mar 2011 22:05:49 -0430

Modified: packages/tweepy/trunk/debian/control
===================================================================
--- packages/tweepy/trunk/debian/control	2011-03-23 20:34:26 UTC (rev 16195)
+++ packages/tweepy/trunk/debian/control	2011-03-23 21:59:02 UTC (rev 16196)
@@ -13,9 +13,9 @@
 
 Package: python-tweepy
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, python-oauth, ${misc:Depends}
 Recommends: ipython
-Breaks: ${python:Breaks}
+Suggests: python-tweepy-doc
 Description: A Twitter library for Python
  Tweepy is a Twitter and Identi.ca library for Python
  that can be used in desktop and web applications. It has the

Modified: packages/tweepy/trunk/debian/copyright
===================================================================
--- packages/tweepy/trunk/debian/copyright	2011-03-23 20:34:26 UTC (rev 16195)
+++ packages/tweepy/trunk/debian/copyright	2011-03-23 21:59:02 UTC (rev 16196)
@@ -4,7 +4,7 @@
 Source: https://github.com/joshthecoder/tweepy/archives/master
 
 Files: *
-Copyright: © 2009-2010, Joshua Roesslein <jroesslein at gmail.com>
+Copyright: © 2009-2011, Joshua Roesslein <jroesslein at gmail.com>
 License: Expat
 
 Files: tweepy/oauth.py

Added: packages/tweepy/trunk/debian/patches/01_use_python_oauth.diff
===================================================================
--- packages/tweepy/trunk/debian/patches/01_use_python_oauth.diff	                        (rev 0)
+++ packages/tweepy/trunk/debian/patches/01_use_python_oauth.diff	2011-03-23 21:59:02 UTC (rev 16196)
@@ -0,0 +1,17 @@
+Description: Use python-oauth installed on system
+Author: Miguel Landaeta <miguel at miguel.cc>
+Bug-Debian: http://bugs.debian.org/581602
+Forwarded: no
+Last-Update: 2011-03-23
+
+--- tweepy-1.7.1.orig/tweepy/auth.py
++++ tweepy-1.7.1/tweepy/auth.py
+@@ -5,7 +5,7 @@
+ from urllib2 import Request, urlopen
+ import base64
+ 
+-from tweepy import oauth
++from oauth import oauth
+ from tweepy.error import TweepError
+ from tweepy.api import API
+ 

Added: packages/tweepy/trunk/debian/patches/series
===================================================================
--- packages/tweepy/trunk/debian/patches/series	                        (rev 0)
+++ packages/tweepy/trunk/debian/patches/series	2011-03-23 21:59:02 UTC (rev 16196)
@@ -0,0 +1 @@
+01_use_python_oauth.diff

Modified: packages/tweepy/trunk/debian/python-tweepy.install
===================================================================
--- packages/tweepy/trunk/debian/python-tweepy.install	2011-03-23 20:34:26 UTC (rev 16195)
+++ packages/tweepy/trunk/debian/python-tweepy.install	2011-03-23 21:59:02 UTC (rev 16196)
@@ -1,2 +1,2 @@
 usr/lib/python2.*/*-packages/*
-tweepyshell  usr/bin
+tools/tweepyshell  usr/bin

Modified: packages/tweepy/trunk/debian/rules
===================================================================
--- packages/tweepy/trunk/debian/rules	2011-03-23 20:34:26 UTC (rev 16195)
+++ packages/tweepy/trunk/debian/rules	2011-03-23 21:59:02 UTC (rev 16196)
@@ -4,8 +4,13 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	cd doc && sphinx-build -b html -D latex_paper_size=letter . ../build/html
+	cd doc && sphinx-build -b html . ../build/html
 
+override_dh_auto_install:
+	dh_auto_install
+	# delete bundled copy of python-oauth
+	find debian/tmp -name oauth.py -delete
+
 override_dh_installdocs:
 	dh_installdocs -Xjquery