[Pkg-bazaar-commits] r148 ./bzr-builddeb/people/jdw/merge_upstream: Fix up some copyright notices.

[James Westby]

------------------------------------------------------------
revno: 148
committer: James Westby <jw+debian at jameswestby.net>
branch nick: merge_upstream
timestamp: Tue 2007-07-10 20:47:58 +0100
message:
  Fix up some copyright notices.
modified:
  README
  debian/copyright
  import_dsc.py
  merge_upstream.py
-------------- next part --------------
=== modified file 'README'
--- a/README	2007-06-18 22:07:21 +0000
+++ b/README	2007-07-10 19:47:58 +0000
@@ -391,13 +391,13 @@
 This involves reusing the tarball each build, so saving the need to unpack it.
 To do this run::
 
-  $ bzr --export-only 
+  $ bzr bd --export-only 
 
 once to create a build-dir to use. (``-e`` is the short option for this). Then 
 on the next builds you can use the ``--reuse`` and ``--dont-purge`` options to
 keep using this build directory. **N.B. This may cause build problems, 
 especially if files are removed**, it is advisable to run a build without 
-``--dont-purge`` after removing any files.
+``--reuse`` after removing any files.
 
 
 Workflow
@@ -415,9 +415,7 @@
 ---------
 
 This README is Copyright (C) 2006 James Westby <jw+debian at jameswestby.net> and
-is distributed under the following terms.
-
-..
+is distributed under the following terms::
 
    This file is part of bzr-builddeb.
 

=== modified file 'debian/copyright'
--- a/debian/copyright	2007-06-22 15:43:18 +0000
+++ b/debian/copyright	2007-07-10 19:47:58 +0000
@@ -29,5 +29,13 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
+merge_upstream.py and import_dsc.py include code from bzrtools, which is
+
+# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron.bentley at utoronto.ca>
+# Copyright (C) 2005, 2006 Canonical Limited.
+# Copyright (C) 2006 Michael Ellerman.
+
+and is also under the GPL, version 2 or later.
+
 The Debian packaging is (C) 2006 James Westby <jw+debian at jameswestby.net>,
 and is placed under the same license as the rest of the package.

=== modified file 'import_dsc.py'
--- a/import_dsc.py	2007-07-08 13:50:27 +0000
+++ b/import_dsc.py	2007-07-10 19:47:58 +0000
@@ -1,5 +1,11 @@
 #    import_dsc.py -- Import a series of .dsc files.
 #    Copyright (C) 2007 James Westby <jw+debian at jameswestby.net>
+#
+#    Code is also taken from bzrtools, which is
+#             (C) 2005, 2006, 2007 Aaron Bentley <aaron.bentley at utoronto.ca>
+#             (C) 2005, 2006 Canonical Limited.
+#             (C) 2006 Michael Ellerman.
+#    and distributed under the GPL, version 2 or later.
 #    
 #    This file is part of bzr-builddeb.
 #

=== modified file 'merge_upstream.py'
--- a/merge_upstream.py	2007-06-25 21:37:31 +0000
+++ b/merge_upstream.py	2007-07-10 19:47:58 +0000
@@ -1,7 +1,12 @@
 #    merge_upstream.py -- Merge new upstream versions of packages.
 #    Copyright (C) 2007 Reinhard Tartler <siretart at tauware.de>
 #                  2007 James Westby <jw+debian at jameswestby.net>
-#                  2007 Aaron Bentley <aaron.bentley at utoronto.ca>
+#
+#    Code is also taken from bzrtools, which is
+#             (C) 2005, 2006, 2007 Aaron Bentley <aaron.bentley at utoronto.ca>
+#             (C) 2005, 2006 Canonical Limited.
+#             (C) 2006 Michael Ellerman.
+#    and distributed under the GPL, version 2 or later.
 #
 #    This file is part of bzr-builddeb.
 #