This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch master
in repository pleiades.

commit 72b324a195ce757d910c2d123df81853cbc05e89
Author: Hideki Yamane (Debian-JP) <[email protected]>
Date:   Mon Mar 22 15:05:28 2010 +0900

    Imported Debian patch 1.3.1-dfsg-1
---
 debian/README.Debian          |  29 ++++++
 debian/changelog              |  58 +++++++++++
 debian/compat                 |   1 +
 debian/control                |  18 ++++
 debian/copyright              | 224 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/build.xml      | 174 ++++++++++++++++++++++++++++++++
 debian/patches/fix-config.ini |  29 ++++++
 debian/patches/series         |   2 +
 debian/pleiades.dirs          |   2 +
 debian/pleiades.docs          |   1 +
 debian/pleiades.links         |   2 +
 debian/rules                  |  18 ++++
 debian/source/format          |   1 +
 debian/watch                  |   7 ++
 14 files changed, 566 insertions(+)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..ab11351
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,29 @@
+pleiades for Debian
+-------------------
+
+ Please edit /etc/eclipse.ini file to add below line to bottom,
+ then restart eclipse.
+
+-javaagent:/usr/lib/eclipse/plugins/jp.sourceforge.mergedoc.pleiades/pleiades.jar
+
+
+ And comment out these 2 lines in /etc/eclipse.ini also changes splash screen.
+#-showsplash
+#org.eclipse.platform
+
+
+(in Japanese)
+
+ /etc/eclipse.ini の最後の行に以下の1行を追加してから eclipse を起動して
+ください。
+
+-javaagent:/usr/lib/eclipse/plugins/jp.sourceforge.mergedoc.pleiades/pleiades.jar
+
+
+ また、/etc/ecliplse.ini 中の以下の2行をコメントアウトするとスプラッシュ
+ スクリーンが変わります。
+#-showsplash
+#org.eclipse.platform
+
+
+ -- Hideki Yamane (Debian-JP) <[email protected]>  Wed, 04 Nov 2009 
20:23:07 +0900
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..f8d09d8
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,58 @@
+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 --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..aa89a24
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: pleiades
+Section: devel
+Priority: extra
+Maintainer: Hideki Yamane (Debian-JP) <[email protected]>
+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.8.4
+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 --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..83f984a
--- /dev/null
+++ b/debian/copyright
@@ -0,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
+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) <[email protected]>
+License: Eclipse Public License v1.0
diff --git a/debian/patches/build.xml b/debian/patches/build.xml
new file mode 100644
index 0000000..1b477e1
--- /dev/null
+++ b/debian/patches/build.xml
@@ -0,0 +1,174 @@
+Index: pleiades-1.3.1-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"/>
+               <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="/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>
+                               <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>
+ 
+@@ -102,11 +106,13 @@
+               <copy tofile="META-INF/MANIFEST.MF" 
file="META-INF/MANIFEST.MF.template" overwrite="true"/>
+               <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="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 --git a/debian/patches/fix-config.ini b/debian/patches/fix-config.ini
new file mode 100644
index 0000000..8816e0b
--- /dev/null
+++ b/debian/patches/fix-config.ini
@@ -0,0 +1,29 @@
+Index: pleiades-1.3.1-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 @@
+               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;
++              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()) {
++                                      return configIniFile;
++                              }
+                       }
+               }
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0445324
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+build.xml
+fix-config.ini
diff --git a/debian/pleiades.dirs b/debian/pleiades.dirs
new file mode 100644
index 0000000..948ea72
--- /dev/null
+++ b/debian/pleiades.dirs
@@ -0,0 +1,2 @@
+usr/lib/eclipse
+usr/share/eclipse
diff --git a/debian/pleiades.docs b/debian/pleiades.docs
new file mode 100644
index 0000000..c26f44c
--- /dev/null
+++ b/debian/pleiades.docs
@@ -0,0 +1 @@
+readme/readme_pleiades.txt
diff --git a/debian/pleiades.links b/debian/pleiades.links
new file mode 100644
index 0000000..65ac5fa
--- /dev/null
+++ b/debian/pleiades.links
@@ -0,0 +1,2 @@
+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
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..2310544
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,18 @@
+#!/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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..154932a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,7 @@
+version=3
+
+opts="downloadurlmangle=s/sourceforge/iij.dl.sourceforge/;s/downloads\///;s/projects\///,\
+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

Reply via email to