debian/0000755000000000000000000000000012261235754007175 5ustar debian/source/0000755000000000000000000000000012261235754010475 5ustar debian/source/format0000644000000000000000000000001412261235754011703 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000050712261235754010230 0ustar version=3 opts="downloadurlmangle=s/sourceforge/iij.dl.sourceforge/;s/downloads\///;s/projects\///;s/zip\//zip/,\ uversionmangle=s/-beta/~beta/;s/-rc/~rc/;s/-preview/~preview/,\ dversionmangle=s/-dfsg//;s/~I/~/" \ http://sourceforge.jp/projects/mergedoc/releases/ \ /projects/mergedoc/downloads/.*/pleiades_(.*)\-src.zip/ debian/pleiades.links0000644000000000000000000000035212261235754012025 0ustar usr/share/eclipse/plugins/jp.sourceforge.mergedoc.pleiades usr/lib/eclipse/plugins/jp.sourceforge.mergedoc.pleiades usr/share/eclipse/features/jp.sourceforge.mergedoc.pleiades usr/lib/eclipse/features/jp.sourceforge.mergedoc.pleiades debian/patches/0000755000000000000000000000000012261235754010624 5ustar debian/patches/disable-create-src_zip0000644000000000000000000000237512261235754015071 0ustar 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 --- Origin: vendor Forwarded: not-needed Last-Update: 2013-03-06 --- pleiades-1.4.0-dfsg.orig/build.xml +++ pleiades-1.4.0-dfsg/build.xml @@ -221,25 +221,6 @@ - - - - - - - - - - - - - - - - - debian/patches/series0000644000000000000000000000023712261235754012043 0ustar disable-create-src_zip build.xml compile_junit.patch not_run_integrate.patch #use_org.apache.commons.lang3.patch bug713779_dont-specify-encoding-as-null.patch debian/patches/fix-config.ini0000644000000000000000000000375612261235754013371 0ustar Description: change behavior to search config.ini file In Debian, we should search /usr/lib/eclipse first. . Author: Hideki Yamane --- 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())) { debian/patches/use_org.apache.commons.lang30000644000000000000000000002667312261235754016125 0ustar 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 構成クラスです。
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; /** * 翻訳対象となる項目を表すクラスです。 debian/patches/compile_junit.patch0000644000000000000000000000205612261235754014511 0ustar 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 Author: Hideki Yamane --- Origin: vendor Forwarded: no Last-Update: 2013-03-15 Index: pleiades-1.4.0-dfsg/build.xml =================================================================== --- pleiades-1.4.0-dfsg.orig/build.xml 2013-03-15 10:56:14.448914084 +0900 +++ pleiades-1.4.0-dfsg/build.xml 2013-03-15 10:56:14.448914084 +0900 @@ -292,7 +292,17 @@ --> - + + + + + + + + + + + debian/patches/not_run_integrate.patch0000644000000000000000000000136712261235754015402 0ustar 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. Author: Hideki Yamane --- Origin: vendor Forwarded: no Last-Update: 2013-03-15 Index: pleiades-1.4.0-dfsg/build.xml =================================================================== --- pleiades-1.4.0-dfsg.orig/build.xml 2013-03-15 10:58:14.845244717 +0900 +++ pleiades-1.4.0-dfsg/build.xml 2013-03-15 10:58:14.845244717 +0900 @@ -282,7 +282,7 @@ - +