This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch master in repository pleiades.
commit 3c19a2f06b5d6297b79fbfe1b36f0dad200d6a08 Author: Hideki Yamane <[email protected]> Date: Tue May 29 09:42:09 2012 +0900 Imported Debian patch 1.3.3-dfsg-3 --- debian/changelog | 11 +++++++++++ debian/control | 2 +- debian/patches/build.xml | 12 ++++++++---- debian/patches/class-path_in_MANIFEST | 9 +++++++++ debian/rules | 3 +++ 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 99734ed..6492fd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +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 <[email protected]> Tue, 29 May 2012 09:42:09 +0900 + pleiades (1.3.3-dfsg-2) unstable; urgency=low * debian/control diff --git a/debian/control b/debian/control index 7c46973..9eddaf8 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Hideki Yamane <[email protected]> Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk Build-Depends-Indep: libcommons-lang-java, libcommons-io-java, libjavassist-java, zip, unzip -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://mergedoc.sourceforge.jp/ Package: pleiades diff --git a/debian/patches/build.xml b/debian/patches/build.xml index 6a02f9a..b371d22 100644 --- a/debian/patches/build.xml +++ b/debian/patches/build.xml @@ -1,7 +1,7 @@ Index: pleiades-1.3.3-dfsg/build.xml =================================================================== ---- pleiades-1.3.3-dfsg.orig/build.xml 2011-07-03 10:33:50.000000000 +0900 -+++ pleiades-1.3.3-dfsg/build.xml 2011-09-08 22:45:25.698503112 +0900 +--- 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"/> @@ -18,7 +18,7 @@ Index: pleiades-1.3.3-dfsg/build.xml </path> <!-- 翻訳プロパティーの生成（各プロパティーのマージ） --> -@@ -99,7 +98,10 @@ +@@ -99,7 +98,14 @@ <attribute name="Premain-Class" value="${project.id}.Pleiades"/> <attribute name="Boot-Class-Path" @@ -27,10 +27,14 @@ Index: pleiades-1.3.3-dfsg/build.xml + /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 +110,7 @@ +@@ -108,6 +114,7 @@ <copy todir="plugins/${project.id}"> <fileset dir="${basedir}"> <exclude name="debian/"/> diff --git a/debian/patches/class-path_in_MANIFEST b/debian/patches/class-path_in_MANIFEST new file mode 100644 index 0000000..8849644 --- /dev/null +++ b/debian/patches/class-path_in_MANIFEST @@ -0,0 +1,9 @@ +Index: pleiades-1.3.3-dfsg/META-INF/MANIFEST.MF +=================================================================== +--- pleiades-1.3.3-dfsg.orig/META-INF/MANIFEST.MF 2011-07-03 17:33:00.000000000 +0900 ++++ pleiades-1.3.3-dfsg/META-INF/MANIFEST.MF 2012-05-29 09:22:39.321500217 +0900 +@@ -5,3 +5,4 @@ + Bundle-Localization: plugin + Bundle-SymbolicName: jp.sourceforge.mergedoc.pleiades + Bundle-Version: @version ++Class-Path: ../../../java/commons-lang.jar ../../../java/commons-io.jar ../../../java/javassist.jar diff --git a/debian/rules b/debian/rules index 2310544..5589dc9 100755 --- a/debian/rules +++ b/debian/rules @@ -16,3 +16,6 @@ override_dh_auto_install: # remove unneeded files -rm -r $(CURDIR)/debian/$(packagename)/$(eclipse_dir)/readme -rm $(CURDIR)/debian/$(packagename)/$(eclipse_dir)/*cmd + +override_dh_builddeb: + dh_builddeb -- -Zxz -- 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
