[SCM] Java port of Oniguruma regexp library branch, master, updated. debian/1.1.4-2-9-g2f48cf2
Hideki Yamane
henrich at debian.org
Tue May 7 10:52:48 UTC 2013
The following commit has been merged in the master branch:
commit c6f13203230083b82e578883edda2fb6ee2843a3
Merge: 165776108955ecd8ea887018122a1eaa6b83b0fe 1974bf5c7e9fa576bbac00fc88bb6507c1fc3285
Author: Hideki Yamane <henrich at debian.org>
Date: Sat Jul 21 08:54:04 2012 +0900
Imported Debian patch 1.1.7+git20120721-1
diff --combined 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 <henrich at debian.org> 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 <drazzib at debian.org> 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 <twerner at debian.org> Sun, 01 Aug 2010 22:16:34 +0200
+
+jruby-joni (1.1.3-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Hideki Yamane (Debian-JP) <henrich at debian.or.jp> Fri, 19 Mar 2010 10:32:00 +0900
diff --combined 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 <pkg-java-maintainers at lists.alioth.debian.org>
- Uploaders: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>,
++Uploaders: Hideki Yamane <henrich at debian.org>,
+ Torsten Werner <twerner at debian.org>
+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 --combined 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 <tom.enebo at gmail.com>
+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 <tom.enebo at gmail.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)
-
- 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.
+
diff --combined 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 --combined 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 --combined 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 --combined 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
--
Java port of Oniguruma regexp library
More information about the pkg-java-commits
mailing list