[Python-modules-commits] r25070 - in packages/tweepy/trunk/debian (changelog rules)

[rak at users.alioth.debian.org]

    Date: Wednesday, July 3, 2013 @ 19:05:29
  Author: rak
Revision: 25070

Fix conflict between bundled oauth and Debian's oauth during clean/build

Modified:
  packages/tweepy/trunk/debian/changelog
  packages/tweepy/trunk/debian/rules

Modified: packages/tweepy/trunk/debian/changelog
===================================================================
--- packages/tweepy/trunk/debian/changelog	2013-07-03 12:36:04 UTC (rev 25069)
+++ packages/tweepy/trunk/debian/changelog	2013-07-03 19:05:29 UTC (rev 25070)
@@ -12,6 +12,11 @@
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
+  [ Ryan Kavanagh ]
+  * Move tweepy/oauth.py out of the way during calls to setup.py (i.e., during
+    clean and build). This bundled version is out of sync with Debian's copy
+    and was causing build build failures.
+
  -- Miguel Landaeta <miguel at miguel.cc>  Sat, 29 Jun 2013 16:41:02 -0300
 
 tweepy (1.7.1-2) unstable; urgency=low

Modified: packages/tweepy/trunk/debian/rules
===================================================================
--- packages/tweepy/trunk/debian/rules	2013-07-03 12:36:04 UTC (rev 25069)
+++ packages/tweepy/trunk/debian/rules	2013-07-03 19:05:29 UTC (rev 25070)
@@ -1,8 +1,15 @@
 #!/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
 
-override_dh_auto_build:
+# tweepy/oauth.py wreaks havoc with setup.py. Move it out of the way first.
+override_dh_auto_build: $(BACKED_UP_FILES)
 	dh_auto_build
 	cd docs && sphinx-build -b html . ../build/html
 	rst2man debian/tweepyshell.rst tweepyshell.1
@@ -18,13 +25,28 @@
 override_dh_compress:
 	dh_compress -X.py
 
-override_dh_auto_clean:
-	dh_auto_clean
+# The "|" ensures that the dependencies are called in order.
+override_dh_auto_clean: | dhac restore
 	rm -rf tweepy.egg-info build/html
 
+# 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