[SCM] templates for different package types branch, master, updated. b4bc88856635801db61ca0569f92396cdf8cc34e

[Miriam Ruiz]

The following commit has been merged in the master branch:
commit b4bc88856635801db61ca0569f92396cdf8cc34e
Author: Miriam Ruiz <miriam at debian.org>
Date:   Fri Sep 11 00:16:49 2009 +0200

    Added Apache2 License

diff --git a/license/other b/license/Apache2
similarity index 58%
copy from license/other
copy to license/Apache2
index dcb267c..edd6b4b 100644
--- a/license/other
+++ b/license/Apache2
@@ -8,10 +8,15 @@ Files: *
 Copyright: Copyright (C) YYYY OWNER 1 OF COPYRIGHT
  Copyright (C) YYYY OWNER 2 OF COPYRIGHT
  Copyright (C) YYYY OWNER 3 OF COPYRIGHT
-Licence: other
- TEXT OF THE LICENSE
+Licence: Apache-2.0
 
 Files: debian/*
 Copyright: Copyright (C) %NOW_YEAR%, %DEBNAME% <%DEBEMAIL%>
-Licence: other
- The Debian packaging is licensed under the same license as the program.
+Licence: Apache-2.0
+
+Licence: Apache-2.0
+ This program is is licensed under the Apache Licence, Version 2.0.
+ You may not use this work except in compliance with that license.
+ .
+ The complete text of the Apache Licence, Version 2.0 can be
+ found in `/usr/share/common-licenses/Apache-2.0'.

-- 
templates for different package types