r1387 - in zope.interface/trunk/debian (5 files)

[Brian Sutherland]

    Date: Wednesday, May 27, 2009 @ 09:00:38
  Author: jinty-guest
Revision: 1387

new packaging for 3.5.1

Modified:
  zope.interface/trunk/debian/changelog
  zope.interface/trunk/debian/compat
  zope.interface/trunk/debian/control
  zope.interface/trunk/debian/rules
  zope.interface/trunk/debian/tests/all

Modified: zope.interface/trunk/debian/changelog
===================================================================
--- zope.interface/trunk/debian/changelog	2009-05-26 19:01:13 UTC (rev 1386)
+++ zope.interface/trunk/debian/changelog	2009-05-27 09:00:38 UTC (rev 1387)
@@ -1,3 +1,9 @@
+zope.interface (3.5.1-1) unstable; urgency=low
+
+  * Major re-write/update. 
+
+ --  <brian at vanguardistas.net>  Tue, 26 May 2009 19:07:43 +0000
+
 python-zope.interface (3.4.0~b1-1) experimental; urgency=low
 
   * New upstream release

Modified: zope.interface/trunk/debian/compat
===================================================================
--- zope.interface/trunk/debian/compat	2009-05-26 19:01:13 UTC (rev 1386)
+++ zope.interface/trunk/debian/compat	2009-05-27 09:00:38 UTC (rev 1387)
@@ -1 +1 @@
-4
+5

Modified: zope.interface/trunk/debian/control
===================================================================
--- zope.interface/trunk/debian/control	2009-05-26 19:01:13 UTC (rev 1386)
+++ zope.interface/trunk/debian/control	2009-05-27 09:00:38 UTC (rev 1387)
@@ -1,25 +1,28 @@
-Source: python-zope.interface
+Source: zope.interface
 Section: python
 Priority: extra
-Maintainer: Brian Sutherland <jinty at web.de>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1)
-Standards-Version: 3.7.2
+Maintainer: Brian Sutherland <brian#vanguardistas.net>
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-van.pydeb
+Standards-Version: 3.8.0
 XS-Python-Version: all
 
 Package: python-zope.interface
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-zope
-Provides: ${python:Provides}
+Depends: ${setuptools:Depends}, ${python:Depends}, ${shlibs:Depends}
+Provides: python-zope, ${python:Provides}
+Suggests: ${setuptools:Suggests}
+Replaces: python-zope, python-zopeinterface
 XB-Python-Version: ${python:Versions}
-Conflicts: python-zopeinterface
+Conflicts: python-zope, zope3
 Description: Zope 3 Interface Infrastructure
  This package provides the zope.interface module, which provide interfaces
  for python.
 
-Package: python-zope
+Package: python-zopeinterface
 Architecture: all
-Depends: ${python:Depends}
+Depends: python-zope.interface (= ${Source-Version})
+Provides: ${python:Provides}
+Conflicts: ${setuptools:Conflicts}
 XB-Python-Version: ${python:Versions}
-Conflicts: python-zopeinterface
-Description: Zope namespace package
- Namespace package for all zope.* packages to depend on.
+Description: Dummy package depending on python-zope.interface
+ zope.interface

Modified: zope.interface/trunk/debian/rules
===================================================================
--- zope.interface/trunk/debian/rules	2009-05-26 19:01:13 UTC (rev 1386)
+++ zope.interface/trunk/debian/rules	2009-05-27 09:00:38 UTC (rev 1387)
@@ -4,11 +4,8 @@
 #export DH_VERBOSE=1
 
 PYVERS=$(shell pyversions -vr debian/control)
-NAMESPACE_MOD=zope
-SUB_MODULE=interface
-PYMOD=$(NAMESPACE_MOD).$(SUB_MODULE)
-PACKAGE=python-$(NAMESPACE_MOD).$(SUB_MODULE)
-NAMESPACE_PACKAGE=python-$(NAMESPACE_MOD)
+PYMOD=zope.interface
+PACKAGE=python-$(PYMOD)
 
 build: $(PYVERS:%=build-python%)
 	touch $@
@@ -38,14 +35,17 @@
 	$(MAKE) -f debian/rules $(PYVERS:%=install-python%)
 
 install-python%:
-	# copy __init__ to the python-zc package
-	install -D -m 644 src/$(NAMESPACE_MOD)/__init__.py \
-	    debian/$(NAMESPACE_PACKAGE)/usr/lib/python$*/site-packages/$(NAMESPACE_MOD)/__init__.py
+	# copy __init__
+	install -D -m 644 src/zope/__init__.py \
+	    debian/$(PACKAGE)/usr/lib/python$*/site-packages/zope/__init__.py
 	python$* setup.py install --no-compile --single-version-externally-managed --root=debian/$(PACKAGE)
 	mv debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD)-*-py$*.egg-info \
 	   debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD).egg-info 
 	mv debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD)-*-py$*-nspkg.pth \
 	   debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD)-nspkg.pth
+	i="$$(van-pydeb depends --egg-info debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD).egg-info --exclude-extra docs)" && echo "setuptools:Depends=$$i" >> debian/$(PACKAGE).substvars
+	i="$$(van-pydeb depends --egg-info debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD).egg-info --extra docs)" && echo "setuptools:Suggests=$$i" >> debian/$(PACKAGE).substvars
+	
 
 .PHONY: binary-common
 binary-common:

Modified: zope.interface/trunk/debian/tests/all
===================================================================
--- zope.interface/trunk/debian/tests/all	2009-05-26 19:01:13 UTC (rev 1386)
+++ zope.interface/trunk/debian/tests/all	2009-05-27 09:00:38 UTC (rev 1387)
@@ -3,21 +3,20 @@
 set -e
 
 PYVERS=$(pyversions -vr debian/control)
-MODULE=$(dpkg-parsechangelog | grep '^Source:' | sed 's/.*python-//')
 TMPFILE=$(mktemp)
 
-cat | sed s/@@MODULE@@/$MODULE/g > $TMPFILE << EOF
+cat > $TMPFILE << EOF
 import sys
-import @@MODULE@@
 from zope.testing import testrunner
 
-module = '@@MODULE@@'.strip()
 subs = (sys.version_info[0], sys.version_info[1])
 test_path = '/usr/lib/python%s.%s/site-packages/' % subs
 
+
+
 exitcode = testrunner.run([
                 '--tests-pattern', '^f?tests$',
-                '-s', module,
+                '-s', 'zope.interface',
                 '--test-path', test_path
                 ])
 sys.exit(exitcode)