[Python-modules-commits] r31573 - in packages/tweepy/trunk/debian (6 files)

[nomadium at users.alioth.debian.org]

    Date: Sunday, December 14, 2014 @ 18:48:24
  Author: nomadium
Revision: 31573

Upload tweepy 3.1.0-1 to experimental

Modified:
  packages/tweepy/trunk/debian/changelog
  packages/tweepy/trunk/debian/compat
  packages/tweepy/trunk/debian/control
  packages/tweepy/trunk/debian/copyright
  packages/tweepy/trunk/debian/rules
Deleted:
  packages/tweepy/trunk/debian/patches/

Modified: packages/tweepy/trunk/debian/changelog
===================================================================
--- packages/tweepy/trunk/debian/changelog	2014-12-14 12:35:33 UTC (rev 31572)
+++ packages/tweepy/trunk/debian/changelog	2014-12-14 18:48:24 UTC (rev 31573)
@@ -1,3 +1,18 @@
+tweepy (3.1.0-1) experimental; urgency=low
+
+  * New upstream release. (Closes: #692444).
+    Since 3.0.0 release a fix for security vulnerability CVE-2012-5821
+    is included.
+  * Bump Standards-Version to 3.9.6. No changes were required.
+  * Update copyright file.
+  * Drop 01_use_python_oauth.diff patch. Upstream doesn't use python-auth
+    library anymore.
+  * Simplify d/rules file.
+  * Bump dependency on debhelper to v9.
+  * Add B-D on python-pip, python-requests-oauthlib and dh-python.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Sun, 14 Dec 2014 14:51:37 -0300
+
 tweepy (2.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/tweepy/trunk/debian/compat
===================================================================
--- packages/tweepy/trunk/debian/compat	2014-12-14 12:35:33 UTC (rev 31572)
+++ packages/tweepy/trunk/debian/compat	2014-12-14 18:48:24 UTC (rev 31573)
@@ -1 +1 @@
-7
+9

Modified: packages/tweepy/trunk/debian/control
===================================================================
--- packages/tweepy/trunk/debian/control	2014-12-14 12:35:33 UTC (rev 31572)
+++ packages/tweepy/trunk/debian/control	2014-12-14 18:48:24 UTC (rev 31573)
@@ -3,9 +3,10 @@
 Uploaders: Miguel Landaeta <nomadium at debian.org>
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~),
- python-docutils, python-setuptools, python-sphinx, python-oauth
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9~), python-all (>= 2.6.6-3~),
+ python-docutils, python-setuptools, python-sphinx, python-pip,
+ python-requests-oauthlib, dh-python
+Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/tweepy/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/tweepy/trunk/
@@ -13,7 +14,7 @@
 
 Package: python-tweepy
 Architecture: all
-Depends: python-oauth, python-simplejson | python (>= 2.6), ${misc:Depends},
+Depends: python-simplejson | python (>= 2.6), ${misc:Depends},
  ${python:Depends}
 Suggests: python-tweepy-doc
 Description: Twitter library for Python

Modified: packages/tweepy/trunk/debian/copyright
===================================================================
--- packages/tweepy/trunk/debian/copyright	2014-12-14 12:35:33 UTC (rev 31572)
+++ packages/tweepy/trunk/debian/copyright	2014-12-14 18:48:24 UTC (rev 31573)
@@ -7,10 +7,6 @@
 Copyright: © 2009-2014, Joshua Roesslein <jroesslein at gmail.com>
 License: Expat
 
-Files: tweepy/oauth.py
-Copyright: © 2007, Leah Culver
-License: Expat
-
 Files: debian/*
 Copyright: © 2011-2014, Miguel Landaeta <nomadium at debian.org>
 License: Expat

Modified: packages/tweepy/trunk/debian/rules
===================================================================
--- packages/tweepy/trunk/debian/rules	2014-12-14 12:35:33 UTC (rev 31572)
+++ packages/tweepy/trunk/debian/rules	2014-12-14 18:48:24 UTC (rev 31573)
@@ -1,22 +1,14 @@
 #!/usr/bin/make -f
 
-# The following bundled files break the build process by conflicting
-# with system copies. Temporarily move them.
-BACKUP_FILES = tweepy/oauth.py
-BACKED_UP_FILES = $(BACKUP_FILES:%=%.debian-backup)
-
 %:
 	dh $@ --with python2
 
-# tweepy/oauth.py wreaks havoc with setup.py. Move it out of the way first.
-override_dh_auto_build: $(BACKED_UP_FILES)
+override_dh_auto_build:
 	dh_auto_build
 	cd docs && 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 -X.doctrees -X.buildinfo -Xunderscore
@@ -24,28 +16,13 @@
 override_dh_compress:
 	dh_compress -X.py
 
-# The "|" ensures that the dependencies are called in order.
-override_dh_auto_clean: | dhac restore
-	rm -rf tweepy.egg-info build/html
+override_dh_auto_clean:
+	rm -rf tweepy.egg-info build/*
+	-find tweepy -type f -name '*.pyc' -delete
 
-# tweepy/oauth.py wreaks havoc with setup.py. Move it out of the way first.
-dhac: $(BACKED_UP_FILES)
-	dh_auto_clean
-
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG.md
 
 get-orig-source:
 	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
 	uscan --no-conf --rename --force-download --destdir $(CURDIR)
-
-%.debian-backup:
-	@# Move the matching stem, foo, to foo.debian-backup.
-	mv -f $* $@
-
-restore:
-	for file in $(BACKUP_FILES); do \
-            [ ! -f $${file}.debian-backup ] || mv $${file}.debian-backup $${file}; \
-        done
-
-.PHONY: restore dhac