Hi,

Attached is the diff for my webut 0.1-0.2 NMU.

  Note that it needs an updated version from nevow as well, that I just
NMUed (Version: 0.7.0-1.1).

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
diff -Nru /tmp/u307onTCg0/webut-0.1/debian/changelog 
/tmp/KBM34woAw3/webut-0.1/debian/changelog
--- /tmp/u307onTCg0/webut-0.1/debian/changelog  2006-04-20 13:47:51.000000000 
+0200
+++ /tmp/KBM34woAw3/webut-0.1/debian/changelog  2006-06-29 14:59:31.000000000 
+0200
@@ -1,3 +1,10 @@
+webut (0.1-0.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update to the new python policy (Closes: #373408)
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Thu, 29 Jun 2006 14:59:26 +0200
+
 webut (0.1-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru /tmp/u307onTCg0/webut-0.1/debian/compat 
/tmp/KBM34woAw3/webut-0.1/debian/compat
--- /tmp/u307onTCg0/webut-0.1/debian/compat     2006-03-06 20:17:08.000000000 
+0100
+++ /tmp/KBM34woAw3/webut-0.1/debian/compat     2006-06-29 15:01:04.000000000 
+0200
@@ -1 +1 @@
-4
+5
diff -Nru /tmp/u307onTCg0/webut-0.1/debian/control 
/tmp/KBM34woAw3/webut-0.1/debian/control
--- /tmp/u307onTCg0/webut-0.1/debian/control    2006-04-20 13:47:51.000000000 
+0200
+++ /tmp/KBM34woAw3/webut-0.1/debian/control    2006-06-29 15:18:24.000000000 
+0200
@@ -2,12 +2,17 @@
 Section: python
 Priority: optional
 Maintainer: Tommi Virtanen <[EMAIL PROTECTED]>
-Standards-Version: 3.6.2
-Build-Depends-Indep: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debhelper (>= 
4.1.68), python (>= 2.3), python2.3-dev, python2.3-twisted-core (>= 2.2), 
python2.3-twisted-web (>= 0.5), python2.3-nevow (>= 0.6), python2.4-dev, 
python2.4-twisted-core (>= 2.2), python2.4-twisted-web (>= 0.5), 
python2.4-nevow (>= 0.6)
+Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), debhelper (>= 
5.0.37.2), cdbs (>= 0.4.43), python-dev (>= 2.3.5-11), python-support (>= 
0.3.2), python-all-dev (>= 2.3.5-11)
+Build-Depends-Indep: python-twisted-core (>= 2.2), python-twisted-web (>= 
0.5), python-nevow (>= 0.7.0-1.1)
 
 Package: python-webut
 Architecture: all
-Depends: ${python:Depends}
+Depends: ${python:Depends}, python-twisted-core (>= 2.2), python-twisted-web 
(>= 0.5), python-nevow (>= 0.7.0-1.1)
+Provides: ${python:Provides}
+Replaces: python2.3-webut (<< 0.1-0.2), python2.4-webut (<< 0.1-0.2)
+Conflicts: python2.3-webut (<< 0.1-0.2), python2.4-webut (<< 0.1-0.2)
+XB-Python-Version: ${python:Versions}
 Description: Miscellaneous utilities for nevow and twisted.web{,2} programming
  A collection of utility libraries for use when programming web
  applications with nevow, twisted.web and twisted.web2.
@@ -19,41 +24,4 @@
   - support library for skinnable web apps
   - web app navigation library
  .
- This is a dummy package that only depends on python2.3-webut.
-
-Package: python2.3-webut
-Architecture: all
-Depends: ${python:Depends}, python2.3-twisted-core (>= 2.2), 
python2.3-twisted-web (>= 0.5), python2.3-nevow (>= 0.6)
-Description: Miscellaneous utilities for nevow and twisted.web{,2} programming
- A collection of utility libraries for use when programming web
- applications with nevow, twisted.web and twisted.web2.
- .
- The intent is that as the individual libraries stabilize, they can be
- moved to nevow or twisted.web2.
- .
- Current content:
-  - support library for skinnable web apps
-  - web app navigation library
- .
- This version is usable with python2.3
- .
- Homepage: http://www.inoi.fi/open/trac/webut
-
-Package: python2.4-webut
-Architecture: all
-Depends: ${python:Depends}, python2.4-twisted-core (>= 2.2), 
python2.4-twisted-web (>= 0.5), python2.4-nevow (>= 0.6)
-Description: Miscellaneous utilities for nevow and twisted.web{,2} programming
- A collection of utility libraries for use when programming web
- applications with nevow, twisted.web and twisted.web2.
- .
- The intent is that as the individual libraries stabilize, they can be
- moved to nevow or twisted.web2.
- .
- Current content:
-  - support library for skinnable web apps
-  - web app navigation library
- .
- This version is usable with python2.4
- .
  Homepage: http://www.inoi.fi/open/trac/webut
-
diff -Nru /tmp/u307onTCg0/webut-0.1/debian/control.in 
/tmp/KBM34woAw3/webut-0.1/debian/control.in
--- /tmp/u307onTCg0/webut-0.1/debian/control.in 2006-04-20 13:47:51.000000000 
+0200
+++ /tmp/KBM34woAw3/webut-0.1/debian/control.in 2006-06-29 15:18:19.000000000 
+0200
@@ -2,34 +2,18 @@
 Section: python
 Priority: optional
 Maintainer: Tommi Virtanen <[EMAIL PROTECTED]>
-Standards-Version: 3.6.2
-Build-Depends-Indep: @cdbs@, debhelper (>= 4.1.68), python (>= 2.3), 
python2.3-dev, python2.3-twisted-core (>= 2.2), python2.3-twisted-web (>= 0.5), 
python2.3-nevow (>= 0.6), python2.4-dev, python2.4-twisted-core (>= 2.2), 
python2.4-twisted-web (>= 0.5), python2.4-nevow (>= 0.6)
+Standards-Version: 3.7.2
+Build-Depends: @cdbs@, python-all-dev (>= 2.3.5-11)
+Build-Depends-Indep: python-twisted-core (>= 2.2), python-twisted-web (>= 
0.5), python-nevow (>= 0.7.0-1.1)
 
 Package: python-webut
 Architecture: all
-Depends: ${python:Depends}
+Depends: ${python:Depends}, python-twisted-core (>= 2.2), python-twisted-web 
(>= 0.5), python-nevow (>= 0.7.0-1.1)
+Provides: ${python:Provides}
+Replaces: python2.3-webut (<< 0.1-0.2), python2.4-webut (<< 0.1-0.2)
+Conflicts: python2.3-webut (<< 0.1-0.2), python2.4-webut (<< 0.1-0.2)
+XB-Python-Version: ${python:Versions}
 Description: `python ./setup.py --description`
 `python ./setup.py --long-description | sed 's/^$/./; s/^/ /'`
  .
- This is a dummy package that only depends on python2.3-webut.
-
-Package: python2.3-webut
-Architecture: all
-Depends: ${python:Depends}, python2.3-twisted-core (>= 2.2), 
python2.3-twisted-web (>= 0.5), python2.3-nevow (>= 0.6)
-Description: `python ./setup.py --description`
-`python ./setup.py --long-description | sed 's/^$/./; s/^/ /'`
- .
- This version is usable with python2.3
- .
- Homepage: `python ./setup.py --url`
-
-Package: python2.4-webut
-Architecture: all
-Depends: ${python:Depends}, python2.4-twisted-core (>= 2.2), 
python2.4-twisted-web (>= 0.5), python2.4-nevow (>= 0.6)
-Description: `python ./setup.py --description`
-`python ./setup.py --long-description | sed 's/^$/./; s/^/ /'`
- .
- This version is usable with python2.4
- .
  Homepage: `python ./setup.py --url`
-
diff -Nru /tmp/u307onTCg0/webut-0.1/debian/pycompat 
/tmp/KBM34woAw3/webut-0.1/debian/pycompat
--- /tmp/u307onTCg0/webut-0.1/debian/pycompat   1970-01-01 01:00:00.000000000 
+0100
+++ /tmp/KBM34woAw3/webut-0.1/debian/pycompat   2006-06-29 15:19:44.000000000 
+0200
@@ -0,0 +1 @@
+2
diff -Nru /tmp/u307onTCg0/webut-0.1/debian/python2.3-webut.examples 
/tmp/KBM34woAw3/webut-0.1/debian/python2.3-webut.examples
--- /tmp/u307onTCg0/webut-0.1/debian/python2.3-webut.examples   2006-03-06 
20:17:08.000000000 +0100
+++ /tmp/KBM34woAw3/webut-0.1/debian/python2.3-webut.examples   1970-01-01 
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-examples/*
-
diff -Nru /tmp/u307onTCg0/webut-0.1/debian/python2.4-webut.examples 
/tmp/KBM34woAw3/webut-0.1/debian/python2.4-webut.examples
--- /tmp/u307onTCg0/webut-0.1/debian/python2.4-webut.examples   2006-03-06 
20:17:08.000000000 +0100
+++ /tmp/KBM34woAw3/webut-0.1/debian/python2.4-webut.examples   1970-01-01 
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-examples/*
-
diff -Nru /tmp/u307onTCg0/webut-0.1/debian/rules 
/tmp/KBM34woAw3/webut-0.1/debian/rules
--- /tmp/u307onTCg0/webut-0.1/debian/rules      2006-03-06 20:17:08.000000000 
+0100
+++ /tmp/KBM34woAw3/webut-0.1/debian/rules      2006-06-29 15:19:40.000000000 
+0200
@@ -2,9 +2,13 @@
 # -*- 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
 
+DEB_INSTALL_EXAMPLES_python-webut := examples/*
+
 DEB_DH_ALWAYS_EXCLUDE := .git
 
 docdir = debian/$(1)/usr/share/doc/$(1)
@@ -17,9 +21,6 @@
                '$(call docdir,$*)/copyright'
 
 
-# see http://bugs.debian.org/295906
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst 
python%,%,$(cdbs_curpkg))))
-
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 TRIAL=trial$(cdbs_python_ver)
 TOPMODULES:=webut

Attachment: signature.asc
Description: Digital signature

Reply via email to