From 5deba844dd93ffe65f8b82776db81326bbbe023a Mon Sep 17 00:00:00 2001

From: cmlenz <cmlenz@59ecc08e-a131-0410-9ea7-d4c0f28ac310>

Date: Fri, 29 Jun 2007 14:50:20 +0000

Subject: [PATCH] Rename command-line script to avoid conflict with the OpenBabel project. Closes #34.

---

 ChangeLog       |    8 ++++++++

 doc/cmdline.txt |   26 +++++++++++++-------------

 setup.py        |    2 +-

 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog

index a6e24e5..648f927 100644

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+Version 0.9

+http://svn.edgewall.org/repos/babel/tags/0.9.0/

+(?, from branches/stable/0.9.x)

+

+ * The name of the command-line script has been changed from just "babel" to

+   "pybabel" to avoid a conflict with the OpenBabel project (ticket #34).

+

+

 Version 0.8

 http://svn.edgewall.org/repos/babel/tags/0.8.0/

 (Jun 20 2007, from branches/stable/0.8.x)

diff --git a/doc/cmdline.txt b/doc/cmdline.txt

index 637e3ea..cd89842 100644

--- a/doc/cmdline.txt

+++ b/doc/cmdline.txt

@@ -14,21 +14,21 @@ systems.

 .. sectnum::

-When properly installed, Babel provides a script called ``babel``::

+When properly installed, Babel provides a script called ``pybabel``::

-    $ babel --help

-    usage: babel subcommand [options] [args]

+    $ pybabel --help

+    usage: pybabel subcommand [options] [args]

     options:

-      --version             show program's version number and exit

-      -h, --help            show this help message and exit

+      --version   show program's version number and exit

+      -h, --help  show this help message and exit

     subcommands:

-      extract   extract messages from source files and generate a POT file

-      init      create new message catalogs from a template

+      extract     extract messages from source files and generate a POT file

+      init        create new message catalogs from a template

-The ``babel`` script provides a number of sub-commands that do the actual work.

-Those sub-commands are described below.

+The ``pybabel`` script provides a number of sub-commands that do the actual

+work. Those sub-commands are described below.

 extract

@@ -37,8 +37,8 @@ extract

 The ``extract`` sub-command can be used to extract localizable messages from

 a collection of source files::

-    $ babel extract --help

-    usage: babel extract [options] dir1 <dir2> ...

+    $ pybabel extract --help

+    usage: pybabel extract [options] dir1 <dir2> ...

     extract messages from source files and generate a POT file

@@ -79,8 +79,8 @@ init

 The `init` sub-command creates a new translations catalog based on a PO

 template file::

-    $ babel init --help

-    usage: babel init [options] 

+    $ pybabel init --help

+    usage: pybabel init [options] 

     create new message catalogs from a template

diff --git a/setup.py b/setup.py

index f9c098b..a519f81 100755

--- a/setup.py

+++ b/setup.py

@@ -135,7 +135,7 @@ setup(

     entry_points = """

     [console_scripts]

-    babel = babel.messages.frontend:main

+    pybabel = babel.messages.frontend:main

     [distutils.commands]

     extract_messages = babel.messages.frontend:extract_messages

-- 

1.5.2.GIT