Author: nomadium-guest Date: 2011-09-29 16:08:14 +0000 (Thu, 29 Sep 2011) New Revision: 15115
Modified: trunk/httpunit/debian/changelog trunk/httpunit/debian/copyright Log: Make copyright file DEP-5 compliant Modified: trunk/httpunit/debian/changelog =================================================================== --- trunk/httpunit/debian/changelog 2011-09-29 15:51:11 UTC (rev 15114) +++ trunk/httpunit/debian/changelog 2011-09-29 16:08:14 UTC (rev 15115) @@ -2,6 +2,7 @@ * Update maven metadata about jtidy dependency. (Closes: #643749). * Fix minor lintian warnings about control file. + * Make copyright file DEP-5 compliant. -- Miguel Landaeta <mig...@miguel.cc> Thu, 29 Sep 2011 07:37:34 -0430 Modified: trunk/httpunit/debian/copyright =================================================================== --- trunk/httpunit/debian/copyright 2011-09-29 15:51:11 UTC (rev 15114) +++ trunk/httpunit/debian/copyright 2011-09-29 16:08:14 UTC (rev 15115) @@ -1,10 +1,10 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=440 +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173 Upstream-Name: httpunit -Upstream-Maintainer: Russell Gold <russg...@httpunit.org> -Upstream-Source: http://httpunit.org/ +Upstream-Contact: Russell Gold <russg...@httpunit.org> +Source: http://httpunit.org/ Files: * -Copyright: Copyright 2000-2008, Russell Gold <russg...@httpunit.org> +Copyright: © 2000-2008, Russell Gold <russg...@httpunit.org> License: other Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -12,10 +12,10 @@ 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 @@ -25,7 +25,7 @@ SOFTWARE. Files: examples/GoogleMapsExample.java -Copyright: Copyright 2008, Wolfgang Fahl, BITPlan GmbH (http://www.bitplan.com) +Copyright: © 2008, Wolfgang Fahl, BITPlan GmbH (http://www.bitplan.com) License: other Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -33,10 +33,10 @@ 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 @@ -46,8 +46,22 @@ SOFTWARE. Files: debian/* -Copyright: © 2009-2010, Miguel Landaeta <mig...@miguel.cc>, - © 2010, Gabriele Giacone <1o5g4...@gmail.com> +Copyright: © 2009-2011, Miguel Landaeta <mig...@miguel.cc>, + © 2010, Gabriele Giacone <1o5g4...@gmail.com> 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 version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . On Debian systems the full text of the GNU General Public License can be found in the `/usr/share/common-licenses/GPL-2' file. _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits