This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch master in repository pleiades.
commit 78cb676d7ea9eb353926180d3e093f47af27d54d Author: Hideki Yamane <[email protected]> Date: Tue Jul 2 20:00:56 2013 +0900 Imported Debian patch 1.4.0-dfsg-4 --- debian/changelog | 7 + debian/control | 2 +- debian/patches/build.xml | 4 +- debian/patches/series | 2 +- debian/patches/use_org.apache.commons.lang3.patch | 187 ---------------------- 5 files changed, 11 insertions(+), 191 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e15586..3048ba7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pleiades (1.4.0-dfsg-4) unstable; urgency=medium + + * debian/control + - revert to "Depends: libcommons-lang-java", not lang3 + + -- Hideki Yamane <[email protected]> Tue, 02 Jul 2013 20:00:56 +0900 + pleiades (1.4.0-dfsg-3) unstable; urgency=medium * debian/control diff --git a/debian/control b/debian/control index 0f7a1bc..4413744 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: extra Maintainer: Hideki Yamane <[email protected]> Build-Depends: debhelper (>= 9), ant, default-jdk, ant-optional, junit -Build-Depends-Indep: libcommons-lang3-java, libcommons-io-java, libjavassist-java, zip, unzip +Build-Depends-Indep: libcommons-lang-java, libcommons-io-java, libjavassist-java, zip, unzip Standards-Version: 3.9.4 Homepage: http://mergedoc.sourceforge.jp/ diff --git a/debian/patches/build.xml b/debian/patches/build.xml index 3838d60..bb6e7ab 100644 --- a/debian/patches/build.xml +++ b/debian/patches/build.xml @@ -35,7 +35,7 @@ Author: Hideki Yamane <[email protected]> --- Origin: vendor Forwarded: not-needed -Last-Update: 2012-06-26 +Last-Update: 2012-07-02 Index: pleiades-1.4.0-dfsg/build.xml =================================================================== @@ -50,7 +50,7 @@ Index: pleiades-1.4.0-dfsg/build.xml - </fileset> + <pathelement location="/usr/share/java/javassist.jar"/> + <pathelement location="/usr/share/java/commons-io.jar"/> -+ <pathelement location="/usr/share/java/commons-lang3.jar"/> ++ <pathelement location="/usr/share/java/commons-lang.jar"/> + <pathelement location="/usr/share/java/junit.jar"/> </path> diff --git a/debian/patches/series b/debian/patches/series index a387529..bab6d20 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,5 @@ disable-create-src_zip build.xml compile_junit.patch not_run_integrate.patch -use_org.apache.commons.lang3.patch +#use_org.apache.commons.lang3.patch bug713779_dont-specify-encoding-as-null.patch diff --git a/debian/patches/use_org.apache.commons.lang3.patch b/debian/patches/use_org.apache.commons.lang3.patch deleted file mode 100644 index 2c11bb2..0000000 --- a/debian/patches/use_org.apache.commons.lang3.patch +++ /dev/null @@ -1,187 +0,0 @@ -Description: <short summary of the patch> -Author: Hideki Yamane <[email protected]> - ---- -Bug-Debian: http://bugs.debian.org/713779 -Forwarded: no -Last-Update: 2013-06-25 - ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/PleiadesOption.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/PleiadesOption.java -@@ -10,7 +10,7 @@ import jp.sourceforge.mergedoc.pleiades. - import jp.sourceforge.mergedoc.pleiades.log.Logger.Level; - import jp.sourceforge.mergedoc.pleiades.resource.TranslationNotFoundProperties; - --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - - /** - * Pleiades 起動オプションです。 ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/Generator.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/Generator.java -@@ -22,7 +22,7 @@ import jp.sourceforge.mergedoc.pleiades. - import jp.sourceforge.mergedoc.pleiades.resource.PropertySet; - - import org.apache.commons.io.FileUtils; --import org.apache.commons.lang.ArrayUtils; -+import org.apache.commons.lang3.ArrayUtils; - - /** - * 複数のプロパティー・ファイルをマージし、1 つのプロパティー・ファイル ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/HelpExtractor.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/HelpExtractor.java -@@ -23,7 +23,7 @@ import jp.sourceforge.mergedoc.pleiades. - import jp.sourceforge.mergedoc.pleiades.resource.Property; - import jp.sourceforge.mergedoc.pleiades.resource.PropertySet; - --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - - /** - * 言語パックから、ヘルプに関する日本語訳を抽出し、Pleiades 形式の ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/AbstractExtractor.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/AbstractExtractor.java -@@ -18,7 +18,7 @@ import jp.sourceforge.mergedoc.pleiades. - import jp.sourceforge.mergedoc.pleiades.resource.PropertySet; - - import org.apache.commons.io.FileUtils; --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - - /** - * 言語パックから日本語訳を抽出し Pleiades 形式の ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/UIExtractor.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/UIExtractor.java -@@ -23,7 +23,7 @@ import jp.sourceforge.mergedoc.pleiades. - import jp.sourceforge.mergedoc.pleiades.resource.PropertySet; - import jp.sourceforge.mergedoc.pleiades.resource.TranslationString; - --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - - /** - * 言語パックから、UI に関する日本語訳を抽出し、Pleiades 形式の ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/resource/TranslationString.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/TranslationString.java -@@ -14,7 +14,7 @@ import java.util.regex.Pattern; - - import jp.sourceforge.mergedoc.pleiades.log.Logger; - --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - - /** - * 翻訳対象となる項目を表すクラスです。 ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/resource/PropertySet.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/PropertySet.java -@@ -35,7 +35,7 @@ import java.util.zip.ZipOutputStream; - import jp.sourceforge.mergedoc.pleiades.log.Logger; - - import org.apache.commons.io.IOUtils; --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - - /** - * プロパティー・セット・クラスです。 ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/log/Logger.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/log/Logger.java -@@ -13,7 +13,7 @@ import java.util.Date; - import java.util.HashMap; - import java.util.Map; - --import org.apache.commons.lang.ArrayUtils; -+import org.apache.commons.lang3.ArrayUtils; - - /** - * Log4J ライクなインタフェースを持つ抽象ロガーです。 ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherEclipseTransformer.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherEclipseTransformer.java -@@ -23,7 +23,7 @@ import jp.sourceforge.mergedoc.pleiades. - import jp.sourceforge.mergedoc.pleiades.resource.Files; - import jp.sourceforge.mergedoc.pleiades.resource.PropertySet; - --import org.apache.commons.lang.ArrayUtils; -+import org.apache.commons.lang3.ArrayUtils; - - /** - * Eclipse 起動時のバイトコード変換を行うトランスフォーマーです。 ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherTransformer.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherTransformer.java -@@ -28,7 +28,7 @@ import jp.sourceforge.mergedoc.pleiades. - import jp.sourceforge.mergedoc.pleiades.aspect.resource.TransformedClassCache; - import jp.sourceforge.mergedoc.pleiades.log.Logger; - --import org.apache.commons.lang.ArrayUtils; -+import org.apache.commons.lang3.ArrayUtils; - - /** - * Java アプリケーション起動時のバイトコード変換を行うトランスフォーマーです。 ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/TranslationEditor.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/TranslationEditor.java -@@ -25,7 +25,7 @@ import jp.sourceforge.mergedoc.pleiades. - import jp.sourceforge.mergedoc.pleiades.log.Logger; - import jp.sourceforge.mergedoc.pleiades.log.Logger.Level; - --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - - /** - * 翻訳処理をクラス・オブジェクトに埋め込むエディターです。 ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/JointPoint.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/JointPoint.java -@@ -6,11 +6,11 @@ - */ - package jp.sourceforge.mergedoc.pleiades.aspect.advice; - --import org.apache.commons.lang.StringUtils; --import org.apache.commons.lang.builder.EqualsBuilder; --import org.apache.commons.lang.builder.HashCodeBuilder; --import org.apache.commons.lang.builder.ToStringBuilder; --import org.apache.commons.lang.builder.ToStringStyle; -+import org.apache.commons.lang3.StringUtils; -+import org.apache.commons.lang3.builder.EqualsBuilder; -+import org.apache.commons.lang3.builder.HashCodeBuilder; -+import org.apache.commons.lang3.builder.ToStringBuilder; -+import org.apache.commons.lang3.builder.ToStringStyle; - - /** - * ジョイント・ポイントです。 ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PleiadesConfig.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PleiadesConfig.java -@@ -22,8 +22,8 @@ import jp.sourceforge.mergedoc.pleiades. - import jp.sourceforge.mergedoc.pleiades.log.Logger; - import jp.sourceforge.mergedoc.pleiades.resource.Files; - --import org.apache.commons.lang.builder.ToStringBuilder; --import org.apache.commons.lang.builder.ToStringStyle; -+import org.apache.commons.lang3.builder.ToStringBuilder; -+import org.apache.commons.lang3.builder.ToStringStyle; - - /** - * Pleiades 構成クラスです。<br> ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PointCut.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PointCut.java -@@ -9,9 +9,9 @@ package jp.sourceforge.mergedoc.pleiades - import java.util.LinkedList; - import java.util.List; - --import org.apache.commons.lang.StringUtils; --import org.apache.commons.lang.builder.ToStringBuilder; --import org.apache.commons.lang.builder.ToStringStyle; -+import org.apache.commons.lang3.StringUtils; -+import org.apache.commons.lang3.builder.ToStringBuilder; -+import org.apache.commons.lang3.builder.ToStringStyle; - - /** - * ポイント・カットです。 ---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/TraceableTranslationDictionary.java -+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/TraceableTranslationDictionary.java -@@ -10,7 +10,7 @@ import jp.sourceforge.mergedoc.pleiades. - import jp.sourceforge.mergedoc.pleiades.aspect.advice.PleiadesConfig; - import jp.sourceforge.mergedoc.pleiades.log.Logger; - --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - - /** - * 翻訳単語のトレース調査を行うための辞書クラスです。 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pleiades.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
