[Python-modules-commits] r26258 - in packages/python-babel/trunk/debian (18 files)
zigo at users.alioth.debian.org
zigo at users.alioth.debian.org
Wed Oct 23 05:27:41 UTC 2013
Date: Wednesday, October 23, 2013 @ 05:27:37
Author: zigo
Revision: 26258
Moves the thing packaged in Sid into the VSN repo.
Added:
packages/python-babel/trunk/debian/python-babel.postinst
packages/python-babel/trunk/debian/python-babel.prerm
packages/python-babel/trunk/debian/python3-babel.postinst
packages/python-babel/trunk/debian/python3-babel.prerm
Modified:
packages/python-babel/trunk/debian/changelog
packages/python-babel/trunk/debian/compat
packages/python-babel/trunk/debian/control
packages/python-babel/trunk/debian/copyright
packages/python-babel/trunk/debian/python-babel-doc.doc-base
packages/python-babel/trunk/debian/rules
packages/python-babel/trunk/debian/watch
Deleted:
packages/python-babel/trunk/debian/patches/c.utf-8.patch
packages/python-babel/trunk/debian/patches/series
packages/python-babel/trunk/debian/pybabel3.1
packages/python-babel/trunk/debian/pydist-overrides
packages/python-babel/trunk/debian/python-babel-doc.docs
packages/python-babel/trunk/debian/python-babel-localedata.install
packages/python-babel/trunk/debian/python3-babel.manpages
Modified: packages/python-babel/trunk/debian/changelog
===================================================================
--- packages/python-babel/trunk/debian/changelog 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/changelog 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1,34 +1,29 @@
-python-babel (1.3-1) unstable; urgency=low
+python-babel (1.3-2) UNRELEASED; urgency=low
- [Jakub Wilk]
- * Use canonical URIs for Vcs-* fields.
+ * Adds missing Replaces + Breaks in the doc package (Closes: #726043).
- [ Andrey Rahmatullin ]
- * Add myself to Uploaders
- * New upstream version (Closes: #718420)
- * Update the Homepage field and debian/watch for the new upstream
- * Rewrite packaging to use dh and pybuild
- + this adds build-{arch,indep} target support
- + add dh-python to B-D
- * Switch the package format to 3.0 (quilt)
- * Add a Python 3 subpackage
- + add python3-all, python3-setuptools, python3-tz to B-D
- * Split locale data files into a separate subpackage used by both module
- packages, install those files into /usr/share/python-babel-localedata
- * Split docs into a separate subpackage
- * Use dh_sphinxdoc
- + add python-sphinx | python3-sphinx to B-D
- * python-pybabel:
- + set Priority to extra
- + replace Conflicts with Breaks
- * Bump Standards-Version to 3.9.4
- * Rewrite debian/changelog in the DEP5 format, add the license for CLDR data
- * Ship CLDR source data as a secondary tarball and rebuild localedata from it
- at the build time, add get-orig-source target for generating this tarball
- * Add python-pytest, python3-pytest to B-D for build-time tests
+ -- Thomas Goirand <zigo at debian.org> Wed, 23 Oct 2013 04:53:40 +0000
- -- Andrey Rahmatullin <wrar at wrar.name> Tue, 24 Sep 2013 02:02:55 +0600
+python-babel (1.3-1) unstable; urgency=low
+ * Team upload.
+ * New upstream release.
+ * Standard-Version is now 3.9.4.
+ * Ran wrap-and-sort.
+ * debian/copyright is now in parseable format 1.0.
+ * Switched to 3.0 (quilt) source format.
+ * Switched to debhelper and compat level 9.
+ * Drops obsolete python-pybabel package.
+ * Drops Replaces:+Conflicts: python-pybabel (<< 0.9.6-1~).
+ * Adds Recommends: ${python:Recommends}.
+ * Adds support for python3, rewrote the debian/rules using the dh short
+ style with python_distutils.
+ * Updated debian/watch file to use PyPi.
+ * Using sphinx-build to build the doc.
+ * Updated homepage to http://babel.pocoo.org/.
+
+ -- Thomas Goirand <zigo at debian.org> Fri, 04 Oct 2013 18:33:36 +0000
+
python-babel (0.9.6-1) unstable; urgency=low
[ Andrey Rahmatullin ]
@@ -128,4 +123,3 @@
* Initial release (Closes: #461087)
-- Christoph Haas <haas at debian.org> Wed, 16 Jan 2008 15:35:18 +0100
-
Modified: packages/python-babel/trunk/debian/compat
===================================================================
--- packages/python-babel/trunk/debian/compat 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/compat 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1 +1 @@
-8
+9
\ No newline at end of file
Modified: packages/python-babel/trunk/debian/control
===================================================================
--- packages/python-babel/trunk/debian/control 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/control 2013-10-23 05:27:37 UTC (rev 26258)
@@ -2,20 +2,23 @@
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Christoph Haas <haas at debian.org>, Andrey Rahmatullin <wrar at wrar.name>
-Build-Depends: debhelper (>= 8), dh-python, python-sphinx | python3-sphinx,
- python-all (>= 2.6.6-3), python3-all, python-setuptools, python3-setuptools, python-tz,
- python3-tz, python-pytest, python3-pytest
+Uploaders: Christoph Haas <haas at debian.org>
+Build-Depends: debhelper (>= 9),
+ python-all (>= 2.6.6-3),
+ python-setuptools,
+ python-tz,
+ python3-all,
+ python3-setuptools,
+ python3-tz,
+ python-sphinx
Standards-Version: 3.9.4
Homepage: http://babel.pocoo.org/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-babel/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-babel/trunk/
-X-Python3-Version: >= 3.3
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-pybabel/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-pybabel/trunk/
Package: python-pybabel
Architecture: all
Section: oldlibs
-Priority: extra
Depends: python-babel, ${misc:Depends}
Description: tools for internationalizing Python applications (transitional dummy package)
Babel is composed of two major parts. First tools to build and work with
@@ -27,46 +30,38 @@
Package: python-babel
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-babel-localedata (= ${source:Version}), python-pkg-resources
-Replaces: python-pybabel (<< 0.9.6-1~)
-Breaks: python-pybabel (<< 0.9.6-1~)
-Description: tools for internationalizing Python applications
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
+Recommends: ${python:Recommends}
+Description: tools for internationalizing Python applications - Python 2.x
Babel is composed of two major parts. First tools to build and work with
gettext message catalogs. Second a Python interface to the CLDR (Common
Locale Data Repository), providing access to various locale display
names, localized number and date formatting, etc.
+ .
+ This package provides the Python 2.x module.
Package: python3-babel
Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, python-babel-localedata (= ${source:Version}), python3-pkg-resources
-Description: tools for internationalizing Python applications (Python 3 version)
+Depends: python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
+Recommends: ${python3:Recommends}
+Description: tools for internationalizing Python applications - Python 3.x
Babel is composed of two major parts. First tools to build and work with
gettext message catalogs. Second a Python interface to the CLDR (Common
Locale Data Repository), providing access to various locale display
names, localized number and date formatting, etc.
.
- This package contains the Python 3 version of the module.
+ This package provides the Python 3.x module.
-Package: python-babel-localedata
-Architecture: all
-Depends: ${misc:Depends}
-Description: tools for internationalizing Python applications (locale data files)
- Babel is composed of two major parts. First tools to build and work with
- gettext message catalogs. Second a Python interface to the CLDR (Common
- Locale Data Repository), providing access to various locale display
- names, localized number and date formatting, etc.
- .
- This package contains the locale data files used by both python-babel and
- python3-babel.
-
Package: python-babel-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: tools for internationalizing Python applications (API docs)
+Breaks: python-babel (<< 1.3-1)
+Replaces: python-babel (<< 1.3-1)
+Depends: python3-pkg-resources, ${misc:Depends}
+Description: tools for internationalizing Python applications - documentation
Babel is composed of two major parts. First tools to build and work with
gettext message catalogs. Second a Python interface to the CLDR (Common
Locale Data Repository), providing access to various locale display
names, localized number and date formatting, etc.
.
- This package contains the API documentation in the HTML form.
+ This package contains the Babel documentation.
Modified: packages/python-babel/trunk/debian/copyright
===================================================================
--- packages/python-babel/trunk/debian/copyright 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/copyright 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1,75 +1,57 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Babel
-Upstream-Contact: Armin Ronacher <armin.ronacher at active-4.com>
-Source: http://babel.pocoo.org/
+Source: https://pypi.python.org/pypi/Babel
+Files: debian/*
+Copyright: (c) 2008, Christoph Haas <haas at debian.org>
+ (c) 2008, Piotr Ożarowski
+ (c) 2009, Kumar Appaiah
+ (c) 2011, Andrey Rahmatullin
+ (c) 2013, Thomas Goirand <zigo at debian.org>
+License: GPL-2
+
Files: *
-Copyright: 2007-2011, Edgewall Software
- 2013, the Babel Team
+Copyright: (c) 2007-2013, Edgewall Software <info at edgewall.org>
License: BSD-3-clause
-Files: babel/localedata/* cldr/*
-Copyright: 1991-2013 Unicode, Inc.
-License: Unicode
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of the Unicode data files and any associated documentation (the "Data Files")
- or Unicode software and any associated documentation (the "Software") to deal
- in the Data Files or Software without restriction, including without
- limitation the rights to use, copy, modify, merge, publish, distribute, and/or
- sell copies of the Data Files or Software, and to permit persons to whom the
- Data Files or Software are furnished to do so, provided that (a) the above
- copyright notice(s) and this permission notice appear with all copies of the
- Data Files or Software, (b) both the above copyright notice(s) and this
- permission notice appear in associated documentation, and (c) there is clear
- notice in each modified Data File or in the Software as well as in the
- documentation associated with the Data File(s) or Software that the data or
- software has been modified.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
.
- THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
- PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
- DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE
- DATA FILES OR SOFTWARE.
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
.
- Except as contained in this notice, the name of a copyright holder shall not
- be used in advertising or otherwise to promote the sale, use or other dealings
- in these Data Files or Software without prior written authorization of the
- copyright holder.
-Comment:
- cldr/* is unpacked http://unicode.org/Public/cldr/23.1/core.zip
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
-Files: debian/*
-Copyright: 2008, Christoph Haas <haas at debian.org>
- 2011-2013, Andrey Rahmatullin <wrar at wrar.name>
-License: BSD-3-clause
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+License: GPL-2
+ 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 of the License, or (at your option) any later
+ version.
.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- 3. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior
- written permission.
+ 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.
.
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 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., 51 Franklin
+ St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public License v2
+ (GPL) can be found in /usr/share/common-licenses/GPL-2.
Deleted: packages/python-babel/trunk/debian/patches/c.utf-8.patch
===================================================================
--- packages/python-babel/trunk/debian/patches/c.utf-8.patch 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/patches/c.utf-8.patch 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1,16 +0,0 @@
-Description: Handle C.UTF-8 locale like C locale in default_locale()
-Author: Andrey Rahmatullin <wrar at wrar.name>
-Bug: https://github.com/mitsuhiko/babel/issues/57
-Last-Update: 2013-09-21
-
---- python-babel-1.3.orig/babel/core.py 2013-07-29 03:15:48.000000000 +0600
-+++ python-babel-1.3/babel/core.py 2013-09-21 02:06:23.547103108 +0600
-@@ -775,7 +775,7 @@
- # the LANGUAGE variable may contain a colon-separated list of
- # language codes; we just pick the language on the list
- locale = locale.split(':')[0]
-- if locale in ('C', 'POSIX'):
-+ if locale in ('C', 'C.UTF-8', 'POSIX'):
- locale = 'en_US_POSIX'
- elif aliases and locale in aliases:
- locale = aliases[locale]
Deleted: packages/python-babel/trunk/debian/patches/series
===================================================================
--- packages/python-babel/trunk/debian/patches/series 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/patches/series 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1 +0,0 @@
-c.utf-8.patch
Deleted: packages/python-babel/trunk/debian/pybabel3.1
===================================================================
--- packages/python-babel/trunk/debian/pybabel3.1 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/pybabel3.1 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1,43 +0,0 @@
-.\" Manpage created by Christoph Haas <haas at debian.org>
-.TH PYBABEL3 "1" "January 2008"
-.SH NAME
-pybabel3 \- command line tool for working with message catalogs
-.SH SYNOPSIS
-.B pybabel
-\fIcommand \fR[\fIoptions\fR] [\fIargs\fR]
-.SH OPTIONS
-.TP
-\fB\-\-version\fR
-show program's version number and exit
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-\-list\-locales\fR
-print all known locales and exit
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-print as much as possible
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-print as little as possible
-.SS "commands:"
-.TP
-compile
-compile message catalogs to MO files
-.TP
-extract
-extract messages from source files and generate a POT file
-.TP
-init
-create new message catalogs from a POT file
-.TP
-update
-update existing message catalogs from a POT file
-.PP
-To learn more about the commands run e.g. \fIpybabel3 compile \-\-help\fR.
-.SH AUTHORS
-The original program was written by Edgewall Software. This manual page was
-provided by Christoph Haas <haas at debian.org> for the Debian GNU/Linux system
-but may freely be used by anyone.
-
Deleted: packages/python-babel/trunk/debian/pydist-overrides
===================================================================
--- packages/python-babel/trunk/debian/pydist-overrides 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/pydist-overrides 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1 +0,0 @@
-pytz python-tz
Modified: packages/python-babel/trunk/debian/python-babel-doc.doc-base
===================================================================
--- packages/python-babel/trunk/debian/python-babel-doc.doc-base 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/python-babel-doc.doc-base 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1,12 +1,10 @@
Document: python-babel
Title: Python Babel documentation
-Author: Armin Ronacher <armin.ronacher at active-4.com>
+Author: Edgewall Software
Abstract: Babel Python module provides tools for internationalizing Python
applications.
Section: Programming/Python
Format: HTML
Index: /usr/share/doc/python-babel-doc/html/index.html
-Files: /usr/share/doc/python-babel-doc/html/*.html
- /usr/share/doc/python-babel-doc/html/api/*.html
- /usr/share/doc/python-babel-doc/html/api/messages/*.html
+Files: /usr/share/doc/python-babel-doc/html/*.html /usr/share/doc/python-babel-doc/html/api/*.html
Deleted: packages/python-babel/trunk/debian/python-babel-doc.docs
===================================================================
--- packages/python-babel/trunk/debian/python-babel-doc.docs 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/python-babel-doc.docs 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1 +0,0 @@
-docs/_build/html
Deleted: packages/python-babel/trunk/debian/python-babel-localedata.install
===================================================================
--- packages/python-babel/trunk/debian/python-babel-localedata.install 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/python-babel-localedata.install 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1 +0,0 @@
-babel/localedata/* usr/share/python-babel-localedata/
Added: packages/python-babel/trunk/debian/python-babel.postinst
===================================================================
--- packages/python-babel/trunk/debian/python-babel.postinst (rev 0)
+++ packages/python-babel/trunk/debian/python-babel.postinst 2013-10-23 05:27:37 UTC (rev 26258)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+ update-alternatives --install /usr/bin/pybabel pybabel /usr/bin/pybabel-python2 200
+fi
+
+#DEBHELPER#
Added: packages/python-babel/trunk/debian/python-babel.prerm
===================================================================
--- packages/python-babel/trunk/debian/python-babel.prerm (rev 0)
+++ packages/python-babel/trunk/debian/python-babel.prerm 2013-10-23 05:27:37 UTC (rev 26258)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ] ; then
+ update-alternatives --remove pybabel /usr/bin/waitress-serve-python2
+fi
+
+#DEBHELPER#
Deleted: packages/python-babel/trunk/debian/python3-babel.manpages
===================================================================
--- packages/python-babel/trunk/debian/python3-babel.manpages 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/python3-babel.manpages 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1 +0,0 @@
-debian/pybabel3.1
Added: packages/python-babel/trunk/debian/python3-babel.postinst
===================================================================
--- packages/python-babel/trunk/debian/python3-babel.postinst (rev 0)
+++ packages/python-babel/trunk/debian/python3-babel.postinst 2013-10-23 05:27:37 UTC (rev 26258)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+ update-alternatives --install /usr/bin/pybabel pybabel /usr/bin/pybabel-python3 200
+fi
+
+#DEBHELPER#
Added: packages/python-babel/trunk/debian/python3-babel.prerm
===================================================================
--- packages/python-babel/trunk/debian/python3-babel.prerm (rev 0)
+++ packages/python-babel/trunk/debian/python3-babel.prerm 2013-10-23 05:27:37 UTC (rev 26258)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ] ; then
+ update-alternatives --remove pybabel /usr/bin/waitress-serve-python3
+fi
+
+#DEBHELPER#
Modified: packages/python-babel/trunk/debian/rules
===================================================================
--- packages/python-babel/trunk/debian/rules 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/rules 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1,54 +1,40 @@
#!/usr/bin/make -f
-export PYBUILD_DESTDIR_python2=debian/python-babel/
-export PYBUILD_DESTDIR_python3=debian/python3-babel/
-export PYBUILD_TEST_PYTEST=1
-export PYBUILD_TEST_ARGS=$(CURDIR)/tests
+PYTHONS:=$(shell pyversions -vr)
+PYTHON3S:=$(shell py3versions -vr)
%:
- dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+ dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc
-override_dh_auto_build:
- mkdir localedata.bak
- mv babel/localedata babel/global.dat localedata.bak
- mkdir babel/localedata
- scripts/import_cldr.py cldr/common
-
- dh_auto_build
- make -C docs html
-
-override_dh_auto_clean:
- dh_auto_clean
- make -C docs clean
- rm tests/messages/data/project/i18n/en_US/LC_MESSAGES/messages.po
- rm tests/messages/data/project/i18n/temp.pot
-
- if [ -d localedata.bak ]; then \
- rm -rf babel/localedata babel/global.dat; \
- mv localedata.bak/* babel/; \
- rm -rf localedata.bak; \
- fi
-
override_dh_auto_install:
- dh_auto_install
- rm -rf debian/python-babel/usr/lib/python*/dist-packages/babel/localedata
- rm -rf debian/python3-babel/usr/lib/python*/dist-packages/babel/localedata
- mv debian/python3-babel/usr/bin/pybabel debian/python3-babel/usr/bin/pybabel3
- sed -i -e "s,^_dirname = os\.path\.join.*,_dirname = '/usr/share/python-babel-localedata'," \
- debian/python-babel/usr/lib/python*/dist-packages/babel/localedata.py \
- debian/python3-babel/usr/lib/python*/dist-packages/babel/localedata.py
+ set -e && for pyvers in $(PYTHONS); do \
+ python$$pyvers setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/python-babel; \
+ done
+ set -e && for pyvers in $(PYTHON3S); do \
+ python$$pyvers setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/python3-babel; \
+ done
+ mv debian/python-babel/usr/bin/pybabel debian/python-babel/usr/bin/pybabel-python2
+ mv debian/python3-babel/usr/bin/pybabel debian/python3-babel/usr/bin/pybabel-python3
-override_dh_compress:
- dh_compress -X *.html
+override_dh_installdocs:
+ sphinx-build docs docs/_build
+ dh_installdocs -O--buildsystem=python_distutils
+ mkdir -p debian/python-babel-doc/usr/share/doc/python-babel-doc/html
+ cp -auxf docs/_build/* debian/python-babel-doc/usr/share/doc/python-babel-doc/html
-DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
-get-orig-source:
- uscan --noconf --force-download --rename --download-current-version --destdir=$(CURDIR) $(DEB_DEBIAN_DIR)/..
+override_dh_sphinxdoc:
+ dh_sphinxdoc -O--buildsystem=python_distutils
+ rm debian/python-babel-doc/usr/share/doc/python-babel-doc/html/_sources/license.txt
- TMPDIR=`mktemp -d`; \
- CLDR=python-babel_$(DEB_UPSTREAM_VERSION).orig-cldr; \
- wget -P $$TMPDIR http://unicode.org/Public/cldr/23.1/core.zip && \
- unzip $$TMPDIR/core.zip -d $$TMPDIR/$$CLDR && \
- tar -C $$TMPDIR --owner=root --group=root --mode=a+rX -c $$CLDR | xz -6 > $$CLDR.tar.xz && \
- rm -rf $$TMPDIR
+override_dh_auto_clean:
+ rm -rf docs/_build build Babel.egg-info
+ dh_auto_clean -O--buildsystem=python_distutils
+
+#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+# set -e; \
+# for python in $(PYVERS); do \
+# $$python setup.py test -vv; \
+# done
+#endif
Modified: packages/python-babel/trunk/debian/watch
===================================================================
--- packages/python-babel/trunk/debian/watch 2013-10-22 23:07:16 UTC (rev 26257)
+++ packages/python-babel/trunk/debian/watch 2013-10-23 05:27:37 UTC (rev 26258)
@@ -1,2 +1,2 @@
version=3
-https://pypi.python.org/packages/source/B/Babel/Babel-([\d\.]+)\.tar\.gz
+https://pypi.python.org/packages/source/B/Babel/Babel-(.*)\.tar\.gz
More information about the Python-modules-commits
mailing list