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 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/moinmoin-common.postinst moin-1.5.3/debian/moinmoin-common.postinst
--- moin-1.5.3/debian/moinmoin-common.postinst
+++ moin-1.5.3/debian/moinmoin-common.postinst
@@ -31,5 +31,2 @@
-# Remove byte-compiled configfile generated by dh_python
-find /usr/share/moin/server -name *.pyc -o -name *.pyo | xargs -r rm -f
-
rename_conffile_commit /etc/moin/moinmaster.py
diff -u moin-1.5.3/debian/rules moin-1.5.3/debian/rules
--- moin-1.5.3/debian/rules
+++ moin-1.5.3/debian/rules
@@ -4,9 +4,9 @@
include debian/cdbs/1/rules/auto-update.mk
+# python-distutils first is intentional so that we can use dh_pysupport ourselves.
+include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/class/python-distutils.mk
-include debian/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/1/rules/buildinfo.mk
@@ -18,23 +18,18 @@
include debian/cdbs/1/rules/copyright-check.mk
pkg_data = moinmoin-common
-pkg_lib = python$(DEB_PYTHON_DEFAULT_VERSION)-moinmoin
-pkg_lib_alternatives = $(filter-out $(patsubst %,python%%,$(DEB_PYTHON_DEFAULT_VERSION)),$(DEB_PYTHON_REAL_LIB_PACKAGES))
+pkg_lib = python-moinmoin
DEB_MAKE_CHECK_TARGET = test
DEB_COMPRESS_EXCLUDE = .py
-DEB_INSTALL_EXAMPLES_$(pkg_data) = build/scripts-$(DEB_PYTHON_DEFAULT_VERSION)/* wiki/underlay/pages/LocalSpellingWords contrib/phpwiki_migration wiki/config debian/examples/*
+DEB_INSTALL_EXAMPLES_$(pkg_data) = build/scripts-*/* wiki/underlay/pages/LocalSpellingWords contrib/phpwiki_migration wiki/config debian/examples/*
DEB_INSTALL_DOCS_ALL += debian/README.Debian
DEB_INSTALL_DOCS_$(pkg_data) += docs/README.migration docs/INSTALL.html docs/CHANGES.config docs/HACKS
DEB_INSTALL_CHANGELOGS_ALL = docs/CHANGES
-$(patsubst %,binary-install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) ::
- dh_installexamples -p$(cdbs_curpkg) debian/$(cdbs_curpkg)/usr/bin/* debian/$(cdbs_curpkg)/usr/share/moin/server
-
# just being lazy...
datadir = /usr/share/moin
spelldir= $(datadir)/underlay/pages/LocalSpellingWords
-libdir = /usr/lib/python$(cdbs_python_ver)/site-packages/MoinMoin
ubuntu:
cp -f debian/control.in.ubuntu debian/control.in
@@ -42,6 +37,9 @@
sarge:
cp -f debian/control.in.sarge debian/control.in
+binary-install/$(pkg_lib)::
+ dh_installexamples -p$(cdbs_curpkg) debian/$(cdbs_curpkg)/usr/bin/* debian/$(cdbs_curpkg)/usr/share/moin/server
+
## Force remove build dir (cdbs DEB_PYTHON_COMPILE_VERSION is slightly broken)
#clean::
# rm -rf build
@@ -71,26 +69,23 @@
#endif
egrep -r -l -Z '^#! ?/usr/bin/(env )?python[[:print:]]*$$' debian/$(cdbs_curpkg)$(datadir)/server/* debian/$(cdbs_curpkg)/usr/share/doc/* \
| xargs -r -0 perl -pi -e 's,^#! ?/usr/bin/(env )?python[[:print:]]*$$,#!/usr/bin/python$(DEB_PYTHON_COMPILE_VERSION),'
-
-## FIXME: Avoid pkg_data if that is set to one of the lib packages
-$(patsubst %,binary-fixup/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) ::
- egrep -r -l -Z '^#! ?/usr/bin/(env )?python[[:print:]]*$$' debian/$(cdbs_curpkg)$(libdir)/* debian/$(cdbs_curpkg)$(datadir)/server/* debian/$(cdbs_curpkg)/usr/share/doc/* \
- | xargs -r -0 perl -pi -e 's,^#! ?/usr/bin/(env )?python[[:print:]]*$$,#!/usr/bin/python$(cdbs_python_ver),'
+ dh_pysupport -p$(cdbs_curpkg) /usr/share/moin/data/plugin /usr/share/moin/server
# Strip notes in underlay about editing only on moinmaster
binary-fixup/$(pkg_data)::
egrep -r -l -Z '^## ' debian/$(cdbs_curpkg)$(datadir)/underlay/pages/*/revisions/* \
| xargs -r -0 perl -pi -e 's;^## (Please edit system|information, please see|Please edit |For more information).*\n;;'
-## Please edit system and help pages ONLY in the moinmaster wiki! For more
-## information, please see MoinMaster:MoinPagesEditorGroup.
-## Please edit (or translate) system/help pages on the moinmaster wiki ONLY.
-## For more information, please see MoinMaster:MoinPagesEditorGroup.
+## Please edit system and help pages ONLY in the moinmaster wiki! For more
+## information, please see MoinMaster:MoinPagesEditorGroup.
+## Please edit (or translate) system/help pages on the moinmaster wiki ONLY.
+## For more information, please see MoinMaster:MoinPagesEditorGroup.
# Make sure scripts are executable
-$(patsubst %,binary-fixup/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) ::
- egrep -r -l -Z '^#! ?/usr/bin/(env )?python[[:print:]]*$$' debian/$(cdbs_curpkg)$(libdir)/* \
+binary-fixup/$(pkg_lib)::
+ dh_pysupport -p$(cdbs_curpkg)
+ egrep -r -l -Z '^#! ?/usr/bin/(env )?python[[:print:]]*$$' debian/$(cdbs_curpkg)/usr/share/python-support/$(cdbs_curpkg) \
| xargs -r -0 chmod a+x
# Make sure translations are up-to-date
@@ -113,11 +108,6 @@
mv debian/$(pkg_lib)$(datadir)/* debian/$(pkg_data)$(datadir)
rm -rf debian/$(pkg_lib)$(datadir)
-# Drop common and example files from non-default lib builds
-$(patsubst %,binary-post-install/%,$(pkg_lib_alternatives)) ::
- rm -rf debian/$(cdbs_curpkg)$(datadir)
- rm -rf debian/$(cdbs_curpkg)/usr/bin
-
# Create virtually empty local dictionary
# (default german words already provided as example files)
binary-fixup/$(pkg_data)::
@@ -132,7 +122,7 @@
# Use sitewide word file as main dictionary
binary-fixup/$(pkg_data)::
mkdir -p debian/$(cdbs_curpkg)$(datadir)/data/dict
- ln -s /usr/share/dict/words debian/$(cdbs_curpkg)$(datadir)/data/dict/words
+ ln -s ../../../dict/words debian/$(cdbs_curpkg)$(datadir)/data/dict/words
# Setup system wide farmconfig.
binary-fixup/$(pkg_data)::
reverted:
--- moin-1.5.3/debian/cdbs/1/class/python-distutils-vars.mk
+++ moin-1.5.3.orig/debian/cdbs/1/class/python-distutils-vars.mk
@@ -1,51 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <[EMAIL PROTECTED]>
-# Copyright © 2004-2005 Jonas Smedegaard <dr$jones.dk>
-# Description: Defines useful variables for Python libraries and programs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_python_distutils_vars
-_cdbs_class_python_distutils_vars := 1
-
-# These should reflect the system
-DEB_PYTHON_DEFAULT_VERSION := $(shell /usr/bin/python -V 2>&1 | sed 's/^[^0-9]*\([0-9]\+.[0-9]\+\)[^0-9].*/\1/')
-DEB_PYTHON_NEXT_VERSION := $(shell expr '$(DEB_PYTHON_DEFAULT_VERSION)' : '[^0-9]*\([0-9]\+\).').$(shell expr '(' '$(DEB_PYTHON_DEFAULT_VERSION)' : '[^0-9]*[0-9]\+.\([0-9]\+\)' ')' + 1)
-
-# Common build options
-DEB_PYTHON_SETUP_CMD = setup.py
-DEB_PYTHON_CLEAN_ARGS = -a
-DEB_PYTHON_BUILD_ARGS = --build-base="$(DEB_BUILDDIR)/build"
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0
-DEB_PYTHON_DESTDIR = debian/$(cdbs_curpkg)
-
-# Properly named Python libraries are preferred
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4
-DEB_PYTHON_REAL_LIB_PACKAGES := $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(DEB_ALL_PACKAGES)))
-
-# Alternatively package simpler packages using default Python
-DEB_PYTHON_SIMPLE_PACKAGES := $(strip $(filter python-%,$(DEB_ALL_PACKAGES)))
-# Force using a non-default Python for simpler packages
-DEB_PYTHON_COMPILE_VERSION =
-
-endif
reverted:
--- moin-1.5.3/debian/cdbs/1/class/python-distutils.mk.diff
+++ moin-1.5.3.orig/debian/cdbs/1/class/python-distutils.mk.diff
@@ -1,90 +0,0 @@
---- /usr/share/cdbs/1/class/python-distutils.mk 2005-05-23 20:45:30.000000000 +0200
-+++ python-distutils.mk 2005-06-13 19:57:05.000000000 +0200
-@@ -1,5 +1,6 @@
- # -*- mode: makefile; coding: utf-8 -*-
- # Copyright © 2003 Colin Walters <[EMAIL PROTECTED]>
-+# Copyright © 2004-2005 Jonas Smedegaard <[EMAIL PROTECTED]>
- # Description: configure, compile, binary, and clean Python libraries and programs
- # This class works for Python packages which use the Python
- # "distutils". Note that optionally it can also use the
-@@ -31,52 +32,56 @@
- ifndef _cdbs_class_python_distutils
- _cdbs_class_python_distutils := 1
-
--include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
--
--DEB_PYTHON_COMPILE_VERSION =
--
--DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4
--
--DEB_PYTHON_SETUP_CMD = setup.py
--DEB_PYTHON_CLEAN_ARGS = -a
--DEB_PYTHON_BUILD_ARGS = --build-base="$(DEB_BUILDDIR)/build"
--DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0
-+## FIXME: Correct path when included officially!!!
-+#include $(_cdbs_class_path)/python-distutils-vars.mk$(_cdbs_makefile_suffix)
-+include debian/cdbs/1/class/python-distutils-vars.mk$(_cdbs_makefile_suffix)
-
- # make: *** No rule to make target `voodoo'. Stop.
--DEB_PYTHON_REAL_LIB_PACKAGES := $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(DEB_ALL_PACKAGES)))
- # If no versioned python library packages found, grab all simpler ones
- ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
--DEB_PYTHON_SIMPLE_PACKAGES := $(strip $(filter python-%,$(DEB_ALL_PACKAGES)))
-+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= $(DEB_PYTHON_DEFAULT_VERSION)), python-dev (<< $(DEB_PYTHON_NEXT_VERSION))
-+else
-+DEB_PYTHON_REAL_VERSIONS := $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(DEB_PYTHON_REAL_LIB_PACKAGES))))
-+comma := ,
-+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), $(patsubst %,python%-dev$(comma),$(DEB_PYTHON_REAL_VERSIONS)) python
- endif
-
--cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst install/python%,%,$@)))
-+cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
-
- common-build-arch common-build-indep:: common-build-impl
- common-build-impl::
-- cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-+ cd $(DEB_SRCDIR) && /usr/bin/python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
- clean::
- # Ignore errors from this rule. In a tarball build, the file
- # may not exist.
-- -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
--
--# See if this package doesn't appear to need to be compiled by multiple
--# Python versions.
-+# Try all flavors of Python used.
- ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
--common-install-arch common-install-indep:: common-install-impl
--common-install-impl::
-- cd $(DEB_SRCDIR) && /usr/bin/python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-+ -/usr/bin/python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
- else
--$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
-- cd $(DEB_SRCDIR) && /usr/bin/python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-+ -$(patsubst %, /usr/bin/python% $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS);, $(DEB_PYTHON_REAL_VERSIONS))
- endif
-
-+# Use specific Python binary if needed
-+ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
- $(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
-- cd $(DEB_SRCDIR) && python $(DEB_PYTHON_SETUP_CMD) install --root="debian/$(cdbs_curpkg)" $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-+ cd $(DEB_SRCDIR) && /usr/bin/python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root="$(DEB_PYTHON_DESTDIR)" $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-+else
-+$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
-+ cd $(DEB_SRCDIR) && /usr/bin/python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root="$(DEB_PYTHON_DESTDIR)" $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-+endif
-
- # This class can optionally utilize debhelper's "dh_python" command. Just
- # be sure you include debhelper.mk before including this file.
- ifdef _cdbs_rules_debhelper
-+ifneq (,$(strip $(filter 2.4,$(DEB_PYTHON_REAL_VERSIONS))))
-+# Python 2.4 support
-+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 4.2.28)
-+else
-+# Python 2.3 support
-+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 4.1.60)
-+endif
-+
- $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- dh_python -p$(cdbs_curpkg)
- endif
reverted:
--- moin-1.5.3/debian/cdbs/1/class/python-distutils.mk
+++ moin-1.5.3.orig/debian/cdbs/1/class/python-distutils.mk
@@ -1,89 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <[EMAIL PROTECTED]>
-# Copyright © 2004-2005 Jonas Smedegaard <[EMAIL PROTECTED]>
-# Description: configure, compile, binary, and clean Python libraries and programs
-# This class works for Python packages which use the Python
-# "distutils". Note that optionally it can also use the
-# dh_python program which does some nice stuff. See
-# the manual page for that program for more information.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_python_distutils
-_cdbs_class_python_distutils := 1
-
-## FIXME: Correct path when included officially!!!
-#include $(_cdbs_class_path)/python-distutils-vars.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/1/class/python-distutils-vars.mk$(_cdbs_makefile_suffix)
-
-# make: *** No rule to make target `voodoo'. Stop.
-# If no versioned python library packages found, grab all simpler ones
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= $(DEB_PYTHON_DEFAULT_VERSION)), python-dev (<< $(DEB_PYTHON_NEXT_VERSION))
-else
-DEB_PYTHON_REAL_VERSIONS := $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(DEB_PYTHON_REAL_LIB_PACKAGES))))
-comma := ,
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), $(patsubst %,python%-dev$(comma),$(DEB_PYTHON_REAL_VERSIONS)) python
-endif
-
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
-
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
- cd $(DEB_SRCDIR) && /usr/bin/python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
-clean::
-# Ignore errors from this rule. In a tarball build, the file
-# may not exist.
-# Try all flavors of Python used.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
- -/usr/bin/python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
- -$(patsubst %, /usr/bin/python% $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS);, $(DEB_PYTHON_REAL_VERSIONS))
-endif
-
-# Use specific Python binary if needed
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && /usr/bin/python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root="$(DEB_PYTHON_DESTDIR)" $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-else
-$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && /usr/bin/python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root="$(DEB_PYTHON_DESTDIR)" $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-endif
-
-# This class can optionally utilize debhelper's "dh_python" command. Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-ifneq (,$(strip $(filter 2.4,$(DEB_PYTHON_REAL_VERSIONS))))
-# Python 2.4 support
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 4.2.28)
-else
-# Python 2.3 support
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 4.1.60)
-endif
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- dh_python -p$(cdbs_curpkg)
-endif
-
-endif
only in patch2:
unchanged:
--- moin-1.5.3.orig/MoinMoin/i18n/meta.py
+++ moin-1.5.3/MoinMoin/i18n/meta.py
@@ -25,8 +25,8 @@
'nb': (u'Norsk Bokmål', u'Norwegian Bokmal', 'utf-8', 0, """Joerg Cassens <[EMAIL PROTECTED]>""",),
'nl': (u'Nederlands', u'Dutch', 'utf-8', 0, """Reinout van Schouwen <[EMAIL PROTECTED]>""",),
'pl': (u'Polski', u'Polish', 'utf-8', 0, """Wojciech Palacz <[EMAIL PROTECTED]>""",),
-'pt': (u'Português', u'Portuguese', 'utf-8', 0, """Leonardo Gregianin""",),
'pt-br': (u'Português do Brasil', u'Brazillian Portuguese', 'utf-8', 0, """Leonardo Gregianin <[EMAIL PROTECTED]>""",),
+'pt': (u'Português', u'Portuguese', 'utf-8', 0, """Leonardo Gregianin""",),
'ro': (u'RomânÄ', u'Romanian', 'utf-8', 0, """Ovidiu Sabou <[EMAIL PROTECTED]>""",),
'ru': (u'Ð ÑÑÑкОй', u'Russian', 'utf-8', 0, """Mike Rovner <[EMAIL PROTECTED]>""",),
'sl': (u'slovenÅ¡Äina', u'Slovenian', 'utf-8', 0, """Mark Martinec <[EMAIL PROTECTED]>""",),
only in patch2:
unchanged:
--- moin-1.5.3.orig/debian/pyversions
+++ moin-1.5.3/debian/pyversions
@@ -0,0 +1 @@
+2.1-
signature.asc
Description: Ceci est une partie de message numériquement signée
