Hi,

Attached is the diff for my pyparsing 1.4.2-1.1 NMU.

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
diff -u pyparsing-1.4.2/debian/changelog pyparsing-1.4.2/debian/changelog
--- pyparsing-1.4.2/debian/changelog
+++ pyparsing-1.4.2/debian/changelog
@@ -1,3 +1,10 @@
+pyparsing (1.4.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update package to new python policy (Closes: #373503).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Thu, 29 Jun 2006 23:20:52 +0200
+
 pyparsing (1.4.2-1) unstable; urgency=low
 
   * New upstream release (closes: #351648).
diff -u pyparsing-1.4.2/debian/rules pyparsing-1.4.2/debian/rules
--- pyparsing-1.4.2/debian/rules
+++ pyparsing-1.4.2/debian/rules
@@ -2,6 +2,8 @@
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright © 2002,2003 Colin Walters <[EMAIL PROTECTED]>
 
+DEB_PYTHON_SYSTEM = pysupport
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
diff -u pyparsing-1.4.2/debian/control pyparsing-1.4.2/debian/control
--- pyparsing-1.4.2/debian/control
+++ pyparsing-1.4.2/debian/control
@@ -2,12 +2,17 @@
 Section: python
 Priority: optional
 Maintainer: Tommi Virtanen <[EMAIL PROTECTED]>
-Standards-Version: 3.6.1
-Build-Depends: python2.3-dev, python2.4-dev, debhelper (>= 4.1.68), python, 
cdbs (>= 0.4.26-1), sysutils
+Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python-all-dev (>= 
2.3.5-11)
+Build-Depends-Indep: python-support (>= 0.3), sysutils
 
 Package: python-pyparsing
 Architecture: all
 Depends: ${python:Depends}
+Provides: ${python:Provides}
+Replaces: python2.3-pyparsing (<< 1.4.2-1.1), python2.4-pyparsing (<< 
1.4.2-1.1)
+Conflicts: python2.3-pyparsing (<< 1.4.2-1.1), python2.4-pyparsing (<< 
1.4.2-1.1)
+XB-Python-Version: ${python:Versions}
 Description: Python parsing module
  The parsing module is an alternative approach to creating and
  executing simple grammars, vs. the traditional lex/yacc approach, or
@@ -24,43 +28,0 @@
- .
- This is a dummy package that depends on the correct version of
- python-pyparsing for the default version of Python.
- It also contains documentation for the library.
-
-Package: python2.3-pyparsing
-Architecture: all
-Depends: ${python:Depends}
-Description: Python parsing module
- The parsing module is an alternative approach to creating and
- executing simple grammars, vs. the traditional lex/yacc approach, or
- the use of regular expressions.  The parsing module provides a
- library of classes that client code uses to construct the grammar
- directly in Python code.
- .
- Here's an example:
- .
-  from parsing import Word, alphas
-  greet = Word(alphas) + "," + Word(alphas) + "!"
-  hello = "Hello, World!"
-  print hello, "->", greet.parseString(hello)
- .
- This version is usable with python2.3
-
-Package: python2.4-pyparsing
-Architecture: all
-Depends: ${python:Depends}
-Description: Python parsing module
- The parsing module is an alternative approach to creating and
- executing simple grammars, vs. the traditional lex/yacc approach, or
- the use of regular expressions.  The parsing module provides a
- library of classes that client code uses to construct the grammar
- directly in Python code.
- .
- Here's an example:
- .
-  from parsing import Word, alphas
-  greet = Word(alphas) + "," + Word(alphas) + "!"
-  hello = "Hello, World!"
-  print hello, "->", greet.parseString(hello)
- .
- This version is usable with python2.4
-
reverted:
--- pyparsing-1.4.2/debian/python2.3-pyparsing.README.Debian
+++ pyparsing-1.4.2.orig/debian/python2.3-pyparsing.README.Debian
@@ -1,4 +0,0 @@
-All the documentation is in python-pyparsing, please install that
-package for introductory information and API docs.
-
- -- Tommi Virtanen <[EMAIL PROTECTED]>, Wed Mar  9 20:11:23 2005
diff -u pyparsing-1.4.2/debian/compat pyparsing-1.4.2/debian/compat
--- pyparsing-1.4.2/debian/compat
+++ pyparsing-1.4.2/debian/compat
@@ -1 +1 @@
-4
+5
reverted:
--- pyparsing-1.4.2/debian/python2.4-pyparsing.README.Debian
+++ pyparsing-1.4.2.orig/debian/python2.4-pyparsing.README.Debian
@@ -1,4 +0,0 @@
-All the documentation is in python-pyparsing, please install that
-package for introductory information and API docs.
-
- -- Tommi Virtanen <[EMAIL PROTECTED]>, Wed Mar  9 20:11:48 2005
only in patch2:
unchanged:
--- pyparsing-1.4.2.orig/debian/pycompat
+++ pyparsing-1.4.2/debian/pycompat
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- pyparsing-1.4.2.orig/debian/python-pyparsing.README.Debian
+++ pyparsing-1.4.2/debian/python-pyparsing.README.Debian
@@ -0,0 +1,4 @@
+All the documentation is in python-pyparsing, please install that
+package for introductory information and API docs.
+
+ -- Tommi Virtanen <[EMAIL PROTECTED]>, Wed Mar  9 20:11:23 2005

Attachment: signature.asc
Description: Digital signature

Reply via email to