On Wed, Jul 18, 2012 at 08:57:35AM +0200, Evgeni Golov wrote:

> attached you find a patch

09:10 < jwilk> Zhenech: You didn't actually attach the patch to #681379 AFAICS.
09:20 < Zhenech> buuuh Zhenech, buuuh! ENOCOFFEE :/

-- 
Bruce Schneier can read and understand Perl programs.
diff -Nru django-celery-2.5.5/debian/changelog django-celery-2.5.5/debian/changelog
--- django-celery-2.5.5/debian/changelog	2012-05-30 16:00:03.000000000 +0000
+++ django-celery-2.5.5/debian/changelog	2012-07-18 06:44:02.000000000 +0000
@@ -1,3 +1,11 @@
+django-celery (2.5.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Do not build issues by default, they need a network connection.
+    Closes: #681379
+
+ -- Evgeni Golov <evg...@debian.org>  Wed, 18 Jul 2012 08:37:00 +0200
+
 django-celery (2.5.5-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru django-celery-2.5.5/debian/patches/no-issues.patch django-celery-2.5.5/debian/patches/no-issues.patch
--- django-celery-2.5.5/debian/patches/no-issues.patch	1970-01-01 00:00:00.000000000 +0000
+++ django-celery-2.5.5/debian/patches/no-issues.patch	2012-07-18 06:43:08.000000000 +0000
@@ -0,0 +1,20 @@
+Description: Do not build issues if DEB_BUILD_ISSUES=disabled
+   Building the issues via sphinxcontrib.issuetracker requires
+   a network connection which is not available on Debian
+   buildds.
+Author: Evgeni Golov <evg...@debian.org>
+Bug-Debian: http://bugs.debian.org/681379
+
+--- django-celery-2.5.5.orig/docs/conf.py
++++ django-celery-2.5.5/docs/conf.py
+@@ -77,6 +77,7 @@ html_sidebars = {
+ }
+ 
+ ### Issuetracker
+-issuetracker = "github"
+-issuetracker_project = "ask/django-celery"
+-issuetracker_issue_pattern = r'[Ii]ssue #(\d+)'
++if os.environ.get("DEB_BUILD_ISSUES", False) != "disabled":
++    issuetracker = "github"
++    issuetracker_project = "ask/django-celery"
++    issuetracker_issue_pattern = r'[Ii]ssue #(\d+)'
diff -Nru django-celery-2.5.5/debian/patches/series django-celery-2.5.5/debian/patches/series
--- django-celery-2.5.5/debian/patches/series	2012-05-30 16:00:03.000000000 +0000
+++ django-celery-2.5.5/debian/patches/series	2012-07-18 06:37:55.000000000 +0000
@@ -1,2 +1,3 @@
 skip_tests.patch
 fix_dependencies.patch
+no-issues.patch
diff -Nru django-celery-2.5.5/debian/rules django-celery-2.5.5/debian/rules
--- django-celery-2.5.5/debian/rules	2012-05-30 16:00:03.000000000 +0000
+++ django-celery-2.5.5/debian/rules	2012-07-18 06:39:24.000000000 +0000
@@ -12,7 +12,7 @@
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	PYTHONPATH=. sphinx-build -b html -d .build/.doctrees -N docs .build/html
+	PYTHONPATH=. DEB_BUILD_ISSUES=disabled sphinx-build -b html -d .build/.doctrees -N docs .build/html
 	dh_auto_build
 
 .PHONY: override_dh_compress
_______________________________________________
Python-modules-team mailing list
Python-modules-team@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team

Reply via email to