The following commit has been merged in the master branch:
commit 63976bf5f660eef5371d63b117b2396e70e9e76d
Author: Alexandre Rossi <[email protected]>
Date: Thu May 23 15:33:18 2013 +0200
migrate debian/copyright to DEP-5
diff --git a/debian/copyright b/debian/copyright
index 32c80d8..8c3c9f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,38 +1,28 @@
-This work was packaged for Debian by:
-
- Alexandre Rossi <[email protected]> in May 2011
-
-It was downloaded from:
-
- <http://htmlcleaner.sourceforge.net/>
-
-Upstream Author(s):
-
- Vladimir Nikic <[email protected]>
-
-Copyright:
-
- Copyright (C) 2006-2010, Vladimir Nikic <[email protected]>
-
-License:
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: htmlcleaner
+Upstream-Contact: Vladimir Nikic <[email protected]>
+Source: http://htmlcleaner.sourceforge.net
+
+Files: *
+Copyright: 2006-2010 Vladimir Nikic
+Licence: BSD htmlcleaner
Redistribution and use of this software in source and binary forms,
with or without modification, are permitted provided that the following
conditions are met:
-
+ .
* Redistributions of source code must retain the above
copyright notice, this list of conditions and the
following disclaimer.
-
+ .
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the
following disclaimer in the documentation and/or other
materials provided with the distribution.
-
+ .
* The name of HtmlCleaner may not be used to endorse or promote
products derived from this software without specific prior
written permission.
-
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -45,8 +35,6 @@ License:
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-The Debian packaging is:
-
- Copyright (C) 2011 Alexandre Rossi <[email protected]>
-
-and is licensed under the GPL version 2, see
"/usr/share/common-licenses/GPL-2".
+Files: debian/*
+Copyright: 2011 Alexandre Rossi
+Licence: GPL-2
--
libhtmlcleaner-java packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
