Credit people for their work and update copyright file.

diff --git a/AUTHORS b/AUTHORS
index e0a88d77498e4d55d9f81d28d2c9e942446ceb66..5285fbf3a3c542b94f38d53ca2b28a1b45f891b3 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,12 +12,13 @@ based on the Perl implementation by:
 It is currently maintained by:
 
        Guillem Jover <guillem@debian.org>
-       Brendan O'Dea <bod@debian.org>
-       Christian Perrier <bubulle@debian.org>
        Frank Lichtenheld <djpig@debian.org>
+       Raphael Hertzog <hertzog@debian.org>
+       Christian Perrier <bubulle@debian.org> (translation coordinator)
 
 and has previously been maintained by:
 
+       Brendan O'Dea <bod@debian.org> (2006-2007)
        Scott James Remnant <scott@netsplit.com> (2004-2005)
        Adam Heath <doogie@brainfood.com> (2001-2003)
        Wichert Akkerman <wakkerma@debian.org> (1999-2003)

diff --git a/ChangeLog b/ChangeLog
index 92f8371f60a21c84a92c079db44694ff447ee2e9..692794fd4d571a1afc794efa60cc675e925ef118 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 2008-03-27  Raphael Hertzog  <hertzog@debian.org>
+            Frank Lichtenheld  <djpig@debian.org>
+            Joey Hess  <joeyh@debian.org>
+            Colin Watson  <cjwatson@debian.org>
 
        * Merge branch 'sourcev3'. It contains an extensive refactoring of
        dpkg-source around many new modules in scripts/Dpkg/Source/.
@@ -54,9 +57,9 @@
        a new patch at the end of the series if changes are present
        at build-time.
        * scripts/Dpkg/Source/Package/V3_0/bzr.pm: Experimental format
-       based on a bzr repository.
+       based on a bzr repository. Contributed by Colin Watson.
        * scripts/Dpkg/Source/Package/V3_0/git.pm: Experimental format
-       based on a git repository.
+       based on a git repository. Contributed by Joey Hess.
        * scripts/Dpkg/Source/Package/V3_0/custom.pm: Special purpose
        format that can be used to create source packages with arbitrary
        files. Useful for helper tools (like git-buildpackage) which can

diff --git a/debian/changelog b/debian/changelog
index 4135f7a890eca987bbce6d9fc466f4f4104373ec..f41ac700f87a308d398f0222b73f3dac6156b2cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,9 +86,9 @@ dpkg (1.14.17) UNRELEASED; urgency=low
     activate. By default, do not activate the warning about useless
     libraries at the binary level (instead the new warning above is activated
     by default: it's less strict and more useful).
-  * Merge of the sourcev3 branch. dpkg-source has been heavily refactored to
-    make it easier to support multiple source package formats. Several new
-    source package formats have been added:
+  * dpkg-source has been heavily refactored to make it easier to support
+    multiple source package formats. Several new source package formats have
+    been added:
     - the format "2.0" is the original wig&pen
     - the format "3.0 (quilt)" is based on 2.0. It uses a tarball for the
       debian directory and can thus include binary files. Binaries
@@ -112,7 +112,8 @@ dpkg (1.14.17) UNRELEASED; urgency=low
       generate the files by themselves in a more efficient way
       (like all the *-buildpackage tools). Closes: #246918
     - the formats "3.0 (git/bzr)" are experimental formats based
-      on corresponding VCS repositories.
+      on corresponding VCS repositories. Thanks to Joey Hess and Colin Watson
+      respectively.
   * dpkg-source has a new --no-check option. It disables GPG check and
     checksums checks. Closes: #220758
 

diff --git a/debian/copyright b/debian/copyright
index 8ea1e6dbbc437e6a67f6b994829ce5a295c173ac..c2a36c7ca48c62db7639ced3a540af5ff901639d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,14 @@
 This is Debian's package maintenance system.
 
-Copyright © 2006-2007 Frank Lichtenheld <djpig@debian.org>
+Copyright © 2006-2008 Frank Lichtenheld <djpig@debian.org>
+Copyright © 2006-2008 Guillem Jover <guillem@debian.org>
+Copyright © 2007-2008 Raphael Hertzog <hertzog@debian.org>
+Copyright © 2007 Colin Watson <cjwatson@debian.org>
 Copyright © 2004-2005 Scott James Remnant <scott@netsplit.com>
 Copyright © 2004-2005 Canonical Ltd.
 Copyright © 1999-2002 Wichert Akkerman <wakkerma@debian.org>
 Copyright © 1999-2001 Marcus Brinkmann <brinkmd@debian.org>
-Copyright © 2001 Joey Hess <joeyh@debian.org>
+Copyright © 2001,2007 Joey Hess <joeyh@debian.org>
 Copyright © 1994-1999 Ian Jackson <ian@chiark.greenend.org.uk>
 Copyright © 1999 Richard Kettlewell <rjk@sfere.greenend.org.uk>
 Copyright © 1999 Ben Collins <bcollins@debian.org>