[SCM] Java-based codings helper classes for Joni and JRuby branch, master, updated. debian/1.0.4-1-6-gf8b902e

[Hideki Yamane]

The following commit has been merged in the master branch:
commit a81a564af93c09dd5ae26adc8f98ec8aec80c216
Merge: 0a9689f9fdd6d75e760d1ff6c6641f7951a4a03b ffde15f4fd99719257892ef802e7def8103644f9
Author: Hideki Yamane <henrich at debian.org>
Date:   Sat Jul 21 09:30:19 2012 +0900

    Imported Debian patch 1.0.9-1

diff --combined debian/changelog
index f948d56,0000000..fdcc927
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,0 +1,21 @@@
- jcodings (1.0.4-1.1) UNRELEASED; urgency=low
++jcodings (1.0.9-1) experimental; urgency=low
 +
-   * Non-maintainer upload.
++  * Team upload.
++  * New upstream release
++  * debian/control
++    - set "Standards-Version: 3.9.3"
 +  * debian/watch
 +    - fix to watch tags
 +  * debian/orig-tar.sh
 +    - create tarball in parent directory
++  * debian/copyright
++    - fix and update to copyright-format 1.0
 +
-  -- Hideki Yamane <henrich at debian.org>  Sat, 21 Jul 2012 09:14:59 +0900
++ -- Hideki Yamane <henrich at debian.org>  Sat, 21 Jul 2012 09:30:19 +0900
 +
 +jcodings (1.0.4-1) unstable; urgency=low
 +
 +  * Initial Release (closes: #590913).
 +    - The package is needed for JRuby.
 +
 + -- Torsten Werner <twerner at debian.org>  Fri, 30 Jul 2010 04:32:11 +0200
diff --combined debian/control
index 9bd37b5,0000000..27582d5
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,17 @@@
 +Source: jcodings
 +Section: java
 +Priority: optional
 +Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 +Uploaders: Torsten Werner <twerner at debian.org>
 +Build-Depends: debhelper (>= 7), cdbs, maven-repo-helper
 +Build-Depends-Indep: ant, default-jdk
- Standards-Version: 3.9.0
++Standards-Version: 3.9.3
 +Vcs-Git: git://git.debian.org/pkg-java/jcodings.git
 +Vcs-Browser: http://git.debian.org/?p=pkg-java/jcodings.git
 +Homepage: http://github.com/jruby/jcodings
 +
 +Package: libjcodings-java
 +Architecture: all
 +Depends: ${misc:Depends}
 +Description: Java-based codings helper classes for Joni and JRuby
 + Jcodings is a Java library for handling JRuby string encodings.
diff --combined debian/copyright
index 63acb2d,0000000..b897871
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,47 -1,0 +1,50 @@@
- Format-Specification: http://dep.debian.net/deps/dep5/
- Name: JCodings
- Maintainer: Thomas E. Enobo
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: JCodings
++Upstream-Contact: Thomas E. Enobo
 +Source: http://github.com/jruby/jcodings
 +
- Copyright: 2008-2010 Marcin Mielżyński
-            2008-2010 Thomas E. Enobo
- License: other (MIT/X11)
++Files: *
++Copyright: 2008-2012 Marcin Mielżyński
++           2008-2010 Thomas E. Enobo <tom.enebo at gmail.com>
++           2009-2011 Charles Oliver Nutter <headius at headius.com>
++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.
 +
 +Files: debian/*
 +Copyright: 2010 Torsten Werner <twerner at debian.org>
- License: other (MIT/X11)
++           2012 Hideki Yamane <henrich at debian.org>
++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.
 +

-- 
Java-based codings helper classes for Joni and JRuby