This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch master in repository jcodings.
commit 3043478fb3c848269149277fc65051291e04614f Merge: 001fa8d 77dec83 Author: Hideki Yamane <[email protected]> Date: Sun Dec 15 22:35:49 2013 +0900 Imported Debian patch 1.0.11-1 .gitignore | 1 + README.md | 8 + debian/{README.source => README.Debian-source} | 0 debian/ant.properties | 6 + debian/changelog | 17 +-- debian/compat | 2 +- debian/control | 10 +- debian/libjcodings-java.poms | 28 ---- debian/maven.ignoreRules | 3 - debian/maven.rules | 2 - debian/orig-tar.sh | 12 ++ debian/rules | 7 +- debian/watch | 2 +- pom.xml | 54 ++----- resources/tables/Transcoder_Big5_ByteArray.bin | Bin 133967 -> 0 bytes resources/tables/Transcoder_Big5_WordArray.bin | Bin 436952 -> 0 bytes resources/tables/Transcoder_Chinese_ByteArray.bin | Bin 46111 -> 0 bytes resources/tables/Transcoder_Chinese_WordArray.bin | Bin 130828 -> 0 bytes .../Transcoder_EmojiIso2022Kddi_ByteArray.bin | Bin 26506 -> 0 bytes .../Transcoder_EmojiIso2022Kddi_WordArray.bin | Bin 76416 -> 0 bytes .../Transcoder_EmojiSjisDocomo_ByteArray.bin | Bin 27222 -> 0 bytes .../Transcoder_EmojiSjisDocomo_WordArray.bin | Bin 84716 -> 0 bytes .../tables/Transcoder_EmojiSjisKddi_ByteArray.bin | Bin 27420 -> 0 bytes .../tables/Transcoder_EmojiSjisKddi_WordArray.bin | Bin 88680 -> 0 bytes .../Transcoder_EmojiSjisSoftbank_ByteArray.bin | Bin 27222 -> 0 bytes .../Transcoder_EmojiSjisSoftbank_WordArray.bin | Bin 84716 -> 0 bytes resources/tables/Transcoder_Emoji_ByteArray.bin | Bin 15572 -> 0 bytes resources/tables/Transcoder_Emoji_WordArray.bin | Bin 24072 -> 0 bytes resources/tables/Transcoder_Escape_ByteArray.bin | Bin 1059 -> 0 bytes resources/tables/Transcoder_Escape_WordArray.bin | Bin 84 -> 0 bytes resources/tables/Transcoder_Gb18030_ByteArray.bin | Bin 56186 -> 0 bytes resources/tables/Transcoder_Gb18030_WordArray.bin | Bin 115588 -> 0 bytes resources/tables/Transcoder_Gbk_ByteArray.bin | Bin 6260 -> 0 bytes resources/tables/Transcoder_Gbk_WordArray.bin | Bin 182924 -> 0 bytes resources/tables/Transcoder_Iso2022_ByteArray.bin | Bin 1249 -> 0 bytes resources/tables/Transcoder_Iso2022_WordArray.bin | Bin 280 -> 0 bytes .../tables/Transcoder_JapaneseEuc_ByteArray.bin | Bin 53786 -> 0 bytes .../tables/Transcoder_JapaneseEuc_WordArray.bin | Bin 179452 -> 0 bytes .../tables/Transcoder_JapaneseSjis_ByteArray.bin | Bin 39406 -> 0 bytes .../tables/Transcoder_JapaneseSjis_WordArray.bin | Bin 104512 -> 0 bytes resources/tables/Transcoder_Japanese_ByteArray.bin | Bin 899 -> 0 bytes resources/tables/Transcoder_Japanese_WordArray.bin | Bin 144 -> 0 bytes resources/tables/Transcoder_Korean_ByteArray.bin | Bin 40459 -> 0 bytes resources/tables/Transcoder_Korean_WordArray.bin | Bin 196872 -> 0 bytes .../tables/Transcoder_SingleByte_ByteArray.bin | Bin 25194 -> 0 bytes .../tables/Transcoder_SingleByte_WordArray.bin | Bin 49212 -> 0 bytes resources/tables/Transcoder_Utf1632_ByteArray.bin | Bin 1292 -> 0 bytes resources/tables/Transcoder_Utf1632_WordArray.bin | Bin 428 -> 0 bytes resources/tables/Transcoder_Utf8Mac_ByteArray.bin | Bin 9974 -> 0 bytes resources/tables/Transcoder_Utf8Mac_WordArray.bin | Bin 23224 -> 0 bytes src/org/jcodings/unicode/UnicodeEncoding.java | 169 +++++++++++---------- 51 files changed, 149 insertions(+), 172 deletions(-) diff --cc debian/README.Debian-source index 6dd29c2,0000000..6dd29c2 mode 100644,000000..100644 --- a/debian/README.Debian-source +++ b/debian/README.Debian-source diff --cc debian/ant.properties index 0000000,0000000..c13a929 new file mode 100644 --- /dev/null +++ b/debian/ant.properties @@@ -1,0 -1,0 +1,6 @@@ ++# Ensure that source and target are 1.6 ++# For backwards compat on Java 7 ++# see https://lists.debian.org/debian-java/2012/12/msg00026.html ++# ++ant.build.javac.source=1.6 ++ant.build.javac.target=1.6 diff --cc debian/changelog index 67da9a7,0000000..3981876 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,64 -1,0 +1,57 @@@ - jcodings (1.0.10-2) unstable; urgency=medium - - [ Emmanuel Bourg ] - * Team upload. - * Build with Maven instead of Ant - * Switch to debhelper level 9 - * debian/control: - - Standards-Version updated to 3.9.5 (no changes) - - Use canonical URLs for the Vcs-* fields - * Removed the unused debian/orig-tar.sh script - * Renamed debian/README.Debian-source to README.source - - -- Hideki Yamane <[email protected]> Mon, 13 Jan 2014 23:02:32 +0900 ++jcodings (1.0.11-1) unstable; urgency=medium ++ ++ * New upstream release ++ * fix debian/watch ++ ++ -- Hideki Yamane <[email protected]> Sun, 15 Dec 2013 22:35:49 +0900 + +jcodings (1.0.10-1) unstable; urgency=low + + * New upstream release + * debian/watch + - deal with upstream's change + + -- Hideki Yamane <[email protected]> Tue, 04 Jun 2013 20:31:31 +0900 + +jcodings (1.0.9-3) unstable; urgency=low + + * Upload to unstable + * debian/control + - add myself to Uploaders + + -- Hideki Yamane <[email protected]> Tue, 07 May 2013 13:21:57 +0900 + +jcodings (1.0.9-2) experimental; urgency=low + + * Team upload. + * debian/rules + - use debian/ant.properties to specify version to avoid incompatible + java bytecode format with OpenJDK 7 issue (LP: #1049779) + * add debian/ant.properties + - use "ant.build.javac.{source,target}=1.6" + * debian/control + - set "Standards-Version: 3.9.4" + + -- Hideki Yamane <[email protected]> Sat, 15 Dec 2012 08:03:02 +0900 + +jcodings (1.0.9-1) experimental; urgency=low + + * 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 <[email protected]> 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 <[email protected]> Fri, 30 Jul 2010 04:32:11 +0200 diff --cc debian/compat index ec63514,0000000..7f8f011 mode 100644,000000..100644 --- a/debian/compat +++ b/debian/compat @@@ -1,1 -1,0 +1,1 @@@ - 9 ++7 diff --cc debian/control index 123fa38,0000000..cdd3749 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 <[email protected]> +Uploaders: Torsten Werner <[email protected]>, Hideki Yamane <[email protected]> - Build-Depends: default-jdk, debhelper (>= 9), cdbs, maven-debian-helper - Build-Depends-Indep: junit4 - Standards-Version: 3.9.5 - Vcs-Git: git://anonscm.debian.org/pkg-java/jcodings.git - Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jcodings.git ++Build-Depends: debhelper (>= 7), cdbs, maven-repo-helper ++Build-Depends-Indep: ant, default-jdk ++Standards-Version: 3.9.4 ++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 --cc debian/orig-tar.sh index 0000000,0000000..9fa7791 new file mode 100755 --- /dev/null +++ b/debian/orig-tar.sh @@@ -1,0 -1,0 +1,12 @@@ ++#!/bin/sh -e ++ ++# called by uscan with '--upstream-version' <version> <file> ++ ++DIR=jcodings-$2 ++ ++git clone http://github.com/jruby/jcodings.git $DIR ++(cd $DIR && git checkout $2) ++ ++tar cfz ../jcodings_$2.orig.tar.gz --exclude .git $DIR ++ ++rm -rf $DIR ../$2 diff --cc debian/rules index b76c54a,0000000..5bff79c mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,9 -1,0 +1,14 @@@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk - include /usr/share/cdbs/1/class/maven.mk ++include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/jvm/default-java ++ANT := ant -propertyfile $(CURDIR)/debian/ant.properties ++ ++install/libjcodings-java:: ++ mh_installpom -plibjcodings-java pom.xml ++ mh_installjar -plibjcodings-java pom.xml -l target/jcodings.jar + +get-orig-source: + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename diff --cc debian/watch index 8c4692c,0000000..9c8253c mode 100644,000000..100644 --- a/debian/watch +++ b/debian/watch @@@ -1,3 -1,0 +1,3 @@@ +version=3 +http://github.com/jruby/jcodings/tags \ - /jruby/jcodings/archive/(.*).tar.gz debian uupdate ++ /jruby/jcodings/archive/jcodings-(.*).tar.gz debian uupdate -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jcodings.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
