[pleiades] 13/21: Imported Debian patch 1.4.0-dfsg-1
Hideki Yamane
henrich at moszumanska.debian.org
Thu Jan 2 10:18:26 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 804a5a5dee8fb557efd2aa87d8d61857e11ab08b
Merge: 27473ac d18be19
Author: Hideki Yamane <henrich at debian.org>
Date: Tue Mar 5 23:47:08 2013 +0900
Imported Debian patch 1.4.0-dfsg-1
.classpath | 2 +-
META-INF/MANIFEST.MF | 2 +-
META-INF/MANIFEST.MF.template | 2 +-
about/features/feature.xml | 2 +-
about/plugins/about.properties | 2 +-
about/plugins/icons/preferences.png | Bin 0 -> 917 bytes
about/plugins/plugin.xml | 28 +-
build.xml | 297 +-
conf/pleiades-config.xml | 306 +-
conf/props/additions/ASF/IDEA.properties | 23 +
conf/props/additions/ASF/IvyDE.properties | 41 +-
conf/props/additions/EPL/AnyEditTools.properties | 10 +-
conf/props/additions/EPL/ChromeTheme.properties | 52 +
conf/props/additions/EPL/EclEmma.properties | 28 +-
.../EPL/Eclipse_3.4_contributed.properties | 8 +-
conf/props/additions/EPL/Eclipse_3.7.properties | 13 +-
conf/props/additions/EPL/Eclipse_4.2.properties | 82 +-
conf/props/additions/EPL/Eclipse_CDT.properties | 16 +
conf/props/additions/EPL/Eclipse_Dali.properties | 96 +
conf/props/additions/EPL/Eclipse_EGit.properties | 22 +-
conf/props/additions/EPL/Eclipse_JEE.properties | 25 +
conf/props/additions/EPL/Eclipse_PDE.properties | 3 +
conf/props/additions/EPL/Eclipse_PDT.properties | 5 +
conf/props/additions/EPL/Eclipse_RSE.properties | 2 +
.../additions/EPL/Eclipse_Subversive.properties | 9 +-
.../additions/EPL/Eclipse_UpdateManager.properties | 35 +
.../additions/EPL/Eclipse_WindowBuilder.properties | 24 +
conf/props/additions/EPL/Eclipse_m2e.properties | 224 +-
conf/props/additions/EPL/Eclipse_mat.properties | 32 +
.../EPL/Eclipse_mylyn_trans_newdic.properties | 6 +-
.../props/additions/EPL/Eclipse_papyrus.properties | 1 +
conf/props/additions/EPL/Gradle.properties | 3 +
conf/props/additions/EPL/OpenExternal.properties | 2 +
conf/props/additions/EPL/QucikJUnit.properties | 1 +
conf/props/additions/EPL/QuickJUnit.properties | 10 +
.../org.eclipse-jee-galileo-20091022-2.properties | 2 +-
.../EPL/org.eclipse.jpt-20091006.properties | 178 +-
.../EPL/org.eclipse.jst-20091208-8.properties | 84 +-
.../EPL/org.eclipse.rse-20091018-4.properties | 102 +-
conf/props/additions/GPL/Aptana-PyDev.properties | 20 +
conf/props/additions/LGPL/CheckStyle.properties | 1 +
conf/props/additions/LGPL/FindBugs.properties | 15 +-
conf/props/additions/OTHER/Android.properties | 200 +-
conf/props/additions/OTHER/EcSplorer.properties | 6 +-
conf/props/additions/OTHER/JDEclipse.properties | 9 +
conf/props/additions/OTHER/Scala.properties | 85 +
conf/props/additions/exclude-EPL.properties | 5 +-
conf/props/additions/regex-EPL.properties | 12 +-
conf/props/additions/regex-OTHER.properties | 7 +-
conf/props/nls-ui-customized.properties | 11 +-
.../nls-ui-customized/babel-201207.properties | 80 +
.../original/babel-201207.properties} | 61019 ++++++++-----------
conf/props/temp-all.properties | 1002 +-
conf/props/temp-nls-ui-customized.properties | 1577 +-
conf/props/translation-ASF.properties | 66 +-
conf/props/translation-EPL.properties | 611 +-
conf/props/translation-GPL.properties | 82 +-
conf/props/translation-LGPL.properties | 28 +-
conf/props/translation-OTHER.properties | 323 +-
conf/splash.bmp | Bin 403614 -> 403614 bytes
conf/splash.png | Bin 611150 -> 491833 bytes
conf/splash3.2.bmp | Bin 403614 -> 0 bytes
conf/splash3.2.png | Bin 615880 -> 0 bytes
conf/splash4.2.bmp | Bin 0 -> 409566 bytes
conf/splash4.2.png | Bin 0 -> 443388 bytes
conf/splash_clean.png | Bin 0 -> 31535 bytes
conf/translation-exclude-package.properties | 5 +-
conf/translation-multibytes-key.properties | 5 +-
conf/translation-regex-through.properties | 11 +-
conf/translation-regex.properties | 15 +-
conf/translation.properties | 1002 +-
debian/changelog | 15 +
debian/control | 4 +-
debian/patches/build.xml | 14 +-
debian/patches/compile_junit.patch | 35 +
debian/patches/disable-create-src_zip | 36 +-
debian/patches/fix-config.ini | 22 -
debian/patches/not_run_integrate.patch | 24 +
debian/patches/series | 3 +-
debian/rules | 2 +-
lib/javassist/License.html | 27 +-
lib/javassist/javassist-src.zip | Bin 475584 -> 505287 bytes
...t-version-3.9GA => javassist-version-3.16.1-GA} | 0
lib/javassist/javassist.jar | Bin 596036 -> 665248 bytes
...ssist-version-3.9GA => pleiades-1.4.0.I20130222 | 0
readme/readme_pleiades.txt | 19 +-
readme/readme_pleiades_changes.txt | 61 +-
src/jp/sourceforge/mergedoc/pleiades/Pleiades.java | 219 +-
.../mergedoc/pleiades/PleiadesOption.java | 89 +-
.../pleiades/aspect/AbstractTransformer.java | 132 +-
.../mergedoc/pleiades/aspect/Analyses.java | 49 +-
.../mergedoc/pleiades/aspect/AsyncCommand.java | 62 +
.../mergedoc/pleiades/aspect/AsyncQueue.java | 111 +
.../mergedoc/pleiades/aspect/Asyncs.java | 70 -
.../mergedoc/pleiades/aspect/CleanMessage.java | 146 +
.../mergedoc/pleiades/aspect/EclipseFiles.java | 296 +
.../aspect/LauncherEclipseTransformer.java | 431 +
.../pleiades/aspect/LauncherTransformer.java | 474 +-
.../mergedoc/pleiades/aspect/Locks.java | 37 +-
.../mergedoc/pleiades/aspect/Metadata.java | 96 +-
.../pleiades/aspect/TranslationEditor.java | 8 +-
.../pleiades/aspect/TranslationTransformer.java | 119 +-
.../pleiades/aspect/advice/PleiadesConfig.java | 22 +-
.../aspect/advice/PleiadesConfigAssembler.java | 77 +-
.../pleiades/aspect/resource/CacheFileNames.java | 24 -
.../pleiades/aspect/resource/CacheFiles.java | 44 +
.../aspect/resource/CallHierarchyExplorer.java | 152 +
.../resource/DynamicTranslationDictionary.java | 286 +-
...ssNameCache.java => ExcludeClassNameCache.java} | 29 +-
.../resource/TraceableTranslationDictionary.java | 33 +-
.../aspect/resource/TransformedClassCache.java | 57 +-
.../pleiades/aspect/resource/Translations.java | 8 +-
.../resource/UnderscoreMnemonicDictionary.java | 41 +
.../pleiades/aspect/util/CachePropertySet.java | 60 +
.../aspect/util/ConcurrentPropertySet.java | 40 +
.../pleiades/aspect/util/ValueHashPropertySet.java | 44 +
.../pleiades/generator/AbstractValidator.java | 2 +-
.../mergedoc/pleiades/generator/Generator.java | 73 +-
.../pleiades/generator/TranslationRule.java | 4 +-
.../mergedoc/pleiades/generator/Validator.java | 12 +-
.../pleiades/generator/nls/AbstractExtractor.java | 2 +-
.../pleiades/generator/nls/J10nHelpValidator.java | 4 +-
.../mergedoc/pleiades/generator/nls/Plugin.java | 30 +-
.../pleiades/generator/nls/UIExtractor.java | 5 +-
.../sourceforge/mergedoc/pleiades/log/Dialogs.java | 69 +
.../mergedoc/pleiades/log/PopupFileLogger.java | 15 +-
.../resource/AbstractTranslationDictionary.java | 85 +-
.../mergedoc/pleiades/resource/FileNames.java | 3 +
.../mergedoc/pleiades/resource/Files.java | 22 +-
.../mergedoc/pleiades/resource/HelpHtmlParser.java | 12 +-
.../mergedoc/pleiades/resource/Mnemonics.java | 3 +-
.../mergedoc/pleiades/resource/PropertySet.java | 39 +-
.../mergedoc/pleiades/resource/Strings.java | 37 +
.../resource/TranslationNotFoundProperties.java | 3 +-
.../pleiades/resource/TranslationString.java | 2 +-
.../resource/DynamicTranslationDictionaryTest.java | 32 +
.../resource/TranslationDictionaryTest.java | 7 +
srctest/pending/HelpHtmlParserTest.java | 220 -
srctest/pending/PropertySetTest.java | 36 -
.../pending/TranslationDictionaryHelpTestX.java | 43 -
140 files changed, 33452 insertions(+), 38803 deletions(-)
diff --cc debian/changelog
index 6a7cbb4,0000000..9bd3b4d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,203 -1,0 +1,218 @@@
++pleiades (1.4.0-dfsg-1) experimental; urgency=low
++
++ * New upstream release
++ * debian/patches
++ - drop fix-config.ini since it is unnecessary by change in upstream
++ - add compile_junit.patch
++ * debian/control
++ - set Standards-Version: 3.9.4
++ - add Build-Depends: ant-optional (/usr/share/ant/lib/ant-junit.jar),
++ junit
++ * debian/rules
++ - deal with changes in build.xml
++
++ -- Hideki Yamane <henrich at debian.org> Tue, 05 Mar 2013 23:47:08 +0900
++
+pleiades (1.3.4-dfsg-4) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Hideki Yamane <henrich at debian.org> Mon, 06 Aug 2012 23:44:28 +0900
+
+pleiades (1.3.4-dfsg-3) experimental; urgency=low
+
+ * debconf/po
+ - add Portuguese translation (Closes: #678739)
+ * temporary disabled debconf usage, its behaivior violates policy and I'll
+ look for another solution after Wheezy will be released (Closes: #679846)
+
+ -- Hideki Yamane <henrich at debian.org> Mon, 06 Aug 2012 18:29:33 +0900
+
+pleiades (1.3.4-dfsg-2) experimental; urgency=low
+
+ [ Christian Perrier ]
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. Closes: #676312
+ * [Debconf translation updates]
+ * Swedish (Martin Bagge / brother). Closes: #678321
+ * Danish (Joe Hansen). Closes: #678323
+ * Slovak (Ivan Masár). Closes: #678334
+ * Russian (Yuri Kozlov). Closes: #678432
+ * Galician (Jorge Barreiro). Closes: #678465
+ * Czech (Michal Simunek). Closes: #678672
+ * French (Étienne Gilli). Closes: #679006
+ * Polish (Michał Kułach). Closes: #679434
+ * German (Chris Leick). Closes: #679461
+ * Spanish; (# traductor (campo Last-Translator) y ponga en copia a la
+ lista de Fernando C. Estrada). Closes: #679805
+ * Italian (Beatrice Torracca). Closes: #680569
+
+ [ Hideki Yamane ]
+ * debian/control
+ - set "Build-Depends: debhelper (>= 9)"
+ * upload to experimental
+
+ -- Hideki Yamane <henrich at debian.org> Sat, 04 Aug 2012 10:28:49 +0900
+
+pleiades (1.3.4-dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control
+ - improve descriptions
+ - bump up debehelper version to use xz option
+ * debian/compat
+ - set 9
+ * add debian/NEWS file about automatic configuration and manual
+ configuration due to upgrading eclipse package would override its change
+ * debian/patches
+ - refresh all patches to meet to DEP3 format.
+ * debian/watch
+ - update to catch newer upstream version correctly.
+ * debian/rules
+ - add "--parallel" option to build
+ - remove unnecessary lib directory with dh_auto_install
+ * debian/copyright
+ - update to deal with changes about not exclude javaassist and commons-io
+ from upstream source
+
+ -- Hideki Yamane <henrich at debian.org> Sun, 01 Jul 2012 10:03:06 +0900
+
+pleiades (1.3.4~I20120531-dfsg-2) unstable; urgency=low
+
+ * debian/control
+ - add "Depends: dpkg (>= 1.15.6~)" to deal with Lintian warning
+ "data.tar.xz-member-without-dpkg-pre-depends"
+ * debian/copyright
+ - update "Format:" field to
+ http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+ and set License: EPL-1.0
+ * debian/rules
+ - install readme_pleiades_changes.txt as upstream ChangeLog
+
+ -- Hideki Yamane <henrich at debian.org> Tue, 05 Jun 2012 13:07:59 +0900
+
+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 1277952,0000000..4413744
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>
- Build-Depends: debhelper (>= 9), ant, default-jdk
++Build-Depends: debhelper (>= 9), ant, default-jdk, ant-optional, junit
+Build-Depends-Indep: libcommons-lang-java, libcommons-io-java, libjavassist-java, zip, unzip
- Standards-Version: 3.9.3
++Standards-Version: 3.9.4
+Homepage: http://mergedoc.sourceforge.jp/
+
+Package: pleiades
+Architecture: all
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: eclipse, libcommons-lang-java, libcommons-io-java, libjavassist-java,
+ ${misc:Depends}
+Description: Japanese translation plug-in for Eclipse using dynamic AOP
+ Pleiades is a dynamic Aspect-Oriented Programming translation layer for the
+ Eclipse platform and many of its plug-ins. It uses a Japanese glossary to
+ provide side-by-side English/Japanese property resource bundles.
diff --cc debian/patches/build.xml
index 912a88a,0000000..42c7439
mode 100644,000000..100644
--- a/debian/patches/build.xml
+++ b/debian/patches/build.xml
@@@ -1,80 -1,0 +1,82 @@@
+Description: adjust library location, Class-Path and excluding .pc dir (Debian Specific)
+ Upstream distributes some libraries with Pleiades, however, on Debian system,
+ it should be used system library instead of bundled one. This patch changes
+ library path on build.xml file.
+ .
+ And it lacks Class-Path specification on build.xml, so add it (path is changed
+ same as above, so not apply to upstream).
+ .
+ Upstream lacks excluding ".pc" directory for patching with quilt. It should be
+ forwarded to upstream.
+ .
+ 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>!
+Author: Hideki Yamane <henrich at debian.org>
+---
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2012-06-26
+
- --- pleiades-1.3.4~I20120531-dfsg.orig/build.xml
- +++ pleiades-1.3.4~I20120531-dfsg/build.xml
- @@ -41,9 +41,10 @@
++Index: pleiades-1.4.0-dfsg/build.xml
++===================================================================
++--- pleiades-1.4.0-dfsg.orig/build.xml 2013-03-14 06:20:35.000000000 +0900
+++++ pleiades-1.4.0-dfsg/build.xml 2013-03-14 06:23:36.846737414 +0900
++@@ -46,9 +46,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>
+
- <!-- 翻訳プロパティーの生成（各プロパティーのマージ） -->
- @@ -94,7 +95,15 @@
++ <!--
++@@ -105,7 +106,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>
+
- @@ -103,6 +112,7 @@
++@@ -114,6 +123,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/compile_junit.patch
index 0000000,0000000..5765da6
new file mode 100644
--- /dev/null
+++ b/debian/patches/compile_junit.patch
@@@ -1,0 -1,0 +1,35 @@@
++Description: adjust compiling before run test.unit
++ We need to prepare classes befero runnning test.unit, so
++ - compile as javac and copy files from build/bin to bin
++ - compile as srctest to bintest
++
++Author: Hideki Yamane <henrich at debian.org>
++
++---
++Origin: vendor
++Forwarded: no
++Last-Update: 2013-03-15
++
++Index: pleiades-1.4.0-dfsg/build.xml
++===================================================================
++--- pleiades-1.4.0-dfsg.orig/build.xml 2013-03-15 10:56:14.448914084 +0900
+++++ pleiades-1.4.0-dfsg/build.xml 2013-03-15 10:56:14.448914084 +0900
++@@ -292,7 +292,17 @@
++ -->
++
++ <!-- ユニット・テスト -->
++- <target name="test.unit" description="">
+++ <target name="prepare" depends="javac">
+++ <copy todir="bin">
+++ <fileset dir="${bin.dir}">
+++ <include name="**/*" />
+++ </fileset>
+++ </copy>
+++ <mkdir dir="bintest" />
+++ <javac srcdir="srctest" destdir="bintest" classpathref="project.classpath" encoding="UTF-8" source="1.5" target="1.5" />
+++ </target>
+++
+++ <target name="test.unit" depends="prepare" description="">
++
++ <mkdir dir="report" />
++
diff --cc debian/patches/disable-create-src_zip
index 459befb,0000000..2069126
mode 100644,000000..100644
--- a/debian/patches/disable-create-src_zip
+++ b/debian/patches/disable-create-src_zip
@@@ -1,59 -1,0 +1,39 @@@
+Description: disable building src.zip file (Debian Specific)
+ When building package, upstream build.xml tries to build src.zip. It's
+ not necessary to build for Debian package, so disable it to make build
+ time short.
+ .
- 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
-
+Author: Hideki Yamane <henrich at debian.org>
+---
+Origin: vendor
+Forwarded: not-needed
- Last-Update: 2012-06-26
++Last-Update: 2013-03-06
+
- --- pleiades-1.3.4~I20120531-dfsg.orig/build.xml
- +++ pleiades-1.3.4~I20120531-dfsg/build.xml
- @@ -185,26 +185,6 @@
++--- pleiades-1.4.0-dfsg.orig/build.xml
+++++ pleiades-1.4.0-dfsg/build.xml
++@@ -221,25 +221,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="conf/props/**/.*" />
+- <exclude name="nls/" />
+- <exclude name="report/" />
+- <exclude name="build/" />
+- <!-- コマンドでエラーになるため追加 -->
+- <exclude name="features/" />
+- <exclude name="plugins/" />
+- </fileset>
+- </zip>
- -
- </target>
-
- <!-- クリーン (コマンドライン用) -->
++ <delete>
++ <fileset dir=".">
++ <include name="pleiades-*" />
diff --cc debian/patches/fix-config.ini
index 5f8e04c,0000000..f4bfba4
mode 100644,000000..100644
--- a/debian/patches/fix-config.ini
+++ b/debian/patches/fix-config.ini
@@@ -1,64 -1,0 +1,42 @@@
+Description: change behavior to search config.ini file
+ In Debian, we should search /usr/lib/eclipse first.
+ .
- 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>!
+Author: Hideki Yamane <henrich at debian.org>
+
+---
+Origin: vendor
+Forwarded: Yes (via private mail)
+Last-Update: 2012-06-26
+
+--- pleiades-1.3.3-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java 2011-09-08 23:31:27.236196838 +0900
++++ pleiades-1.3.3-dfsg/src/jp/sourceforge/mergedoc/pleiades/Pleiades.java 2011-09-08 23:38:11.046199226 +0900
+@@ -230,13 +230,23 @@
+ File eclipseDir = Files.resourceRoot.getParentFile().getParentFile().getParentFile();
+
+ // config ディレクトリがデフォルトの名前の場合の検索 (ディレクトリー＋ファイル名で検索)
+- for (File dir = eclipseDir; dir != null; dir = dir.getParentFile()) {
+- configIniFile = new File(dir, CONFIG_DIR_INI);
+- if (configIniFile.exists()) {
+- return configIniFile;
+- }
++ // Linux の場合に /usr/lib/eclipse 以下を最初に参照する
++ if (os == OS.LINUX) {
++ for (File dir = eclipseDir; dir != null; dir = dir.getParentFile()) {
++ dir = new File("/usr/lib/eclipse/");
++ configIniFile = new File(dir, CONFIG_DIR_INI);
++ if (configIniFile.exists()) {
++ return configIniFile;
++ }
++ }
++ } else {
++ for (File dir = eclipseDir; dir != null; dir = dir.getParentFile()) {
++ configIniFile = new File(dir, CONFIG_DIR_INI);
++ if (configIniFile.exists()) {
++ return configIniFile;
++ }
++ }
+ }
+-
+ // config ディレクトリが -configuration で変更されている場合の検索 (ファイル名だけで検索)
+ for (File dir = eclipseDir; dir != null; dir = dir.getParentFile()) {
+ for (File d : dir.listFiles(Files.createDirectoryFilter())) {
diff --cc debian/patches/not_run_integrate.patch
index 0000000,0000000..14aeca7
new file mode 100644
--- /dev/null
+++ b/debian/patches/not_run_integrate.patch
@@@ -1,0 -1,0 +1,24 @@@
++Description: adjust build.full target
++ It's unnecessary to run build.integration (fails since pleiades-src is not
++ prepared). Also, it's better to run test.unit.
++
++Author: Hideki Yamane <henrich at debian.org>
++
++---
++Origin: vendor
++Forwarded: no
++Last-Update: 2013-03-15
++
++Index: pleiades-1.4.0-dfsg/build.xml
++===================================================================
++--- pleiades-1.4.0-dfsg.orig/build.xml 2013-03-15 10:58:14.845244717 +0900
+++++ pleiades-1.4.0-dfsg/build.xml 2013-03-15 10:58:14.845244717 +0900
++@@ -282,7 +282,7 @@
++ </target>
++
++ <!-- ビルド (コマンドライン用) -->
++- <target name="build.full" depends="clean, javac, build.integration">
+++ <target name="build.full" depends="clean, javac, test.unit, build">
++ </target>
++
++ <!--
diff --cc debian/patches/series
index 91ed833,0000000..c5469f7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
+disable-create-src_zip
+build.xml
- fix-config.ini
++compile_junit.patch
++not_run_integrate.patch
diff --cc debian/rules
index 5b1aa5c,0000000..ec9fb33
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,29 -1,0 +1,29 @@@
+#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+packagename=pleiades
+eclipse_dir=usr/share/eclipse
+
+%:
+ dh $@ --parallel
+
+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
++ unzip -q -d $(CURDIR)/debian/$(packagename)/$(eclipse_dir) $(CURDIR)/build/nightly/$(packagename).zip
+# remove unneeded files
+ -rm $(CURDIR)/debian/$(packagename)/$(eclipse_dir)/*cmd
+ -rm -r $(CURDIR)/debian/$(packagename)/$(eclipse_dir)/readme
+ -rm -r $(CURDIR)/debian/$(packagename)/$(eclipse_dir)/plugins/jp.sourceforge.mergedoc.pleiades/lib
+
+override_dh_installchangelogs:
+ dh_installchangelogs $(CURDIR)/readme/readme_pleiades_changes.txt
+
+#override_dh_clean:
+# debconf-updatepo
+# dh_clean
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -Sextreme -z9
--
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