diff -Nru tagpy-2013.1/debian/changelog tagpy-2013.1/debian/changelog --- tagpy-2013.1/debian/changelog 2013-10-22 17:08:41.000000000 +0000 +++ tagpy-2013.1/debian/changelog 2014-01-26 02:33:25.000000000 +0000 @@ -1,3 +1,9 @@ +tagpy (2013.1-3ubuntu1) trusty; urgency=medium + + * Use system setuptools to fix FTBFS without Internet connection. + + -- Logan Rosen Sat, 25 Jan 2014 21:33:12 -0500 + tagpy (2013.1-3build1) trusty; urgency=low * No change rebuild for Boost 1.54 transition. diff -Nru tagpy-2013.1/debian/patches/series tagpy-2013.1/debian/patches/series --- tagpy-2013.1/debian/patches/series 2013-07-10 08:53:58.000000000 +0000 +++ tagpy-2013.1/debian/patches/series 2014-01-26 02:32:51.000000000 +0000 @@ -1,2 +1,3 @@ taglib-1.8.patch optional-siteconf.patch +use-system-setuptools.patch diff -Nru tagpy-2013.1/debian/patches/use-system-setuptools.patch tagpy-2013.1/debian/patches/use-system-setuptools.patch --- tagpy-2013.1/debian/patches/use-system-setuptools.patch 1970-01-01 00:00:00.000000000 +0000 +++ tagpy-2013.1/debian/patches/use-system-setuptools.patch 2014-01-26 02:39:12.000000000 +0000 @@ -0,0 +1,36 @@ +--- a/aksetup_helper.py ++++ b/aksetup_helper.py +@@ -1,7 +1,4 @@ + # dealings with ez_setup ------------------------------------------------------ +-import distribute_setup +-distribute_setup.use_setuptools() +- + import setuptools + from setuptools import Extension + +@@ -18,25 +15,6 @@ + + + +-if not hasattr(setuptools, "_distribute"): +- print("-------------------------------------------------------------------------") +- print("Setuptools conflict detected.") +- print("-------------------------------------------------------------------------") +- print("When I imported setuptools, I did not get the distribute version of") +- print("setuptools, which is troubling--this package really wants to be used") +- print("with distribute rather than the old setuptools package. More than likely,") +- print("you have both distribute and setuptools installed, which is bad.") +- print("") +- print("See this page for more information:") +- print("http://wiki.tiker.net/DistributeVsSetuptools") +- print("-------------------------------------------------------------------------") +- print("I will continue after a short while, fingers crossed.") +- print("Hit Ctrl-C now if you'd like to think about the situation.") +- print("-------------------------------------------------------------------------") +- +- count_down_delay(delay=10) +- +- + import os + try: + DEFAULT_SITECONF = os.environ['SITECONF_NAME']