Merge lp:~andrewsomething/ubuntu-packaging-guide/1.0_copyright_format into lp:ubuntu-packaging-guide

[Andrew Starr-Bochicchio]

The machine-parseable debian/copyright format has been officially release in its 1.0 version. This updates the URL and makes the example comply with the accepted spec.

http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

[Daniel Holbach (dholbach)]

Great work!

review: Approve

=== modified file 'debian-dir-overview.rst'
--- debian-dir-overview.rst	2011-11-08 03:08:12 +0000
+++ debian-dir-overview.rst	2012-02-25 16:13:22 +0000
@@ -139,13 +139,19 @@
 example template would be::
 
 
- Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
  Upstream-Name: Hello
  Source: ftp://ftp.example.com/pub/games
  
  Files: *
  Copyright: Copyright 1998 John Doe <[e-mail]>
  License: GPL-2+
+ 
+ Files: debian/*
+ Copyright: Copyright 1998 Jane Doe <[e-mail]>
+ License: GPL-2+
+ 
+ License: GPL-2+
   This program is free software; you can redistribute it
   and/or modify it under the terms of the GNU General Public
   License as published by the Free Software Foundation; either
@@ -167,13 +173,9 @@
   License version 2 can be found in the file
   `/usr/share/common-licenses/GPL-2'.
  
- Files: debian/*
- Copyright: Copyright 1998 Jane Doe <[e-mail]>
- License: GPL-2+
- 
-This example follows the `DEP-5: Machine-parseable debian/copyright 
-<http://dep.debian.net/deps/dep5/>`_ proposal. You are encouraged to use this 
-format as well.
+This example follows the `Machine-readable debian/copyright 
+<http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/>`_ format.
+You are encouraged to use this format as well.
 
 
 The rules file