This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch master in repository pleiades.
commit 23756acf589f326ac6942c6ebbd738bbb273f425 Merge: 72b324a d6f91fd Author: Hideki Yamane <[email protected]> Date: Sun Oct 31 21:09:27 2010 +0900 Imported Debian patch 1.3.2-dfsg-1 .classpath | 2 +- .keystore | Bin 1268 -> 1268 bytes build.xml | 105 +- .../additions/ASF/ApacheDirectoryStudio.properties | 2 +- conf/props/additions/EPL/AnyEditTools.properties | 1 + conf/props/additions/EPL/EclipseGlance.properties | 6 + conf/props/additions/EPL/Eclipse_3.3.properties | 4 +- .../EPL/Eclipse_3.4_contributed.properties | 4 +- .../EPL/Eclipse_3.5_contributed.properties | 2 +- conf/props/additions/EPL/Eclipse_3.6.properties | 109 + conf/props/additions/EPL/Eclipse_CDT.properties | 27 + .../Eclipse_DLTK-ATF_200811_contributed.properties | 2 +- conf/props/additions/EPL/Eclipse_EGit.properties | 23 + conf/props/additions/EPL/Eclipse_JEE.properties | 7 +- conf/props/additions/EPL/Eclipse_Mylyn.properties | 3 + conf/props/additions/EPL/Eclipse_PDT.properties | 22 + conf/props/additions/EPL/Eclipse_RSE.properties | 5 +- .../additions/EPL/Eclipse_Subversive.properties | 18 +- .../additions/EPL/Eclipse_UpdateManager.properties | 4 +- .../EPL/Eclipse_ecf_trans_newdic.properties | 2 +- .../EPL/Eclipse_mylyn_trans_newdic.properties | 14 +- .../EPL/org.eclipse-SDK_3.5-20091008.properties | 45 + .../EPL/org.eclipse-SDK_3.5-20091021.properties | 53 + .../EPL/org.eclipse-SDK_3.5-20091126.properties | 73 + .../EPL/org.eclipse-SDK_3.5-20091208.properties | 27 + .../org.eclipse-cpp-galileo-20091203-1.properties | 44 + .../org.eclipse-cpp-galileo-20091203-2.properties | 38 + .../org.eclipse-jee-galileo-20091018-1.properties | 58 + .../org.eclipse-jee-galileo-20091018-2.properties | 55 + .../org.eclipse-jee-galileo-20091018-3.properties | 52 + .../org.eclipse-jee-galileo-20091018-4.properties | 60 + .../org.eclipse-jee-galileo-20091018-5.properties | 59 + .../org.eclipse-jee-galileo-20091018-6.properties | 57 + .../org.eclipse-jee-galileo-20091018-7.properties | 19 + .../org.eclipse-jee-galileo-20091022-1.properties | 56 + .../org.eclipse-jee-galileo-20091022-2.properties | 52 + .../org.eclipse-jee-galileo-20091022-3.properties | 70 + .../org.eclipse-jee-galileo-20091022-4.properties | 72 + .../org.eclipse-jee-galileo-20091022-5.properties | 66 + .../org.eclipse-jee-galileo-20091027.properties | 125 + .../org.eclipse-jee-galileo-20091126.properties | 29 + .../org.eclipse-jee-galileo-20091208.properties | 34 + .../EPL/org.eclipse.datatools-20091006.properties | 56 + ...ipse.datatools.capabilities-20091126.properties | 48 + ...ols.enablement.sybase.asa-20091126-1.properties | 45 + ...ols.enablement.sybase.asa-20091126-2.properties | 28 + ...clipse.datatools.sqltools-20091126-1.properties | 43 + ...clipse.datatools.sqltools-20091126-2.properties | 28 + .../EPL/org.eclipse.equinox-20091008-1.properties | 55 + .../EPL/org.eclipse.equinox-20091008-2.properties | 58 + .../EPL/org.eclipse.equinox-20091008-3.properties | 57 + .../EPL/org.eclipse.equinox-20091008-4.properties | 59 + .../EPL/org.eclipse.equinox-20091008-5.properties | 55 + .../EPL/org.eclipse.equinox-20091008-6.properties | 64 + .../EPL/org.eclipse.equinox-20091008-7.properties | 56 + .../EPL/org.eclipse.equinox-20091008-8.properties | 53 + .../EPL/org.eclipse.equinox-20091008-9.properties | 27 + .../EPL/org.eclipse.jdt-20091008-1.properties | 56 + .../EPL/org.eclipse.jdt-20091008-2.properties | 57 + .../EPL/org.eclipse.jdt-20091008-3.properties | 54 + .../EPL/org.eclipse.jdt-20091008-4.properties | 53 + .../EPL/org.eclipse.jdt-20091008-5.properties | 62 + .../EPL/org.eclipse.jdt-20091008-6.properties | 55 + .../EPL/org.eclipse.jdt-20091008-7.properties | 59 + .../EPL/org.eclipse.jdt-20091008-8.properties | 34 + .../EPL/org.eclipse.jpt-20091006.properties | 97 + .../EPL/org.eclipse.jpt-20091018-1.properties | 51 + .../EPL/org.eclipse.jpt-20091018-2.properties | 51 + .../EPL/org.eclipse.jpt-20091018-3.properties | 53 + .../EPL/org.eclipse.jpt-20091018-4.properties | 39 + .../EPL/org.eclipse.jst-20091006.properties | 59 + .../EPL/org.eclipse.jst-20091208-7.properties | 46 + .../EPL/org.eclipse.jst-20091208-8.properties | 44 + .../EPL/org.eclipse.jst-20091208-9.properties | 41 + .../EPL/org.eclipse.jst.jsf-20091109.properties | 102 + .../EPL/org.eclipse.mtj-20091215-1.properties | 52 + .../EPL/org.eclipse.mtj-20091215-2.properties | 49 + .../EPL/org.eclipse.mtj-20091215-3.properties | 35 + .../EPL/org.eclipse.mylyn-20091008-1.properties | 105 + .../EPL/org.eclipse.mylyn-20091008-2.properties | 114 + .../EPL/org.eclipse.mylyn-20091018-1.properties | 56 + .../EPL/org.eclipse.mylyn-20091018-2.properties | 54 + .../EPL/org.eclipse.mylyn-20091018-3.properties | 33 + .../EPL/org.eclipse.pde-20091006.properties | 78 + .../EPL/org.eclipse.php-20091215.properties | 9 + .../EPL/org.eclipse.rse-20091006.properties | 44 + .../EPL/org.eclipse.rse-20091018-1.properties | 52 + .../EPL/org.eclipse.rse-20091018-2.properties | 54 + .../EPL/org.eclipse.rse-20091018-3.properties | 57 + .../EPL/org.eclipse.rse-20091018-4.properties | 54 + .../EPL/org.eclipse.rse-20091018-5.properties | 55 + .../EPL/org.eclipse.rse-20091018-6.properties | 54 + .../EPL/org.eclipse.rse-20091018-7.properties | 43 + .../org.eclipse.swordfish.tooling.ui.properties | 38 + .../org.eclipse.team.svn_1.0-20091126.properties | 114 + .../EPL/org.eclipse.wst-20091006.properties | 45 + .../EPL/org.eclipse.wst-20091018-1.properties | 66 + .../EPL/org.eclipse.wst-20091018-2.properties | 55 + .../EPL/org.eclipse.wst-20091018-3.properties | 51 + .../EPL/org.eclipse.wst-20091018-4.properties | 54 + .../EPL/org.eclipse.wst-20091018-5.properties | 40 + .../EPL/org.eclipse.wst-20091018-6(2).properties | 21 + conf/props/additions/EPL/q4e.properties | 1 - .../additions/GPL/Aptana-RDT-RadRails.properties | 6 + conf/props/additions/GPL/Aptana.properties | 1 + ...rprise.jst.server.sunappsrv-20091023.properties | 99 + conf/props/additions/LGPL/FindBugs.properties | 6 + conf/props/additions/OTHER/Android.properties | 32 + conf/props/additions/OTHER/JDocEditor.properties | 2 +- conf/props/additions/regex-EPL.properties | 6 +- conf/props/nls-ui-customized.properties | 106 +- conf/props/temp-all.properties | 4541 +- conf/props/temp-nls-help-checked.properties | 63622 +++++++++---------- conf/props/temp-nls-ui-customized.properties | 107 +- conf/props/translation-ASF.properties | 14 +- conf/props/translation-EPL.properties | 4395 +- conf/props/translation-GPL.properties | 108 +- conf/props/translation-LGPL.properties | 20 +- conf/props/translation-OTHER.properties | 62 +- conf/props/validation-translation.properties | 7 +- conf/splash3.6.bmp | Bin 0 -> 403614 bytes conf/splash3.6.png | Bin 0 -> 632448 bytes conf/translation-multibytes-key.properties | 5 +- conf/translation-regex-through.properties | 2 + conf/translation-regex.properties | 6 +- conf/translation.properties | 4541 +- debian/changelog | 18 + debian/control | 8 +- debian/patches/build.xml | 160 +- debian/patches/fix-config.ini | 29 +- debian/watch | 3 +- readme/eclipse.ini_sample.win.3.1-3.2 | 5 - readme/eclipse.ini_sample.win.3.3 | 7 - readme/eclipse.ini_sample.win.3.4 | 60 - readme/eclipse.ini_sample.win.3.5 | 90 - readme/readme_pleiades.txt | 10 +- readme/readme_pleiades_changes.txt | 455 +- src/jp/sourceforge/mergedoc/pleiades/Pleiades.java | 39 +- .../pleiades/aspect/AbstractTransformer.java | 8 +- .../pleiades/aspect/LauncherTransformer.java | 10 + .../resource/DynamicTranslationDictionary.java | 11 +- .../mergedoc/pleiades/generator/Generator.java | 3 +- .../mergedoc/pleiades/generator/Validator.java | 9 +- .../resource/AbstractTranslationDictionary.java | 30 +- .../resource/TranslationDictionaryTest.java | 4 +- 145 files changed, 50459 insertions(+), 32922 deletions(-) diff --cc debian/changelog index f8d09d8,0000000..8aa7578 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,58 -1,0 +1,76 @@@ ++pleiades (1.3.2-dfsg-1) unstable; urgency=low ++ ++ * New upstream release ++ * debian/control ++ - change my email address ++ - Build-Depends: debhelper (>= 7.0.50~) ++ - set "Standards-Version: 3.9.1" ++ * debian/watch ++ - fix to work ++ * debian/patches ++ - refresh fix-config.ini ++ - refresh build.xml, most of non-debian specific changes were included ++ in upstream ++ * debian/rules ++ - change ant target from build-full to build.full ++ ++ -- Hideki Yamane <[email protected]> Sun, 31 Oct 2010 21:09:27 +0900 ++ +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 <[email protected]> and Matthew Johnson + <[email protected]>! + + -- Hideki Yamane (Debian-JP) <[email protected]> Mon, 22 Mar 2010 15:05:28 +0900 + +pleiades (1.3.1-1~pre5) unstable; urgency=low + + * put features file to /usr/lib + + -- Hideki Yamane (Debian-JP) <[email protected]> Sun, 21 Mar 2010 17:35:26 +0900 + +pleiades (1.3.1-1~pre4) unstable; urgency=low + + * debian/control + - move default-jre-headless from Depends to Recommends + + -- Hideki Yamane (Debian-JP) <[email protected]> Sun, 15 Nov 2009 19:35:40 +0900 + +pleiades (1.3.1-1~pre3) unstable; urgency=low + + * debian/control + - add "Depends: default-jre-headless" + + -- Hideki Yamane (Debian-JP) <[email protected]> Sun, 15 Nov 2009 09:20:07 +0900 + +pleiades (1.3.1-1~pre2) unstable; urgency=low + + * debian/README.Debian + - $ cp /usr/share/"doc"/pleiades/examples/eclipserc ~/.eclipse/eclipserc + Thanks to Wataru Nakanishi <[email protected]> + + -- Hideki Yamane (Debian-JP) <[email protected]> Sat, 14 Nov 2009 15:23:53 +0900 + +pleiades (1.3.1-1~pre) unstable; urgency=low + + * Initial release at sourceforge.jp (not Debian Official, yet) + + -- Hideki Yamane (Debian-JP) <[email protected]> Thu, 12 Nov 2009 11:57:55 +0900 diff --cc debian/control index aa89a24,0000000..9bcd6ea mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,18 -1,0 +1,18 @@@ +Source: pleiades +Section: devel +Priority: extra - Maintainer: Hideki Yamane (Debian-JP) <[email protected]> ++Maintainer: Hideki Yamane <[email protected]> +DM-Upload-Allowed: yes - Build-Depends: debhelper (>= 7.0.50), ant, default-jdk ++Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk +Build-Depends-Indep: libcommons-lang-java, libcommons-io-java, libjavassist-java, zip, unzip - Standards-Version: 3.8.4 ++Standards-Version: 3.9.1 +Homepage: http://mergedoc.sourceforge.jp/ + +Package: pleiades +Architecture: all +Depends: eclipse, libcommons-lang-java, libcommons-io-java, libjavassist-java, + ${misc:Depends} - Description: Japanese Language package for Eclipse using Dynamic AOP, Pleiades ++Description: Japanese Language package for Eclipse using Dynamic AOP, Pleiades + The Pleiades is a dynamic AOP translation container, it provides dynamic + Japanese localization to the Eclipse Platform and a large number of plug-ins. + Some of its resources has contributed to the Eclipse.org. diff --cc debian/patches/build.xml index 1b477e1,0000000..de9221d mode 100644,000000..100644 --- a/debian/patches/build.xml +++ b/debian/patches/build.xml @@@ -1,174 -1,0 +1,40 @@@ - Index: pleiades-1.3.1-dfsg/build.xml ++Index: pleiades-1.3.2-dfsg/build.xml +=================================================================== - --- pleiades-1.3.1-dfsg.orig/build.xml 2010-03-22 00:17:05.000000000 +0900 - +++ pleiades-1.3.1-dfsg/build.xml 2010-03-22 00:22:49.000000000 +0900 - @@ -17,10 +17,6 @@ - - <!-- Pleiades バージョン --> - <property name="version" value="1.3.1"/> - - - - <!-- コピー先ディレクトリー --> - - <property name="dist.dir" location="../../dist/3.5"/> - - <property name="this.eclipse.dir" location="../../Tools/Eclipse3.5.1/dropins/MergeDoc/eclipse"/> - - <!-- プロダクト定数定義 --> - <property name="project.name" value="pleiades"/> - @@ -28,21 +24,26 @@ - <property name="agent.jar.name" value="${project.name}.jar"/> - - <!-- ディレクトリー・ファイル定義 --> - + <property name="bin.dir" value="bin"/> - <property name="build.dir" value="build"/> - <property name="pleiades.zip.file" location="${build.dir}/${project.name}.zip"/> - - <property name="pleiades.src.zip.file" location="${build.dir}/${project.name}-src.zip"/> - + <property name="pleiades.src.zip.file" location="${build.dir}/${project.name}-src.zip"/> - <property name="test.eclipse.plugin.dir" location="${test.eclipse.dir}/plugins"/> - - + <!-- コピー先ディレクトリー --> - + <property name="dist.dir" location="../../dist/3.5"/> - + <property name="this.eclipse.dir" location="../../Tools/Eclipse3.5.1/dropins/MergeDoc/eclipse"/> - + - <!-- プロジェクト・クラスパス --> - <path id="project.classpath"> - <pathelement location="bin"/> ++--- pleiades-1.3.2-dfsg.orig/build.xml 2010-09-25 17:21:10.000000000 +0900 +++++ pleiades-1.3.2-dfsg/build.xml 2010-11-06 11:34:42.497084770 +0900 ++@@ -40,11 +40,10 @@ + <pathelement location="bintest"/> + <pathelement location="srctest"/> + <pathelement location="conf"/> +- <pathelement location="lib/javassist/javassist.jar"/> +- <pathelement location="lib/apache/commons-io.jar"/> +- <pathelement location="lib/apache/commons-lang.jar"/> - - <pathelement location="${eclipse.home}/plugins/org.junit_3.8.2.v20090203-1005/junit.jar"/> ++- <pathelement location="${eclipse.home}/plugins/org.junit_3.8.2.v20090203-1005/junit.jar"/> <!-- Eclipse3.5 --> ++- <pathelement location="${eclipse.home}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar"/> <!-- Eclipse3.6 --> ++ <pathelement location="/usr/share/java/javassist.jar"/> ++ <pathelement location="/usr/share/java/commons-io.jar"/> ++ <pathelement location="/usr/share/java/commons-lang.jar"/> ++ <pathelement location="/usr/share/java/junit.jar"/> + </path> + + <!-- 翻訳プロパティーの生成（各プロパティーのマージ） --> - @@ -83,18 +84,21 @@ - --> - - <!-- ビルド (SVN 管理) --> - - <target name="build" depends="" description=""> - + <target name="build" depends="" description=""> - - <!-- Agent jar ファイル作成 --> - <jar destfile="${agent.jar.name}"> - - <fileset dir="bin"> - + <fileset dir="${bin.dir}"> - <include name="**/${project.name}/**/*.class"/> - </fileset> - <manifest> ++@@ -96,7 +95,10 @@ + <attribute name="Premain-Class" + value="${project.id}.Pleiades"/> + <attribute name="Boot-Class-Path" +- value="./${agent.jar.name} ./conf ./lib/javassist/javassist.jar ./lib/apache/commons-io.jar ./lib/apache/commons-lang.jar"/> - + value="./${agent.jar.name} ./conf - + /usr/share/java/javassist.jar - + /usr/share/java/commons-io.jar - + /usr/share/java/commons-lang.jar"/> +++ value="./${agent.jar.name} ./conf +++ /usr/share/java/javassist.jar +++ /usr/share/java/commons-io.jar +++ /usr/share/java/commons-lang.jar"/> + </manifest> + </jar> + - @@ -102,11 +106,13 @@ - <copy tofile="META-INF/MANIFEST.MF" file="META-INF/MANIFEST.MF.template" overwrite="true"/> ++@@ -105,6 +107,7 @@ + <copy todir="plugins/${project.id}"> + <fileset dir="${basedir}"> - + <exclude name="debian/"/> ++ <exclude name="debian/"/> ++ <exclude name=".pc/"/> + <exclude name=".settings/*"/> + <exclude name="about/"/> + <exclude name="bin/"/> - <exclude name="bintest/"/> - - <exclude name="nls/"/> - + <exclude name="nls/"/> - <exclude name="report/"/> - <exclude name="conf/props/additions/"/> - <exclude name="conf/props/history/"/> - @@ -140,8 +146,8 @@ - </fileset> - </copy> - - - <!-- Agent jar ファイルの削除 --> - - <delete file="${agent.jar.name}"/> - + <!-- Agent jar ファイルの削除 --> - + <delete file="${agent.jar.name}"/> - - <!-- バージョンを設定 --> - <replace file="plugins/${project.id}/META-INF/MANIFEST.MF" - @@ -173,6 +179,7 @@ - </unjar> - - <!-- Pleiades zip ファイルの作成 --> - + <mkdir dir="${build.dir}"/> - <delete file="${pleiades.zip.file}"/> - <zip destfile="${pleiades.zip.file}"> - <fileset dir="${basedir}"> - @@ -183,23 +190,58 @@ - </fileset> - </zip> - <delete dir="plugins"/> - - <delete dir="features"/> - - - + <delete dir="features"/> - + - <!-- Pleiades zip ソース・ファイルの作成 --> - - <delete file="${pleiades.src.zip.file}"/> - - <zip destfile="${pleiades.src.zip.file}"> - - <fileset dir="${basedir}"> - - <exclude name="bin/**/*"/> - + <delete file="${pleiades.src.zip.file}"/> - + <zip destfile="${pleiades.src.zip.file}"> - + <fileset dir="${basedir}"> - + <!-- コマンド・ラインからビルド可能とするため class を含めておく - + <exclude name="bin/**/*"/> - + --> - <exclude name="bintest/**/*"/> - <exclude name="conf/props/history/"/> - <exclude name="conf/props/temp/"/> - <exclude name="conf/props/.*"/> - - <exclude name="nls/"/> - + <exclude name="nls/"/> - <exclude name="report/"/> - <exclude name="build/"/> - - </fileset> - - </zip> - + <!-- コマンドでエラーになるため追加 --> - + <exclude name="features/"/> - + <exclude name="plugins/"/> - + </fileset> - + </zip> - + - + </target> - + - + <!-- クリーン (コマンドライン用) --> - + <target name="clean" depends="" description=""> - + - + <delete dir="${bin.dir}" /> - + <mkdir dir="${bin.dir}" /> - + - + <delete dir="${build.dir}" /> - + <mkdir dir="${build.dir}" /> - + - + </target> - + - + <!-- ビルド (コマンドライン用) --> - + <target name="javac" depends="" description=""> - + - + <mkdir dir="${bin.dir}" /> - + <javac - + srcdir="src" - + destdir="${bin.dir}" - + classpathref="project.classpath" - + encoding="UTF-8" - + source="1.5" - + target="1.5" - + debug="on" /> - + - + </target> - - + <!-- ビルド (コマンドライン用) --> - + <target name="build.full" depends="clean, javac, build" description=""> - </target> - - <!-- リリース・ビルド (手動アップロードしてリリース一覧で管理) --> diff --cc debian/patches/fix-config.ini index 8816e0b,0000000..e2f3457 mode 100644,000000..100644 --- a/debian/patches/fix-config.ini +++ b/debian/patches/fix-config.ini @@@ -1,29 -1,0 +1,36 @@@ - Index: pleiades-1.3.1-dfsg/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java ++Index: pleiades-1.3.2-dfsg/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java +=================================================================== - --- pleiades-1.3.1-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java 2010-03-22 11:08:25.000000000 +0900 - +++ pleiades-1.3.1-dfsg/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java 2010-03-22 14:45:42.000000000 +0900 - @@ -213,10 +213,20 @@ ++--- pleiades-1.3.2-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java 2010-11-07 19:39:38.628330448 +0900 +++++ pleiades-1.3.2-dfsg/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java 2010-11-07 19:46:38.199341140 +0900 ++@@ -219,14 +219,27 @@ ++ CONFIG_DIR_INI); ++ if (configIniFile.exists()) { ++ return configIniFile; +++ ++ } + File pleiadesDir = Files.resourceRoot.getParentFile().getParentFile().getParentFile(); + + // config ディレクトリがデフォルトの名前の場合の検索 +- for (File dir = pleiadesDir; 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 = pleiadesDir; dir != null; dir = dir.getParentFile()) { - + dir = new File("/usr/lib/eclipse/"); - + configIniFile = new File(dir, CONFIG_DIR_INI); +++ for (File dir = pleiadesDir; dir != null; dir = dir.getParentFile()) { +++ dir = new File("/usr/lib/eclipse/"); +++ configIniFile = new File(dir, CONFIG_DIR_INI); ++ if (configIniFile.exists()) { - + return configIniFile; +++ return configIniFile; ++ } - + } +++ } ++ } else { - + for (File dir = pleiadesDir; dir != null; dir = dir.getParentFile()) { +++ for (File dir = pleiadesDir; dir != null; dir = dir.getParentFile()) { ++ configIniFile = new File(dir, CONFIG_DIR_INI); ++ if (configIniFile.exists()) { - + return configIniFile; +++ return configIniFile; ++ } +++ + } + } + diff --cc debian/watch index 154932a,0000000..2ca2fe6 mode 100644,000000..100644 --- a/debian/watch +++ b/debian/watch @@@ -1,7 -1,0 +1,8 @@@ +version=3 + - opts="downloadurlmangle=s/sourceforge/iij.dl.sourceforge/;s/downloads\///;s/projects\///,\ ++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//" \ + http://sourceforge.jp/projects/mergedoc/releases/ \ + /projects/mergedoc/downloads/.*/pleiades_(.*)\-src.zip/ debian uupdate ++ -- 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
