[pleiades] 04/06: refresh patches before add new patch
Hideki Yamane
henrich at moszumanska.debian.org
Tue Nov 17 13:04:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
henrich pushed a commit to branch master
in repository pleiades.
commit 2d0905991bfe8fe4ceb54303d02f1d178af0cc4f
Author: Hideki Yamane <henrich at debian.org>
Date: Tue Nov 17 21:55:58 2015 +0900
refresh patches before add new patch
---
.../bug713779_dont-specify-encoding-as-null.patch | 30 ---
debian/patches/build.xml | 51 +----
debian/patches/compile_junit.patch | 15 +-
debian/patches/disable-create-src_zip | 17 +-
debian/patches/fix-config.ini | 42 -----
debian/patches/not_run_integrate.patch | 14 +-
debian/patches/series | 2 +-
debian/patches/use_org.apache.commons.lang3 | 209 ---------------------
8 files changed, 33 insertions(+), 347 deletions(-)
diff --git a/debian/patches/bug713779_dont-specify-encoding-as-null.patch b/debian/patches/bug713779_dont-specify-encoding-as-null.patch
deleted file mode 100644
index 65e4674..0000000
--- a/debian/patches/bug713779_dont-specify-encoding-as-null.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: not set null as encoding to avoid build failure with commons-io (>= 2.3)
-
- From 2.3, commons-io added new readLines
- http://commons.apache.org/proper/commons-io/javadocs/api-release/org/apache/commons/io/FileUtils.html#readLines(java.io.File, java.nio.charset.Charset)
-
- And also it already has another readLines
- http://commons.apache.org/proper/commons-io/javadocs/api-release/org/apache/commons/io/FileUtils.html#readLines(java.io.File, java.lang.String)
-
- Pleiades upstream bundled 1.4, so probably want to use later one, and it's equivalent
- to http://commons.apache.org/proper/commons-io/javadocs/api-release/org/apache/commons/io/FileUtils.html#readLines(java.io.File)
-
-
-Author: Hideki Yamane <henrich at debian.org>
-
----
-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/aspect/resource/ExcludeClassNameCache.java
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/ExcludeClassNameCache.java
-@@ -77,7 +77,7 @@ public class ExcludeClassNameCache {
- } else {
-
- try {
-- set.addAll(FileUtils.readLines(cacheFile, null));
-+ set.addAll(FileUtils.readLines(cacheFile));
- log.info("load %6d エントリー %s", set.size(), cacheFile.getName());
-
- } catch (Exception e) {
diff --git a/debian/patches/build.xml b/debian/patches/build.xml
index f28860c..bbb5624 100644
--- a/debian/patches/build.xml
+++ b/debian/patches/build.xml
@@ -1,46 +1,15 @@
-Description: adjust library location, Class-Path and excluding .pc dir (Debian Specific)
- Upstream distributes some libraries with Pleiades, however, on Debian system,
- it should be used system library instead of bundled one. This patch changes
- library path on build.xml file.
- .
- And it lacks Class-Path specification on build.xml, so add it (path is changed
- same as above, so not apply to upstream).
- .
- Upstream lacks excluding ".pc" directory for patching with quilt. It should be
- forwarded to upstream.
- .
- pleiades (1.3.1-dfsg-1) unstable; urgency=low
- .
- * Upload to Debian (Closes: #555846)
- * remove lib directory to comply DFSG
- * also remove srctest/jp/sourceforge/mergedoc/pleiades/resource/3.* since
- those files' license is not clear enough and not need to build.
- * remove debian/eclipserc,pleiades.examples since eclipse no longer uses
- .eclipserc and update debian/README.Debian
- * add debian/patches/build.xml and use "source format 3.0 (quilt)"
- * add debian/pleiades.links and put files to /usr/share/eclipse
- * remove debian/{pleiades.install,lintian/*}
- * add debian/patches/fix-config.ini to deal with error with finding
- config.ini
- * debian/control
- - set "DM-Upload-Allowed: yes"
- - correction
- + "Build-Depends: default-jdk"
- + add "Depends: libcommons-lang-java, libcommons-io-java,
- libjavassist-java"
- + remove "Recommends: default-jre-headless"
- Thanks to Niels Thykier <niels at thykier.net> and Matthew Johnson
- <mjj29 at debian.org>!
-Author: Hideki Yamane <henrich at debian.org>
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Tue, 17 Nov 2015 21:52:36 +0900
+Subject: build.xml
+
---
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2012-07-02
+ build.xml | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
-Index: pleiades/build.xml
-===================================================================
---- pleiades.orig/build.xml 2014-10-08 23:31:04.980376171 +0900
-+++ pleiades/build.xml 2014-10-08 23:31:04.976376156 +0900
+diff --git a/build.xml b/build.xml
+index 344a4f6..28a3a7f 100644
+--- a/build.xml
++++ b/build.xml
@@ -56,9 +56,10 @@
<pathelement location="bintest" />
<pathelement location="srctest" />
diff --git a/debian/patches/compile_junit.patch b/debian/patches/compile_junit.patch
index bb9e982..67f69f7 100644
--- a/debian/patches/compile_junit.patch
+++ b/debian/patches/compile_junit.patch
@@ -1,15 +1,14 @@
-Description: adjust compiling before run test.unit
- We need to prepare classes befero runnning test.unit, so
- - compile as javac and copy files from build/bin to bin
- - compile as srctest to bintest
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Tue, 17 Nov 2015 21:52:36 +0900
+Subject: compile_junit
Author: Hideki Yamane <henrich at debian.org>
-
---
-Origin: vendor
-Forwarded: no
-Last-Update: 2013-03-15
+ build.xml | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+diff --git a/build.xml b/build.xml
+index 28a3a7f..8be7f30 100644
--- a/build.xml
+++ b/build.xml
@@ -321,7 +321,17 @@
diff --git a/debian/patches/disable-create-src_zip b/debian/patches/disable-create-src_zip
index e51781b..ff957ac 100644
--- a/debian/patches/disable-create-src_zip
+++ b/debian/patches/disable-create-src_zip
@@ -1,14 +1,13 @@
-Description: disable building src.zip file (Debian Specific)
- When building package, upstream build.xml tries to build src.zip. It's
- not necessary to build for Debian package, so disable it to make build
- time short.
- .
-Author: Hideki Yamane <henrich at debian.org>
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Tue, 17 Nov 2015 21:52:36 +0900
+Subject: disable-create-src_zip
+
---
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2013-03-06
+ build.xml | 19 -------------------
+ 1 file changed, 19 deletions(-)
+diff --git a/build.xml b/build.xml
+index 215f223..344a4f6 100644
--- a/build.xml
+++ b/build.xml
@@ -242,25 +242,6 @@
diff --git a/debian/patches/fix-config.ini b/debian/patches/fix-config.ini
deleted file mode 100644
index f4bfba4..0000000
--- a/debian/patches/fix-config.ini
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: change behavior to search config.ini file
- In Debian, we should search /usr/lib/eclipse first.
- .
-Author: Hideki Yamane <henrich at debian.org>
-
----
-Origin: vendor
-Forwarded: Yes (via private mail)
-Last-Update: 2012-06-26
-
---- pleiades-1.3.3-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java 2011-09-08 23:31:27.236196838 +0900
-+++ pleiades-1.3.3-dfsg/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java 2011-09-08 23:38:11.046199226 +0900
-@@ -230,13 +230,23 @@
- File eclipseDir = Files.resourceRoot.getParentFile().getParentFile().getParentFile();
-
- // config ディレクトリがデフォルトの名前の場合の検索 (ディレクトリー＋ファイル名で検索)
-- for (File dir = eclipseDir; dir != null; dir = dir.getParentFile()) {
-- configIniFile = new File(dir, CONFIG_DIR_INI);
-- if (configIniFile.exists()) {
-- return configIniFile;
-- }
-+ // Linux の場合に /usr/lib/eclipse 以下を最初に参照する
-+ if (os == OS.LINUX) {
-+ for (File dir = eclipseDir; dir != null; dir = dir.getParentFile()) {
-+ dir = new File("/usr/lib/eclipse/");
-+ configIniFile = new File(dir, CONFIG_DIR_INI);
-+ if (configIniFile.exists()) {
-+ return configIniFile;
-+ }
-+ }
-+ } else {
-+ for (File dir = eclipseDir; dir != null; dir = dir.getParentFile()) {
-+ configIniFile = new File(dir, CONFIG_DIR_INI);
-+ if (configIniFile.exists()) {
-+ return configIniFile;
-+ }
-+ }
- }
--
- // config ディレクトリが -configuration で変更されている場合の検索 (ファイル名だけで検索)
- for (File dir = eclipseDir; dir != null; dir = dir.getParentFile()) {
- for (File d : dir.listFiles(Files.createDirectoryFilter())) {
diff --git a/debian/patches/not_run_integrate.patch b/debian/patches/not_run_integrate.patch
index acb64f0..88a828b 100644
--- a/debian/patches/not_run_integrate.patch
+++ b/debian/patches/not_run_integrate.patch
@@ -1,14 +1,14 @@
-Description: adjust build.full target
- It's unnecessary to run build.integration (fails since pleiades-src is not
- prepared). Also, it's better to run test.unit.
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Tue, 17 Nov 2015 21:52:36 +0900
+Subject: not_run_integrate
Author: Hideki Yamane <henrich at debian.org>
-
---
-Origin: vendor
-Forwarded: no
-Last-Update: 2013-03-15
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/build.xml b/build.xml
+index 8be7f30..6a235dc 100644
--- a/build.xml
+++ b/build.xml
@@ -311,7 +311,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 1dbc9fd..98a894f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ disable-create-src_zip
build.xml
compile_junit.patch
not_run_integrate.patch
-#use_org.apache.commons.lang3.patch
+0005-do-not-ask-timestamp.digicert.com-to-sign.patch
diff --git a/debian/patches/use_org.apache.commons.lang3 b/debian/patches/use_org.apache.commons.lang3
deleted file mode 100644
index ccc7c9e..0000000
--- a/debian/patches/use_org.apache.commons.lang3
+++ /dev/null
@@ -1,209 +0,0 @@
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/PleiadesOption.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/PleiadesOption.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/PleiadesOption.java 2013-06-25 18:52:21.000000000 +0900
-@@ -10,7 +10,7 @@
- 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 起動オプションです。
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherEclipseTransformer.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherEclipseTransformer.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherEclipseTransformer.java 2013-06-25 18:52:21.000000000 +0900
-@@ -23,7 +23,7 @@
- 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 起動時のバイトコード変換を行うトランスフォーマーです。
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherTransformer.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherTransformer.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherTransformer.java 2013-06-25 18:52:21.000000000 +0900
-@@ -28,7 +28,7 @@
- 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 アプリケーション起動時のバイトコード変換を行うトランスフォーマーです。
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/TranslationEditor.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/TranslationEditor.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/TranslationEditor.java 2013-06-25 18:52:21.000000000 +0900
-@@ -25,7 +25,7 @@
- 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;
-
- /**
- * 翻訳処理をクラス・オブジェクトに埋め込むエディターです。
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/JointPoint.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/JointPoint.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/JointPoint.java 2013-06-25 18:52:21.000000000 +0900
-@@ -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;
-
- /**
- * ジョイント・ポイントです。
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PleiadesConfig.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PleiadesConfig.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PleiadesConfig.java 2013-06-25 18:52:21.000000000 +0900
-@@ -22,8 +22,8 @@
- 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>
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PointCut.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PointCut.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PointCut.java 2013-06-25 18:52:21.000000000 +0900
-@@ -9,9 +9,9 @@
- 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;
-
- /**
- * ポイント・カットです。
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/TraceableTranslationDictionary.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/TraceableTranslationDictionary.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/TraceableTranslationDictionary.java 2013-06-25 18:52:21.000000000 +0900
-@@ -10,7 +10,7 @@
- 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;
-
- /**
- * 翻訳単語のトレース調査を行うための辞書クラスです。
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/Generator.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/Generator.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/Generator.java 2013-06-25 18:52:21.000000000 +0900
-@@ -22,7 +22,7 @@
- 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 つのプロパティー・ファイル
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/AbstractExtractor.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/AbstractExtractor.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/AbstractExtractor.java 2013-06-25 18:52:21.000000000 +0900
-@@ -18,7 +18,7 @@
- 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 形式の
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/HelpExtractor.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/HelpExtractor.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/HelpExtractor.java 2013-06-25 18:52:21.000000000 +0900
-@@ -23,7 +23,7 @@
- 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 形式の
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/UIExtractor.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/UIExtractor.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/UIExtractor.java 2013-06-25 18:52:21.000000000 +0900
-@@ -23,7 +23,7 @@
- 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 形式の
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/log/Logger.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/log/Logger.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/log/Logger.java 2013-06-25 18:52:21.000000000 +0900
-@@ -13,7 +13,7 @@
- import java.util.HashMap;
- import java.util.Map;
-
--import org.apache.commons.lang.ArrayUtils;
-+import org.apache.commons.lang3.ArrayUtils;
-
- /**
- * Log4J ライクなインタフェースを持つ抽象ロガーです。
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/PropertySet.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/resource/PropertySet.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/PropertySet.java 2013-06-25 18:52:21.000000000 +0900
-@@ -35,7 +35,7 @@
- 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;
-
- /**
- * プロパティー・セット・クラスです。
-Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/TranslationString.java
-===================================================================
---- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/resource/TranslationString.java 2013-06-25 18:52:21.000000000 +0900
-+++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/TranslationString.java 2013-06-25 18:52:21.000000000 +0900
-@@ -14,7 +14,7 @@
-
- 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
More information about the pkg-java-commits
mailing list