[Pkg-bazaar-commits] ./bzr-builddeb/trunk r358: Add plugin information as parsed by 'bzr plugin-info'.

[James Westby]

------------------------------------------------------------
revno: 358
committer: James Westby <james.westby at canonical.com>
branch nick: trunk
timestamp: Sun 2009-07-26 18:52:46 +0200
message:
  Add plugin information as parsed by 'bzr plugin-info'.
added:
  info.py
modified:
  __init__.py
  setup.py
    ------------------------------------------------------------
    revno: 354.1.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: plugin-info
    timestamp: Fri 2009-07-17 20:15:54 +0200
    message:
      Add plugin information as parsed by 'bzr plugin-info' and documented in the 
      plugin-api.txt specification.
    modified:
      __init__.py
      setup.py
    ------------------------------------------------------------
    revno: 354.1.2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: plugin-info
    timestamp: Sun 2009-07-26 17:51:02 +0200
    message:
      Move plugin info details to a separate file.
    added:
      info.py
    modified:
      __init__.py
      setup.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2009-07-15 17:06:04 +0000
+++ b/__init__.py	2009-07-26 15:51:02 +0000
@@ -29,6 +29,10 @@
 from bzrlib.commands import plugin_cmds
 from bzrlib.directory_service import directories
 
+from info import (
+    bzr_plugin_version as version_info,
+    )
+
 commands = {
         "test_builddeb": [],
         "builddeb": ["bd"],

=== added file 'info.py'
--- a/info.py	1970-01-01 00:00:00 +0000
+++ b/info.py	2009-07-26 15:51:02 +0000
@@ -0,0 +1,30 @@
+#    info.py -- Plugin information for bzr-builddeb
+#
+#    This file is part of bzr-builddeb.
+#
+#    bzr-builddeb 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.
+#
+#    bzr-builddeb 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 bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+bzr_plugin_name = 'builddeb'
+
+bzr_plugin_version = (2, 1, 1, 'dev', 0)
+
+bzr_commands = [
+    "test_builddeb",
+    "builddeb",
+    "merge_upstream",
+    "import_dsc",
+    "bd_do",
+    "mark_uploaded",
+    ]

=== modified file 'setup.py'
--- a/setup.py	2009-03-05 16:22:04 +0000
+++ b/setup.py	2009-07-26 15:51:02 +0000
@@ -20,18 +20,24 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-from distutils.core import setup
-
-setup(name="bzr-builddeb",
-      version="2.1.1",
-      description="Build a .deb from a bzr branch",
-      author="James Westby",
-      author_email="jw+debian at jameswestby.net",
-      license = "GNU GPL v2",
-      url="http://jameswestby.net/bzr/bzr-builddeb/",
-      packages=['bzrlib.plugins.builddeb',
-                'bzrlib.plugins.builddeb.tests',
-                'bzrlib.plugins.builddeb.tests.blackbox'],
-      package_dir={'bzrlib.plugins.builddeb': '.'},
-      scripts=['bzr-buildpackage'],
-      data_files=[('share/man/man1', ['bzr-buildpackage.1'])])
+from info import *
+
+if __name__ == '__main__':
+
+    from distutils.core import setup
+
+    version_string = ".".join([str(v) for v in bzr_plugin_version[:3]])
+
+    setup(name="bzr-builddeb",
+          version=version_string,
+          description="Build a .deb from a bzr branch",
+          author="James Westby",
+          author_email="jw+debian at jameswestby.net",
+          license = "GNU GPL v2",
+          url="http://jameswestby.net/bzr/bzr-builddeb/",
+          packages=['bzrlib.plugins.builddeb',
+                    'bzrlib.plugins.builddeb.tests',
+                    'bzrlib.plugins.builddeb.tests.blackbox'],
+          package_dir={'bzrlib.plugins.builddeb': '.'},
+          scripts=['bzr-buildpackage'],
+          data_files=[('share/man/man1', ['bzr-buildpackage.1'])])