[Python-modules-commits] r12541 - in packages/django-threaded-multihost/trunk/debian (7 files)

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

    Date: Friday, April 9, 2010 @ 09:37:52
  Author: deepak-guest
Revision: 12541

Added quilt 3.0 and patch

Added:
  packages/django-threaded-multihost/trunk/debian/patches/001networkcheck
  packages/django-threaded-multihost/trunk/debian/patches/series
Modified:
  packages/django-threaded-multihost/trunk/debian/changelog
  packages/django-threaded-multihost/trunk/debian/control
  packages/django-threaded-multihost/trunk/debian/rules
  packages/django-threaded-multihost/trunk/debian/source/format
Deleted:
  packages/django-threaded-multihost/trunk/debian/patches/001-remove-network-build.patch

Modified: packages/django-threaded-multihost/trunk/debian/changelog
===================================================================
--- packages/django-threaded-multihost/trunk/debian/changelog	2010-04-08 16:55:16 UTC (rev 12540)
+++ packages/django-threaded-multihost/trunk/debian/changelog	2010-04-09 09:37:52 UTC (rev 12541)
@@ -3,7 +3,7 @@
   * Changing to quilt 3.0.
   * Added debian/source/format
   * Stop downloading at build time (Closes: #573685)
-    + Added simple-patchsys.mk for changing setup.py
+    + Added patchsys-quilt.mk for changing setup.py
     + Changes in debian/rules. 
 
  -- Deepak Tripathi <apenguinlinux at gmail.com>  Sun, 04 Apr 2010 16:50:50 +0000

Modified: packages/django-threaded-multihost/trunk/debian/control
===================================================================
--- packages/django-threaded-multihost/trunk/debian/control	2010-04-08 16:55:16 UTC (rev 12540)
+++ packages/django-threaded-multihost/trunk/debian/control	2010-04-09 09:37:52 UTC (rev 12541)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Deepak Tripathi <apenguinlinux at gmail.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), python (>= 2.5), python-support, python-setuptools
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), python (>= 2.5), python-support, python-setuptools, quilt
 Standards-Version: 3.8.4
 XS-Python-Version: all
 Homepage: http://gosatchmo.com/apps/django-threaded-multihost/

Deleted: packages/django-threaded-multihost/trunk/debian/patches/001-remove-network-build.patch
===================================================================
--- packages/django-threaded-multihost/trunk/debian/patches/001-remove-network-build.patch	2010-04-08 16:55:16 UTC (rev 12540)
+++ packages/django-threaded-multihost/trunk/debian/patches/001-remove-network-build.patch	2010-04-09 09:37:52 UTC (rev 12541)
@@ -1,16 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' django-threaded-multihost-1.3.2/setup.py django-threaded-multihost-1.3.2.new/setup.py
---- django-threaded-multihost-1.3.2/setup.py	2009-08-13 00:59:24.000000000 +0530
-+++ django-threaded-multihost-1.3.2.new/setup.py	2010-04-04 17:23:35.000000000 +0530
-@@ -1,5 +1,3 @@
--import ez_setup
--ez_setup.use_setuptools()
- from setuptools import setup, find_packages
- 
- version = __import__('threaded_multihost').__version__
-@@ -26,5 +24,5 @@
-     packages = ['threaded_multihost'],
-     #package_dir = {'':'threaded_multihost'},
-     include_package_data = False,
--    setup_requires = ["setuptools_hg"],
-+    setup_requires = ["setuptools"],
- )

Added: packages/django-threaded-multihost/trunk/debian/patches/001networkcheck
===================================================================
--- packages/django-threaded-multihost/trunk/debian/patches/001networkcheck	                        (rev 0)
+++ packages/django-threaded-multihost/trunk/debian/patches/001networkcheck	2010-04-09 09:37:52 UTC (rev 12541)
@@ -0,0 +1,17 @@
+Index: django-threaded-multihost-1.3.2/setup.py
+===================================================================
+--- django-threaded-multihost-1.3.2.orig/setup.py	2010-04-09 09:24:58.000000000 +0000
++++ django-threaded-multihost-1.3.2/setup.py	2010-04-09 09:25:10.000000000 +0000
+@@ -1,5 +1,3 @@
+-import ez_setup
+-ez_setup.use_setuptools()
+ from setuptools import setup, find_packages
+ 
+ version = __import__('threaded_multihost').__version__
+@@ -26,5 +24,5 @@
+     packages = ['threaded_multihost'],
+     #package_dir = {'':'threaded_multihost'},
+     include_package_data = False,
+-    setup_requires = ["setuptools_hg"],
++    setup_requires = ["setuptools"],
+ )

Added: packages/django-threaded-multihost/trunk/debian/patches/series
===================================================================
--- packages/django-threaded-multihost/trunk/debian/patches/series	                        (rev 0)
+++ packages/django-threaded-multihost/trunk/debian/patches/series	2010-04-09 09:37:52 UTC (rev 12541)
@@ -0,0 +1 @@
+001networkcheck

Modified: packages/django-threaded-multihost/trunk/debian/rules
===================================================================
--- packages/django-threaded-multihost/trunk/debian/rules	2010-04-08 16:55:16 UTC (rev 12540)
+++ packages/django-threaded-multihost/trunk/debian/rules	2010-04-09 09:37:52 UTC (rev 12541)
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 DEB_PYTHON_SYSTEM=pysupport
 
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 clean::
 	rm -rf $(CURDIR)/django_threaded_multihost.egg-info

Modified: packages/django-threaded-multihost/trunk/debian/source/format
===================================================================
--- packages/django-threaded-multihost/trunk/debian/source/format	2010-04-08 16:55:16 UTC (rev 12540)
+++ packages/django-threaded-multihost/trunk/debian/source/format	2010-04-09 09:37:52 UTC (rev 12541)
@@ -1 +1 @@
-1.0
+3.0 (quilt)