[Pkg-bazaar-commits] ./bzr-builddeb/trunk r357: Automatically use merge mode if there's only a debian/ directory.

[James Westby]

------------------------------------------------------------
revno: 357
committer: James Westby <james.westby at canonical.com>
branch nick: trunk
timestamp: Sun 2009-07-26 18:39:24 +0200
message:
  Automatically use merge mode if there's only a debian/ directory.
modified:
  cmds.py
  debian/changelog
  doc/user_manual/license.rst
    ------------------------------------------------------------
    revno: 334.2.5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2009-05-03 17:46:26 +0200
    message:
      Fix typo in license.rst.
    modified:
      doc/user_manual/license.rst
    ------------------------------------------------------------
    revno: 334.2.6
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: auto-merge-mode
    timestamp: Fri 2009-06-05 01:00:17 +0200
    message:
      Automatically use merge mode if there's only a debian/ directory in
      the packaging branch. Closes: #529816.
    modified:
      cmds.py
      debian/changelog
    ------------------------------------------------------------
    revno: 356.1.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: auto-merge
    timestamp: Sun 2009-07-26 18:21:15 +0200
    message:
      Automatically use merge mode if there's only a debian/ directory in
      the packaging branch. Closes: #529816.
    modified:
      cmds.py
      debian/changelog
      doc/user_manual/license.rst
-------------- next part --------------
=== modified file 'cmds.py'
--- a/cmds.py	2009-07-26 08:05:34 +0000
+++ b/cmds.py	2009-07-26 16:21:15 +0000
@@ -360,6 +360,10 @@
                 dont_purge = True
                 use_existing = True
             merge, native, split = self._build_type(config, merge, native, split)
+            if (not merge and not native and not split and
+                tree.inventory.root.children.keys() == ["debian"]):
+                # Default to merge mode if there's only a debian/ directory
+                merge = True
             build_cmd = self._get_build_command(config, builder, quick,
                     build_options)
             (changelog, larstiq) = find_changelog(tree, merge)

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-07-26 08:05:34 +0000
+++ b/debian/changelog	2009-07-26 16:39:24 +0000
@@ -1,11 +1,20 @@
+bzr-builddeb (2.2~ubuntu3) UNRELEASED; urgency=low
+
+  [ Jelmer Vernooij ]
+  * Automatically use merge mode if there's only a debian/ directory in
+    the packaging branch. Closes: #529816.
+
+ -- James Westby <james.westby at ubuntu.com>  Sun, 26 Jul 2009 18:38:47 +0200
+
 bzr-builddeb (2.2~ubuntu2) karmic; urgency=low
 
+  [ James Westby ]
   * Don't cause the commit to fail if the changelog file is present but
     unknown.
   * Also avoid problems with SIGPIPE when running the build command.
     (LP: #399938)
 
- -- James Westby <james.westby at ubuntu.com>  Wed, 15 Jul 2009 18:05:38 +0100
+ -- Jelmer Vernooij <jelmer at debian.org>  Sun, 26 Jul 2009 18:20:30 +0200
 
 bzr-builddeb (2.2~ubuntu1) karmic; urgency=low
 

=== modified file 'doc/user_manual/license.rst'
--- a/doc/user_manual/license.rst	2007-07-10 20:52:45 +0000
+++ b/doc/user_manual/license.rst	2009-05-03 15:46:26 +0000
@@ -5,7 +5,7 @@
 
      (C) 2007 James Westby <jw+debian at jameswestby.net> and
 
-is distributed under the followind terms::
+is distributed under the following terms::
 
    This file is part of bzr-builddeb.