The following commit has been merged in the master branch: commit 0d36c04db41b9813f6de84c02d47830f93c3febb Author: Miguel Landaeta <mig...@miguel.cc> Date: Sat Oct 22 15:47:55 2011 -0430
Make copyright file DEP-5 compliant diff --git a/debian/changelog b/debian/changelog index c4870de..95aa723 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ omegat-plugin-tokenizer (0.4.2+dfsg-2) UNRELEASED; urgency=low * Team upload. * Switch to default-jdk. (Closes: #643539). * Add missing Build-Depends on liblucene2-java. + * Make copyright file DEP-5 compliant. -- Miguel Landaeta <mig...@miguel.cc> Sat, 22 Oct 2011 15:24:14 -0430 diff --git a/debian/copyright b/debian/copyright index 68348dd..6888189 100644 --- a/debian/copyright +++ b/debian/copyright @@ -15,15 +15,15 @@ License: GPL-3+ it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>. - + . On Debian systems, the full text of the GNU General Public License version 3 can be found in the file `/usr/share/common-licenses/GPL-3'. @@ -33,12 +33,12 @@ License: Apache-2 may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - + . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + . On Debian systems, the full text of the Apache License version 2.0 can be found in the file '/usr/share/common-licenses/Apache-2.0'. -- omegat-plugin-tokenizer packaging _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits