[Python-modules-commits] r4624 - in packages/simplejson/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Sunday, February 24, 2008 @ 20:43:49
  Author: piotr
Revision: 4624

* New upstream release
* disable_ez_setup patch updated
* Strip the "-1" from quilt's and setuptools' required build versions
* Compress binary package with bzip2
* Standards-version bumped to 3.7.3 (no changes needed)

Modified:
  packages/simplejson/trunk/debian/changelog
  packages/simplejson/trunk/debian/control
  packages/simplejson/trunk/debian/patches/disable_ez_setup.patch
  packages/simplejson/trunk/debian/rules

Modified: packages/simplejson/trunk/debian/changelog
===================================================================
--- packages/simplejson/trunk/debian/changelog	2008-02-24 17:21:28 UTC (rev 4623)
+++ packages/simplejson/trunk/debian/changelog	2008-02-24 20:43:49 UTC (rev 4624)
@@ -1,3 +1,13 @@
+simplejson (1.7.4-1) unstable; urgency=low
+
+  * New upstream release
+  * disable_ez_setup patch updated
+  * Strip the "-1" from quilt's and setuptools' required build versions
+  * Compress binary package with bzip2
+  * Standards-version bumped to 3.7.3 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 24 Feb 2008 15:26:50 +0100
+
 simplejson (1.7.3-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/simplejson/trunk/debian/control
===================================================================
--- packages/simplejson/trunk/debian/control	2008-02-24 17:21:28 UTC (rev 4623)
+++ packages/simplejson/trunk/debian/control	2008-02-24 20:43:49 UTC (rev 4624)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Piotr Ożarowski <piotr at debian.org>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.38), quilt (>= 0.40-1), python-all-dev (>= 2.3.5-11), python-setuptools (>= 0.6b3-1), python-support (>= 0.6.4)
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5.0.38), quilt (>= 0.40), python-all-dev (>= 2.3.5-11), python-setuptools (>= 0.6b3), python-support (>= 0.6.4)
 Homepage: http://undefined.org/python/#simplejson
 XS-Python-Version: >= 2.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/simplejson/trunk/

Modified: packages/simplejson/trunk/debian/patches/disable_ez_setup.patch
===================================================================
--- packages/simplejson/trunk/debian/patches/disable_ez_setup.patch	2008-02-24 17:21:28 UTC (rev 4623)
+++ packages/simplejson/trunk/debian/patches/disable_ez_setup.patch	2008-02-24 20:43:49 UTC (rev 4624)
@@ -1,8 +1,6 @@
-Index: simplejson-1.7.2/setup.py
-===================================================================
---- simplejson-1.7.2.orig/setup.py	2007-10-02 22:51:51.000000000 +0200
-+++ simplejson-1.7.2/setup.py	2007-10-02 22:51:58.000000000 +0200
-@@ -1,12 +1,12 @@
+--- simplejson-1.7.4.orig/setup.py.orig	2008-02-24 20:39:05.000000000 +0100
++++ simplejson-1.7.4/setup.py	2008-02-24 20:39:42.000000000 +0100
+@@ -1,17 +1,17 @@
  #!/usr/bin/env python
  
 -from ez_setup import use_setuptools
@@ -11,14 +9,24 @@
 -   min_version='0.6c6'
 -else:
 -   min_version='0.6a9'
--use_setuptools(min_version=min_version)
+-try:
+-    use_setuptools(min_version=min_version)
+-except TypeError:
+-    # If a non-local ez_setup is already imported, it won't be able to
+-    # use the min_version kwarg and will bail with TypeError
+-    use_setuptools()
 +#from ez_setup import use_setuptools
 +#import sys
 +#if 'cygwin' in sys.platform.lower():
 +#   min_version='0.6c6'
 +#else:
 +#   min_version='0.6a9'
-+#use_setuptools(min_version=min_version)
++#try:
++#    use_setuptools(min_version=min_version)
++#except TypeError:
++#    # If a non-local ez_setup is already imported, it won't be able to
++#    # use the min_version kwarg and will bail with TypeError
++#    use_setuptools()
  
  from setuptools import setup, find_packages, Extension, Feature
  from distutils.command.build_ext import build_ext

Modified: packages/simplejson/trunk/debian/rules
===================================================================
--- packages/simplejson/trunk/debian/rules	2008-02-24 17:21:28 UTC (rev 4623)
+++ packages/simplejson/trunk/debian/rules	2008-02-24 20:43:49 UTC (rev 4624)
@@ -20,11 +20,10 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	-rm -rf dist build build-stamp build-ext-*
-	-rm -rf $(MODULE_NAME).egg-info
+	rm -rf dist build build-stamp build-ext-*
+	rm -rf $(MODULE_NAME).egg-info
 	find . -name '*\.py[co]' -delete
-	-rm install-stamp install-ext-*
-	dh_clean
+	dh_clean install-stamp install-ext-*
 
 build: patch build-stamp
 build-stamp: $(PYVERS:%=build-ext-%)
@@ -36,10 +35,12 @@
 
 install: install-stamp
 install-stamp: build-stamp $(PYVERS:%=install-ext-%)
+	touch $@
 install-ext-%:
 	python$* setup.py install \
 		--root $(CURDIR)/debian/$(PACKAGE_NAME) \
 		--single-version-externally-managed
+	touch $@
 
 binary-indep:
 
@@ -57,7 +58,7 @@
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb
+	dh_builddeb -- -Z bzip2
 
 binary: binary-indep binary-arch