[Python-modules-commits] r25700 - in packages/python-babel/trunk/debian (17 files)
wrar-guest at users.alioth.debian.org
wrar-guest at users.alioth.debian.org
Wed Aug 28 20:45:58 UTC 2013
Date: Wednesday, August 28, 2013 @ 20:45:54
Author: wrar-guest
Revision: 25700
Most packaging changes for 1.3.
Added:
packages/python-babel/trunk/debian/patches/
packages/python-babel/trunk/debian/patches/localedata.patch
packages/python-babel/trunk/debian/patches/series
packages/python-babel/trunk/debian/py3dist-overrides
packages/python-babel/trunk/debian/pybabel3.1
(from rev 25516, packages/python-babel/trunk/debian/pybabel.1)
packages/python-babel/trunk/debian/pydist-overrides
packages/python-babel/trunk/debian/python-babel-doc.doc-base
(from rev 25516, packages/python-babel/trunk/debian/python-babel.doc-base)
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
(from rev 25516, packages/python-babel/trunk/debian/python-babel.manpages)
Modified:
packages/python-babel/trunk/debian/changelog
packages/python-babel/trunk/debian/control
packages/python-babel/trunk/debian/rules
packages/python-babel/trunk/debian/source/format
Deleted:
packages/python-babel/trunk/debian/python-babel.doc-base
packages/python-babel/trunk/debian/python-babel.docs
packages/python-babel/trunk/debian/python-babel.install
Modified: packages/python-babel/trunk/debian/changelog
===================================================================
--- packages/python-babel/trunk/debian/changelog 2013-08-28 20:14:27 UTC (rev 25699)
+++ packages/python-babel/trunk/debian/changelog 2013-08-28 20:45:54 UTC (rev 25700)
@@ -1,9 +1,26 @@
-python-babel (0.9.6-2) UNRELEASED; urgency=low
+python-babel (1.3-1) UNRELEASED; urgency=low
+ [Jakub Wilk]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:02:08 +0200
+ [ Andrey Rahmatullin ]
+ * 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
+ * Switch the package format to 3.0 (quilt)
+ * Add a Python 3 subpackage
+ * Split locale data files into a separate subpackage used by both module
+ packages
+ * Split docs into a separate subpackage
+ * Use dh_sphinxdoc
+ * python-pybabel:
+ + set Priority to extra
+ + replace Conflicts with Breaks
+ * Bump Standards-Version to 3.9.4
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> Fri, 25 Feb 2011 23:06:10 +0500
+
python-babel (0.9.6-1) unstable; urgency=low
[ Andrey Rahmatullin ]
Modified: packages/python-babel/trunk/debian/control
===================================================================
--- packages/python-babel/trunk/debian/control 2013-08-28 20:14:27 UTC (rev 25699)
+++ packages/python-babel/trunk/debian/control 2013-08-28 20:45:54 UTC (rev 25700)
@@ -3,11 +3,13 @@
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), python-all (>= 2.6.6-3), python-setuptools, python-tz
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 8), dh-python, python-sphinx | python3-sphinx,
+ python-all (>= 2.6.6-3), python3-all, python-setuptools, python3-setuptools, python-tz
+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
Package: python-pybabel
Architecture: all
@@ -24,7 +26,7 @@
Package: python-babel
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources
+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
@@ -32,3 +34,38 @@
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.
+
+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)
+ 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.
+
+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)
+ 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.
Added: packages/python-babel/trunk/debian/patches/localedata.patch
===================================================================
--- packages/python-babel/trunk/debian/patches/localedata.patch (rev 0)
+++ packages/python-babel/trunk/debian/patches/localedata.patch 2013-08-28 20:45:54 UTC (rev 25700)
@@ -0,0 +1,18 @@
+Description: Search for locale data in /usr/share/python-babel-localedata
+ This allows splitting locale data into a common package which can be used
+ both by Python 2 and Python 3 modules.
+Author: Andrey Rahmatullin <wrar at wrar.name>
+Forwarded: not-needed
+Last-Update: 2013-08-28
+
+--- a/babel/localedata.py
++++ b/babel/localedata.py
+@@ -21,7 +21,7 @@
+
+ _cache = {}
+ _cache_lock = threading.RLock()
+-_dirname = os.path.join(os.path.dirname(__file__), 'localedata')
++_dirname = '/usr/share/python-babel-localedata'
+
+
+ def exists(name):
Added: packages/python-babel/trunk/debian/patches/series
===================================================================
--- packages/python-babel/trunk/debian/patches/series (rev 0)
+++ packages/python-babel/trunk/debian/patches/series 2013-08-28 20:45:54 UTC (rev 25700)
@@ -0,0 +1 @@
+localedata.patch
Added: packages/python-babel/trunk/debian/py3dist-overrides
===================================================================
--- packages/python-babel/trunk/debian/py3dist-overrides (rev 0)
+++ packages/python-babel/trunk/debian/py3dist-overrides 2013-08-28 20:45:54 UTC (rev 25700)
@@ -0,0 +1 @@
+pytz python3-tz
Copied: packages/python-babel/trunk/debian/pybabel3.1 (from rev 25516, packages/python-babel/trunk/debian/pybabel.1)
===================================================================
--- packages/python-babel/trunk/debian/pybabel3.1 (rev 0)
+++ packages/python-babel/trunk/debian/pybabel3.1 2013-08-28 20:45:54 UTC (rev 25700)
@@ -0,0 +1,43 @@
+.\" 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.
+
Added: packages/python-babel/trunk/debian/pydist-overrides
===================================================================
--- packages/python-babel/trunk/debian/pydist-overrides (rev 0)
+++ packages/python-babel/trunk/debian/pydist-overrides 2013-08-28 20:45:54 UTC (rev 25700)
@@ -0,0 +1 @@
+pytz python-tz
Copied: packages/python-babel/trunk/debian/python-babel-doc.doc-base (from rev 25516, packages/python-babel/trunk/debian/python-babel.doc-base)
===================================================================
--- packages/python-babel/trunk/debian/python-babel-doc.doc-base (rev 0)
+++ packages/python-babel/trunk/debian/python-babel-doc.doc-base 2013-08-28 20:45:54 UTC (rev 25700)
@@ -0,0 +1,12 @@
+Document: python-babel
+Title: Python Babel documentation
+Author: Armin Ronacher <armin.ronacher at active-4.com>
+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
Added: packages/python-babel/trunk/debian/python-babel-doc.docs
===================================================================
--- packages/python-babel/trunk/debian/python-babel-doc.docs (rev 0)
+++ packages/python-babel/trunk/debian/python-babel-doc.docs 2013-08-28 20:45:54 UTC (rev 25700)
@@ -0,0 +1 @@
+docs/_build/html
Added: packages/python-babel/trunk/debian/python-babel-localedata.install
===================================================================
--- packages/python-babel/trunk/debian/python-babel-localedata.install (rev 0)
+++ packages/python-babel/trunk/debian/python-babel-localedata.install 2013-08-28 20:45:54 UTC (rev 25700)
@@ -0,0 +1 @@
+babel/localedata/* usr/share/python-babel-localedata/
Deleted: packages/python-babel/trunk/debian/python-babel.doc-base
===================================================================
--- packages/python-babel/trunk/debian/python-babel.doc-base 2013-08-28 20:14:27 UTC (rev 25699)
+++ packages/python-babel/trunk/debian/python-babel.doc-base 2013-08-28 20:45:54 UTC (rev 25700)
@@ -1,10 +0,0 @@
-Document: python-babel
-Title: Python Babel documentation
-Author: Edgewall Software
-Abstract: Babel Python module provides tools for internationalizing Python
- applications.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-babel/index.html
-Files: /usr/share/doc/python-babel/*.html /usr/share/doc/python-babel/api/*.html
Deleted: packages/python-babel/trunk/debian/python-babel.docs
===================================================================
--- packages/python-babel/trunk/debian/python-babel.docs 2013-08-28 20:14:27 UTC (rev 25699)
+++ packages/python-babel/trunk/debian/python-babel.docs 2013-08-28 20:45:54 UTC (rev 25700)
@@ -1,5 +0,0 @@
-doc/*.txt
-doc/*.html
-doc/*.png
-doc/*.pdf
-doc/api
Deleted: packages/python-babel/trunk/debian/python-babel.install
===================================================================
--- packages/python-babel/trunk/debian/python-babel.install 2013-08-28 20:14:27 UTC (rev 25699)
+++ packages/python-babel/trunk/debian/python-babel.install 2013-08-28 20:45:54 UTC (rev 25700)
@@ -1 +0,0 @@
-doc/common/style usr/share/doc/python-pybabel/common
Copied: packages/python-babel/trunk/debian/python3-babel.manpages (from rev 25516, packages/python-babel/trunk/debian/python-babel.manpages)
===================================================================
--- packages/python-babel/trunk/debian/python3-babel.manpages (rev 0)
+++ packages/python-babel/trunk/debian/python3-babel.manpages 2013-08-28 20:45:54 UTC (rev 25700)
@@ -0,0 +1 @@
+debian/pybabel3.1
Modified: packages/python-babel/trunk/debian/rules
===================================================================
--- packages/python-babel/trunk/debian/rules 2013-08-28 20:14:27 UTC (rev 25699)
+++ packages/python-babel/trunk/debian/rules 2013-08-28 20:45:54 UTC (rev 25700)
@@ -1,96 +1,20 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export PYBUILD_DESTDIR_python2=debian/python-babel/
+export PYBUILD_DESTDIR_python3=debian/python3-babel/
-PYVERS=$(shell pyversions -r)
+%:
+ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
+override_dh_auto_build:
+ dh_auto_build
+ make -C docs html
-build-stamp:
- dh_testdir
+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
- set -e; \
- for python in $(PYVERS); do \
- $$python setup.py build; \
- done
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- for python in $(PYVERS); do \
- $$python setup.py clean; \
- done
-
- # Some files do not get cleaned up properly
- #rm -f doc/common/doctools.pyc
- rm -rf babel/messages/tests/data/project/i18n/temp.pot babel/messages/tests/data/project/i18n/en_US
- find . -type f -name '*.pyc' -print0 | xargs -r0 rm
-
- rm -rf build build-stamp
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- set -e; \
- for python in $(PYVERS); do \
- $$python setup.py install --root=debian/python-babel --install-layout=deb; \
- done
-
- # Strip specific Python version from 'pybabel' script
- sed -i -e 's,#!/usr/bin/python.*,#!/usr/bin/python,' ./debian/python-babel/usr/bin/pybabel
-
-test:
- -
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- set -e; \
- for python in $(PYVERS); do \
- $$python setup.py test -vv; \
- done
-endif
-
-# Build architecture-dependent files here.
-binary: build install
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: build install test
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
-# dh_installexamples
- dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installmime
- dh_python2
-# dh_installinfo
- dh_installman
-# dh_link
- dh_strip
- # Keep documentation readable
- dh_compress -X.js -X.txt -X.pdf
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure test
-
+override_dh_compress:
+ dh_compress -X *.html
Modified: packages/python-babel/trunk/debian/source/format
===================================================================
--- packages/python-babel/trunk/debian/source/format 2013-08-28 20:14:27 UTC (rev 25699)
+++ packages/python-babel/trunk/debian/source/format 2013-08-28 20:45:54 UTC (rev 25700)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list