[icu4j] 01/01: Switch from CDBS to DH sequences
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Tue Mar 1 10:26:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository icu4j.
commit f7c8cff2d1868cfab7633a9f29e417fff104e4dd
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Tue Mar 1 18:26:08 2016 +0800
Switch from CDBS to DH sequences
---
debian/.gitignore | 6 ++++++
debian/NEWS | 6 +++---
debian/build.xml | 42 -------------------------------------
debian/changelog | 1 +
debian/control | 1 -
debian/icu4j-charset.pom | 9 ++++++++
debian/icu4j-localespi.pom | 9 ++++++++
debian/{docs => libicu4j-java.docs} | 1 +
debian/libicu4j-java.poms | 3 +++
debian/links | 1 -
debian/orig-tar.sh | 16 --------------
debian/pom.xml | 16 --------------
debian/rules | 22 ++++---------------
13 files changed, 36 insertions(+), 97 deletions(-)
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..3590eae
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,6 @@
+.mh/
+*.log
+*.substvars
+debhelper-build-stamp
+files
+libicu4j-java*/
\ No newline at end of file
diff --git a/debian/NEWS b/debian/NEWS
index d4ea249..0755584 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,7 +1,7 @@
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
- this library.
+ 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
+ this library.
-- Nathan Summers <rock at gimp.org> Thu, 25 Sep 2008 18:53:40 -0400
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 16e121d..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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="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}"
- fork="yes" />
- <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"
- manifest="${source.base.dir}/${build.part}/META-INF/MANIFEST.MF"
- >
- <fileset dir="${source.base.dir}/${build.part}" >
- <exclude name="**/.*/**" />
- <exclude name="**/src/**" />
- </fileset>
- </jar>
- </target>
-</project>
diff --git a/debian/changelog b/debian/changelog
index 7dda6bd..759a034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ icu4j (56.1-1) UNRELEASED; urgency=medium
* get-orig-source: Download released tarballs instead of checking out SVN
* Update d/copyright to the standardized format
* Refresh patches
+ * Switch from CDBS to DH sequences
-- Kai-Chung Yan <seamlikok at gmail.com> Mon, 29 Feb 2016 14:48:30 +0800
diff --git a/debian/control b/debian/control
index b2fa789..68ed4a4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders: Andreas Tille <tille at debian.org>,
Kai-Chung Yan <seamlikok at gmail.com>
Standards-Version: 3.9.7
Build-Depends: ant (>= 1.7.0),
- cdbs,
debhelper (>= 9),
default-jdk,
javahelper,
diff --git a/debian/icu4j-charset.pom b/debian/icu4j-charset.pom
new file mode 100644
index 0000000..cebddf3
--- /dev/null
+++ b/debian/icu4j-charset.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j-charset</artifactId>
+ <version>56.1</version>
+</project>
\ No newline at end of file
diff --git a/debian/icu4j-localespi.pom b/debian/icu4j-localespi.pom
new file mode 100644
index 0000000..0c83e00
--- /dev/null
+++ b/debian/icu4j-localespi.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j-localespi</artifactId>
+ <version>56.1</version>
+</project>
\ No newline at end of file
diff --git a/debian/docs b/debian/libicu4j-java.docs
similarity index 65%
rename from debian/docs
rename to debian/libicu4j-java.docs
index 6d0e6d3..98631b6 100644
--- a/debian/docs
+++ b/debian/libicu4j-java.docs
@@ -1 +1,2 @@
APIChangeReport.html
+readme.html
\ No newline at end of file
diff --git a/debian/libicu4j-java.poms b/debian/libicu4j-java.poms
new file mode 100644
index 0000000..f478405
--- /dev/null
+++ b/debian/libicu4j-java.poms
@@ -0,0 +1,3 @@
+debian/icu4j-charset.pom --artifact=icu4j-charset.jar --java-lib
+debian/icu4j-localespi.pom --artifact=icu4j-localespi.jar --java-lib
+pom.xml --artifact=icu4j.jar --java-lib
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 7a4017d..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/java/com.ibm.icu.jar /usr/share/java/icu4j.jar
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 5675da8..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../icu4j_$VERSION.orig.tar.gz
-DIR=icu4j-$VERSION
-TAG=$(echo "release-$VERSION" | sed -re's,\.,-,g')
-
-svn export http://source.icu-project.org/repos/icu/icu4j/tags/${TAG}/ $DIR
-tar -c -z -f $TAR $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
diff --git a/debian/pom.xml b/debian/pom.xml
deleted file mode 100644
index bdf96d1..0000000
--- a/debian/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>56.1</version>
- <packaging>jar</packaging>
- <name>ICU4J</name>
- <url>http://www.icu-project.org/</url>
- <description>The International Component for Unicode (ICU) is a
- mature, portable set of C/C++ and Java libraries for Unicode
- support, software internationalization (I18N) and globalization
- (G11N), giving applications the same results on all
- platforms.</description>
-</project>
diff --git a/debian/rules b/debian/rules
index aeae377..79d86f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,13 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/dpkg/pkg-info.mk
-export JAVA_HOME := /usr/lib/jvm/default-java/
+export JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_CLEAN_TARGET := normSrc clean
-DEB_ANT_BUILD_TARGET := eclipseProjects eclipseCoreProject eclipseWrapperProject
UPSTREAM_TAR = icu4j-$(subst .,_,$(DEB_UPSTREAM_VERSION)).tgz
-build/libicu4j-java:: stamp-extra-build
-stamp-extra-build:
- ant -f debian/build.xml build-jars
- touch $@
-
-install/libicu4j-java::
- jh_installlibs -plibicu4j-java com.ibm.icu.jar com.ibm.icu.base.jar
- mh_linkjar -plibicu4j-java debian/pom.xml usr/share/java/icu4j.jar
- mh_installpom -plibicu4j-java debian/pom.xml
-
-clean::
- mh_clean
- rm -f *.jar stamp-extra-build
+%:
+ dh $@ --buildsystem=ant --with=maven-repo-helper
get-orig-source: $(UPSTREAM_TAR)
mk-origtargz --repack --compression xz $<
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/icu4j.git
More information about the pkg-java-commits
mailing list