[SCM] jsoup HTML parser branch, master, updated. debian/1.6.1-2-6-g48f7f10

Jakub Adam jakub.adam at ktknet.cz
Mon Mar 26 21:22:43 UTC 2012


The following commit has been merged in the master branch:
commit 484e08094fb23f3de086c4871020968513eb2008
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Mar 25 22:11:42 2012 +0200

    Fixed syntax-error-in-dep5-copyright lintian warning

diff --git a/debian/changelog b/debian/changelog
index 1643eec..4116cbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jsoup (1.6.1-3) UNRELEASED; urgency=low
   * Add OSGi metadata to JAR manifest.
   * Add Jakub Adam to Uploaders.
   * Update Standards-Version to 3.9.3.
+  * Fixed syntax-error-in-dep5-copyright lintian warning.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 25 Mar 2012 21:32:27 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 99a40ba..460c9d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
 Upstream-Name: jsoup
-Upstream-Contact:  Jonathan Hedley <jonathan at hedley.net> as Lead Developer 
+Upstream-Contact: Jonathan Hedley <jonathan at hedley.net> as Lead Developer
 Source: http://jsoup.org/
 
 Files: *
@@ -9,24 +9,24 @@ License: MIT
 
 Files: debian/*
 Copyright: 2011, Torsten Werner <Torsten Werner <twerner at debian.org>>
+           2012, Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 License: MIT
 
 License: MIT
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.

-- 
jsoup HTML parser



More information about the pkg-java-commits mailing list