[pleiades] 03/21: Imported Debian patch 1.3.3-dfsg-1
Hideki Yamane
henrich at moszumanska.debian.org
Thu Jan 2 10:18:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
henrich pushed a commit to branch master
in repository pleiades.
commit 6de30b7e23497e277af0bc9157f121bd86b32cbf
Merge: 23756ac e7453b9
Author: Hideki Yamane <henrich at debian.org>
Date: Thu Sep 8 23:45:14 2011 +0900
Imported Debian patch 1.3.3-dfsg-1
.keystore | Bin 1268 -> 1268 bytes
build.xml | 121 +-
conf/pleiades-config.xml | 33 +-
.../additions/.pending/FlexBuilder.properties | 18 +-
conf/props/additions/ASF/Slim3.properties | 6 +
conf/props/additions/ASF/WindowsAzure4e.properties | 56 +
conf/props/additions/EPL/AnyEditTools.properties | 3 +
conf/props/additions/EPL/Eclipse_3.3.properties | 6 +-
conf/props/additions/EPL/Eclipse_3.4.properties | 2 +-
.../EPL/Eclipse_3.4_contributed.properties | 6 +-
conf/props/additions/EPL/Eclipse_3.6.properties | 8 +
conf/props/additions/EPL/Eclipse_3.7.properties | 70 +
conf/props/additions/EPL/Eclipse_CDT.properties | 24 +
conf/props/additions/EPL/Eclipse_EGit.properties | 141 +-
conf/props/additions/EPL/Eclipse_JEE.properties | 34 +
conf/props/additions/EPL/Eclipse_Mylyn.properties | 3 +
conf/props/additions/EPL/Eclipse_PDE.properties | 12 +
conf/props/additions/EPL/Eclipse_PDT.properties | 2 +
conf/props/additions/EPL/Eclipse_RSE.properties | 1 +
.../additions/EPL/Eclipse_Subversive.properties | 47 +
conf/props/additions/EPL/Eclipse_TPTP.properties | 14 +-
.../additions/EPL/Eclipse_UpdateManager.properties | 4 +-
.../EPL/org.eclipse.jst-20091006.properties | 2 +-
...rprise.jst.server.sunappsrv-20091023.properties | 2 +-
conf/props/additions/OTHER/Android.properties | 52 +
.../OTHER/GooglePluginForEclipse.properties | 111 +-
conf/props/additions/OTHER/jsLex.properties | 2 +-
conf/props/additions/exclude-EPL.properties | 7 +-
conf/props/additions/regex-EPL.properties | 484 +-
conf/props/additions/regex-OTHER.properties | 9 +-
conf/props/nls-ui-customized.properties | 232 +-
conf/props/temp-all.properties | 1305 +-
conf/props/temp-nls-help-checked.properties | 547 +-
conf/props/temp-nls-help-unchecked.properties | 52 +-
conf/props/temp-nls-ui-customized.properties | 103740 +++++++++---------
conf/props/translation-ASF.properties | 66 +-
conf/props/translation-EPL.properties | 1101 +-
conf/props/translation-GPL.properties | 4 +-
conf/props/translation-OTHER.properties | 144 +-
conf/props/validation-help-override.properties | 357 +-
conf/splash3.7.bmp | Bin 0 -> 403614 bytes
conf/splash3.7.png | Bin 0 -> 633174 bytes
conf/translation-exclude-package.properties | 7 +-
conf/translation-help-unchecked.properties | 52 +-
conf/translation-regex.properties | 11 +-
conf/translation.properties | 1305 +-
debian/changelog | 10 +
debian/control | 2 +-
debian/patches/build.xml | 14 +-
debian/patches/fix-config.ini | 56 +-
readme/readme_pleiades_changes.txt | 21 +
src/jp/sourceforge/mergedoc/pleiades/Pleiades.java | 27 +-
.../mergedoc/pleiades/aspect/Metadata.java | 50 +-
.../resource/DynamicTranslationDictionary.java | 2 +-
.../resource/AbstractTranslationDictionary.java | 14 +-
.../jdt_api_options/en.html | 3932 +
.../jdt_api_options/ja.html | 3989 +
.../jdt_api_options/ja_actual.html | 3846 +
.../jdt_api_options/ja_expected.html | 3846 +
.../jdt_api_options/trans.properties | 516 +
.../whatsNew/platform_whatsnew/en.html | 1019 +
.../whatsNew/platform_whatsnew/ja.html | 734 +
.../whatsNew/platform_whatsnew/ja_actual.html | 654 +
.../whatsNew/platform_whatsnew/ja_expected.html | 654 +
.../whatsNew/platform_whatsnew/trans.properties | 263 +
.../3.2.1/org.eclipse.help.base/help_home/en.html | 53 +
.../3.2.1/org.eclipse.help.base/help_home/ja.html | 47 +
.../org.eclipse.help.base/help_home/ja_actual.html | 37 +
.../help_home/ja_expected.html | 37 +
.../help_home/trans.properties | 18 +
.../_countTest/colordialog/en.html | 535 +
.../_countTest/colordialog/ja.html | 537 +
.../_countTest/cprbview/en.html | 61 +
.../_countTest/cprbview/ja.html | 50 +
.../_countTest/ref-19cvs-password/en.html | 27 +
.../_countTest/ref-19cvs-password/ja.html | 22 +
.../_countTest/ref-19cvs/en.html | 229 +
.../_countTest/ref-19cvs/ja.html | 198 +
.../_countTest/tasks-cvs-passwords/en.html | 50 +
.../_countTest/tasks-cvs-passwords/ja.html | 46 +
.../gettingStarted/qs-02a/en.html | 48 +
.../gettingStarted/qs-02a/ja.html | 34 +
.../gettingStarted/qs-02a/ja_actual.html | 30 +
.../gettingStarted/qs-02a/ja_expected.html | 30 +
.../gettingStarted/qs-02a/trans.properties | 14 +
.../rnmspc/en.html | 276 +
.../rnmspc/ja.html | 207 +
87 files changed, 78337 insertions(+), 54101 deletions(-)
diff --cc debian/changelog
index 8aa7578,0000000..5a70fc0
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,76 -1,0 +1,86 @@@
++pleiades (1.3.3-dfsg-1) unstable; urgency=low
++
++ * New upstream release
++ * debian/control
++ - set "Standards-Version: 3.9.2"
++ * debian/patches
++ - adjust build.xml and fix-config.ini
++
++ -- Hideki Yamane <henrich at debian.org> Thu, 08 Sep 2011 23:45:14 +0900
++
+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 <henrich at debian.org> 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 <niels at thykier.net> and Matthew Johnson
+ <mjj29 at debian.org>!
+
+ -- Hideki Yamane (Debian-JP) <henrich at debian.or.jp> 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) <henrich at debian.or.jp> 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) <henrich at debian.or.jp> 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) <henrich at debian.or.jp> 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 <watayan at meigaku.ac.jp>
+
+ -- Hideki Yamane (Debian-JP) <henrich at debian.or.jp> 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) <henrich at debian.or.jp> Thu, 12 Nov 2009 11:57:55 +0900
diff --cc debian/control
index 9bcd6ea,0000000..994d7ea
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 <henrich at debian.org>
+DM-Upload-Allowed: yes
+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.9.1
++Standards-Version: 3.9.2
+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
+ 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 de9221d,0000000..6a02f9a
mode 100644,000000..100644
--- a/debian/patches/build.xml
+++ b/debian/patches/build.xml
@@@ -1,40 -1,0 +1,40 @@@
- Index: pleiades-1.3.2-dfsg/build.xml
++Index: pleiades-1.3.3-dfsg/build.xml
+===================================================================
- --- 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
++--- pleiades-1.3.3-dfsg.orig/build.xml 2011-07-03 10:33:50.000000000 +0900
+++++ pleiades-1.3.3-dfsg/build.xml 2011-09-08 22:45:25.698503112 +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"/> <!-- Eclipse3.5 -->
- - <pathelement location="${eclipse.home}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar"/> <!-- Eclipse3.6 -->
++- <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>
+
+ <!-- 翻訳プロパティーの生成（各プロパティーのマージ） -->
- @@ -96,7 +95,10 @@
++@@ -99,7 +98,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"/>
+ </manifest>
+ </jar>
+
- @@ -105,6 +107,7 @@
++@@ -108,6 +110,7 @@
+ <copy todir="plugins/${project.id}">
+ <fileset dir="${basedir}">
+ <exclude name="debian/"/>
++ <exclude name=".pc/"/>
+ <exclude name=".settings/*"/>
+ <exclude name="about/"/>
+ <exclude name="bin/"/>
diff --cc debian/patches/fix-config.ini
index e2f3457,0000000..3794953
mode 100644,000000..100644
--- a/debian/patches/fix-config.ini
+++ b/debian/patches/fix-config.ini
@@@ -1,36 -1,0 +1,34 @@@
- Index: pleiades-1.3.2-dfsg/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java
++Index: pleiades-1.3.3-dfsg/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java
+===================================================================
- --- 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();
++--- 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 = pleiadesDir; dir != null; dir = dir.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 = pleiadesDir; 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 = pleiadesDir; dir != null; dir = dir.getParentFile()) {
- + configIniFile = new File(dir, CONFIG_DIR_INI);
- + if (configIniFile.exists()) {
++- }
+++ // 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())) {
--
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