[DRE-commits] [SCM] ruby-mecab.git branch, master, updated. debian/0.98-5-15-g31f5369
TANIGUCHI Takaki
takaki at asis.media-as.org
Sat Mar 31 10:36:50 UTC 2012
The following commit has been merged in the master branch:
commit 79f3accbfd0a68a8a5223a8669e6c91dbf130007
Merge: 6d2d1ac446bba8d4aa6645a2b1594caefac8c331 39a6e4678fa5028db5eacd3dfc78156d12c4c8af
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date: Sat Mar 31 18:55:57 2012 +0900
debian/copyright: Update copyright-format URI
diff --combined debian/copyright
index a5d34e4,a5d34e4..215b7ff
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,26 -1,26 +1,25 @@@
--Format: http://dep.debian.net/deps/dep5
--Upstream-Name: ruby-mecab
--Source: http://sourceforge.net/projects/mecab/
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: MeCab
++Upstream-Contact: Taku Kudo <taku at chasen.org>
++Source: https://code.google.com/p/mecab/downloads/list
--Files: *
--Copyright: 2001-2008, Taku Kudo
++Files: *
++Copyright: 2001-2008, Taku Kudo <taku at chasen.org>
2004-2008, Nippon Telegraph and Telephone Corporation
--License: BSD-3-clause or GPL-2 or LGPL-2.1
--
++License: GPL-2+ or LGPL-2+ or BSD-3-clause
Files: debian/*
--Copyright: 2009-2011 TANIGUCHI Takaki <takaki at debian.org>
--License: BSD-3-clause or GPL-2 or LGPL-2.1
--
++Copyright: 2009-2012, TANIGUCHI Takaki <takaki at debian.org>
++License: GPL-2+ or LGPL-2+ or BSD-3-clause
License: BSD-3-clause
-- Redistribution and use in source and binary forms, with or without modification, are
-- permitted provided that the following conditions are met:
++ Redistribution and use 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
@@@ -30,7 -30,7 +29,7 @@@
nor the names of its contributors may 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 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
@@@ -40,45 -40,45 +39,21 @@@
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--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.
-- .
-- 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 package; if not, write to the Free
-- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-- Boston, MA 02110-1301 USA
-- .
-- On Debian systems, the full text of the GNU General Public
-- License version 2 can be found in the file
-- `/usr/share/common-licenses/GPL-2'.
--
--License: LGPL-2.1
-- This program is free software; you can redistribute it
-- and/or modify it under the terms of the Lesser GNU General Public
-- License as published by the Free Software Foundation; either
-- version 2 of the License.
-- .
-- 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.
++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, or (at your option)
++ any later version.
.
-- You should have received a copy of the Lesser GNU General Public
-- License along with this package; if not, write to the Free
-- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-- Boston, MA 02110-1301 USA
++ On Debian systems, the complete text of version 2 of the GNU General
++ Public License can be found in `/usr/share/common-licenses/GPL-2'.
++
++License: LGPL-2+
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as published
++ by the Free Software Foundation; either version 2, or (at your option)
++ any later version.
.
-- On Debian systems, the full text of the GNU General Public
-- License version 2.1 can be found in the file
-- `/usr/share/common-licenses/LGPL-2.1'.
++ On Debian systems, the complete text of version 2 of the GNU Lesser General
++ Public License can be found in `/usr/share/common-licenses/LGPL-2'.
diff --combined debian/watch
index 1f00ac6,f3d756c..2947bcb
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,29 +1,4 @@@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
- opts="uversionmangle=s/pre/~pre/;s/rc/~rc/" \
- http://googlecode.debian.net/p/mecab/mecab-ruby-(.*)\.tar\.gz
-
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php libmecab-ruby-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/libmecab-ruby-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/libmecab-ruby-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for devscripts >= 2.9
-# http://sf.net/libmecab-ruby/libmecab-ruby-(.*)\.tar\.gz
-#opts="uversionmangle=s/pre/~pre/;s/rc/~rc/" \
-# http://sf.net/mecab/mecab-ruby-(.*)\.tar\.gz
-
-# Uncomment to find new files on GooglePages
-# http://example.googlepages.com/foo.html libmecab-ruby-(.*)\.tar\.gz
-
-# Use google code repository
-opts="uversionmangle=s/pre/~pre/;s/rc/~rc/" \
- http://code.google.com/p/mecab/downloads/list?can=1 .*/mecab-ruby-(.*)\.tar\.gz
++opts="uversionmangle=s/pre/~pre/;s/rc/~rc/;s/(\d+)\.(\d\d)(\d+)$/$1.$2.$3/" \
++ http://code.google.com/p/mecab/downloads/list?can=1 \
++ .*/mecab-perl-v?(\d[\d\.-]+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
--
ruby-mecab.git
More information about the Pkg-ruby-extras-commits
mailing list