[Pkg-bazaar-commits] ./bzr-rebase/unstable r62: New upstream release.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 62 [merge]
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: unstable
timestamp: Sat 2009-07-18 22:35:04 +0200
message:
  New upstream release.
added:
  info.py
modified:
  NEWS
  __init__.py
  debian/changelog
  setup.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-07-13 23:23:22 +0000
+++ b/NEWS	2009-07-18 20:31:57 +0000
@@ -1,3 +1,9 @@
+0.5.3	2009-07-18
+
+  BUG FIXES
+
+  * Fix for brown paper bag issue in the 0.5.2 release. (#401174)
+
 0.5.2	2009-07-14
 
   * Mark as compatible with Bazaar 1.17.

=== modified file '__init__.py'
--- a/__init__.py	2009-07-13 23:23:22 +0000
+++ b/__init__.py	2009-07-18 20:31:57 +0000
@@ -25,7 +25,12 @@
 import bzrlib.api
 from bzrlib.commands import plugin_cmds
 
-version_info = (0, 5, 2, 'final', 0)
+from info import (
+    bzr_commands,
+    bzr_plugin_version as version_info,
+    bzr_compatible_versions,
+    )
+
 if version_info[3] == 'final':
     version_string = '%d.%d.%d' % version_info[:3]
 else:
@@ -33,12 +38,9 @@
 __version__ = version_string
 __author__ = 'Jelmer Vernooij <jelmer at samba.org>'
 
-COMPATIBLE_BZR_VERSIONS = [(1, 14, 0), (1, 15, 0), (1, 16, 0), (1, 17, 0)]
-
-bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
-
-for cmd in ["replay", "rebase", "rebase_abort", "rebase_continue",
-            "rebase_todo", "filter_branch"]:
+bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
+
+for cmd in bzr_commands:
     plugin_cmds.register_lazy("cmd_%s" % cmd, [], 
         "bzrlib.plugins.rebase.commands")
 

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-07-17 10:21:40 +0000
+++ b/debian/changelog	2009-07-18 20:35:04 +0000
@@ -1,3 +1,9 @@
+bzr-rebase (0.5.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Sat, 18 Jul 2009 22:34:49 +0200
+
 bzr-rebase (0.5.2-1) unstable; urgency=low
 
   * New upstream release.

=== added file 'info.py'
--- a/info.py	1970-01-01 00:00:00 +0000
+++ b/info.py	2009-07-18 20:31:57 +0000
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+bzr_plugin_name = 'rewrite'
+
+bzr_plugin_version = (0, 5, 3, 'final', 0)
+
+bzr_compatible_versions = [(1, 14, 0), (1, 15, 0), (1, 16, 0), (1, 17, 0)]
+
+bzr_minimum_version = bzr_compatible_versions[0]
+
+bzr_maximum_version = bzr_compatible_versions[-1]
+
+bzr_commands = [
+    "replay",
+    "rebase",
+    "rebase_abort",
+    "rebase_continue",
+    "rebase_todo",
+    ]
+
+

=== modified file 'setup.py'
--- a/setup.py	2009-06-18 22:04:45 +0000
+++ b/setup.py	2009-07-18 20:31:57 +0000
@@ -1,19 +1,24 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
-
-setup(name='bzr-rebase',
-      description='Rebase plugin for Bazaar',
-      keywords='plugin bzr rebase',
-      version='0.5.2',
-      url='http://bazaar-vcs.org/Rebase',
-      download_url='http://bazaar-vcs.org/Rebase',
-      license='GPLv3 or later',
-      author='Jelmer Vernooij',
-      author_email='jelmer at samba.org',
-      long_description="""
-      Hooks into Bazaar and provides commands for rebasing.
-      """,
-      package_dir={'bzrlib.plugins.rebase':'.'},
-      packages=['bzrlib.plugins.rebase']
-)
+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-rewrite',
+          description='Rebase plugin for Bazaar',
+          keywords='plugin bzr rebase',
+          version=version_string,
+          url='http://bazaar-vcs.org/Rebase',
+          download_url='http://samba.org/~jelmer/bzr/bzr-rebase-%s.tar.gz' % version_string,
+          license='GPLv3 or later',
+          author='Jelmer Vernooij',
+          author_email='jelmer at samba.org',
+          long_description="""
+          Hooks into Bazaar and provides commands for rebasing.
+          """,
+          package_dir={'bzrlib.plugins.rebase':'.'},
+          packages=['bzrlib.plugins.rebase']
+    )