[Python-modules-commits] r3360 - in /packages/simplejson/trunk/debian: changelog control patches/01_disable_ez_setup.diff patches/disable_ez_setup.patch patches/series rules

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Tue Oct 2 21:01:40 UTC 2007 

Author: piotr
Date: Tue Oct  2 21:01:39 2007
New Revision: 3360

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3360
Log:
* New upstream release
* Build Python extension (_speedups.so)
  - architecture changed to "any"
  - package now provides pythonX.Y-simplejson packages
* Convert from CDBS to pure debhelper & quilt
* Homepage field added
* disable_ez_setup patch updated

Added:
    packages/simplejson/trunk/debian/patches/disable_ez_setup.patch
    packages/simplejson/trunk/debian/patches/series
Removed:
    packages/simplejson/trunk/debian/patches/01_disable_ez_setup.diff
Modified:
    packages/simplejson/trunk/debian/changelog
    packages/simplejson/trunk/debian/control
    packages/simplejson/trunk/debian/rules

Modified: packages/simplejson/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/simplejson/trunk/debian/changelog?rev=3360&op=diff
==============================================================================
--- packages/simplejson/trunk/debian/changelog (original)
+++ packages/simplejson/trunk/debian/changelog Tue Oct  2 21:01:39 2007
@@ -1,6 +1,12 @@
-simplejson (1.7.1-3) UNRELEASED; urgency=low
+simplejson (1.7.2-1) unstable; urgency=low
 
+  * New upstream release
+  * Build Python extension (_speedups.so)
+    - architecture changed to "any"
+    - package now provides pythonX.Y-simplejson packages
+  * Convert from CDBS to pure debhelper & quilt
   * Homepage field added
+  * disable_ez_setup patch updated
 
  -- Piotr Ożarowski <piotr at debian.org>  Sat, 22 Sep 2007 16:59:56 +0200
 

Modified: packages/simplejson/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/simplejson/trunk/debian/control?rev=3360&op=diff
==============================================================================
--- packages/simplejson/trunk/debian/control (original)
+++ packages/simplejson/trunk/debian/control Tue Oct  2 21:01:39 2007
@@ -4,17 +4,17 @@
 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: cdbs (>= 0.4.42), debhelper (>= 5.0.38), python (>= 2.3.5-11), python-setuptools (>= 0.6b3-1), python-support (>= 0.6.4)
-Build-Depends-Indep: python-all-dev
+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)
 Homepage: http://undefined.org/python/#simplejson
 XS-Python-Version: >= 2.3
 XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/simplejson/trunk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/simplejson/trunk/?op=log
 
 Package: python-simplejson
-Architecture: all
-Depends: ${python:Depends}
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}
 XB-Python-Version: ${python:Versions}
+Provides: ${python:Provides}
 Replaces: python2.4-simplejson
 Conflicts: python2.4-simplejson
 Description: Simple, fast, extensible JSON encoder/decoder for Python

Added: packages/simplejson/trunk/debian/patches/disable_ez_setup.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/simplejson/trunk/debian/patches/disable_ez_setup.patch?rev=3360&op=file
==============================================================================
--- packages/simplejson/trunk/debian/patches/disable_ez_setup.patch (added)
+++ packages/simplejson/trunk/debian/patches/disable_ez_setup.patch Tue Oct  2 21:01:39 2007
@@ -1,0 +1,24 @@
+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 @@
+ #!/usr/bin/env python
+ 
+-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)
++#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)
+ 
+ from setuptools import setup, find_packages, Extension, Feature
+ from distutils.command.build_ext import build_ext

Added: packages/simplejson/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/python-modules/packages/simplejson/trunk/debian/patches/series?rev=3360&op=file
==============================================================================
--- packages/simplejson/trunk/debian/patches/series (added)
+++ packages/simplejson/trunk/debian/patches/series Tue Oct  2 21:01:39 2007
@@ -1,0 +1,1 @@
+disable_ez_setup.patch

Modified: packages/simplejson/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/simplejson/trunk/debian/rules?rev=3360&op=diff
==============================================================================
--- packages/simplejson/trunk/debian/rules (original)
+++ packages/simplejson/trunk/debian/rules Tue Oct  2 21:01:39 2007
@@ -1,15 +1,64 @@
 #!/usr/bin/make -f
+#export DH_VERBOSE=1
 
-DEB_PYTHON_SYSTEM := pysupport
+include /usr/share/quilt/quilt.make
 
-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
+PACKAGE_NAME=python-simplejson
+MODULE_NAME=simplejson
 
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
+PYVERS=$(shell pyversions -vr)
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
+	| sed -rne 's,^Version: ([^-]+).*,\1,p')
 
-binary-post-install/python-simplejson::
-	-rm -rf debian/python-simplejson/usr/lib/
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CFLAGS += -O0
+else
+  CFLAGS += -O2
+endif
+export CFLAGS
 
-clean::
-	rm -rf dist simplejson.egg-info
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	-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
+
+build: patch build-stamp
+build-stamp: $(PYVERS:%=build-ext-%)
+	touch $@
+build-ext-%:
+	dh_testdir
+	python$* setup.py build
+	touch $@
+
+install: install-stamp
+install-stamp: build-stamp $(PYVERS:%=install-ext-%)
+install-ext-%:
+	python$* setup.py install \
+		--root $(CURDIR)/debian/$(PACKAGE_NAME) \
+		--single-version-externally-managed
+
+binary-indep:
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_pysupport
+	dh_strip
+	dh_compress -X.py
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+
+.PHONY: clean binary-indep binary-arch binary unpatch

More information about the Python-modules-commits mailing list