Hi,

Attached is the diff for my eunuchs 20050320.1-0.1 NMU.

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
diff -Nru /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/changelog 
/tmp/99uSRIbnMd/eunuchs-20050320.1/debian/changelog
--- /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/changelog 2005-03-20 
13:53:47.000000000 +0100
+++ /tmp/99uSRIbnMd/eunuchs-20050320.1/debian/changelog 2006-06-29 
15:28:41.000000000 +0200
@@ -1,3 +1,10 @@
+eunuchs (20050320.1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update eunuchs to the new python policy (Closes: #373423).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Thu, 29 Jun 2006 15:28:40 +0200
+
 eunuchs (20050320.1) unstable; urgency=low
 
   * Drop copy-paste error dependencies on pwgen and twisted.
diff -Nru /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/compat 
/tmp/99uSRIbnMd/eunuchs-20050320.1/debian/compat
--- /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/compat    2003-08-24 
18:23:02.000000000 +0200
+++ /tmp/99uSRIbnMd/eunuchs-20050320.1/debian/compat    2006-06-29 
15:30:42.000000000 +0200
@@ -1 +1 @@
-4
+5
diff -Nru /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/control 
/tmp/99uSRIbnMd/eunuchs-20050320.1/debian/control
--- /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/control   2005-03-20 
13:55:06.000000000 +0100
+++ /tmp/99uSRIbnMd/eunuchs-20050320.1/debian/control   2006-06-29 
15:30:28.000000000 +0200
@@ -2,57 +2,17 @@
 Section: python
 Priority: optional
 Maintainer: Tommi Virtanen <[EMAIL PROTECTED]>
-Standards-Version: 3.5.6
-Build-Depends: python2.3-dev, python2.4-dev, debhelper (>= 4.1.68), python, 
cdbs (>= 0.4.0.1)
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 
2.3.5-11),
+ python-support (>= 0.3)
 
 Package: python-eunuchs
-Architecture: all
-Depends: ${python:Depends}
-Description: Missing manly parts of UNIX API for Python
- Eunuchs is a library of Python extensions that complement the standard
- libraries in parts where full support for the UNIX API (or the Linux
- API) is missing.
- .
- Most of the functions wrapped by Eunuchs are low-level, dirty, but
- absolutely necessary functions for real systems programming. The aim is
- to have the functions added to mainstream Python libraries.
- .
- Current list of features included:
- .
- - recvmsg(2) and sendmsg(2), including use of cmsg(3)
- .
- - socketpair(2)
- .
- - support for TUN/TAP virtual network interfaces
- .
- This is a dummy package that depends on the correct version of
- python-eunuchs for the default version of Python.
-
-Package: python2.3-eunuchs
-Architecture: any
-Depends: ${python:Depends}
-Description: Missing manly parts of UNIX API for Python
- Eunuchs is a library of Python extensions that complement the standard
- libraries in parts where full support for the UNIX API (or the Linux
- API) is missing.
- .
- Most of the functions wrapped by Eunuchs are low-level, dirty, but
- absolutely necessary functions for real systems programming. The aim is
- to have the functions added to mainstream Python libraries.
- .
- Current list of features included:
- .
- - recvmsg(2) and sendmsg(2), including use of cmsg(3)
- .
- - socketpair(2)
- .
- - support for TUN/TAP virtual network interfaces
- .
- This version is usable with python2.3
-
-Package: python2.4-eunuchs
 Architecture: any
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}
+Provides: ${python:Provides}
+Replaces: python2.3-eunuchs (<< 20050320.1-0.1), python2.4-eunuchs (<< 
20050320.1-0.1)
+Conflicts: python2.3-eunuchs (<< 20050320.1-0.1), python2.4-eunuchs (<< 
20050320.1-0.1)
+XB-Python-Version: ${python:Versions}
 Description: Missing manly parts of UNIX API for Python
  Eunuchs is a library of Python extensions that complement the standard
  libraries in parts where full support for the UNIX API (or the Linux
@@ -63,12 +23,6 @@
  to have the functions added to mainstream Python libraries.
  .
  Current list of features included:
- .
- - recvmsg(2) and sendmsg(2), including use of cmsg(3)
- .
- - socketpair(2)
- .
- - support for TUN/TAP virtual network interfaces
- .
- This version is usable with python2.4
-
+   - recvmsg(2) and sendmsg(2), including use of cmsg(3)
+   - socketpair(2)
+   - support for TUN/TAP virtual network interfaces
diff -Nru /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/generate-control 
/tmp/99uSRIbnMd/eunuchs-20050320.1/debian/generate-control
--- /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/generate-control  2005-03-20 
13:54:58.000000000 +0100
+++ /tmp/99uSRIbnMd/eunuchs-20050320.1/debian/generate-control  1970-01-01 
01:00:00.000000000 +0100
@@ -1,117 +0,0 @@
-#!/usr/bin/python
-import os, os.path, commands
-import formatter, StringIO
-
-PYTHON_VERSIONS=['2.3', '2.4']
-
-def reflow(s):
-    out=StringIO.StringIO()
-    w=formatter.DumbWriter(out)
-    for para in s.split('\n\n'):
-       if para[:1]==' ':
-           w.send_literal_data(para)
-       else:
-           w.send_flowing_data(para)
-           w.send_literal_data('\n')
-       w.send_paragraph(1)
-
-    l=[]
-    for line in out.getvalue().split('\n'):
-       if line=='':
-           l.append(' .')
-       else:
-           l.append(' '+line)
-    while l and l[-1]==' .':
-       del l[-1]
-    return '\n'.join(l)
-
-
-class CmdDict:
-    def __init__(self, setup=None, **kwargs):
-       self.setup=setup
-       self.vars=kwargs
-
-    def handle_var(self, var):
-       return self.vars[var]
-
-    def handle_setup(self, cmd):
-       assert self.setup
-       return self.handle_shell('python %s %s'%(self.setup, cmd))
-
-    def handle_extract_setup_var(self, var):
-       """Extract a variable from a comment inside the setup file."""
-       assert self.setup
-       f=open(self.setup)
-       start="#%s:" % var
-       for line in f.xreadlines():
-           line=line.strip()
-           if line.startswith(start):
-               line=line[len(start):].strip()
-               return line
-       raise 'No special variable %s in setup file %s' \
-             % (repr(var), self.setup)
-
-    def handle_shell(self, cmd):
-       status, output = commands.getstatusoutput(cmd)
-       if status:
-           raise 'Command %s failed with exit status %d.' \
-                 % (repr(cmd), status)
-       return output
-
-    def handle_forpython(self, s):
-       l=[]
-       for pyver in PYTHON_VERSIONS:
-           l.append(s % pyver)
-       return ', '.join(l)
-
-    def __getitem__(self, s):
-       first, rest = s.split(None, 1)
-       f=getattr(self, 'handle_'+first.replace('-', '_'))
-       return f(rest)
-
-pypackage = """
-Package: %(var package)s
-Architecture: %(var arch)s
-Depends: ${python:Depends}
-Description: %(setup --description)s
-"""
-
-filename = 'setup.py'
-package = 'python-eunuchs'
-
-print """\
-Source: %(shell dpkg-parsechangelog|sed -n 's/^Source: //p')s
-Section: %(extract-setup-var debian-section)s
-Priority: optional
-Maintainer: %(setup --contact)s <%(setup --contact-email)s>
-Standards-Version: 3.5.6
-Build-Depends: %(forpython python%s-dev)s, debhelper (>= 4.1.68), python, cdbs 
(>= 0.4.0.1)
-""" % CmdDict(filename)
-
-c = CmdDict(filename,
-            python_version='',
-            package=package,
-            arch='all',
-            )
-print pypackage.strip() % c
-print reflow('%(setup --long-description)s' % c)
-print ' .'
-print '''\
- This is a dummy package that depends on the correct version of
- %s for the default version of Python.
-'''.rstrip() % package
-print
-
-for pyver in PYTHON_VERSIONS:
-    pkgname='python'+pyver+'-'+package[len('python-'):]
-    c=CmdDict(
-        filename,
-        package=pkgname,
-        arch='any',
-        python_version=pyver,
-        )
-    print pypackage.strip() % c
-    print reflow('%(setup --long-description)s' % c)
-    print ' .'
-    print ' This version is usable with python%s' % pyver
-    print
diff -Nru /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/pycompat 
/tmp/99uSRIbnMd/eunuchs-20050320.1/debian/pycompat
--- /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/pycompat  1970-01-01 
01:00:00.000000000 +0100
+++ /tmp/99uSRIbnMd/eunuchs-20050320.1/debian/pycompat  2006-06-29 
15:30:52.000000000 +0200
@@ -0,0 +1 @@
+2
diff -Nru /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/README.Debian.dummy 
/tmp/99uSRIbnMd/eunuchs-20050320.1/debian/README.Debian.dummy
--- /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/README.Debian.dummy       
2003-08-24 18:23:02.000000000 +0200
+++ /tmp/99uSRIbnMd/eunuchs-20050320.1/debian/README.Debian.dummy       
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-This is a dummy package that only depends on the version of
-python-eunuchs matching the current default Python package in
-Debian. That is, while the Debian package 'python' depends
-on pythonX.Y, this package will depend on pythonX.Y-eunuchs.
diff -Nru /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/rules 
/tmp/99uSRIbnMd/eunuchs-20050320.1/debian/rules
--- /tmp/befXl0n9Mr/eunuchs-20050320.1/debian/rules     2005-03-20 
14:32:02.000000000 +0100
+++ /tmp/99uSRIbnMd/eunuchs-20050320.1/debian/rules     2006-06-29 
15:26:18.000000000 +0200
@@ -1,11 +1,12 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
+DEB_PYTHON_SYSTEM=pysupport
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-binary-post-install/%::
-       find examples -mindepth 1 -maxdepth 1 -print0 | xargs -0 
dh_installexamples -p$(cdbs_curpkg)
+DEB_INSTALL_EXAMPLES_python-eunuchs = examples/*.py
 
 clean::
        # distutils is sloppy and only cleans with the default python version,

Attachment: signature.asc
Description: Digital signature

Reply via email to