[pkg-bacula-commits] [SCM] 'Bacula-doc. documentation for bacula.' branch, master, updated. debian/5.2.6-2-5-g90e0e5a

[Alexander Golovko]

The following commit has been merged in the master branch:
commit e343c70ffa17a5c0530517c07189bbe4adc4ba46
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Tue Apr 23 01:59:43 2013 +0400

    switch debian/copyright to DEP-5 format

diff --git a/debian/changelog b/debian/changelog
index 9fec321..767a45d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 bacula-doc (5.2.6-3) unstable; urgency=low
 
-  * Revert bumping standards to 3.9.4.
+  * debian/control:
+    - Revert bumping standards to 3.9.4.
+  * debian/copyright:
+    + Switch to DEP-5 format.
+    + Update license information.
 
  -- Alexander Golovko <alexandro at ankalagon.ru>  Mon, 22 Apr 2013 15:16:22 +0400
 
diff --git a/debian/copyright b/debian/copyright
index d6f279c..621a6ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,31 @@
-This package was debianized by John Goerzen <jgoerzen at complete.org> on
-Mon, 26 Jun 2006 13:32:58 -0500.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Bacula
+Source: http://git.bacula.org/docs
 
-It was downloaded from www.bacula.org
-
-Upstream Author: Kern Sibbald
-
-Copyright: Copyright ©1999-2006, Free Software Foundation Europe e.V.
+Files: *
+Copyright: 1999-2006, Free Software Foundation Europe e.V.
+License: GFDL-1.2
+Comment: Some files can be shipped under other terms, if license info included
+ into files.
 
+Files: techlogs/*
 License:
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2
-published by the Free Software Foundation; with no Invariant Sections,
-no Front-Cover Texts, and no Back-Cover Texts.
-
-On a debian system, the full text of this licence can be found in the
-file /usr/share/common-licenses/GFDL-1.2.
-
--------------------------------------------------------------------
-
-This directory containing the technical logs (techlogs) and
-ReleaseNotes is licensed under the same license used for the
-Bacula Source code, namely a modified GPL version 2.  This
-license applies only to the contents of this directory and does
-not apply to the Bacula "manuals", each of which has its own
-license.
-
-This license can be found at /usr/share/doc/bacula-common/copyright
+ Same as bacula source code.
+ .
+ This license can be found at /usr/share/doc/bacula-common/copyright.
+
+Files: debian/*
+Copyright:
+ 2006-2011, John Goerzen <jgoerzen at complete.org>
+ 2013, Debian Bacula Team <pkg-bacula-devel at lists.alioth.debian.org>
+License: GFDL-1.2
+Comment: There was no license specification for debian/* files at moment of
+ this file creating, so we threat files as licensed under the same license, as
+ upstream.
+
+File: debian/fake-bacula-source/*:
+License:
+ Same as bacula source code.
+ .
+ This license can be found at /usr/share/doc/bacula-common/copyright.
+Comment: This files was directly copied from bacula upstream sources.

-- 
This package provides the documentation for Bacula, a backup program that permits you to manage backup, recovery and verification of computer data across a network of computers of different kinds.