This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch debian/sid in repository jruby-joni.
commit c6f13203230083b82e578883edda2fb6ee2843a3 Merge: 1657761 1974bf5 Author: Hideki Yamane <[email protected]> Date: Sat Jul 21 08:54:04 2012 +0900 Imported Debian patch 1.1.7+git20120721-1 .gitignore | 1 + .travis.yml | 6 + MANIFEST.MF | 2 +- debian/changelog | 24 + debian/control | 6 +- debian/copyright | 35 +- debian/libjruby-joni-java.lintian-overrides | 1 + debian/orig-tar.sh | 2 +- debian/patches/build.xml-jcoding.patch | 15 +- debian/watch | 2 +- pom.xml | 14 +- src/org/joni/Analyser.java | 982 ++++++------- src/org/joni/ApplyCaseFold.java | 37 +- src/org/joni/ApplyCaseFoldArg.java | 24 +- src/org/joni/ArrayCompiler.java | 358 ++--- src/org/joni/AsmCompiler.java | 26 +- src/org/joni/AsmCompilerSupport.java | 44 +- src/org/joni/BitSet.java | 40 +- src/org/joni/BitStatus.java | 30 +- src/org/joni/ByteCodeMachine.java | 650 +++++---- src/org/joni/ByteCodePrinter.java | 194 ++- src/org/joni/CaptureTreeNode.java | 36 +- src/org/joni/CodeRangeBuffer.java | 146 +- src/org/joni/Compiler.java | 66 +- src/org/joni/Config.java | 60 +- src/org/joni/Lexer.java | 1440 +++++++++----------- src/org/joni/Matcher.java | 157 ++- src/org/joni/MatcherFactory.java | 22 +- src/org/joni/MinMaxLen.java | 82 +- src/org/joni/NameEntry.java | 40 +- src/org/joni/NativeMachine.java | 22 +- src/org/joni/NodeOptInfo.java | 54 +- src/org/joni/OptAnchorInfo.java | 42 +- src/org/joni/OptEnvironment.java | 24 +- src/org/joni/OptExactInfo.java | 107 +- src/org/joni/OptMapInfo.java | 56 +- src/org/joni/Option.java | 80 +- src/org/joni/Parser.java | 492 +++---- src/org/joni/Regex.java | 136 +- src/org/joni/Region.java | 36 +- src/org/joni/ScanEnvironment.java | 46 +- src/org/joni/ScannerSupport.java | 88 +- src/org/joni/SearchAlgorithm.java | 274 ++-- src/org/joni/StackEntry.java | 44 +- src/org/joni/StackMachine.java | 146 +- src/org/joni/Syntax.java | 382 +++--- src/org/joni/Token.java | 24 +- src/org/joni/UnsetAddrList.java | 34 +- src/org/joni/WarnCallback.java | 35 +- src/org/joni/{NativeMachine.java => Warnings.java} | 31 +- src/org/joni/ast/AnchorNode.java | 44 +- src/org/joni/ast/AnyCharNode.java | 32 +- src/org/joni/ast/BackRefNode.java | 54 +- src/org/joni/ast/CClassNode.java | 221 +-- src/org/joni/ast/CTypeNode.java | 36 +- src/org/joni/ast/CallNode.java | 46 +- src/org/joni/ast/ConsAltNode.java | 65 +- src/org/joni/ast/EncloseNode.java | 76 +- src/org/joni/ast/Node.java | 73 +- src/org/joni/ast/QuantifierNode.java | 106 +- src/org/joni/ast/StateNode.java | 154 +-- src/org/joni/ast/StringNode.java | 98 +- src/org/joni/bench/AbstractBench.java | 4 +- src/org/joni/constants/AnchorType.java | 32 +- src/org/joni/constants/Arguments.java | 26 +- src/org/joni/constants/AsmConstants.java | 22 +- src/org/joni/constants/CCSTATE.java | 22 +- src/org/joni/constants/CCVALTYPE.java | 22 +- src/org/joni/constants/EncloseType.java | 24 +- src/org/joni/constants/MetaChar.java | 26 +- src/org/joni/constants/NodeStatus.java | 22 +- src/org/joni/constants/NodeType.java | 32 +- src/org/joni/constants/OPCode.java | 50 +- src/org/joni/constants/OPSize.java | 29 +- src/org/joni/constants/Reduce.java | 37 +- src/org/joni/constants/RegexState.java | 22 +- src/org/joni/constants/StackPopLevel.java | 22 +- src/org/joni/constants/StackType.java | 22 +- src/org/joni/constants/StringType.java | 22 +- src/org/joni/constants/SyntaxProperties.java | 28 +- src/org/joni/constants/TargetInfo.java | 22 +- src/org/joni/constants/TokenType.java | 22 +- src/org/joni/constants/Traverse.java | 22 +- src/org/joni/exception/ErrorMessages.java | 30 +- src/org/joni/exception/InternalException.java | 24 +- src/org/joni/exception/JOniException.java | 22 +- src/org/joni/exception/SyntaxException.java | 22 +- src/org/joni/exception/ValueException.java | 28 +- test/org/joni/test/Test.java | 88 +- test/org/joni/test/TestA.java | 60 +- test/org/joni/test/TestC.java | 54 +- test/org/joni/test/TestCornerCases.java | 28 +- test/org/joni/test/TestCrnl.java | 30 +- test/org/joni/test/TestJoni.java | 40 +- .../org/joni/test/TestLookBehind.java | 69 +- test/org/joni/test/TestNSU8.java | 32 +- test/org/joni/test/TestU.java | 114 +- test/org/joni/test/TestU8.java | 84 ++ 98 files changed, 4656 insertions(+), 4299 deletions(-) diff --cc debian/changelog index daadfe7,0000000..5f3a794 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,27 -1,0 +1,51 @@@ ++jruby-joni (1.1.7+git20120721-1) experimental; urgency=low ++ ++ * Team upload. ++ * New upstream release ++ * debian/control ++ - update my email address ++ - set "Standards-Version: 3.9.3" ++ - update "Depends: libjcodings-java (>= 1.0.9-1)" since newer jcodings ++ version is required ++ * debian/watch ++ - watch "tags", not master branch ++ * debian/orig-tar.sh ++ - put file to appropriate path ++ * debian/copyright ++ - fix and update to copyright-format 1.0 ++ * debian/patches ++ - update build.xml-jcoding.patch file to fix lintian warning ++ "missing-classpath libjcodings-java, libasm3-java" ++ * debian/libjruby-joni-java.lintian-overrides ++ - add it to ignore warning, jruby libraries are put into under ++ /usr/lib/jruby/lib/ ++ ++ -- Hideki Yamane <[email protected]> Sat, 21 Jul 2012 08:54:04 +0900 ++ +jruby-joni (1.1.4-2) unstable; urgency=low + + * Team upload. + * d/control: Add default-jdk to Build-Depends (Closes: #593017) + * d/control: Add Depends on libjcodings-java, libasm3-java + + -- Damien Raude-Morvan <[email protected]> Sat, 09 Oct 2010 12:37:01 +0200 + +jruby-joni (1.1.4-1) unstable; urgency=low + + * New upstream release + * Add myself to Uploaders. + * Remove Build-Depends: quilt and the file debian/README.source. + * Update Build-Depends: libjcodings-java. + * Fix debian/watch and add get-orig-source target. + * Push package to git and add Vcs headers. + * Set Maintainer to Debian Java Maintainers. + * Improve long description. + * Correct the copyright file. + + -- Torsten Werner <[email protected]> Sun, 01 Aug 2010 22:16:34 +0200 + +jruby-joni (1.1.3-1) unstable; urgency=low + + * Initial release + + -- Hideki Yamane (Debian-JP) <[email protected]> Fri, 19 Mar 2010 10:32:00 +0900 diff --cc debian/control index f9c7232,0000000..67aaaf7 mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,21 -1,0 +1,21 @@@ +Source: jruby-joni +Section: java +Priority: extra +Maintainer: Debian Java Maintainers <[email protected]> - Uploaders: Hideki Yamane (Debian-JP) <[email protected]>, ++Uploaders: Hideki Yamane <[email protected]>, + Torsten Werner <[email protected]> +Build-Depends: debhelper (>= 7), default-jdk +Build-Depends-Indep: ant, libjcodings-java, libasm3-java - Standards-Version: 3.8.4 ++Standards-Version: 3.9.3 +Homepage: http://github.com/jruby/joni/ +Vcs-Git: git://git.debian.org/pkg-java/jruby-joni.git +Vcs-Browser: http://git.debian.org/?p=pkg-java/jruby-joni.git + +Package: libjruby-joni-java +Architecture: all - Depends: ${misc:Depends}, libjcodings-java, libasm3-java ++Depends: ${misc:Depends}, libjcodings-java (>= 1.0.9-1), libasm3-java +Description: Java port of Oniguruma regexp library + Oniguruma is a regular expressions library. The characteristics of this + library is that different character encoding for every regular expression + object can be specified. The supported APIs are GNU regex, POSIX, and Oniguruma + native. diff --cc debian/copyright index ec1d669,0000000..a7103c3 mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,32 -1,0 +1,49 @@@ - Format-Specification: http://dep.debian.net/deps/dep5/ - Name: jony - Maintainer: Thomas E. Enebo ++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: joni ++Upstream-Contact: Thomas E. Enebo <[email protected]> +Source: http://github.com/jruby/joni/ + - Copyright: 2008-2010 Marcin Mielżyński - 2008-2010 Thomas E. Enebo - License: other (MIT/X11) ++Files: * ++Copyright: 2008-2012 Marcin Mielżyński ++ 2008-2012 Thomas E. Enebo <[email protected]> ++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 <[email protected]> - License: other (MIT/X11) - - License: other (MIT/X11) ++ 2012 Hideki Yamane <[email protected]> ++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. + diff --cc debian/libjruby-joni-java.lintian-overrides index 0000000,0000000..9d629e0 new file mode 100644 --- /dev/null +++ b/debian/libjruby-joni-java.lintian-overrides @@@ -1,0 -1,0 +1,1 @@@ ++libjruby-joni-java: jar-not-in-usr-share usr/lib/jruby/lib/joni.jar diff --cc debian/orig-tar.sh index 6f9f5fc,0000000..2a8ddb9 mode 100755,000000..100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@@ -1,14 -1,0 +1,14 @@@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> + +SOURCE=jruby-joni +DIR=${SOURCE}-$2 + +git clone http://github.com/jruby/joni.git $DIR +(cd $DIR && git checkout $2) + - tar cfz ${SOURCE}_$2.orig.tar.gz --exclude .git $DIR ++tar cfz ../${SOURCE}_$2.orig.tar.gz --exclude .git $DIR + +rm -rf $DIR ../$2 +echo 'created orig tarball successfully' diff --cc debian/patches/build.xml-jcoding.patch index 40d9875,0000000..9701f65 mode 100644,000000..100644 --- a/debian/patches/build.xml-jcoding.patch +++ b/debian/patches/build.xml-jcoding.patch @@@ -1,18 -1,0 +1,27 @@@ - Index: jruby-joni-1.1.3/build.xml ++Index: jruby-joni-1.1.7+git20120721/build.xml +=================================================================== - --- jruby-joni-1.1.3.orig/build.xml 2010-03-19 10:58:05.181454419 +0900 - +++ jruby-joni-1.1.3/build.xml 2010-03-19 10:58:52.441454788 +0900 ++--- jruby-joni-1.1.7+git20120721.orig/build.xml 2012-07-21 08:51:49.000000000 +0900 +++++ jruby-joni-1.1.7+git20120721/build.xml 2012-07-21 10:53:03.087135796 +0900 +@@ -14,7 +14,12 @@ + + <target name="compile"> + <mkdir dir="${bin.dir}" /> +- <javac srcdir="${src.dir}" destdir="${bin.dir}"/> ++ <javac srcdir="${src.dir}" destdir="${bin.dir}"> ++ <classpath> ++ <pathelement location="/usr/share/java/jcodings.jar" /> ++ <pathelement location="/usr/share/java/asm3.jar" /> ++ </classpath> ++ </javac> + </target> + + <target name="build" depends="compile"> ++@@ -32,6 +37,8 @@ ++ <attribute name="Built-By" value="${user.name}" /> ++ <attribute name="Built-Date" value="${buildDate}" /> ++ <attribute name="Built-Time" value="${buildTime}" /> +++ <attribute name="Class-Path" value="/usr/share/java/jcodings.jar +++ /usr/share/java/asm3.jar" /> ++ </manifest> ++ </jar> ++ diff --cc debian/watch index cd1ea49,0000000..5467399 mode 100644,000000..100644 --- a/debian/watch +++ b/debian/watch @@@ -1,3 -1,0 +1,3 @@@ +version=3 - http://github.com/jruby/joni/downloads \ ++http://github.com/jruby/joni/tags \ + /jruby/joni/tarball/(.*) debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
