[Pkg-bazaar-commits] r159 ./bzr-builddeb/trunk: A reprieve for local.conf.

[James Westby]

------------------------------------------------------------
revno: 159
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Tue 2007-07-10 23:01:56 +0100
message:
  A reprieve for local.conf.
removed:
  debian/NEWS
modified:
  README
  __init__.py
  debian/changelog
  doc/user_manual/configuration.rst
  doc/user_manual/export_upstream.rst
-------------- next part --------------
=== removed file 'debian/NEWS'
--- a/debian/NEWS	2007-06-17 20:42:35 +0000
+++ b/debian/NEWS	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-bzr-builddeb (0.17) unstable; urgency=low
-
-  * From this version onwards use of .bzr-builddeb/local.conf is deprecated,
-    as it is incompatible with proposed changes to better integrate builddeb
-    with the rest of bzr and support building remote branches. Please move the
-    contents of .bzr-builddeb/local.conf to .bzr/branch/branch.conf. You can
-    then delete the former, and remove any mention from .bzrignore.
-    
-    For compatibility the file will still be read and the values used for
-    this release, but starting from 0.18 the file will be ignored.
-
- -- James Westby <jw+debian at jameswestby.net>  Sun, 17 Jun 2007 21:39:19 +0100

=== modified file 'README'
--- a/README	2007-07-10 21:26:41 +0000
+++ b/README	2007-07-10 22:01:56 +0000
@@ -53,7 +53,7 @@
 There are also configuration files that can be used, these are, in the order
 that values will be used if found::
 
-  * .bzr/branch/branch.conf (in the package directory)
+  * .bzr-builddeb/local.conf (in the package directory)
   * ~/.bazaar/builddeb.conf
   * .bzr-builddeb/default.conf (in the package directory)
 
@@ -219,7 +219,7 @@
 ``~/.bazaar/builddeb.conf``. They can override it for the package if they want 
 (e.g. they have a different location for upstream tarballs of a package if
 they are involved with upstream as well, so they set ``orig_dir = 
-/home/.../releases/``), this can be done in ``.bzr/branch/branch.conf``).
+/home/.../releases/``), this can be done in ``.bzr-builddeb/local.conf``).
 
 
 Creating a package

=== modified file '__init__.py'
--- a/__init__.py	2007-07-10 21:26:41 +0000
+++ b/__init__.py	2007-07-10 22:01:56 +0000
@@ -165,15 +165,7 @@
     tree, relpath = WorkingTree.open_containing('.')
     
     config = DebBuildConfig([(local_conf, True), (global_conf, True),
-                             (default_conf, False)], branch=tree.branch)
-
-    tree.lock_read()
-    try:
-      if os.path.exists(local_conf):
-        warning('Please move the contents of %s ' % local_conf +
-                'to .bzr/branch/branch.conf, as the former is now deprecated')
-    finally:
-      tree.unlock()
+                             (default_conf, False)])
 
     if reuse:
       info("Reusing existing build dir")
@@ -325,7 +317,7 @@
     tree, relpath = WorkingTree.open_containing('.')
 
     config = DebBuildConfig([(local_conf, True), (global_conf, True),
-                             (default_conf, False)], branch=tree.branch)
+                             (default_conf, False)])
 
     if config.merge:
       raise BzrCommandError("Merge upstream in merge mode is not yet "

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-10 21:26:41 +0000
+++ b/debian/changelog	2007-07-10 22:01:56 +0000
@@ -36,9 +36,6 @@
     needed currently. This requires a newer python-debian (0.1.3), so bump the
     version requirements. This would have helped with cases like #429299, but
     Reinhard already fixed that in python-debian.
-  * Using .bzr-builddeb/local.conf is now deprected, please move the contents
-    to .bzr/branch/branch.conf. The local.conf file will not be read in the
-    next version.
   * python-deb822 changed from new classes to old classes in version 0.3.
     Handle the change in API, and bump the dependencies to make sure it will
     work.

=== modified file 'doc/user_manual/configuration.rst'
--- a/doc/user_manual/configuration.rst	2007-07-10 21:26:41 +0000
+++ b/doc/user_manual/configuration.rst	2007-07-10 22:01:56 +0000
@@ -4,7 +4,7 @@
 There are also configuration files that can be used, these are, in the order
 that values will be used if found::
 
-  * .bzr/branch/branch.conf (in the package directory)
+  * .bzr-builddeb/local.conf (in the package directory)
   * ~/.bazaar/builddeb.conf
   * .bzr-builddeb/default.conf (in the package directory)
 
@@ -170,5 +170,5 @@
 ``~/.bazaar/builddeb.conf``. They can override it for the package if they want 
 (e.g. they have a different location for upstream tarballs of a package if
 they are involved with upstream as well, so they set ``orig_dir = 
-/home/.../releases/``), this can be done in ``.bzr/branch/branch.conf``).
+/home/.../releases/``), this can be done in ``.bzr-builddeb/local.conf``).
 

=== modified file 'doc/user_manual/export_upstream.rst'
--- a/doc/user_manual/export_upstream.rst	2007-07-10 20:52:45 +0000
+++ b/doc/user_manual/export_upstream.rst	2007-07-10 22:01:56 +0000
@@ -61,7 +61,7 @@
 ``.bzr-builddeb/default.conf`` should still be set to a public branch as
 above though, for people that wish to build the package, but do not have a
 local mirror.  What you should do instead is set ``export-upstream`` to your
-local mirror in ``.bzr/branch/branch.conf``, like::
+local mirror in ``.bzr-builddeb/local.conf``, like::
 
   [BUILDDEB]
   export-upstream = /home/user/work/scruff/trunk/