[pleiades] 06/21: Imported Debian patch 1.3.4~I20120531-dfsg-1
Hideki Yamane
henrich at moszumanska.debian.org
Thu Jan 2 10:18:23 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 5bfe8680214c3e8775180a83340f2488f4d14cc2
Merge: 3c19a2f fa99248
Author: Hideki Yamane <henrich at debian.org>
Date: Mon Jun 4 10:24:02 2012 +0900
Imported Debian patch 1.3.4~I20120531-dfsg-1
.keystore | Bin 1268 -> 1267 bytes
.settings/org.eclipse.core.resources.prefs | 2 +-
.settings/org.eclipse.jdt.ui.prefs | 6 +-
.settings/org.eclipse.jst.jsp.core.prefs | 31 +
.settings/org.eclipse.wst.html.core.prefs | 39 +
.settings/org.eclipse.wst.validation.prefs | 9 +
.settings/org.eclipse.wst.xsl.core.prefs | 12 +
about/plugins/featureImage.png | Bin 28097 -> 32082 bytes
build.xml | 326 +-
conf/pleiades-config.xml | 46 +-
conf/props/additions/ASF/IvyDE.properties | 42 +
conf/props/additions/ASF/JUnitHelper.properties | 2 +
conf/props/additions/EPL/EGit.properties | 49 -
.../additions/EPL/EclipseColorTheme.properties | 6 +
conf/props/additions/EPL/Eclipse_3.6.properties | 9 +-
conf/props/additions/EPL/Eclipse_3.7.properties | 97 +-
conf/props/additions/EPL/Eclipse_CDT.properties | 26 +
conf/props/additions/EPL/Eclipse_EGit.properties | 103 +-
conf/props/additions/EPL/Eclipse_JEE.properties | 15 +
conf/props/additions/EPL/Eclipse_Mylyn.properties | 76 +
.../Eclipse_Mylyn_200712_contributed.properties | 4 +-
conf/props/additions/EPL/Eclipse_PDE.properties | 11 +
conf/props/additions/EPL/Eclipse_PDT.properties | 3 +
.../additions/EPL/Eclipse_Subversive.properties | 23 +
...m2eclipse.properties => Eclipse_m2e.properties} | 69 +
.../EPL/Eclipse_mylyn_trans_newdic.properties | 2 -
conf/props/additions/EPL/QucikJUnit.properties | 4 +
conf/props/additions/EPL/eclipse-jmx.properties | 11 +
.../EPL/org.eclipse-SDK_3.7-20110905.properties | 82 +
.../EPL/org.eclipse.egit-20110905.properties | 276 +
.../GPL/EclipseRandomSplashScreen.properties | 8 +
conf/props/additions/LGPL/CheckStyle.properties | 2 +
conf/props/additions/LGPL/FindBugs.properties | 2 +
conf/props/additions/OTHER/Android.properties | 107 +
.../OTHER/GooglePluginForEclipse.properties | 48 +
conf/props/additions/OTHER/JBossTools.properties | 19 +-
conf/props/additions/regex-EPL.properties | 487 +-
conf/props/additions/regex-OTHER.properties | 15 +-
conf/props/nls-ui-customized.properties | 10 +-
conf/props/temp-all.properties | 4798 +-
conf/props/temp-nls-ui-customized.properties | 103761 +++++++++---------
conf/props/translation-ASF.properties | 48 +-
conf/props/translation-EPL.properties | 4211 +-
conf/props/translation-GPL.properties | 70 +-
conf/props/translation-LGPL.properties | 16 +-
conf/props/translation-OTHER.properties | 195 +-
conf/translation-multibytes-key.properties | 38 +-
conf/translation-regex.properties | 16 +-
conf/translation.properties | 4798 +-
debian/README.Debian | 29 -
debian/changelog | 21 +
debian/control | 3 +-
debian/copyright | 4 +-
debian/patches/build.xml | 69 +-
debian/patches/class-path_in_MANIFEST | 9 -
debian/patches/disable-create-src_zip | 31 +
debian/patches/series | 3 +-
debian/pleiades.config | 17 +
debian/pleiades.postinst | 42 +
debian/pleiades.postrm | 26 +
debian/pleiades.templates | 5 +
debian/po/POTFILES.in | 1 +
debian/po/ja.po | 29 +
debian/po/templates.pot | 30 +
debian/rules | 11 +-
eclipse.exe -clean.cmd | 1 +
eclipse.exe startup.cmd | 1 +
readme/readme_pleiades.txt | 2 +-
readme/readme_pleiades_changes.txt | 50 +
.../pleiades/aspect/AbstractTransformer.java | 3 +-
.../pleiades/aspect/LauncherTransformer.java | 6 +-
.../pleiades/aspect/TranslationEditor.java | 8 +-
.../{AspectMapping.java => PleiadesConfig.java} | 93 +-
...Assembler.java => PleiadesConfigAssembler.java} | 57 +-
.../mergedoc/pleiades/aspect/advice/Property.java | 57 -
.../resource/DynamicTranslationDictionary.java | 34 +-
.../aspect/resource/ExcludePackageProperties.java | 5 +-
.../aspect/resource/ExcludesClassNameCache.java | 4 +-
.../pleiades/aspect/resource/RegexDictionary.java | 17 +-
.../resource/TraceableTranslationDictionary.java | 49 +
.../aspect/resource/TransformedClassCache.java | 4 +-
.../pleiades/generator/AbstractValidator.java | 9 +-
.../mergedoc/pleiades/generator/Generator.java | 7 +-
.../pleiades/generator/TranslationRule.java | 112 +-
.../mergedoc/pleiades/generator/Validator.java | 2 +
.../pleiades/generator/nls/AbstractExtractor.java | 5 +-
.../pleiades/generator/nls/HelpExtractor.java | 4 +-
.../generator/nls/HelpTranslationRule.java | 15 +-
.../resource/AbstractTranslationDictionary.java | 4 +-
.../pleiades/resource/TranslationString.java | 8 +-
.../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 -
.../pleiades/resource/TranslationStringTest.java | 6 +
.../HelpHtmlParserTest.java} | 11 +-
.../resource => pending}/PropertySetTest.java | 6 +-
.../TranslationDictionaryHelpTestX.java | 5 +-
126 files changed, 62497 insertions(+), 80487 deletions(-)
diff --cc debian/changelog
index 6492fd1,0000000..3f211c3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,104 -1,0 +1,125 @@@
++pleiades (1.3.4~I20120531-dfsg-1) unstable; urgency=low
++
++ * New upstream snapshot
++ * debian/pleiades.{templates,config}
++ - add it to enable debconf
++ * debian/control
++ - add "Build-Depends: po-debconf", "Pre-Depends: debconf"
++ * debian/rules
++ - add option to xz to compress it more efficiently.
++ - exec debconf-updatepo via dh_clean
++ * debian/pleiades.{postinst,postrm}
++ - enable automatic configuration
++ * debian/patches
++ - build.xml: refresh it.
++ - add disable-create-src_zip to reduce build time.
++ * remove debian/README.Debian
++ * debian/copyright
++ - update my address
++
++ -- Hideki Yamane <henrich at debian.org> Mon, 04 Jun 2012 10:24:02 +0900
++
+pleiades (1.3.3-dfsg-3) unstable; urgency=low
+
+ * debian/control
+ - set "Standards-Version: 3.9.3"
+ * debian/rules
+ - compress with xz
+ * debian/patches
+ - build.xml: fix "missing-classpath" (Lintian).
+
+ -- Hideki Yamane <henrich at debian.org> Tue, 29 May 2012 09:42:09 +0900
+
+pleiades (1.3.3-dfsg-2) unstable; urgency=low
+
+ * debian/control
+ - remove unnecessary "DM-Upload-Allowed: yes" field
+
+ -- Hideki Yamane <henrich at debian.org> Sat, 17 Sep 2011 10:11:42 +0900
+
+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 9eddaf8,0000000..9b31879
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,18 @@@
+Source: pleiades
+Section: devel
+Priority: extra
+Maintainer: Hideki Yamane <henrich at debian.org>
- Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk
++Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk, po-debconf
+Build-Depends-Indep: libcommons-lang-java, libcommons-io-java, libjavassist-java, zip, unzip
+Standards-Version: 3.9.3
+Homepage: http://mergedoc.sourceforge.jp/
+
+Package: pleiades
+Architecture: all
++Pre-Depends: debconf
+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/copyright
index 83f984a,0000000..430c1f2
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,224 -1,0 +1,224 @@@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/?rev=135
+Name: pleiades
+Source: http://sourceforge.jp/projects/mergedoc/
+Maintainer: Shinji Kashihara (柏原 真二) <cypher256 @ users.sourceforge.jp>
+
+Files: *
- Copyright: 2005-2009 Shinji Kashihara
++Copyright: 2005-2012 Shinji Kashihara
+License: Eclipse Public License v1.0
+
+ Eclipse Public License -v 1.0
+
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+ CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+ 1. DEFINITIONS
+
+ "Contribution" means:
+
+ a) in the case of the initial Contributor, the initial code and documentation
+ distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+
+ i) changes to the Program, and
+ ii) additions to the Program;
+
+ where such changes and/or additions to the Program originate from and are
+ distributed by that particular Contributor. A Contribution 'originates' from a
+ Contributor if it was added to the Program by such Contributor itself or anyone
+ acting on such Contributor's behalf. Contributions do not include additions to
+ the Program which: (i) are separate modules of software distributed in
+ conjunction with the Program under their own license agreement, and (ii) are
+ not derivative works of the Program.
+
+ "Contributor" means any person or entity that distributes the Program.
+
+ "Licensed Patents " mean patent claims licensable by a Contributor which are
+ necessarily infringed by the use or sale of its Contribution alone or when
+ combined with the Program.
+
+ "Program" means the Contributions distributed in accordance with this
+ Agreement.
+
+ "Recipient" means anyone who receives the Program under this Agreement,
+ including all Contributors.
+
+ 2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly perform,
+ distribute and sublicense the Contribution of such Contributor, if any, and
+ such derivative works, in source code and object code form.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and otherwise
+ transfer the Contribution of such Contributor, if any, in source code and
+ object code form. This patent license shall apply to the combination of the
+ Contribution and the Program if, at the time the Contribution is added by the
+ Contributor, such addition of the Contribution causes such combination to be
+ covered by the Licensed Patents. The patent license shall not apply to any
+ other combinations which include the Contribution. No hardware per se is
+ licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the licenses to
+ its Contributions set forth herein, no assurances are provided by any
+ Contributor that the Program does not infringe the patent or other intellectual
+ property rights of any other entity. Each Contributor disclaims any liability
+ to Recipient for claims brought by any other entity based on infringement of
+ intellectual property rights or otherwise. As a condition to exercising the
+ rights and licenses granted hereunder, each Recipient hereby assumes sole
+ responsibility to secure any other intellectual property rights needed, if any.
+ For example, if a third party patent license is required to allow Recipient to
+ distribute the Program, it is Recipient's responsibility to acquire that
+ license before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright license
+ set forth in this Agreement.
+
+ 3. REQUIREMENTS
+
+ A Contributor may choose to distribute the Program in object code form under
+ its own license agreement, provided that:
+
+ a) it complies with the terms and conditions of this Agreement; and
+
+ b) its license agreement:
+
+ i) effectively disclaims on behalf of all Contributors all warranties and
+ conditions, express and implied, including warranties or conditions of title
+ and non-infringement, and implied warranties or conditions of merchantability
+ and fitness for a particular purpose;
+
+ ii) effectively excludes on behalf of all Contributors all liability for
+ damages, including direct, indirect, special, incidental and consequential
+ damages, such as lost profits;
+
+ iii) states that any provisions which differ from this Agreement are offered by
+ that Contributor alone and not by any other party; and
+
+ iv) states that source code for the Program is available from such Contributor,
+ and informs licensees how to obtain it in a reasonable manner on or through a
+ medium customarily used for software exchange.
+
+ When the Program is made available in source code form:
+
+ a) it must be made available under this Agreement; and
+
+ b) a copy of this Agreement must be included with each copy of the Program.
+
+ Contributors may not remove or alter any copyright notices contained within the
+ Program.
+
+ Each Contributor must identify itself as the originator of its Contribution, if
+ any, in a manner that reasonably allows subsequent Recipients to identify the
+ originator of the Contribution.
+
+ 4. COMMERCIAL DISTRIBUTION
+
+ Commercial distributors of software may accept certain responsibilities with
+ respect to end users, business partners and the like. While this license is
+ intended to facilitate the commercial use of the Program, the Contributor who
+ includes the Program in a commercial product offering should do so in a manner
+ which does not create potential liability for other Contributors. Therefore, if
+ a Contributor includes the Program in a commercial product offering, such
+ Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+ every other Contributor ("Indemnified Contributor") against any losses, damages
+ and costs (collectively "Losses") arising from claims, lawsuits and other legal
+ actions brought by a third party against the Indemnified Contributor to the
+ extent caused by the acts or omissions of such Commercial Contributor in
+ connection with its distribution of the Program in a commercial product
+ offering. The obligations in this section do not apply to any claims or Losses
+ relating to any actual or alleged intellectual property infringement. In order
+ to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+ Contributor in writing of such claim, and b) allow the Commercial Contributor
+ to control, and cooperate with the Commercial Contributor in, the defense and
+ any related settlement negotiations. The Indemnified Contributor may
+ participate in any such claim at its own expense.
+
+ For example, a Contributor might include the Program in a commercial product
+ offering, Product X. That Contributor is then a Commercial Contributor. If that
+ Commercial Contributor then makes performance claims, or offers warranties
+ related to Product X, those performance claims and warranties are such
+ Commercial Contributor's responsibility alone. Under this section, the
+ Commercial Contributor would have to defend claims against the other
+ Contributors related to those performance claims and warranties, and if a court
+ requires any other Contributor to pay any damages as a result, the Commercial
+ Contributor must pay those damages.
+
+ 5. NO WARRANTY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+ IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+ NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+ Recipient is solely responsible for determining the appropriateness of using
+ and distributing the Program and assumes all risks associated with its exercise
+ of rights under this Agreement , including but not limited to the risks and
+ costs of program errors, compliance with applicable laws, damage to or loss of
+ data, programs or equipment, and unavailability or interruption of operations.
+
+ 6. DISCLAIMER OF LIABILITY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+ CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+ PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ 7. GENERAL
+
+ If any provision of this Agreement is invalid or unenforceable under applicable
+ law, it shall not affect the validity or enforceability of the remainder of the
+ terms of this Agreement, and without further action by the parties hereto, such
+ provision shall be reformed to the minimum extent necessary to make such
+ provision valid and enforceable.
+
+ If Recipient institutes patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+ (excluding combinations of the Program with other software or hardware)
+ infringes such Recipient's patent(s), then such Recipient's rights granted
+ under Section 2(b) shall terminate as of the date such litigation is filed.
+
+ All Recipient's rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and does
+ not cure such failure in a reasonable period of time after becoming aware of
+ such noncompliance. If all Recipient's rights under this Agreement terminate,
+ Recipient agrees to cease use and distribution of the Program as soon as
+ reasonably practicable. However, Recipient's obligations under this Agreement
+ and any licenses granted by Recipient relating to the Program shall continue
+ and survive.
+
+ Everyone is permitted to copy and distribute copies of this Agreement, but in
+ order to avoid inconsistency the Agreement is copyrighted and may only be
+ modified in the following manner. The Agreement Steward reserves the right to
+ publish new versions (including revisions) of this Agreement from time to time.
+ No one other than the Agreement Steward has the right to modify this Agreement.
+ The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
+ may assign the responsibility to serve as the Agreement Steward to a suitable
+ separate entity. Each new version of the Agreement will be given a
+ distinguishing version number. The Program (including Contributions) may always
+ be distributed subject to the version of the Agreement under which it was
+ received. In addition, after a new version of the Agreement is published,
+ Contributor may elect to distribute the Program (including its Contributions)
+ under the new version. Except as expressly stated in Sections 2(a) and 2(b)
+ above, Recipient receives no rights or licenses to the intellectual property of
+ any Contributor under this Agreement, whether expressly, by implication,
+ estoppel or otherwise. All rights in the Program not expressly granted under
+ this Agreement are reserved.
+
+ This Agreement is governed by the laws of the State of New York and the
+ intellectual property laws of the United States of America. No party to this
+ Agreement will bring a legal action under this Agreement more than one year
+ after the cause of action arose. Each party waives its rights to a jury trial
+ in any resulting litigation.
+
+Files: debian/*
- Copyright: 2009, 2010 Hideki Yamane (Debian-JP) <henrich at debian.or.jp>
++Copyright: 2009-2012 Hideki Yamane <henrich at debian.org>
+License: Eclipse Public License v1.0
diff --cc debian/patches/build.xml
index b371d22,0000000..bf26054
mode 100644,000000..100644
--- a/debian/patches/build.xml
+++ b/debian/patches/build.xml
@@@ -1,44 -1,0 +1,43 @@@
- Index: pleiades-1.3.3-dfsg/build.xml
++Index: pleiades-1.3.4.I20120531-dfsg/build.xml
+===================================================================
- --- pleiades-1.3.3-dfsg.orig/build.xml 2011-09-08 23:31:27.376197534 +0900
- +++ pleiades-1.3.3-dfsg/build.xml 2012-05-29 09:38:40.206734644 +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="/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"/>
++--- pleiades-1.3.4.I20120531-dfsg.orig/build.xml 2012-02-25 18:10:19.000000000 +0900
+++++ pleiades-1.3.4.I20120531-dfsg/build.xml 2012-06-03 21:29:23.137414648 +0900
++@@ -41,9 +41,10 @@
++ <pathelement location="bintest" />
++ <pathelement location="srctest" />
++ <pathelement location="conf" />
++- <fileset dir="lib">
++- <include name="**/*.jar" />
++- </fileset>
+++ <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>
+
+ <!-- 翻訳プロパティーの生成（各プロパティーのマージ） -->
- @@ -99,7 +98,14 @@
- <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"/>
- + <attribute name="Class-Path"
- + value=" /usr/share/java/javassist.jar
- + /usr/share/java/commons-io.jar
- + /usr/share/java/commons-lang.jar"/>
++@@ -94,7 +95,15 @@
++ </fileset>
++ <manifest>
++ <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" />
+++ <attribute name="Boot-Class-Path" value="./${agent.jar.name} ./conf
+++ /usr/share/java/javassist.jar
+++ /usr/share/java/commons-io.jar
+++ /usr/share/java/commons-lang.jar" />
+++ <attribute name="Class-Path"
+++ value="/usr/share/java/javassist.jar
+++ /usr/share/java/commons-io.jar
+++ /usr/share/java/commons-lang.jar" />
+++
+ </manifest>
+ </jar>
+
- @@ -108,6 +114,7 @@
++@@ -103,6 +112,7 @@
+ <copy todir="plugins/${project.id}">
+ <fileset dir="${basedir}">
- <exclude name="debian/"/>
- + <exclude name=".pc/"/>
- <exclude name=".settings/*"/>
- <exclude name="about/"/>
- <exclude name="bin/"/>
++ <exclude name="debian/" />
+++ <exclude name=".pc/" />
++ <exclude name=".settings/*" />
++ <exclude name="about/" />
++ <exclude name="bin/" />
diff --cc debian/patches/disable-create-src_zip
index 0000000,0000000..8d061dc
new file mode 100644
--- /dev/null
+++ b/debian/patches/disable-create-src_zip
@@@ -1,0 -1,0 +1,31 @@@
++Index: pleiades-1.3.4~I20120531-dfsg/build.xml
++===================================================================
++--- pleiades-1.3.4~I20120531-dfsg.orig/build.xml 2012-06-04 09:11:30.000000000 +0900
+++++ pleiades-1.3.4~I20120531-dfsg/build.xml 2012-06-04 09:13:52.929737697 +0900
++@@ -185,26 +185,6 @@
++ <delete dir="plugins" />
++ <delete dir="features" />
++
++- <!-- Pleiades zip ソース・ファイルの作成 -->
++- <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="report/" />
++- <exclude name="build/" />
++- <!-- コマンドでエラーになるため追加 -->
++- <exclude name="features/" />
++- <exclude name="plugins/" />
++- </fileset>
++- </zip>
++-
++ </target>
++
++ <!-- クリーン (コマンドライン用) -->
diff --cc debian/patches/series
index 0445324,0000000..ba68d6b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
- build.xml
++disable-create-src_zip
+fix-config.ini
++build.xml
diff --cc debian/pleiades.config
index 0000000,0000000..ec7989f
new file mode 100644
--- /dev/null
+++ b/debian/pleiades.config
@@@ -1,0 -1,0 +1,17 @@@
++#!/bin/sh
++
++set -e
++
++INI="/etc/eclipse.ini"
++
++. /usr/share/debconf/confmodule
++db_version 2.0
++
++if [ -f $INI ]; then
++ db_set pleiades/eclipse true
++fi
++
++db_input medium pleiades/eclipse || true
++db_go
++
++exit 0
diff --cc debian/pleiades.postinst
index 0000000,0000000..f148635
new file mode 100644
--- /dev/null
+++ b/debian/pleiades.postinst
@@@ -1,0 -1,0 +1,42 @@@
++#!/bin/sh
++
++set -e
++
++ENABLE_PLEIADES="-javaagent:/usr/lib/eclipse/plugins/jp.sourceforge.mergedoc.pleiades/pleiades.jar"
++ECLIPSE_INI="/etc/eclipse.ini"
++# somehow without export its results change time by time...
++export SETTINGS="`grep -e $ENABLE_PLEIADES $ECLIPSE_INI`"
++
++case "$1" in
++ install|configure)
++ . /usr/share/debconf/confmodule
++ db_version 2.0
++ db_get pleiades/eclipse
++ db_stop
++
++
++ if [ -f $ECLIPSE_INI ]; then
++ if [ $RET = true ] && [ -z "$SETTINGS" ]; then
++ echo $ENABLE_PLEIADES >> $ECLIPSE_INI
++ elif [ $RET = false ] && [ ! -z "$SETTINGS" ]; then
++ sed -e s%\^$ENABLE_PLEIADES%%g -e /^$/d -i $ECLIPSE_INI
++ fi
++ fi
++ ;;
++
++ abort-upgrade|abort-remove|abort-deconfigure)
++ ;;
++
++ *)
++ echo "postinst called with unknown argument \`$1'" >&2
++ exit 1
++ ;;
++esac
++
++# dh_installdeb will replace this with shell code automatically
++# generated by other debhelper scripts.
++
++#DEBHELPER#
++
++unset SETTINGS
++exit 0
diff --cc debian/pleiades.postrm
index 0000000,0000000..d088b2a
new file mode 100644
--- /dev/null
+++ b/debian/pleiades.postrm
@@@ -1,0 -1,0 +1,26 @@@
++#!/bin/sh
++
++set -e
++
++ENABLE_PLEIADES="-javaagent:/usr/lib/eclipse/plugins/jp.sourceforge.mergedoc.pleiades/pleiades.jar"
++ECLIPSE_INI="/etc/eclipse.ini"
++
++case "$1" in
++ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
++ if [ -f $ECLIPSE_INI ]; then
++ sed -e s%\^$ENABLE_PLEIADES%% -i $ECLIPSE_INI
++ fi
++ ;;
++
++ *)
++ echo "postrm called with unknown argument \`$1'" >&2
++ exit 1
++ ;;
++esac
++
++# dh_installdeb will replace this with shell code automatically
++# generated by other debhelper scripts.
++
++#DEBHELPER#
++
++exit 0
diff --cc debian/pleiades.templates
index 0000000,0000000..845dcc9
new file mode 100644
--- /dev/null
+++ b/debian/pleiades.templates
@@@ -1,0 -1,0 +1,5 @@@
++Template: pleiades/eclipse
++Type: boolean
++Default: false
++_Description: Enable pleiades for your Eclipse configuration?
++ If you want to use pleiades, you should enable it in /etc/eclpse.ini.
diff --cc debian/po/POTFILES.in
index 0000000,0000000..7cba524
new file mode 100644
--- /dev/null
+++ b/debian/po/POTFILES.in
@@@ -1,0 -1,0 +1,1 @@@
++[type: gettext/rfc822deb] pleiades.templates
diff --cc debian/po/ja.po
index 0000000,0000000..e5048df
new file mode 100644
--- /dev/null
+++ b/debian/po/ja.po
@@@ -1,0 -1,0 +1,29 @@@
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: pleiades\n"
++"Report-Msgid-Bugs-To: pleiades at packages.debian.org\n"
++"POT-Creation-Date: 2012-06-04 06:18+0900\n"
++"PO-Revision-Date: 2012-06-04 06:18+0900\n"
++"Last-Translator: Hideki Yamane <henrich at debian.org>\n"
++"Language-Team: \n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../pleiades.templates:1001
++msgid "Enable pleiades for your Eclipse configuration?"
++msgstr "Eclipse の設定について pleiades を有効にしますか?"
++
++#. Type: boolean
++#. Description
++#: ../pleiades.templates:1001
++msgid "If you want to use pleiades, you should enable it in /etc/eclpse.ini."
++msgstr "pleiades を使いたい場合には、/etc/eclipse.ini で有効にする必要があります。"
diff --cc debian/po/templates.pot
index 0000000,0000000..9fb7950
new file mode 100644
--- /dev/null
+++ b/debian/po/templates.pot
@@@ -1,0 -1,0 +1,30 @@@
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: pleiades\n"
++"Report-Msgid-Bugs-To: pleiades at packages.debian.org\n"
++"POT-Creation-Date: 2012-06-04 06:18+0900\n"
++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
++"Language-Team: LANGUAGE <LL at li.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=CHARSET\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../pleiades.templates:1001
++msgid "Enable pleiades for your Eclipse configuration?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#: ../pleiades.templates:1001
++msgid "If you want to use pleiades, you should enable it in /etc/eclpse.ini."
++msgstr ""
diff --cc debian/rules
index 5589dc9,0000000..096997f
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,21 -1,0 +1,30 @@@
+#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+packagename=pleiades
+eclipse_dir=usr/share/eclipse
+
+%:
+ dh $@
+
+override_dh_auto_build:
+ ant -Dbin.dir=$(CURDIR)/build/bin -Dbuild.dir=$(CURDIR)/build build.full
+
+override_dh_auto_install:
+ unzip -q -d $(CURDIR)/debian/$(packagename)/$(eclipse_dir) $(CURDIR)/build/$(packagename).zip
+# remove unneeded files
+ -rm -r $(CURDIR)/debian/$(packagename)/$(eclipse_dir)/readme
+ -rm $(CURDIR)/debian/$(packagename)/$(eclipse_dir)/*cmd
+
++override_dh_clean:
++ debconf-updatepo
++ dh_clean
++
+override_dh_builddeb:
- dh_builddeb -- -Zxz
++ dh_builddeb -- -Zxz -Sextreme -z9
++
++make_it_dfsg:
++ rm -r $(CURDIR)/lib \
++ $(CURDIR)/srctest/jp/sourceforge/mergedoc/pleiades/resource/3.*
++ mv $(CURDIR) `sed -e s/$(CURDIR)/$(CURDIR)-dfsg/`
--
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