This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository icu4j-4.2.
commit 5883ee58d7cb5166e376e626a4c39dc70445a3d6 Author: Niels Thykier <[email protected]> Date: Sun Jan 10 15:10:26 2010 +0000 icu4j (4.0.1.1-1) UNRELEASED; urgency=low [ Andreas Tille ] * Watch file now detects all versions even for new major version change [ Niels Thykier ] * New upstream release. - Added patch to handle hardcoded versions. * Bumped debhelper compat to 7. * Bumped Standards-Version to 3.8.3. - Changed section to java. * Added myself to Uploaders. * Removed eclipse from Build-Depends to avoid circular Build-Dependency (eclipse 3.5 depends on icu4j). * Converted source to 3.0 (quilt). * Bumped version in NEWS to match first affected version released in Debian. -- Niels Thykier <[email protected]> Mon, 28 Sep 2009 20:21:19 +0200 --- debian/NEWS | 2 +- debian/build.xml | 44 +++++++++++++++++++++++++++++++ debian/changelog | 18 +++++++++++-- debian/compat | 2 +- debian/control | 20 +++++++------- debian/docs | 1 - debian/install | 1 - debian/links | 2 +- debian/patches/01_build-xml.patch | 48 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 55 +++++++++------------------------------ debian/rules.xml | 9 ------- debian/source/format | 1 + debian/watch | 3 --- 14 files changed, 135 insertions(+), 72 deletions(-) diff --git a/debian/NEWS b/debian/NEWS index 948ae63..d4ea249 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -icu4j (3.8.1-0ubuntu1) hardy; urgency=low +icu4j (3.8.1-1) hardy; urgency=low * The package has been modified to use the eclipse-compatible version of this library. There should be no noticible change for other programs that use diff --git a/debian/build.xml b/debian/build.xml new file mode 100644 index 0000000..1c4aaca --- /dev/null +++ b/debian/build.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="icu-deb" default="build-jars"> + <property name="source" value="1.5" /> + <property name="target" value="1.5" /> + <property name="debug" value="true" /> + <property name="optimize" value="true" /> + <!-- Locations are relative to the debian dir. --> + <property name="output.dir" value=".." /> + <property name="source.base.dir" location="../eclipseProjects/plugins" /> + + <target name="init"> + <mkdir dir="${output.dir}" /> + </target> + <target name="build-jars"> + <antcall target="build-jar"> + <param name="build.part" value="com.ibm.icu.base" /> + </antcall> + <antcall target="build-jar"> + <param name="build.part" value="com.ibm.icu" /> + </antcall> + </target> + <target name="clean"> + <delete dir="${output.dir}" /> + </target> + + <target name="build-jar" depends="init"> + <mkdir dir="${output.dir}/" /> + <javac srcdir="${source.base.dir}/${build.part}/src/" destdir="${source.base.dir}/${build.part}/" + optimize="${optimize}" debug="${debug}" source="${source}" target="${target}" /> + <move todir="${source.base.dir}/${build.part}"> + <fileset dir="${source.base.dir}/${build.part}/src"> + <exclude name="**/*.java" /> + </fileset> + </move> + <jar destfile="${output.dir}/${build.part}.jar" basedir="${source.base.dir}/${build.part}" + manifest="${source.base.dir}/${build.part}/META-INF/MANIFEST.MF" + /> + <fileset dir="${source.base.dir}/${build.part}" > + <exclude name="**/.*/**" /> + <exclude name="**/src/**" /> + </fileset> + + </target> +</project> diff --git a/debian/changelog b/debian/changelog index b637b6f..bfd32a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,23 @@ -icu4j (4.0.0-1) UNRELEASED; urgency=low +icu4j (4.0.1.1-1) UNRELEASED; urgency=low + [ Andreas Tille ] * Watch file now detects all versions even for new major version change - -- Andreas Tille <[email protected]> Tue, 16 Dec 2008 10:41:45 +0100 + [ Niels Thykier ] + * New upstream release. + - Added patch to handle hardcoded versions. + * Bumped debhelper compat to 7. + * Bumped Standards-Version to 3.8.3. + - Changed section to java. + * Added myself to Uploaders. + * Removed eclipse from Build-Depends to avoid circular + Build-Dependency (eclipse 3.5 depends on icu4j). + * Converted source to 3.0 (quilt). + * Bumped version in NEWS to match first affected version + released in Debian. + + -- Niels Thykier <[email protected]> Mon, 28 Sep 2009 20:21:19 +0200 icu4j (3.8.1-1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 1e8b314..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +7 diff --git a/debian/control b/debian/control index 5b4f2a2..2b83ecf 100644 --- a/debian/control +++ b/debian/control @@ -1,21 +1,21 @@ Source: icu4j -Section: devel +Section: java Priority: optional -Maintainer: Debian Java maintainers <[email protected]> +Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Andreas Tille <[email protected]>, - Steffen Moeller <[email protected]> -XSBC-Original-Maintainer: Nathan Summers <[email protected]>, - Steffen Moeller <[email protected]> -Standards-Version: 3.8.0 -Build-Depends: debhelper (>= 6), ant (>= 1.7.0), openjdk-6-jdk -XS-Build-Recommends: flip + Steffen Moeller <[email protected]>, + Niels Thykier <[email protected]> +Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 7), ant (>= 1.7.0), default-jdk, unzip, + javahelper Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/icu4j -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/icu4j/?rev=0&sc=0 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/icu4j/ Homepage: http://www.icu-project.org/ Package: libicu4j-java Architecture: all -Depends: kaffe | java1-runtime | java2-runtime +Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless | + java5-runtime-headless | java6-runtime-headless Description: Library for unicode support and internalisation ICU is a mature, widely used set of C/C++ and Java libraries for Unicode support, software internationalization and globalization diff --git a/debian/docs b/debian/docs index 1d7a62a..6d0e6d3 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1 @@ -readme.html APIChangeReport.html diff --git a/debian/install b/debian/install deleted file mode 100644 index 82f8e52..0000000 --- a/debian/install +++ /dev/null @@ -1 +0,0 @@ -eclipseProjects/plugins/com.ibm.icu/com.ibm.icu_3.8.1.v20080925.jar /usr/share/java/ diff --git a/debian/links b/debian/links index 1440d8b..13947b5 100644 --- a/debian/links +++ b/debian/links @@ -1 +1 @@ -/usr/share/java/com.ibm.icu_3.8.1.v20080925.jar /usr/share/java/icu4j.jar +/usr/share/java/com.ibm.icu_*.jar /usr/share/java/icu4j.jar diff --git a/debian/patches/01_build-xml.patch b/debian/patches/01_build-xml.patch new file mode 100644 index 0000000..b37976c --- /dev/null +++ b/debian/patches/01_build-xml.patch @@ -0,0 +1,48 @@ +Description: "Soften" some hardcoded versions. + +--- a/build.xml 2010-01-10 13:18:03.985282960 +0100 ++++ b/build.xml 2010-01-10 13:20:03.817282945 +0100 +@@ -1664,8 +1664,8 @@ + destdir="${build.dir}" + classpathref="build.classpath" + bootclasspath="ee.foundation.jar" +- source="1.3" +- target="1.1" ++ source="${icu4j.javac.source}" ++ target="${icu4j.javac.target}" + debug="on" + deprecation="off" + encoding="ascii" /> +@@ -1765,8 +1765,8 @@ + destdir="${wrapper.build.dir}" + classpathref="build.classpath" + bootclasspath="ee.foundation.jar" +- source="1.3" +- target="1.1" ++ source="${icu4j.javac.source}" ++ target="${icu4j.javac.target}" + debug="on" + deprecation="off" + encoding="ascii" /> +@@ -1828,8 +1828,8 @@ + excludes="com/ibm/icu/dev/test/charset/**/*.*,com/ibm/icu/dev/test/perf/**/*.*" + srcdir="${src.dir}" + destdir="${build.dir}" +- source="1.3" +- target="1.3" ++ source="${icu4j.javac.source}" ++ target="${icu4j.javac.target}" + classpathref="build.classpath" + debug="on" + deprecation="off" /> +@@ -1885,8 +1885,8 @@ + srcdir="${src.dir}" + destdir="${build.dir}" + classpathref="build.classpath" +- source="1.3" +- target="1.2" ++ source="${icu4j.javac.source}" ++ target="${icu4j.javac.target}" + debug="on" + deprecation="off" + encoding="ascii" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5615b39 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_build-xml.patch diff --git a/debian/rules b/debian/rules index 6b0bd83..0360097 100755 --- a/debian/rules +++ b/debian/rules @@ -1,46 +1,28 @@ #!/usr/bin/make -f -ANT_RUNNER = /usr/lib/eclipse/eclipse \ - -nosplash \ - -consolelog \ - -data builddata \ - -application org.eclipse.ant.core.antRunner - -PLUGIN_BUILD = eclipseProjects/plugins/com.ibm.icu/build.xml - build: build-stamp -patch: $(PLUGIN_BUILD) - -$(PLUGIN_BUILD): - dh_testdir - ant eclipseCoreProject - cp pluginBuild.xml $(PLUGIN_BUILD) - -build-stamp: $(PLUGIN_BUILD) +build-stamp: dh_testdir - - ant -buildfile $(PLUGIN_BUILD) build.update.jar - + ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 eclipseProjects eclipseCoreProject eclipseWrapperProject + ant -f debian/build.xml build-jars touch $@ clean: dh_testdir - - rm -f build-stamp - - -ant -buildfile $(PLUGIN_BUILD) clean - -ant normSrc - -sed -e '/#/d;s/\r//' preprocessor.txt | xargs flip -m - -ant clean - #rm -Rf */*/@dot */*/temp.folder - rm -Rf builddata + rm -f build-stamp + ant normSrc + ant clean dh_testroot dh_clean -binary-indep: build +binary-arch: + +binary-indep: build-stamp dh_testdir dh_testroot + dh_prep + jh_installlibs -plibicu4j-java com.ibm.icu.jar com.ibm.icu.base.jar dh_installchangelogs dh_installdocs dh_install @@ -52,19 +34,6 @@ binary-indep: build dh_md5sums dh_builddeb - -binary-arch: - binary: binary-indep binary-arch -generate-feature: $(PLUGIN_BUILD) - -build-scripts: - dh_testdir - $(ANT_RUNNER) -buildfile debian/rules.xml build-scripts - sed -i -e "/eclipse\\.versionReplacer/d" $(PLUGIN_BUILD) - cp $(PLUGIN_BUILD) pluginBuild.xml - - -.PHONY: build patch clean binary-indep binary-arch binary install -.PHONY: generate-feature build-scripts +.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/rules.xml b/debian/rules.xml deleted file mode 100644 index 9a450f2..0000000 --- a/debian/rules.xml +++ /dev/null @@ -1,9 +0,0 @@ -<project name="Debian build rules" basedir=".." > - <property name="buildDirectory" location="eclipseProjects" /> - - <target name="build-scripts" description="Creates build.xml files"> - <eclipse.buildScript - elements="[email protected]" - buildDirectory="${buildDirectory}" /> - </target> -</project> 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 index a5ccfad..8b4b3a4 100644 --- a/debian/watch +++ b/debian/watch @@ -3,6 +3,3 @@ version=3 opts="uversionmangle=s?_?.?g" \ http://download.icu-project.org/files/icu4j/([0-9.]*)/icu4j-([[:digit:]_]+)-src\.jar -# http://www.icu-project.org/download/3.8.html \ -# http://download.icu-project.org/files/icu4j/.*/icu4j-([0-9]+)_([0-9])_([0-9])-src.jar \ -# debian -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/icu4j-4.2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
