Bug#373464: diff for 1.5.3-1.1 NMU

2006-09-30 Thread Josselin Mouette 
Hi,

please find attached the diff for the 1.5.3-1.1 NMU (for the python
transition).

Regards,
-- 
 .''`.   Josselin Mouette/\./\
: :' :   [EMAIL PROTECTED]
`. `'[EMAIL PROTECTED]
  `-  Debian GNU/Linux -- The power of freedom
diff -u moin-1.5.3/debian/changelog moin-1.5.3/debian/changelog
--- moin-1.5.3/debian/changelog
+++ moin-1.5.3/debian/changelog
@@ -1,3 +1,17 @@
+moin (1.5.3-1.1) unstable; urgency=low
+
+  [ Pierre Habouzit ]
+  * Non-maintainer upload.
+  * Update package to the last python policy (Closes: #373464).
+  * Bump Standards-Version to 3.7.2.
+
+  [ Josselin Mouette ]
+  * Update Suggests now that mod_python packages were rebuilt.
+  * Build-depend on python-dev, python-all-dev is too much.
+  * python-moinmoin needs python-support for a few private modules.
+
+ -- Josselin Mouette [EMAIL PROTECTED]  Sat, 30 Sep 2006 11:28:58 +0200
+
 moin (1.5.3-1) unstable; urgency=medium
 
   * New upstream release. Closes: bug#363354 (thanks to Bob Tanner
diff -u moin-1.5.3/debian/control.in moin-1.5.3/debian/control.in
--- moin-1.5.3/debian/control.in
+++ moin-1.5.3/debian/control.in
@@ -2,11 +2,12 @@
 Section: net
 Priority: optional
 Maintainer: Jonas Smedegaard [EMAIL PROTECTED]
-Standards-Version: 3.6.2
-Build-Depends-Indep: @cdbs@
+Standards-Version: 3.7.2
+Build-Depends: @cdbs@, python-support (= 0.4), python-dev
 
 Package: moinmoin-common
 Architecture: all
+Depends: ${python:Depends}
 Recommends: python-moinmoin
 Conflicts: moin
 Replaces: moin
@@ -27,45 +28,14 @@
 Section: python
-Depends: ${python:Depends}
-Description: Python clone of WikiWiki - dummy library package
- A WikiWikiWeb is a collaborative hypertext environment, with an
- emphasis on easy access to and modification of information. MoinMoin
- is a Python WikiClone that allows you to easily set up your own wiki,
- only requiring a Web server and a Python installation.
- .
- This package is an empty dummy package that always depends on
- a package built for Debian's default Python version.
- .
-  Homepage: http://moinmoin.wikiwikiweb.de/
-
-Package: python2.3-moinmoin
-Architecture: all
-Section: python
-Depends: python2.3, moinmoin-common (= ${Source-Version})
-Recommends: exim4 | mail-transport-agent
-Conflicts: moin
-Suggests: apache | httpd | libapache-mod-python2.3 | libapache2-mod-python2.3 | python2.3-twisted | libapache-mod-fastcgi, miscfiles | wordlist, python2.3-4suite, python2.3-gdchart | python-gdchart, python2.3-docutils (= 0.3.10)
-Description: Python clone of WikiWiki - library
- A WikiWikiWeb is a collaborative hypertext environment, with an
- emphasis on easy access to and modification of information. MoinMoin
- is a Python WikiClone that allows you to easily set up your own wiki,
- only requiring a Web server and a Python installation.
- .
- This package contains the libraries for Python 2.3.
- .
-  Homepage: http://moinmoin.wikiwikiweb.de/
-
-Package: python2.4-moinmoin
-Architecture: all
-Section: python
-Depends: python2.4, moinmoin-common (= ${Source-Version})
+Depends: ${python:Depends}, moinmoin-common (= ${Source-Version})
+Provides: ${python:Provides}
+Replaces: python2.3-moinmoin ( 1.5.3-1.1), python2.4-moinmoin ( 1.5.3-1.1)
+Conflicts: moin, python2.3-moinmoin ( 1.5.3-1.1), python2.4-moinmoin ( 1.5.3-1.1)
 Recommends: exim4 | mail-transport-agent
-Suggests: apache | httpd | libapache-mod-python2.4 | libapache2-mod-python2.4 | python2.4-twisted | libapache-mod-fastcgi, miscfiles | wordlist, python2.4-4suite, python2.4-gdchart, python2.4-docutils (= 0.3.10)
+Suggests: libapache2-mod-python | libapache-mod-python | python-twisted | libapache-mod-fastcgi | httpd, miscfiles | wordlist, python-4suite, python-gdchart, python-docutils (= 0.3.10)
 Description: Python clone of WikiWiki - library
  A WikiWikiWeb is a collaborative hypertext environment, with an
  emphasis on easy access to and modification of information. MoinMoin
  is a Python WikiClone that allows you to easily set up your own wiki,
  only requiring a Web server and a Python installation.
  .
- This package contains the libraries for Python 2.4.
- .
   Homepage: http://moinmoin.wikiwikiweb.de/
diff -u moin-1.5.3/debian/control moin-1.5.3/debian/control
--- moin-1.5.3/debian/control
+++ moin-1.5.3/debian/control
@@ -2,11 +2,12 @@
 Section: net
 Priority: optional
 Maintainer: Jonas Smedegaard [EMAIL PROTECTED]
-Standards-Version: 3.6.2
-Build-Depends-Indep: cdbs (= 0.4.23-1.1), , debhelper (= 4.1.0), python2.3-dev, python2.4-dev, python, debhelper (= 4.2.28), patchutils (= 0.2.25), dh-buildinfo
+Standards-Version: 3.7.2
+Build-Depends: cdbs (= 0.4.23-1.1), debhelper (= 4.2.0), dh-buildinfo, python-support (= 0.4), python-dev
 
 Package: moinmoin-common
 Architecture: all
+Depends: ${python:Depends}
 Recommends: python-moinmoin
 Conflicts: moin
 Replaces: moin
@@ -27,45 +28,14 @@
 Section: python
-Depends: ${python:Depends}
-Description: Python clone of WikiWiki - dummy library package
- A

Bug#373464: diff for 1.5.3-1.1 NMU

2006-08-31 Thread Jonas Smedegaard 
On Thu, 31 Aug 2006 00:47:05 +0200 Pierre HABOUZIT wrote:

   Attached is the diff for my upgrade of moin to the last python
 policy. The package *looks* correct, but I've not the knowledge nor
 the time to test it, and for such a complicated package, I do not
 feel like NMUing it.
 
   So the patch is sent for review.

thanks alot for your help! I'll have a look at it.


 - Jonas

-- 
* Jonas Smedegaard - idealist og Internet-arkitekt
* Tlf.: +45 40843136  Website: http://dr.jones.dk/

 - Enden er nær: http://www.shibumi.org/eoti.htm


pgplax1gD5R8W.pgp
Description: PGP signature

Bug#373464: diff for 1.5.3-1.1 NMU

2006-08-30 Thread Pierre HABOUZIT 
tag 373464 + patch
thanks

  Hi,

  Attached is the diff for my upgrade of moin to the last python policy.
The package *looks* correct, but I've not the knowledge nor the time to
test it, and for such a complicated package, I do not feel like NMUing
it.

  So the patch is sent for review.

-- 
·O·  Pierre Habouzit
··O[EMAIL PROTECTED]
OOOhttp://www.madism.org
diff -u moin-1.5.3/debian/changelog moin-1.5.3/debian/changelog
--- moin-1.5.3/debian/changelog
+++ moin-1.5.3/debian/changelog
@@ -1,3 +1,11 @@
+moin (1.5.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update package to the last python policy (Closes: #373464).
+  * Bump Standards-Version to 3.7.2.
+
+ -- Pierre Habouzit [EMAIL PROTECTED]  Thu, 31 Aug 2006 00:04:28 +0200
+
 moin (1.5.3-1) unstable; urgency=medium
 
   * New upstream release. Closes: bug#363354 (thanks to Bob Tanner
diff -u moin-1.5.3/debian/control.in moin-1.5.3/debian/control.in
--- moin-1.5.3/debian/control.in
+++ moin-1.5.3/debian/control.in
@@ -2,8 +2,8 @@
 Section: net
 Priority: optional
 Maintainer: Jonas Smedegaard [EMAIL PROTECTED]
-Standards-Version: 3.6.2
-Build-Depends-Indep: @cdbs@
+Standards-Version: 3.7.2
+Build-Depends: @cdbs@, python-support (= 0.4), python-all-dev
 
 Package: moinmoin-common
 Architecture: all
@@ -27,45 +27,14 @@
 Section: python
-Depends: ${python:Depends}
-Description: Python clone of WikiWiki - dummy library package
- A WikiWikiWeb is a collaborative hypertext environment, with an
- emphasis on easy access to and modification of information. MoinMoin
- is a Python WikiClone that allows you to easily set up your own wiki,
- only requiring a Web server and a Python installation.
- .
- This package is an empty dummy package that always depends on
- a package built for Debian's default Python version.
- .
-  Homepage: http://moinmoin.wikiwikiweb.de/
-
-Package: python2.3-moinmoin
-Architecture: all
-Section: python
-Depends: python2.3, moinmoin-common (= ${Source-Version})
+Depends: ${python:Depends}, moinmoin-common (= ${Source-Version})
+Provides: ${python:Provides}
+Replaces: python2.3-moinmoin ( 1.5.3-1.1), python2.4-moinmoin ( 1.5.3-1.1)
+Conflicts: moin, python2.3-moinmoin ( 1.5.3-1.1), python2.4-moinmoin ( 
1.5.3-1.1)
 Recommends: exim4 | mail-transport-agent
-Conflicts: moin
-Suggests: apache | httpd | libapache-mod-python2.3 | libapache2-mod-python2.3 
| python2.3-twisted | libapache-mod-fastcgi, miscfiles | wordlist, 
python2.3-4suite, python2.3-gdchart | python-gdchart, python2.3-docutils (= 
0.3.10)
-Description: Python clone of WikiWiki - library
- A WikiWikiWeb is a collaborative hypertext environment, with an
- emphasis on easy access to and modification of information. MoinMoin
- is a Python WikiClone that allows you to easily set up your own wiki,
- only requiring a Web server and a Python installation.
- .
- This package contains the libraries for Python 2.3.
- .
-  Homepage: http://moinmoin.wikiwikiweb.de/
-
-Package: python2.4-moinmoin
-Architecture: all
-Section: python
-Depends: python2.4, moinmoin-common (= ${Source-Version})
-Recommends: exim4 | mail-transport-agent
-Suggests: apache | httpd | libapache-mod-python2.4 | libapache2-mod-python2.4 
| python2.4-twisted | libapache-mod-fastcgi, miscfiles | wordlist, 
python2.4-4suite, python2.4-gdchart, python2.4-docutils (= 0.3.10)
-Description: Python clone of WikiWiki - library
+Suggests: apache | httpd | libapache-mod-python2.3 | libapache2-mod-python2.3 
| libapache-mod-python2.4 | libapache2-mod-python2.4 | python-twisted | 
libapache-mod-fastcgi, miscfiles | wordlist, python-4suite, python-gdchart, 
python-docutils (= 0.3.10)
+Description: Python clone of WikiWiki - dummy library package
  A WikiWikiWeb is a collaborative hypertext environment, with an
  emphasis on easy access to and modification of information. MoinMoin
  is a Python WikiClone that allows you to easily set up your own wiki,
  only requiring a Web server and a Python installation.
  .
- This package contains the libraries for Python 2.4.
- .
   Homepage: http://moinmoin.wikiwikiweb.de/
diff -u moin-1.5.3/debian/control moin-1.5.3/debian/control
--- moin-1.5.3/debian/control
+++ moin-1.5.3/debian/control
@@ -2,8 +2,8 @@
 Section: net
 Priority: optional
 Maintainer: Jonas Smedegaard [EMAIL PROTECTED]
-Standards-Version: 3.6.2
-Build-Depends-Indep: cdbs (= 0.4.23-1.1), , debhelper (= 4.1.0), 
python2.3-dev, python2.4-dev, python, debhelper (= 4.2.28), patchutils (= 
0.2.25), dh-buildinfo
+Standards-Version: 3.7.2
+Build-Depends: cdbs (= 0.4.23-1.1), debhelper (= 4.2.0), dh-buildinfo, 
python-support (= 0.4), python-all-dev
 
 Package: moinmoin-common
 Architecture: all
@@ -27,45 +27,14 @@
 Section: python
-Depends: ${python:Depends}
-Description: Python clone of WikiWiki - dummy library package
- A WikiWikiWeb is a collaborative hypertext environment, with an
- emphasis on easy access to and